---

schmidt-sebastian · schmidt-sebastian · commit f695cc3fd356 · 2018-02-26T07:55:37.000-08:00
yaml --- r: 9043 b: refs/heads/mrschmidt-emptymerge c: 447dbdd h: refs/heads/master i: 9041: 891c1a9 9039: 0f829c7
diff --git a/[refs] b/[refs]
@@ -89,4 +89,4 @@ refs/tags/v0.30.0: 9ea3a32084835d0499934e7c070af9f120747e88
 refs/heads/batching-expr: 95bc1ac20addaeb25ef65f62450593ed600484b9
 "refs/heads/datastore_orderby_tostring": 24a5a107969714ebb69a5a098f47658f7b1e8689
 "refs/heads/mrschmidt-__name___": effe27458f7d31b1d5ae1af6a5a228ce89c33462
-refs/heads/mrschmidt-emptymerge: 1fc5c1bbba7c0713ed9c2b31c6c673621f48b981
+refs/heads/mrschmidt-emptymerge: 447dbddebbcb8b88fe5dc480d16c0c7697712d11
diff --git a/branches/mrschmidt-emptymerge/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java b/branches/mrschmidt-emptymerge/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java
@@ -245,7 +245,6 @@ private T performSet(
         DocumentTransform.fromFieldPathMap(documentReference, documentData);
 
     if (options.isMerge()) {
-      Preconditions.checkArgument(!fields.isEmpty(), "Data to merge cannot be empty.");
       if (options.getFieldMask() != null) {
         List<FieldPath> fieldMask = new ArrayList<>(options.getFieldMask());
         fieldMask.removeAll(documentTransform.getFields());
@@ -257,11 +256,12 @@ private T performSet(
 
     Mutation mutation = addMutation();
 
-    if (!options.isMerge() || !documentSnapshot.isEmpty() || !documentMask.isEmpty()) {
-      mutation.document = documentSnapshot.toPb();
-    }
+    boolean hasDocumentData = !documentSnapshot.isEmpty() || !documentMask.isEmpty();
 
-    if (!documentMask.isEmpty()) {
+    if (!options.isMerge()) {
+      mutation.document = documentSnapshot.toPb();
+    } else if (hasDocumentData || documentTransform.isEmpty()) {
+      mutation.document = documentSnapshot.toPb();
       mutation.document.setUpdateMask(documentMask.toPb());
     }
 
diff --git a/branches/mrschmidt-emptymerge/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/branches/mrschmidt-emptymerge/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
@@ -85,7 +85,8 @@ public class ConformanceTest {
   private interface ConformanceTestCase extends Test, Describable {}
 
   /** Excluded tests by test description. */
-  private final Set<String> excludedTests = Collections.emptySet();
+  private final Set<String> excludedTests =
+      Collections.singleton("set: MergeAll cannot be specified with empty data."); // b/73495873
 
   /** If non-empty, only runs tests included in this set. */
   private final Set<String> includedTests = Collections.emptySet();
diff --git a/branches/mrschmidt-emptymerge/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java b/branches/mrschmidt-emptymerge/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java
@@ -411,6 +411,20 @@ public void setDocumentWithMerge() throws Exception {
     }
   }
 
+  @Test
+  public void setDocumentWithEmptyMerge() throws Exception {
+    doReturn(SINGLE_WRITE_COMMIT_RESPONSE)
+        .when(firestoreMock)
+        .sendRequest(
+            commitCapture.capture(), Matchers.<UnaryCallable<CommitRequest, CommitResponse>>any());
+
+    documentReference.set(map(), SetOptions.merge()).get();
+
+    assertCommitEquals(
+        commit(set(Collections.<String, Value>emptyMap(), Collections.<String>emptyList())),
+        commitCapture.getValue());
+  }
+
   @Test
   public void setDocumentWithNestedMerge() throws Exception {
     doReturn(SINGLE_WRITE_COMMIT_RESPONSE)
