From 5b466128901137b0406932581acaf1ad0849d099 Mon Sep 17 00:00:00 2001
From: Ajay <ajay@qlogic.io>
Date: Wed, 21 Nov 2018 15:11:01 -0500
Subject: [PATCH 1/2] Fix #3279 google-cloud-datastore Java library exposes too
 little of the information in query results

---
 .../com/google/cloud/datastore/QueryResults.java  | 15 +++++++++++++++
 .../google/cloud/datastore/QueryResultsImpl.java  |  5 +++++
 .../com/google/cloud/datastore/DatastoreTest.java |  7 +++++++
 .../cloud/datastore/it/ITDatastoreTest.java       |  7 +++++++
 4 files changed, 34 insertions(+)

diff --git a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
index 8e4818ddc73e..722ad8d1fa99 100644
--- a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
+++ b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
@@ -55,4 +55,19 @@ public interface QueryResults<V> extends Iterator<V> {
    * }</pre>
    */
   Cursor getCursorAfter();
+
+  /**
+   * Returns the number fo results skipped, typically because of an offset.
+   *
+   * <p>A simple use case to count entities:
+   *
+   * <pre>{@code
+   * Query<Key> query = Query.newKeyQueryBuilder().setOffset(Integer.MAX_VALUE).build();
+   * QueryResults<Key> result = datasore.datastore.run(query);
+   * if (!result.hasNext()) {
+   *  int numberOfEntities = result.getSkippedResults();
+   * }
+   * }</pre>
+   */
+  int getSkippedResults();
 }
diff --git a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
index a3156093dcc6..dde12d8a8dd8 100644
--- a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
+++ b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
@@ -114,4 +114,9 @@ public Class<?> getResultClass() {
   public Cursor getCursorAfter() {
     return new Cursor(cursor);
   }
+
+  @Override
+  public int getSkippedResults() {
+    return runQueryResponsePb.getBatch().getSkippedResults();
+  }
 }
diff --git a/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
index 329f4e7ea7d4..931da0dc0626 100644
--- a/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
+++ b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
@@ -633,6 +633,13 @@ public void testQueryPaginationWithLimit() throws DatastoreException {
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
+  @Test
+  public void testRunKeyQueryWithOffset() {
+    Query<Key> query = Query.newKeyQueryBuilder().setOffset(Integer.MAX_VALUE).build();
+    int numberOfEntities = datastore.run(query).getSkippedResults();
+    assertEquals(2, numberOfEntities);
+  }
+
   private List<RunQueryResponse> buildResponsesForQueryPaginationWithLimit() {
     Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build();
     Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build();
diff --git a/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
index dab2145f3e19..9f3bd9001019 100644
--- a/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
+++ b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
@@ -851,4 +851,11 @@ public Integer run(DatastoreReaderWriter transaction) {
       assertEquals(3, ((DatastoreException) expected.getCause()).getCode());
     }
   }
+
+  @Test
+  public void testSkippedResults() {
+    Query<Key> query = Query.newKeyQueryBuilder().setOffset(Integer.MAX_VALUE).build();
+    int numberOfEntities = DATASTORE.run(query).getSkippedResults();
+    assertEquals(2, numberOfEntities);
+  }
 }

From 7e65c85b5cb3ef6c8477ca3cf0d677955cebbf54 Mon Sep 17 00:00:00 2001
From: Ajay <ajay@qlogic.io>
Date: Tue, 27 Nov 2018 10:14:42 -0500
Subject: [PATCH 2/2] fix typo in comment

---
 .../src/main/java/com/google/cloud/datastore/QueryResults.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
index 722ad8d1fa99..8c03bda46bcc 100644
--- a/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
+++ b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
@@ -57,7 +57,7 @@ public interface QueryResults<V> extends Iterator<V> {
   Cursor getCursorAfter();
 
   /**
-   * Returns the number fo results skipped, typically because of an offset.
+   * Returns the number of results skipped, typically because of an offset.
    *
    * <p>A simple use case to count entities:
    *