Formatting firebase-database-collection

Author: schmidt-sebastian

firebase-database-collection/src/main/java/com/google/firebase/database/collection/ImmutableSortedMap.java

@@ -58,10 +58,10 @@ public abstract class ImmutableSortedMap<K, V> implements Iterable<Map.Entry<K,
 
   public ImmutableSortedMap<K, V> insertAll(ImmutableSortedMap<K, V> source) {
     ImmutableSortedMap<K, V> result = this;
-    for (Map.Entry<K, V> entry: source) {
+    for (Map.Entry<K, V> entry : source) {
       result = result.insert(entry.getKey(), entry.getValue());
     }
-    return  result;
+    return result;
   }
 
   @Override

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

@@ -26,7 +26,10 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.firebase.firestore.model.ResourcePath;
+import com.google.firebase.firestore.util.BackgroundQueue;
 import com.google.firebase.firestore.util.Consumer;
+import com.google.firebase.firestore.util.Executors;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,15 +48,8 @@ class SQLiteSchema {
   /**
    * The version of the schema. Increase this by one for each migration added to runMigrations
    * below.
-   *
-   * <p>TODO(index-free): The migration to schema version 9 doesn't backfill `read_time` as this
-   * requires rewriting the RemoteDocumentCache. For index-free queries to efficiently handle
-   * existing documents, we still need to populate read_time for all existing entries, drop the
-   * RemoteDocumentCache or ask users to invoke `clearPersistence()` manually. If we decide to
-   * backfill or drop the contents of the RemoteDocumentCache, we need to perform an additional
-   * schema migration.
    */
-  static final int VERSION = 9;
+  static final int VERSION = 10;
 
   // Remove this constant and increment VERSION to enable indexing support
   static final int INDEXING_SUPPORT_VERSION = VERSION + 1;
@@ -74,11 +70,11 @@ class SQLiteSchema {
     this.db = db;
   }
 
-  void runMigrations() {
+  int runMigrations() {
     runMigrations(0, VERSION);
   }
 
-  void runMigrations(int fromVersion) {
+  int runMigrations(int fromVersion) {
     runMigrations(fromVersion, VERSION);
   }
 
@@ -89,7 +85,9 @@ void runMigrations(int fromVersion) {
    * @param toVersion The version the database is migrating to. Usually VERSION, but can be
    *     otherwise for testing.
    */
-  void runMigrations(int fromVersion, int toVersion) {
+  int runMigrations(int fromVersion, int toVersion) {
+    int finalVersion = fromVersion;
+
     /*
      * New migrations should be added at the end of the series of `if` statements and should follow
      * the pattern. Make sure to increment `VERSION` and to read the comment below about
@@ -100,6 +98,7 @@ void runMigrations(int fromVersion, int toVersion) {
       createV1MutationQueue();
       createV1QueryCache();
       createV1RemoteDocumentCache();
+      finalVersion = 1;
     }
 
     // Migration 2 to populate the target_globals table no longer needed since migration 3
@@ -112,31 +111,49 @@ void runMigrations(int fromVersion, int toVersion) {
         dropV1QueryCache();
         createV1QueryCache();
       }
+      finalVersion = 3;
     }
 
     if (fromVersion < 4 && toVersion >= 4) {
       ensureTargetGlobal();
       addTargetCount();
+      finalVersion = 4;
     }
 
     if (fromVersion < 5 && toVersion >= 5) {
       addSequenceNumber();
+      finalVersion = 5;
     }
 
     if (fromVersion < 6 && toVersion >= 6) {
       removeAcknowledgedMutations();
+      finalVersion = 6;
     }
 
     if (fromVersion < 7 && toVersion >= 7) {
       ensureSequenceNumbers();
+      finalVersion = 7;
     }
 
     if (fromVersion < 8 && toVersion >= 8) {
       createV8CollectionParentsIndex();
+      finalVersion = 8;
     }
 
     if (fromVersion < 9 && toVersion >= 9) {
       addReadTime();
+      finalVersion = 9;
+    }
+
+    if (fromVersion < 10 && toVersion >= 10) {
+      // Migration 10 slowly populates the read time. If no documents lack read time, we mark the migration as complete.
+      if (!hasDocumentsWithoutReadTime()) {
+        return 10;
+      }
+
+      Executors.BACKGROUND_EXECUTOR.execute(this::populateReadTime);
+
+      return 9;
     }
 
     /*
@@ -158,6 +175,10 @@ void runMigrations(int fromVersion, int toVersion) {
     }
   }
 
+  private void populateReadTime() {
+
+  }
+
   /**
    * Used to assert that a set of tables either all exist or not. The supplied function is run if
    * none of the tables exist. Use this method to create a set of tables at once.