Merge

Author: schmidt-sebastian

firebase-abt/firebase-abt.gradle

@@ -14,26 +14,50 @@
 
 plugins {
     id 'firebase-library'
+    id 'com.google.protobuf'
 }
 
 firebaseLibrary {
     testLab.enabled = false
     publishSources = true
 }
 
+// TODO(issue/568): Remove this once legacy logic is removed from Remote Config.
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.4.0'
+    }
+    plugins {
+        javalite {
+            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
+        }
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                remove java
+            }
+            task.plugins {
+                javalite {}
+            }
+        }
+    }
+}
+
 android {
 
     lintOptions {
         abortOnError false
     }
     sourceSets {
         main {
-            java {
-            }
-        }
-        test {
-            java {
+            proto {
+                srcDir 'src/proto'
             }
+
+	    resources {
+	        srcDir 'src/proto/com/google/protos'
+	    }
         }
     }
 
@@ -61,6 +85,7 @@ dependencies {
     implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
+    implementation 'com.google.protobuf:protobuf-lite:3.0.1'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation 'com.google.truth:truth:0.44'
     testImplementation 'junit:junit:4.13-beta-2'

firebase-config/firebase-config.gradle

@@ -50,11 +50,6 @@ protobuf {
     }
 }
 
-firebaseLibrary {
-    testLab.enabled = true
-    publishSources = true
-}
-
 android {
     compileSdkVersion project.targetSdkVersion
     defaultConfig {

firebase-config/src/proto/com/google/protos/developers/mobile/abt/proto/experiment_payload.proto

@@ -1,6 +1,7 @@
 # Unreleased
-- [changed] Improved performance of queries with large result sets by up to
-  60%.
+- [changed] Improved performance of queries with large result sets.
+- [changed] Improved performance for queries with filters that only return a
+  small subset of the documents in a collection.
 - [changed] Instead of failing silently, Firestore now crashes the client app
   if it fails to load SSL Ciphers. To avoid these crashes, you must bundle 
   Conscrypt to support non-GMSCore devices on Android KitKat or JellyBean (see

firebase-firestore/CHANGELOG.md

@@ -33,7 +33,7 @@
 import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.TestAccessHelper;
 import com.google.firebase.firestore.UserDataConverter;
-import com.google.firebase.firestore.core.Filter;
+import com.google.firebase.firestore.core.FieldFilter;
 import com.google.firebase.firestore.core.Filter.Operator;
 import com.google.firebase.firestore.core.OrderBy;
 import com.google.firebase.firestore.core.OrderBy.Direction;
@@ -175,21 +175,21 @@ public static SnapshotVersion version(long versionMicros) {
 
   public static Document doc(String key, long version, Map<String, Object> data) {
     return new Document(
-        key(key), version(version), wrapObject(data), Document.DocumentState.SYNCED);
+        key(key), version(version), Document.DocumentState.SYNCED, wrapObject(data));
   }
 
   public static Document doc(DocumentKey key, long version, Map<String, Object> data) {
-    return new Document(key, version(version), wrapObject(data), Document.DocumentState.SYNCED);
+    return new Document(key, version(version), Document.DocumentState.SYNCED, wrapObject(data));
   }
 
   public static Document doc(
       String key, long version, ObjectValue data, Document.DocumentState documentState) {
-    return new Document(key(key), version(version), data, documentState);
+    return new Document(key(key), version(version), documentState, data);
   }
 
   public static Document doc(
       String key, long version, Map<String, Object> data, Document.DocumentState documentState) {
-    return new Document(key(key), version(version), wrapObject(data), documentState);
+    return new Document(key(key), version(version), documentState, wrapObject(data));
   }
 
   public static NoDocument deletedDoc(String key, long version) {
@@ -220,8 +220,8 @@ public static ImmutableSortedSet<DocumentKey> keySet(DocumentKey... keys) {
     return keySet;
   }
 
-  public static Filter filter(String key, String operator, Object value) {
-    return Filter.create(field(key), operatorFromString(operator), wrap(value));
+  public static FieldFilter filter(String key, String operator, Object value) {
+    return FieldFilter.create(field(key), operatorFromString(operator), wrap(value));
   }
 
   public static Operator operatorFromString(String s) {

firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/testutil/TestUtil.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.isRunningAgainstEmulator;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToIds;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToValues;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollection;
@@ -38,7 +39,7 @@
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import org.junit.After;
-import org.junit.Ignore;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -428,33 +429,56 @@ public void testQueriesCanUseArrayContainsFilters() {
     // much of anything else interesting to test.
   }
 
-  // TODO(in-queries): Re-enable once emulator support is added to travis.
   @Test
-  @Ignore
   public void testQueriesCanUseInFilters() {
-    Map<String, Object> docA = map("zip", 98101);
-    Map<String, Object> docB = map("zip", 91102);
-    Map<String, Object> docC = map("zip", 98103);
-    Map<String, Object> docD = map("zip", asList(98101));
-    Map<String, Object> docE = map("zip", asList("98101", map("zip", 98101)));
-    Map<String, Object> docF = map("zip", map("code", 500));
+    // TODO(in-queries): Re-enable in prod once feature lands in backend.
+    Assume.assumeTrue(isRunningAgainstEmulator());
+
+    Map<String, Object> docA = map("zip", 98101L);
+    Map<String, Object> docB = map("zip", 91102L);
+    Map<String, Object> docC = map("zip", 98103L);
+    Map<String, Object> docD = map("zip", asList(98101L));
+    Map<String, Object> docE = map("zip", asList("98101", map("zip", 98101L)));
+    Map<String, Object> docF = map("zip", map("code", 500L));
     CollectionReference collection =
         testCollectionWithDocs(
             map("a", docA, "b", docB, "c", docC, "d", docD, "e", docE, "f", docF));
 
     // Search for zips matching [98101, 98103].
-    QuerySnapshot snapshot = waitFor(collection.whereIn("zip", asList(98101, 98103)).get());
+    QuerySnapshot snapshot = waitFor(collection.whereIn("zip", asList(98101L, 98103L)).get());
     assertEquals(asList(docA, docC), querySnapshotToValues(snapshot));
 
     // With objects.
-    snapshot = waitFor(collection.whereIn("zip", asList(map("code", 500))).get());
+    snapshot = waitFor(collection.whereIn("zip", asList(map("code", 500L))).get());
     assertEquals(asList(docF), querySnapshotToValues(snapshot));
   }
 
-  // TODO(in-queries): Re-enable once emulator support is added to travis.
   @Test
-  @Ignore
+  public void testQueriesCanUseInFiltersWithDocIds() {
+    // TODO(in-queries): Re-enable in prod once feature lands in backend.
+    Assume.assumeTrue(isRunningAgainstEmulator());
+
+    Map<String, String> docA = map("key", "aa");
+    Map<String, String> docB = map("key", "ab");
+    Map<String, String> docC = map("key", "ba");
+    Map<String, String> docD = map("key", "bb");
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "aa", docA,
+            "ab", docB,
+            "ba", docC,
+            "bb", docD);
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+    QuerySnapshot docs =
+        waitFor(collection.whereIn(FieldPath.documentId(), asList("aa", "ab")).get());
+    assertEquals(asList(docA, docB), querySnapshotToValues(docs));
+  }
+
+  @Test
   public void testQueriesCanUseArrayContainsAnyFilters() {
+    // TODO(in-queries): Re-enable in prod once feature lands in backend.
+    Assume.assumeTrue(isRunningAgainstEmulator());
+
     Map<String, Object> docA = map("array", asList(42L));
     Map<String, Object> docB = map("array", asList("a", 42L, "c"));
     Map<String, Object> docC = map("array", asList(41.999, "42", map("a", asList(42))));

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java

@@ -701,11 +701,6 @@ public void queriesFilteredByDocumentIDMustUseStringsOrDocumentReferences() {
             + "a valid String or DocumentReference, but it was of type: java.lang.Integer";
     expectError(() -> collection.whereGreaterThanOrEqualTo(FieldPath.documentId(), 1), reason);
 
-    reason =
-        "Invalid query. When querying with FieldPath.documentId() you must provide "
-            + "a valid String or DocumentReference, but it was of type: java.util.Arrays$ArrayList";
-    expectError(() -> collection.whereIn(FieldPath.documentId(), asList(1, 2)), reason);
-
     reason =
         "Invalid query. When querying a collection group by FieldPath.documentId(), the value "
             + "provided must result in a valid document path, but 'foo' is not because it has "
@@ -726,6 +721,38 @@ public void queriesFilteredByDocumentIDMustUseStringsOrDocumentReferences() {
         () -> collection.whereArrayContainsAny(FieldPath.documentId(), asList(1, 2)), reason);
   }
 
+  @Test
+  public void queriesUsingInAndDocumentIdMustHaveProperDocumentReferencesInArray() {
+    CollectionReference collection = testCollection();
+    collection.whereIn(FieldPath.documentId(), asList(collection.getPath()));
+
+    String reason =
+        "Invalid query. When querying with FieldPath.documentId() you must provide "
+            + "a valid document ID, but it was an empty string.";
+    expectError(() -> collection.whereIn(FieldPath.documentId(), asList("")), reason);
+
+    reason =
+        "Invalid query. When querying a collection by FieldPath.documentId() you must provide "
+            + "a plain document ID, but 'foo/bar/baz' contains a '/' character.";
+    expectError(() -> collection.whereIn(FieldPath.documentId(), asList("foo/bar/baz")), reason);
+
+    reason =
+        "Invalid query. When querying with FieldPath.documentId() you must provide "
+            + "a valid String or DocumentReference, but it was of type: java.lang.Integer";
+    expectError(() -> collection.whereIn(FieldPath.documentId(), asList(1, 2)), reason);
+
+    reason =
+        "Invalid query. When querying a collection group by FieldPath.documentId(), the value "
+            + "provided must result in a valid document path, but 'foo' is not because it has "
+            + "an odd number of segments (1).";
+    expectError(
+        () ->
+            testFirestore()
+                .collectionGroup("collection")
+                .whereIn(FieldPath.documentId(), asList("foo")),
+        reason);
+  }
+
   // Helpers
 
   /** Performs a write using each write API and makes sure it fails with the expected reason. */