revert change

Author: Brian Chen

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

@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

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

@@ -83,18 +83,18 @@ public static String databaseName(String persistenceKey, DatabaseId databaseId)
   private final SQLiteBundleCache bundleCache;
   private final SQLiteIndexManager indexManager;
   private final SQLiteRemoteDocumentCache remoteDocumentCache;
-  private final SQLiteLruReferenceDelegate lruReferenceDelegate;
+  private final SQLiteLruReferenceDelegate referenceDelegate;
   private final IndexBackfiller indexBackfiller;
   private final SQLiteTransactionListener transactionListener =
       new SQLiteTransactionListener() {
         @Override
         public void onBegin() {
-          lruReferenceDelegate.onTransactionStarted();
+          referenceDelegate.onTransactionStarted();
         }
 
         @Override
         public void onCommit() {
-          lruReferenceDelegate.onTransactionCommitted();
+          referenceDelegate.onTransactionCommitted();
         }
 
         @Override
@@ -124,7 +124,7 @@ public SQLitePersistence(
     this.indexManager = new SQLiteIndexManager(this, this.serializer);
     this.bundleCache = new SQLiteBundleCache(this, this.serializer);
     this.remoteDocumentCache = new SQLiteRemoteDocumentCache(this, this.serializer);
-    this.lruReferenceDelegate = new SQLiteLruReferenceDelegate(this, params);
+    this.referenceDelegate = new SQLiteLruReferenceDelegate(this, params);
     this.indexBackfiller = new IndexBackfiller(this);
   }
 
@@ -147,7 +147,7 @@ public void start() {
           e);
     }
     targetCache.start();
-    lruReferenceDelegate.start(targetCache.getHighestListenSequenceNumber());
+    referenceDelegate.start(targetCache.getHighestListenSequenceNumber());
   }
 
   @Override
@@ -165,7 +165,7 @@ public boolean isStarted() {
 
   @Override
   public SQLiteLruReferenceDelegate getReferenceDelegate() {
-    return lruReferenceDelegate;
+    return referenceDelegate;
   }
 
   public IndexBackfiller getIndexBackfiller() {

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

@@ -367,7 +367,7 @@ private void createFieldIndex() {
                   + "index_value BLOB, " // field value pairs
                   + "uid TEXT, " // user id or null if there are no pending mutations
                   + "document_id TEXT, "
-                  + "PRIMARY KEY (index_id, uid, document_id))");
+                  + "PRIMARY KEY (index_id, index_value, uid, document_id))");
         });
   }