WIP

Author: schmidt-sebastian

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

@@ -216,7 +216,7 @@ public LocalWriteResult writeLocally(List<Mutation> mutations) {
         () -> {
           // Load and apply all existing mutations. This lets us compute the current base state for
           // all non-idempotent transforms before applying any additional user-provided writes.
-          ImmutableSortedMap<DocumentKey, Document> existingDocuments =
+          ImmutableSortedMap<DocumentKey, Document> documents =
               localDocuments.getDocuments(keys);
 
           // For non-idempotent mutations (such as `FieldValue.increment()`), we record the base
@@ -226,7 +226,7 @@ public LocalWriteResult writeLocally(List<Mutation> mutations) {
           List<Mutation> baseMutations = new ArrayList<>();
           for (Mutation mutation : mutations) {
             ObjectValue baseValue =
-                mutation.extractTransformBaseValue(existingDocuments.get(mutation.getKey()));
+                mutation.extractTransformBaseValue(documents.get(mutation.getKey()));
             if (baseValue != null) {
               // NOTE: The base state should only be applied if there's some existing
               // document to override, so use a Precondition of exists=true
@@ -241,9 +241,8 @@ public LocalWriteResult writeLocally(List<Mutation> mutations) {
 
           MutationBatch batch =
               mutationQueue.addMutationBatch(localWriteTime, baseMutations, mutations);
-          ImmutableSortedMap<DocumentKey, Document> changedDocuments =
-              batch.applyToLocalDocumentSet(existingDocuments);
-          return new LocalWriteResult(batch.getBatchId(), changedDocuments);
+           batch.applyToLocalDocumentSet(documents);
+          return new LocalWriteResult(batch.getBatchId(), documents);
         });
   }
 

firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.java

@@ -386,12 +386,12 @@ private static void canonifyArray(StringBuilder builder, ArrayValue arrayValue)
     builder.append("]");
   }
 
-  /** Returns true if `value` is either a INTEGER_VALUE. */
+  /** Returns true if `value` is a INTEGER_VALUE. */
   public static boolean isInteger(@Nullable Value value) {
     return value != null && value.getValueTypeCase() == Value.ValueTypeCase.INTEGER_VALUE;
   }
 
-  /** Returns true if `value` is either a DOUBLE_VALUE. */
+  /** Returns true if `value` is a DOUBLE_VALUE. */
   public static boolean isDouble(@Nullable Value value) {
     return value != null && value.getValueTypeCase() == Value.ValueTypeCase.DOUBLE_VALUE;
   }

firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/MutationBatch.java

@@ -118,7 +118,7 @@ public void applyToLocalView(MutableDocument document) {
   }
 
   /** Computes the local view for all provided documents given the mutations in this batch. */
-  public ImmutableSortedMap<DocumentKey, Document> applyToLocalDocumentSet(
+  public void applyToLocalDocumentSet(
       ImmutableSortedMap<DocumentKey, Document> documentMap) {
     // TODO(mrschmidt): This implementation is O(n^2). If we iterate through the mutations first
     // (as done in `applyToLocalView(MutableDocument d)`), we can reduce the complexity to
@@ -131,9 +131,7 @@ public ImmutableSortedMap<DocumentKey, Document> applyToLocalDocumentSet(
       if (!document.isValidDocument()) {
         document.convertToNoDocument(SnapshotVersion.NONE);
       }
-      documentMap = documentMap.insert(document.getKey(), document);
     }
-    return documentMap;
   }
 
   @Override

firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/PatchMutation.java

@@ -119,7 +119,7 @@ public void applyToRemoteDocument(MutableDocument document, MutationResult mutat
     applyServerTransformResults(value, document, mutationResult.getTransformResults());
     value.setAll(getPatch());
     document
-        .convertToFoundDocument(mutationResult.getVersion(), document.getData())
+        .convertToFoundDocument(mutationResult.getVersion(), value)
         .setHasCommittedMutations();
   }
 
@@ -135,7 +135,7 @@ public void applyToLocalView(MutableDocument document, Timestamp localWriteTime)
     applyLocalTransformResults(value, document, localWriteTime);
     value.setAll(getPatch());
     document
-        .convertToFoundDocument(getPostMutationVersion(document), document.getData())
+        .convertToFoundDocument(getPostMutationVersion(document), value)
         .setHasLocalMutations();
   }