Replicate clear instruction unconditionally

realm · Jun 14, 2024 · b62ce85 · b62ce85
1 parent 8da33a3
commit b62ce85
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Valgrind could report a branch on an uninitialized read when opening something that is not an encrypted Realm file as an encrypted Realm file ([PR #7789](https://github.com/realm/realm-core/pull/7789), since v14.10.0).
 * Opening an FLX realm asynchronously may not wait to download all data ([#7720](https://github.com/realm/realm-core/issues/7720), since FLX sync was introduced).
 * Fix compilation with Xcode 16 ([PR #7802](https://github.com/realm/realm-core/pull/7802))
+* You could get unexpected merge results when assigning to a list ([#7809](https://github.com/realm/realm-core/issues/7809), since v10.2.0)
 
 ### Breaking changes
 * None.

diff --git a/src/realm/dictionary.cpp b/src/realm/dictionary.cpp
@@ -823,10 +823,11 @@ size_t Dictionary::find_first(Mixed value) const
 
 void Dictionary::clear()
 {
-    if (size() > 0) {
-        if (Replication* repl = get_replication()) {
-            repl->dictionary_clear(*this);
-        }
+    auto sz = size();
+    if (Replication* repl = get_replication()) {
+        repl->dictionary_clear(*this);
+    }
+    if (sz > 0) {
         CascadeState cascade_state(CascadeState::Mode::Strong);
         bool recurse = remove_backlinks(cascade_state);
 

diff --git a/src/realm/list.hpp b/src/realm/list.hpp
@@ -930,10 +930,11 @@ inline LnkLst Obj::get_linklist(StringData col_name) const
 template <class T>
 void Lst<T>::clear()
 {
-    if (size() > 0) {
-        if (Replication* repl = Base::get_replication()) {
-            repl->list_clear(*this);
-        }
+    auto sz = size();
+    if (Replication* repl = Base::get_replication()) {
+        repl->list_clear(*this);
+    }
+    if (sz > 0) {
         do_clear();
         bump_content_version();
     }

diff --git a/test/object-store/object.cpp b/test/object-store/object.cpp
@@ -2011,8 +2011,8 @@ TEST_CASE("object") {
 
         r1->begin_transaction();
         r2->begin_transaction();
-        auto object1 = Object::create(c1, r1, *r1->schema().find("pk after list"), std::any(v1));
-        auto object2 = Object::create(c2, r2, *r2->schema().find("pk after list"), std::any(v2));
+        auto object1 = Object::create(c1, r1, "pk after list", std::any(v1), CreatePolicy::UpdateModified);
+        auto object2 = Object::create(c2, r2, "pk after list", std::any(v2), CreatePolicy::UpdateModified);
         r2->commit_transaction();
         r1->commit_transaction();
 

diff --git a/test/test_sync.cpp b/test/test_sync.cpp
@@ -6204,6 +6204,69 @@ TEST(Sync_DeleteCollectionInCollection)
     }
 }
 
+TEST(Sync_CollectionClear)
+{
+    TEST_CLIENT_DB(db_1);
+    TEST_CLIENT_DB(db_2);
+
+    TEST_DIR(dir);
+    fixtures::ClientServerFixture fixture{dir, test_context};
+    fixture.start();
+
+    Session session_1 = fixture.make_session(db_1, "/test");
+    Session session_2 = fixture.make_session(db_2, "/test");
+
+    Timestamp now{std::chrono::system_clock::now()};
+
+    write_transaction(db_1, [&](WriteTransaction& tr) {
+        auto& g = tr.get_group();
+        auto table = g.add_table_with_primary_key("class_Table", type_Int, "id");
+        auto col_list = table->add_column_list(type_Int, "ints");
+        auto col_dict = table->add_column_dictionary(type_String, "features");
+
+        auto foo = table->create_object_with_primary_key(123);
+        auto list = foo.get_list<Int>(col_list);
+        list.clear();
+        list.add(1);
+        auto dict = foo.get_dictionary(col_dict);
+        dict.clear();
+        dict.insert("address", "Any Road 3");
+    });
+
+    write_transaction(db_2, [&](WriteTransaction& tr) {
+        auto& g = tr.get_group();
+        auto table = g.add_table_with_primary_key("class_Table", type_Int, "id");
+        auto col_list = table->add_column_list(type_Int, "ints");
+        auto col_dict = table->add_column_dictionary(type_String, "features");
+
+        auto foo = table->create_object_with_primary_key(123);
+        auto list = foo.get_list<Int>(col_list);
+        list.clear();
+        list.add(2);
+        auto dict = foo.get_dictionary(col_dict);
+        dict.clear();
+        dict.insert("city", "Andeby");
+    });
+
+    session_1.wait_for_upload_complete_or_client_stopped();
+    session_2.wait_for_upload_complete_or_client_stopped();
+    session_1.wait_for_download_complete_or_client_stopped();
+    session_2.wait_for_download_complete_or_client_stopped();
+
+    {
+        ReadTransaction read_1{db_1};
+        auto table = read_1.get_table("class_Table");
+        auto obj = table->get_object_with_primary_key(123);
+        auto list = obj.get_list<Int>("ints");
+        auto dict = obj.get_dictionary("features");
+        CHECK_EQUAL(list.size(), 1);
+        CHECK_EQUAL(dict.size(), 1);
+
+        ReadTransaction read_2{db_2};
+        CHECK(compare_groups(read_1, read_2));
+    }
+}
+
 TEST(Sync_Dictionary_Links)
 {
     TEST_CLIENT_DB(db_1);