Skip to content

Datastore: Fix more_results value to query results #4516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sduskis merged 4 commits into from
Feb 21, 2019
Merged

Datastore: Fix more_results value to query results #4516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5390b67
add moreResults
Feb 18, 2019
d4ca8e4
added getter
Feb 19, 2019
f800fd1
updated code
Feb 19, 2019
ff2f1ef
modified code and added test case
Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.google.cloud.datastore;

import com.google.datastore.v1.QueryResultBatch;
import java.util.Iterator;

/**
Expand Down Expand Up @@ -66,4 +67,7 @@ public interface QueryResults<V> extends Iterator<V> {
* }</pre>
*/
int getSkippedResults();

/** Returns MoreResults state of the query after the current batch. */
QueryResultBatch.MoreResultsType getMoreResults();
}
9 changes: 8 additions & 1 deletion ...nts/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class QueryResultsImpl<T> extends AbstractIterator<T> implements QueryResults<T>
private boolean lastBatch;
private Iterator<com.google.datastore.v1.EntityResult> entityResultPbIter;
private ByteString cursor;
private MoreResultsType moreResults;

QueryResultsImpl(
DatastoreImpl datastore, com.google.datastore.v1.ReadOptions readOptionsPb, Query<T> query) {
Expand Down Expand Up @@ -74,7 +75,8 @@ private void sendRequest() {
if (mostRecentQueryPb == null) {
mostRecentQueryPb = requestPb.getQuery();
}
lastBatch = runQueryResponsePb.getBatch().getMoreResults() != MoreResultsType.NOT_FINISHED;
moreResults = runQueryResponsePb.getBatch().getMoreResults();
lastBatch = moreResults != MoreResultsType.NOT_FINISHED;
entityResultPbIter = runQueryResponsePb.getBatch().getEntityResultsList().iterator();
actualResultType = ResultType.fromPb(runQueryResponsePb.getBatch().getEntityResultType());
if (Objects.equals(queryResultType, ResultType.PROJECTION_ENTITY)) {
Expand Down Expand Up @@ -117,4 +119,9 @@ public Cursor getCursorAfter() {
public int getSkippedResults() {
return runQueryResponsePb.getBatch().getSkippedResults();
}

@Override
public MoreResultsType getMoreResults() {
return moreResults;
}
}
20 changes: 20 additions & 0 deletions ...lients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,26 @@ public void testStructuredQueryPagination() throws DatastoreException {
EasyMock.verify(rpcFactoryMock, rpcMock);
}

@Test
public void testStructuredQueryPaginationWithMoreResults() throws DatastoreException {
List<RunQueryResponse> responses = buildResponsesForQueryPagination();
for (int i = 0; i < responses.size(); i++) {
EasyMock.expect(rpcMock.runQuery(EasyMock.anyObject(RunQueryRequest.class)))
.andReturn(responses.get(i));
}
EasyMock.replay(rpcFactoryMock, rpcMock);
Datastore datastore = rpcMockOptions.getService();
QueryResults<Key> results = datastore.run(Query.newKeyQueryBuilder().build());
int count = 0;
while (results.hasNext()) {
count += 1;
results.next();
}
assertEquals(count, 5);
assertEquals(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS, results.getMoreResults());
EasyMock.verify(rpcFactoryMock, rpcMock);
}

private List<RunQueryResponse> buildResponsesForQueryPagination() {
Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build();
Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build();
Expand Down