---

Ajay Kannan · Ajay Kannan · commit 5e0d860590ff · 2015-10-15T15:52:50.000-07:00
yaml --- r: 4711 b: refs/heads/logging-alpha c: 0c2f9e9 h: refs/heads/master i: 4709: a2a4c98 4707: 1efe9f5 4703: 2365d93
diff --git a/[refs] b/[refs]
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
 refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
-refs/heads/logging-alpha: acf2c4207f384d9e4d8f7ce958a1d7ac2263ff7a
+refs/heads/logging-alpha: 0c2f9e93ffb78aadb55c3abf558e47c616336c18
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
diff --git a/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -68,7 +68,7 @@
  *       .kind(kind)
  *       .projection(Projection.property("age"), Projection.first("name"))
  *       .filter(PropertyFilter.gt("age", 18))
- *       .distinct("age")
+ *       .distinctOn("age")
  *       .orderBy(OrderBy.asc("age"))
  *       .limit(10)
  *       .build();
@@ -532,7 +532,6 @@ static class BaseBuilder<V, B extends BaseBuilder<V, B>> {
     private String kind;
     private final List<String> projection = new LinkedList<>();
     private Filter filter;
-    private boolean distinct = false;
     private final List<String> distinctOn = new LinkedList<>();
     private final List<OrderBy> orderBy = new LinkedList<>();
     private Cursor startCursor;
@@ -620,30 +619,18 @@ B addProjection(String projection, String... others) {
       return self();
     }
 
-    B clearDistinct() {
+    B clearDistinctOn() {
       distinctOn.clear();
-      distinct = false;
       return self();
     }
 
-    B distinct(String... properties) {
-      clearDistinct();
-      if (properties.length == 0) {
-        clearDistinct();
-        this.distinct = true;
-        this.distinctOn.addAll(this.projection);
-      } else if (properties.length == 1) {
-        addDistinct(properties[0]);
-      } else {
-        addDistinct(properties[0], Arrays.copyOfRange(properties, 1, properties.length));
-      }
+    B distinctOn(String property, String... others) {
+      clearDistinctOn();
+      addDistinctOn(property, others);
       return self();
     }
 
-    B addDistinct(String property, String... others) {
-      if (this.distinct) {
-        throw new IllegalStateException("\"distinct()\" is currently set.");
-      }
+    B addDistinctOn(String property, String... others) {
       this.distinctOn.add(property);
       Collections.addAll(this.distinctOn, others);
       return self();
@@ -677,7 +664,7 @@ B mergeFrom(com.google.datastore.v1beta3.Query queryPb) {
         addProjection(projectionPb.getProperty().getName());
       }
       for (com.google.datastore.v1beta3.PropertyReference distinctOnPb : queryPb.getDistinctOnList()) {
-        addDistinct(distinctOnPb.getName());
+        addDistinctOn(distinctOnPb.getName());
       }
       return self();
     }
@@ -717,7 +704,7 @@ public static final class KeyQueryBuilder extends BaseBuilder<Key, KeyQueryBuild
     protected KeyQueryBuilder mergeFrom(com.google.datastore.v1beta3.Query queryPb) {
       super.mergeFrom(queryPb);
       projection(KEY_PROPERTY_NAME);
-      clearDistinct();
+      clearDistinctOn();
       return this;
     }
 
@@ -755,18 +742,18 @@ public ProjectionEntityQueryBuilder addProjection(String projection, String... o
     }
 
     @Override
-    public ProjectionEntityQueryBuilder clearDistinct() {
-      return super.clearDistinct();
+    public ProjectionEntityQueryBuilder clearDistinctOn() {
+      return super.clearDistinctOn();
     }
 
     @Override
-    public ProjectionEntityQueryBuilder distinct(String... properties) {
-      return super.distinct(properties);
+    public ProjectionEntityQueryBuilder distinctOn(String property, String... others) {
+      return super.distinctOn(property, others);
     }
 
     @Override
-    public ProjectionEntityQueryBuilder addDistinct(String property, String... others) {
-      return super.addDistinct(property, others);
+    public ProjectionEntityQueryBuilder addDistinctOn(String property, String... others) {
+      return super.addDistinctOn(property, others);
     }
   }
 
@@ -786,7 +773,7 @@ public ProjectionEntityQueryBuilder addDistinct(String property, String... other
   @Override
   public int hashCode() {
     return Objects.hash(namespace(), kind, startCursor, endCursor, offset, limit, filter, orderBy,
-        distinct());
+distinctOn());
   }
 
   @Override
@@ -827,7 +814,7 @@ public Filter filter() {
     return filter;
   }
 
-  public List<String> distinct() {
+  public List<String> distinctOn() {
     return distinctOn;
   }
 
diff --git a/branches/logging-alpha/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/branches/logging-alpha/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -428,14 +428,15 @@ public void testRunStructuredQuery() {
     assertTrue(projectionEntity.names().isEmpty());
     assertFalse(results2.hasNext());
 
-    StructuredQuery<ProjectionEntity> projectionQuery = Query.projectionEntityQueryBuilder()
-        .kind(KIND2)
-        .projection("age")
-        .filter(PropertyFilter.gt("age", 18))
-        .distinct("age")
-        .orderBy(OrderBy.asc("age"))
-        .limit(10)
-        .build();
+    StructuredQuery<ProjectionEntity> projectionQuery =
+        Query.projectionEntityQueryBuilder()
+            .kind(KIND2)
+            .projection("age")
+            .filter(PropertyFilter.gt("age", 18))
+            .distinctOn("age")
+            .orderBy(OrderBy.asc("age"))
+            .limit(10)
+            .build();
 
     QueryResults<ProjectionEntity> results4 = datastore.run(projectionQuery);
     assertTrue(results4.hasNext());
diff --git a/branches/logging-alpha/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/branches/logging-alpha/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -67,18 +67,19 @@ public class SerializationTest {
       .kind("k")
       .filter(PropertyFilter.eq("p1", "hello"))
       .build();
-  private static final Query<ProjectionEntity> QUERY3 = Query.projectionEntityQueryBuilder()
-      .kind("k")
-      .namespace("ns1")
-      .projection("p")
-      .limit(100)
-      .offset(5)
-      .startCursor(CURSOR1)
-      .endCursor(CURSOR2)
-      .filter(CompositeFilter.and(PropertyFilter.gt("p1", 10), PropertyFilter.eq("a", "v")))
-      .addDistinct("p")
-      .addOrderBy(OrderBy.asc("p"))
-      .build();
+  private static final Query<ProjectionEntity> QUERY3 =
+      Query.projectionEntityQueryBuilder()
+          .kind("k")
+          .namespace("ns1")
+          .projection("p")
+          .limit(100)
+          .offset(5)
+          .startCursor(CURSOR1)
+          .endCursor(CURSOR2)
+          .filter(CompositeFilter.and(PropertyFilter.gt("p1", 10), PropertyFilter.eq("a", "v")))
+          .addDistinctOn("p")
+          .addOrderBy(OrderBy.asc("p"))
+          .build();
   private static final KeyValue KEY_VALUE = KeyValue.of(KEY1);
   private static final NullValue NULL_VALUE = NullValue.builder().excludeFromIndexes(true).build();
   private static final StringValue STRING_VALUE = StringValue.of("hello");
