support query edges of vertex in page #659
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
implemented: #658 Change-Id: I26e8efb1e8e3547f403dd97e2ddc367df69eae51
zhoney
force-pushed
the
edgesOfVertexInPage
branch
from
2ed9ddb
to
d18ab47
Compare
Codecov Report
@@ Coverage Diff @@
## master #659 +/- ##
===========================================
- Coverage 72.35% 64.7% -7.65%
+ Complexity 3780 3423 -357
===========================================
Files 218 218
Lines 17420 17475 +55
Branches 2462 2491 +29
===========================================
- Hits 12604 11307 -1297
- Misses 3521 4938 +1417
+ Partials 1295 1230 -65
Continue to review full report at Codecov.
|
javeme
requested changes
Aug 23, 2019
| E.checkState(iterator instanceof Metadatable, | ||
| "Invalid paging iterator: %s", iterator.getClass()); | ||
| Object page = ((Metadatable) iterator).metadata(PAGE); | ||
| return (String) page; | ||
| E.checkState(page instanceof PageState, | ||
| "Invalid pageState '%s'", page); |
| "Invalid paging iterator: %s", iterator.getClass()); | ||
| Object page = ((Metadatable) iterator).metadata(PAGE); | ||
| E.checkState(page == null || page instanceof PageInfo, | ||
| "Invalid pageInfo '%s'", page); |
| "Invalid page out of lower bound"); | ||
| startId = new BinaryId(position, null); | ||
| } | ||
| boolean includeStart = paging || range.keyMinEq(); |
There was a problem hiding this comment.
move to line 550: boolean includeStart = range.keyMinEq();
and set includeStart = true at line 552
| // There is no latest or no next page | ||
| if (this.lastest == null || | ||
| this.fetched() <= this.query.limit() && this.next == null) { | ||
| return new PageState(PageState.EMPTY_BYTES, 0, (int) this.count()); |
| public PageIterator(Iterator<BackendEntry> iterator, | ||
| PageState pageState) { | ||
| this.iterator = iterator; | ||
| this.page = pageState.toString(); |
There was a problem hiding this comment.
just update page type to PageState
| public Iterator<BackendEntry> iterator() { | ||
| return this.iterator; | ||
| } | ||
|
|
||
| public boolean hasNullPage() { |
| @@ -36,6 +37,11 @@ public PageIds(Set<Id> ids, String page) { | |||
| this.page = page; | |||
| } | |||
|
|
|||
| public PageIds(Set<Id> ids, PageState pageState) { | |||
| this.ids = ids; | |||
| this.page = pageState.toString(); | |||
There was a problem hiding this comment.
update page type to PageState
javeme
requested changes
Aug 23, 2019
| q.resetUserpropConditions(); | ||
| } | ||
| // Query by sort-keys | ||
| ConditionQuery q = query; |
| if (withEdgeCond) { | ||
| return TraversalUtil.filterResult(conditions, edges); | ||
| } else { | ||
| return edges; |
There was a problem hiding this comment.
remove else-statement and return edges if not withEdgeCond
| return page.toString(); | ||
| } else if (page instanceof PageState) { | ||
| // Traversal without condition like: g.V().has("~page", "") | ||
| return ((PageState) page).page(); |
javeme
requested changes
Aug 26, 2019
| @@ -27,27 +27,26 @@ | |||
| public final class PageIds { | |||
|
|
|||
| public static final PageIds EMPTY = new PageIds(ImmutableSet.of(), | |||
| (String) null); | |||
| (PageState) null); | |||
Change-Id: I4f6716cba0973f6c933e23aa3d25e0edeb6e4d84
javeme
reviewed
Aug 26, 2019
| E.checkState(iterator instanceof Metadatable, | ||
| "Invalid paging iterator: %s", iterator.getClass()); | ||
| Object page = ((Metadatable) iterator).metadata(PAGE); | ||
| E.checkState(page == null || page instanceof PageInfo, |
There was a problem hiding this comment.
null is returned if offset > total for PageInfo
javeme
approved these changes
Aug 26, 2019
Linary
approved these changes
Aug 27, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
implemented: #658
Change-Id: I26e8efb1e8e3547f403dd97e2ddc367df69eae51