Feedback.

Author: wu-hui

firebase-firestore/CHANGELOG.md

@@ -2,8 +2,9 @@ Android changes are not released automatically. Ensure that changes are released
 by opting into a release at 
 [go/firebase-android-release](http:go/firebase-android-release) (Googlers only).
 
-# Unreleased
+# 24.1.2
 - [fixed] Fixed an issue where patching multiple fields shadows each other (#3528).
+- [feature] Added customization support for `FirebaseFirestore.runTransaction`.
 
 # 24.1.1
 - [fixed] Fixed an issue in the experimental index engine that might have
@@ -17,7 +18,6 @@ by opting into a release at
   JSON index definition exported by the Firestore CLI. Queries against the
   cache are executed using an index once the asynchronous operation to generate
   the index entries completes.
-- [fixed] Fixed missing document fields issue with offline overlays (#3528)
 
 # 24.0.2
 - [fixed] Fixed an issue of long grpc reconnection period, when App moves to

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

@@ -46,6 +46,10 @@ private void buildOverlays() {
     db.runTransaction(
         "build overlays",
         () -> {
+          if (!hasPendingOverlayMigration()) {
+            return;
+          }
+
           Set<String> userIds = getAllUserIds();
           RemoteDocumentCache remoteDocumentCache = db.getRemoteDocumentCache();
           for (String uid : userIds) {

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

@@ -25,6 +25,7 @@
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 
 import com.google.firebase.firestore.FieldValue;
 import com.google.firebase.firestore.auth.User;
@@ -110,6 +111,46 @@ public void testCreateOverlayFromSet() {
     assertFalse(migrationManager.hasPendingOverlayMigration());
   }
 
+  @Test
+  public void testSkipsIfAlreadyMigrated() {
+    writeRemoteDocument(doc("foo/bar", 2, map("it", "original")));
+    writeMutation(setMutation("foo/bar", map("foo", "bar")));
+
+    // Switch to new persistence and run migrations
+    this.persistence.shutdown();
+    persistence = PersistenceTestHelpers.createSQLitePersistence("test-data-migration");
+    IndexBackfiller indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
+    localStore =
+        new LocalStore(persistence, indexBackfiller, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore.start();
+
+    assertEquals(
+        setMutation("foo/bar", map("foo", "bar")),
+        persistence
+            .getDocumentOverlayCache(User.UNAUTHENTICATED)
+            .getOverlay(key("foo/bar"))
+            .getMutation());
+
+    // Delete the overlay to verify migration is skipped the second time.
+    persistence.getDocumentOverlayCache(User.UNAUTHENTICATED).removeOverlaysForBatchId(1);
+
+    // Switch to new persistence and run migrations which should be a no-op.
+    this.persistence.shutdown();
+    persistence = PersistenceTestHelpers.createSQLitePersistence("test-data-migration");
+    indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
+    localStore =
+        new LocalStore(persistence, indexBackfiller, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore.start();
+
+    SQLiteOverlayMigrationManager migrationManager =
+        (SQLiteOverlayMigrationManager) persistence.getOverlayMigrationManager();
+    assertFalse(migrationManager.hasPendingOverlayMigration());
+
+    // We deleted the overlay earlier and the migration is not run again, so we get a null.
+    assertNull(
+        persistence.getDocumentOverlayCache(User.UNAUTHENTICATED).getOverlay(key("foo/bar")));
+  }
+
   @Test
   public void testCreateOverlayFromDelete() {
     writeRemoteDocument(doc("foo/bar", 2, map("it", "original")));