Remove Serializer

Author: schmidt-sebastian

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

@@ -79,7 +79,7 @@ public static String databaseName(String persistenceKey, DatabaseId databaseId)
   public SQLitePersistence(
       Context context, String persistenceKey, DatabaseId databaseId, LocalSerializer serializer) {
     String databaseName = databaseName(persistenceKey, databaseId);
-    this.opener = new OpenHelper(context, serializer, databaseName);
+    this.opener = new OpenHelper(context, databaseName);
     this.serializer = serializer;
     this.queryCache = new SQLiteQueryCache(this, this.serializer);
     this.remoteDocumentCache = new SQLiteRemoteDocumentCache(this, this.serializer);
@@ -194,12 +194,10 @@ <T> T runTransaction(String action, Supplier<T> operation) {
    */
   private static class OpenHelper extends SQLiteOpenHelper {
 
-    private final LocalSerializer serializer;
     private boolean configured;
 
-    OpenHelper(Context context, LocalSerializer serializer, String databaseName) {
+    OpenHelper(Context context, String databaseName) {
       super(context, databaseName, null, SQLiteSchema.VERSION);
-      this.serializer = serializer;
     }
 
     @Override
@@ -225,13 +223,13 @@ private void ensureConfigured(SQLiteDatabase db) {
     @Override
     public void onCreate(SQLiteDatabase db) {
       ensureConfigured(db);
-      new SQLiteSchema(db, serializer).runMigrations(0);
+      new SQLiteSchema(db).runMigrations(0);
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
       ensureConfigured(db);
-      new SQLiteSchema(db, serializer).runMigrations(oldVersion);
+      new SQLiteSchema(db).runMigrations(oldVersion);
     }
 
     @Override

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

@@ -14,18 +14,13 @@
 
 package com.google.firebase.firestore.local;
 
-import static com.google.firebase.firestore.util.Assert.fail;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
 import android.content.ContentValues;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;
 import com.google.common.base.Preconditions;
-import com.google.firebase.firestore.model.DocumentKey;
-import com.google.firebase.firestore.model.mutation.Mutation;
-import com.google.firebase.firestore.model.mutation.MutationBatch;
-import com.google.protobuf.InvalidProtocolBufferException;
 
 /**
  * Migrates schemas from version 0 (empty) to whatever the current version is.
@@ -46,11 +41,10 @@ class SQLiteSchema {
   static final int VERSION = (Persistence.INDEXING_SUPPORT_ENABLED) ? 7 : 6;
 
   private final SQLiteDatabase db;
-  private final LocalSerializer serializer;
 
-  SQLiteSchema(SQLiteDatabase db, LocalSerializer serializer) {
+  // PORTING NOTE: The Android client doesn't need to use a serializer to remove held write acks.
+  SQLiteSchema(SQLiteDatabase db) {
     this.db = db;
-    this.serializer = serializer;
   }
 
   void runMigrations() {
@@ -148,47 +142,24 @@ private void removeAcknowledgedMutations() {
 
           SQLitePersistence.Query mutationsQuery =
               new SQLitePersistence.Query(
-                      db, "SELECT mutations FROM mutations WHERE uid = ? AND batch_id <= ?")
+                      db, "SELECT batch_id FROM mutations WHERE uid = ? AND batch_id <= ?")
                   .binding(uid, lastAcknowledgedBatchId);
-          mutationsQuery.forEach(
-              value -> {
-                try {
-                  MutationBatch batch =
-                      serializer.decodeMutationBatch(
-                          com.google.firebase.firestore.proto.WriteBatch.parseFrom(
-                              value.getBlob(0)));
-                  removeMutationBatch(uid, batch);
-                } catch (InvalidProtocolBufferException e) {
-                  throw fail("MutationBatch failed to parse: %s", e);
-                }
-              });
+          mutationsQuery.forEach(value -> removeMutationBatch(uid, value.getInt(0)));
         });
   }
 
-  private void removeMutationBatch(String uid, MutationBatch batch) {
-    int batchId = batch.getBatchId();
-
+  private void removeMutationBatch(String uid, int batchId) {
     SQLiteStatement mutationDeleter =
         db.compileStatement("DELETE FROM mutations WHERE uid = ? AND batch_id = ?");
     mutationDeleter.bindString(1, uid);
     mutationDeleter.bindLong(2, batchId);
     int deleted = mutationDeleter.executeUpdateDelete();
-    hardAssert(deleted != 0, "Mutation batch (%s, %d) did not exist", uid, batch.getBatchId());
-
-    SQLiteStatement indexDeleter =
-        db.compileStatement(
-            "DELETE FROM document_mutations WHERE uid = ? AND path = ? AND batch_id = ?");
-
-    for (Mutation mutation : batch.getMutations()) {
-      DocumentKey key = mutation.getKey();
-      String path = EncodedPath.encode(key.getPath());
-      indexDeleter.bindString(1, uid);
-      indexDeleter.bindString(2, path);
-      indexDeleter.bindLong(3, batchId);
-      deleted = indexDeleter.executeUpdateDelete();
-      hardAssert(
-          deleted != 0, "Index entry (%s, %s, %d) did not exist", uid, key, batch.getBatchId());
-    }
+    hardAssert(deleted != 0, "Mutatiohn batch (%s, %d) did not exist", uid, batchId);
+
+    // Delete all index entries for this batch
+    db.execSQL(
+        "DELETE FROM document_mutations WHERE uid = ? AND batch_id = ?",
+        new Object[] {uid, batchId});
   }
 
   private void createQueryCache() {

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

@@ -24,7 +24,6 @@
 import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.proto.WriteBatch;
-import com.google.firebase.firestore.remote.RemoteSerializer;
 import com.google.firestore.v1beta1.Document;
 import com.google.firestore.v1beta1.Write;
 import org.junit.After;
@@ -56,9 +55,7 @@ public void onCreate(SQLiteDatabase db) {}
           public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {}
         };
     db = opener.getWritableDatabase();
-    schema =
-        new SQLiteSchema(
-            db, new LocalSerializer(new RemoteSerializer(DatabaseId.forProject("projectId"))));
+    schema = new SQLiteSchema(db);
   }
 
   @After