Iterate through all elements of target array for ArrayRemove

Brian Chen · Brian Chen · commit e624789e4b49 · 2021-01-11T14:25:04.000-06:00
diff --git a/Firestore/core/src/model/transform_operation.cc b/Firestore/core/src/model/transform_operation.cc
@@ -251,8 +251,12 @@ FieldValue ArrayTransform::Rep::Apply(
       }
     } else {
       HARD_ASSERT(type_ == Type::ArrayRemove);
-      if (pos != result.end()) {
-        result.erase(pos);
+      for (int i = 0; i < static_cast<int>(result.size());) {
+        if (type_ == Type::ArrayRemove && element == result.at(i)) {
+          result.erase(result.cbegin() + i);
+        } else {
+          ++i;
+        }
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -251,8 +251,12 @@ FieldValue ArrayTransform::Rep::Apply(`
`251`	`251`	`}`
`252`	`252`	`} else {`
`253`	`253`	`HARD_ASSERT(type_ == Type::ArrayRemove);`
`254`		`- if (pos != result.end()) {`
`255`		`- result.erase(pos);`
	`254`	`+ for (int i = 0; i < static_cast<int>(result.size());) {`
	`255`	`+ if (type_ == Type::ArrayRemove && element == result.at(i)) {`
	`256`	`+ result.erase(result.cbegin() + i);`
	`257`	`+ } else {`
	`258`	`+ ++i;`
	`259`	`+ }`
`256`	`260`	`}`
`257`	`261`	`}`
`258`	`262`	`}`