merge main branch

Author: cherylEnkidu

firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalStore.java

@@ -147,22 +147,11 @@ public final class LocalStore implements BundleCallback {
   /** Used to generate targetIds for queries tracked locally. */
   private final TargetIdGenerator targetIdGenerator;
 
-  private boolean autoIndexEnabled;
-
   public LocalStore(Persistence persistence, QueryEngine queryEngine, User initialUser) {
-    this(persistence, queryEngine, initialUser, false);
-  }
-
-  public LocalStore(
-      Persistence persistence,
-      QueryEngine queryEngine,
-      User initialUser,
-      boolean autoIndexEnabled) {
     hardAssert(
         persistence.isStarted(), "LocalStore was passed an unstarted persistence implementation");
     this.persistence = persistence;
     this.queryEngine = queryEngine;
-    this.autoIndexEnabled = autoIndexEnabled;
 
     targetCache = persistence.getTargetCache();
     bundleCache = persistence.getBundleCache();
@@ -186,7 +175,7 @@ private void initializeUserComponents(User user) {
         new LocalDocumentsView(remoteDocuments, mutationQueue, documentOverlayCache, indexManager);
 
     remoteDocuments.setIndexManager(indexManager);
-    queryEngine.initialize(localDocuments, indexManager, autoIndexEnabled);
+    queryEngine.initialize(localDocuments, indexManager);
   }
 
   public void start() {

firebase-firestore/src/test/java/com/google/firebase/firestore/local/CountingQueryEngine.java

@@ -102,16 +102,6 @@ public void setRelativeIndexReadCostPerDocument(double newCost) {
     queryEngine.setRelativeIndexReadCostPerDocument(newCost);
   }
 
-  @Override
-  public void setMinCollectionSizeToAutoCreateIndex(int newMin) {
-    queryEngine.setMinCollectionSizeToAutoCreateIndex(newMin);
-  }
-
-  @Override
-  public void setRelativeIndexReadCost(int newCost) {
-    queryEngine.setRelativeIndexReadCost(newCost);
-  }
-
   /**
    * Returns the number of documents returned by the RemoteDocumentCache's `getAll()` API (since the
    * last call to `resetCounts()`)

firebase-firestore/src/test/java/com/google/firebase/firestore/model/TargetIndexMatcherTest.java

@@ -23,7 +23,6 @@
 import static com.google.firebase.firestore.testutil.TestUtil.query;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
 
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.core.Target;
@@ -450,164 +449,6 @@ public void withMultipleNotIn() {
     validateServesTarget(q, "a", FieldIndex.Segment.Kind.ASCENDING);
   }
 
-  @Test
-  public void buildTargetIndex() {
-    Query q =
-        query("collId")
-            .filter(filter("a", "==", 1))
-            .filter(filter("b", "==", 2))
-            .orderBy(orderBy("__name__", "desc"));
-    TargetIndexMatcher targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    FieldIndex expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").orderBy(orderBy("a"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").orderBy(orderBy("a")).orderBy(orderBy("b"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("a", "array-contains", "a")).orderBy(orderBy("b"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").orderBy(orderBy("b"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").orderBy(orderBy("a"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("a", ">", 1)).filter(filter("a", "<", 10));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("a", "in", Arrays.asList(1, 2))).filter(filter("b", "==", 5));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("value", "array-contains", "foo")).orderBy(orderBy("value"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q =
-        query("collId")
-            .filter(filter("a", "array-contains", "a"))
-            .filter(filter("a", ">", "b"))
-            .orderBy(orderBy("a", "asc"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("a", "==", 1)).orderBy(orderBy("__name__", "desc"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("a1", "==", "a")).filter(filter("a2", "==", "b"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q =
-        query("collId")
-            .filter(filter("equality1", "==", "a"))
-            .filter(filter("equality2", "==", "b"))
-            .filter(filter("inequality", ">=", "c"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q =
-        query("collId")
-            .filter(filter("equality1", "==", "a"))
-            .filter(filter("inequality", ">=", "c"))
-            .filter(filter("equality2", "==", "b"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").orderBy(orderBy("a"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").orderBy(orderBy("a", "desc"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").orderBy(orderBy("a")).orderBy(orderBy("__name__"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("a", "!=", 1));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("a", "!=", 1)).orderBy(orderBy("a")).orderBy(orderBy("b"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q = query("collId").filter(filter("a", "==", "a")).filter(filter("b", ">", "b"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q =
-        query("collId")
-            .filter(filter("a1", "==", "a"))
-            .filter(filter("a2", ">", "b"))
-            .orderBy(orderBy("a2", "asc"));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q =
-        query("collId")
-            .filter(filter("a", ">=", 1))
-            .filter(filter("a", "==", 5))
-            .filter(filter("a", "<=", 10));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    // assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-
-    q =
-        query("collId")
-            .filter(filter("a", "not-in", Arrays.asList(1, 2, 3)))
-            .filter(filter("a", ">=", 2));
-    targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-  }
-
-  @Test
-  public void failedTest() {
-    assumeTrue("Skip this test due to a bug in CSI.", false);
-    Query q =
-        query("collId")
-            .filter(filter("a", ">=", 1))
-            .filter(filter("a", "==", 5))
-            .filter(filter("a", "<=", 10));
-    TargetIndexMatcher targetIndexMatcher = new TargetIndexMatcher(q.toTarget());
-    FieldIndex expectedIndex = targetIndexMatcher.BuildTargetIndex();
-    assertTrue(targetIndexMatcher.servedByIndex(expectedIndex));
-  }
-
   @Test
   public void withMultipleOrderBys() {
     Query q =