Update backfill code

Author: schmidt-sebastian

firebase-firestore/src/main/java/com/google/firebase/firestore/index/IndexEntry.java

@@ -23,13 +23,13 @@ public class IndexEntry {
   private final int indexId;
   private final byte[] indexValue;
   private final String uid;
-  private final String documentId;
+  private final String documentName;
 
-  public IndexEntry(int indexId, byte[] indexValue, String uid, String documentId) {
+  public IndexEntry(int indexId, byte[] indexValue, String uid, String documentName) {
     this.indexId = indexId;
     this.indexValue = indexValue;
     this.uid = uid;
-    this.documentId = documentId;
+    this.documentName = documentName;
   }
 
   public int getIndexId() {
@@ -44,7 +44,7 @@ public String getUid() {
     return uid;
   }
 
-  public String getDocumentId() {
-    return documentId;
+  public String getDocumentName() {
+    return documentName;
   }
 }

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

@@ -117,31 +117,31 @@ void addIndexEntry(IndexEntry entry) {
             + "index_id, "
             + "index_value, "
             + "uid, "
-            + "document_id) VALUES(?, ?, ?, ?)",
+            + "document_name) VALUES(?, ?, ?, ?)",
         entry.getIndexId(),
         entry.getIndexValue(),
         entry.getUid(),
-        entry.getDocumentId());
+        entry.getDocumentName());
   }
 
   @VisibleForTesting
-  void removeIndexEntry(int indexId, String uid, String documentId) {
+  void removeIndexEntry(int indexId, String uid, String documentName) {
     persistence.execute(
         "DELETE FROM index_entries "
             + "WHERE index_id = ? "
             + "AND uid = ?"
-            + "AND document_id = ?",
+            + "AND document_name = ?",
         indexId,
         uid,
-        documentId);
+        documentName);
     ;
   }
 
   @Nullable
   @VisibleForTesting
   IndexEntry getIndexEntry(int indexId) {
     return persistence
-        .query("SELECT index_value, uid, document_id FROM index_entries WHERE index_id = ?")
+        .query("SELECT index_value, uid, document_name FROM index_entries WHERE index_id = ?")
         .binding(indexId)
         .firstValue(
             row ->

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

@@ -65,18 +65,18 @@ public void tearDown() {
   @Test
   public void addAndRemoveIndexEntry() {
     IndexEntry testEntry =
-        new IndexEntry(1, "TEST_BLOB".getBytes(), "sample-uid", "sample-documentId");
+        new IndexEntry(1, "TEST_BLOB".getBytes(), "sample-uid", "coll/sample-documentId");
     persistence.runTransaction(
         "testAddAndRemoveIndexEntry",
         () -> {
           backfiller.addIndexEntry(testEntry);
           IndexEntry entry = backfiller.getIndexEntry(1);
           assertNotNull(entry);
           assertEquals("TEST_BLOB", new String(entry.getIndexValue()));
-          assertEquals("sample-documentId", entry.getDocumentId());
+          assertEquals("coll/sample-documentId", entry.getDocumentName());
           assertEquals("sample-uid", entry.getUid());
 
-          backfiller.removeIndexEntry(1, "sample-uid", "sample-documentId");
+          backfiller.removeIndexEntry(1, "sample-uid", "coll/sample-documentId");
           entry = backfiller.getIndexEntry(1);
           assertNull(entry);
         });