Minor fixes

Author: wu-hui

google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java

@@ -52,7 +52,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 import com.google.firestore.bundle.BundledQuery;
 import com.google.firestore.v1.Cursor;
 import com.google.firestore.v1.Document;
@@ -2140,9 +2139,6 @@ public Pipeline pipeline() {
       ppl = ppl.where(toPipelineFilterCondition(f));
     }
 
-    // Collecting implicit exists fields.
-    Set<Exists> exists = new HashSet<>();
-
     // Projections
     if (this.options.getFieldProjections() != null
         && !this.options.getFieldProjections().isEmpty()) {
@@ -2151,15 +2147,25 @@ public Pipeline pipeline() {
               this.options.getFieldProjections().stream()
                   .map(fieldReference -> Field.of(fieldReference.getFieldPath()))
                   .toArray(Selectable[]::new));
-      exists.addAll(
-          this.options.getFieldProjections().stream()
-              .map(fieldReference -> Field.of(fieldReference.getFieldPath()).exists())
-              .collect(Collectors.toList()));
     }
 
     // Orders
     List<FieldOrder> normalizedOrderbys = this.createImplicitOrderBy();
     if (normalizedOrderbys != null && !normalizedOrderbys.isEmpty()) {
+      // Add exists filters to match Query's implicit orderby semantics.
+      List<Exists> exists =
+          normalizedOrderbys.stream()
+              // .filter(order -> !order.fieldReference.getFieldPath().equals("__name__"))
+              .map(order -> Field.of(order.fieldReference.getFieldPath()).exists())
+              .collect(Collectors.toList());
+      if (exists.size() > 1) {
+        ppl =
+            ppl.where(
+                and(exists.get(0), exists.subList(1, exists.size()).toArray(new Exists[] {})));
+      } else if (exists.size() == 1) {
+        ppl = ppl.where(exists.get(0));
+      }
+
       List<Ordering> orders =
           normalizedOrderbys.stream()
               .map(
@@ -2170,24 +2176,6 @@ public Pipeline pipeline() {
                               ? Ordering.Direction.ASCENDING
                               : Ordering.Direction.DESCENDING))
               .collect(Collectors.toList());
-
-      // Add exists filters to match Query's implicit orderby semantics.
-      exists.addAll(
-          normalizedOrderbys.stream()
-              // .filter(order -> !order.fieldReference.getFieldPath().equals("__name__"))
-              .map(order -> Field.of(order.fieldReference.getFieldPath()).exists())
-              .collect(Collectors.toList()));
-      List<Exists> existsList = Lists.newArrayList(exists);
-      if (existsList.size() > 1) {
-        ppl =
-            ppl.where(
-                and(
-                    existsList.get(0),
-                    existsList.subList(1, existsList.size()).toArray(new Exists[] {})));
-      } else if (exists.size() == 1) {
-        ppl = ppl.where(existsList.get(0));
-      }
-
       ppl = ppl.sort(orders, Density.REQUIRED, Truncation.UNSPECIFIED);
     }
 

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/stages/StageUtils.java

@@ -83,8 +83,8 @@ public static com.google.firestore.v1.Pipeline.Stage toStageProto(Stage stage) {
       Aggregate aggregateStage = (Aggregate) stage;
       return com.google.firestore.v1.Pipeline.Stage.newBuilder()
           .setName(aggregateStage.getName())
-          .addArgs(encodeValue(aggregateStage.getGroups()))
           .addArgs(encodeValue(aggregateStage.getAccumulators()))
+          .addArgs(encodeValue(aggregateStage.getGroups()))
           .build();
     } else if (stage instanceof Distinct) {
       Distinct distinctStage = (Distinct) stage;

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITPipelineTest.java

@@ -449,7 +449,12 @@ public void testArrayContainsAny() throws Exception {
   @Test
   public void testArrayContainsAll() throws Exception {
     List<PipelineResult> results =
-        collection.pipeline().where(arrayContainsAll("tags", "adventure", "magic")).execute().get();
+        collection
+            .pipeline()
+            .where(arrayContainsAll("tags", "adventure", "magic"))
+            .select("title")
+            .execute()
+            .get();
 
     assertThat(data(results)).isEqualTo(Lists.newArrayList(map("title", "The Lord of the Rings")));
   }
@@ -492,15 +497,14 @@ public void testArrayFilter() throws Exception {
         collection
             .pipeline()
             .select(
-                arrayFilter(Field.of("tags"), Function.eq(arrayElement(), "")).as("filteredTags"))
+                arrayFilter(Field.of("tags"), Function.eq(arrayElement(), "comedy"))
+                    .as("filteredTags"))
             .limit(1)
             .execute()
             .get();
 
     assertThat(data(results))
-        .isEqualTo(
-            Lists.newArrayList(
-                map("filteredTags", Lists.newArrayList("comedy", "space", "adventure"))));
+        .isEqualTo(Lists.newArrayList(map("filteredTags", Lists.newArrayList("comedy"))));
   }
 
   @Test
@@ -832,6 +836,14 @@ public void testDistanceFunctions() throws Exception {
             .limit(1)
             .execute()
             .get();
+
+    assertThat(data(results))
+        .isEqualTo(
+            Lists.newArrayList(
+                map(
+                    "cosineDistance", 0.02560880430538015,
+                    "dotProductDistance", 0.13,
+                    "euclideanDistance", 0.806225774829855)));
   }
 
   @Test