Merge branch 'master' into next-major

Author: jedelbo

CHANGELOG.md

@@ -28,10 +28,11 @@
 
 ### Fixed
 * <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)
-* None.
+* Fix an assertion failure "m_lock_info && m_lock_info->m_file.get_path() == m_filename" that appears to be related to opening a Realm while the file is in the process of being closed on another thread ([Swift #8507](https://github.com/realm/realm-swift/issues/8507)).
+* Fixed diverging history due to a bug in the replication code when setting default null values (embedded objects included) ([#7536](https://github.com/realm/realm-core/issues/7536)).
 
 ### Breaking changes
-* None.
+* Updated default base URL to be `https://services.cloud.mongodb.com` to support the new domains (was `https://realm.mongodb.com`). ([PR #7534](https://github.com/realm/realm-core/pull/7534))
 
 ### Compatibility
 * Fileformat: Generates files with format v24. Reads and automatically upgrade from fileformat v10. If you want to upgrade from an earlier file format version you will have to use RealmCore v13.x.y or earlier.
@@ -41,6 +42,7 @@
 ### Internals
 * Update libuv used in object store tests from v1.35.0 to v1.48.0 ([PR #7508](https://github.com/realm/realm-core/pull/7508)).
 * Made `set_default_logger` nullable in the bindgen spec.yml (PR [#7515](https://github.com/realm/realm-core/pull/7515)).
+* Added `App::default_base_url()` static accessor for SDKs to retrieve the default base URL from Core. ([PR #7534](https://github.com/realm/realm-core/pull/7534))
 
 ----------------------------------------------
 

src/realm/collection_parent.cpp

@@ -75,13 +75,13 @@ CollectionParent::~CollectionParent() {}
 
 void CollectionParent::check_level() const
 {
-    if (m_level + 1 > s_max_level) {
+    if (size_t(m_level) + 1 > s_max_level) {
         throw LogicError(ErrorCodes::LimitExceeded, "Max nesting level reached");
     }
 }
 
 template <typename Base, template <typename> typename Collection, typename LinkCol>
-std::unique_ptr<Base> create_collection(ColKey col_key, size_t level)
+std::unique_ptr<Base> create_collection(ColKey col_key, uint8_t level)
 {
     bool nullable = col_key.get_attrs().test(col_attr_Nullable);
     switch (col_key.get_type()) {
@@ -128,19 +128,19 @@ std::unique_ptr<Base> create_collection(ColKey col_key, size_t level)
     }
 }
 
-LstBasePtr CollectionParent::get_listbase_ptr(ColKey col_key, size_t level)
+LstBasePtr CollectionParent::get_listbase_ptr(ColKey col_key, uint8_t level)
 {
     REALM_ASSERT(col_key.get_attrs().test(col_attr_List) || col_key.get_type() == col_type_Mixed);
     return create_collection<LstBase, Lst, LnkLst>(col_key, level);
 }
 
-SetBasePtr CollectionParent::get_setbase_ptr(ColKey col_key, size_t level)
+SetBasePtr CollectionParent::get_setbase_ptr(ColKey col_key, uint8_t level)
 {
     REALM_ASSERT(col_key.get_attrs().test(col_attr_Set));
     return create_collection<SetBase, Set, LnkSet>(col_key, level);
 }
 
-CollectionBasePtr CollectionParent::get_collection_ptr(ColKey col_key, size_t level)
+CollectionBasePtr CollectionParent::get_collection_ptr(ColKey col_key, uint8_t level)
 {
     if (col_key.is_list()) {
         return get_listbase_ptr(col_key, level);

src/realm/collection_parent.hpp

@@ -99,9 +99,9 @@ class CollectionParent : public std::enable_shared_from_this<CollectionParent> {
     // a write to mark the already up-to-date parent as still being up-to-date.
     virtual void update_content_version() const noexcept = 0;
 
-    static LstBasePtr get_listbase_ptr(ColKey col_key, size_t level);
-    static SetBasePtr get_setbase_ptr(ColKey col_key, size_t level);
-    static CollectionBasePtr get_collection_ptr(ColKey col_key, size_t level);
+    static LstBasePtr get_listbase_ptr(ColKey col_key, uint8_t level);
+    static SetBasePtr get_setbase_ptr(ColKey col_key, uint8_t level);
+    static CollectionBasePtr get_collection_ptr(ColKey col_key, uint8_t level);
 
     static int64_t generate_key(size_t sz);
     static void set_key(BPlusTreeMixed& tree, size_t index);

src/realm/dictionary.cpp

@@ -48,7 +48,7 @@ void validate_key_value(const Mixed& key)
 
 /******************************** Dictionary *********************************/
 
-Dictionary::Dictionary(ColKey col_key, size_t level)
+Dictionary::Dictionary(ColKey col_key, uint8_t level)
     : Base(col_key)
     , CollectionParent(level)
 {
@@ -433,16 +433,8 @@ void Dictionary::insert_collection(const PathElement& path_elem, CollectionType
     if (dict_or_list == CollectionType::Set) {
         throw IllegalOperation("Set nested in Dictionary is not supported");
     }
-
     check_level();
-    ensure_created();
-    Mixed new_val(0, dict_or_list);
-    auto old_val = try_get(path_elem.get_key());
-    if (!old_val || *old_val != new_val) {
-        m_values->ensure_keys();
-        auto [it, inserted] = insert(path_elem.get_key(), new_val);
-        set_key(*m_values, it.index());
-    }
+    insert(path_elem.get_key(), Mixed(0, dict_or_list));
 }
 
 DictionaryPtr Dictionary::get_dictionary(const PathElement& path_elem) const
@@ -549,6 +541,7 @@ std::pair<Dictionary::Iterator, bool> Dictionary::insert(Mixed key, Mixed value)
         throw StaleAccessor("Stale dictionary");
     }
 
+    bool set_nested_collection_key = value.is_type(type_Dictionary, type_List);
     bool old_entry = false;
     auto [ndx, actual_key] = find_impl(key);
     if (actual_key != key) {
@@ -577,16 +570,25 @@ std::pair<Dictionary::Iterator, bool> Dictionary::insert(Mixed key, Mixed value)
             repl->dictionary_insert(*this, ndx, key, value);
         }
     }
-
     bump_content_version();
 
     ObjLink old_link;
     if (old_entry) {
         Mixed old_value = m_values->get(ndx);
-        if (old_value.is_type(type_TypedLink)) {
-            old_link = old_value.get<ObjLink>();
+        if (!value.is_same_type(old_value) || value != old_value) {
+            if (old_value.is_type(type_TypedLink)) {
+                old_link = old_value.get<ObjLink>();
+            }
+            m_values->set(ndx, value);
         }
-        m_values->set(ndx, value);
+        else {
+            set_nested_collection_key = false;
+        }
+    }
+
+    if (set_nested_collection_key) {
+        m_values->ensure_keys();
+        set_key(*m_values, ndx);
     }
 
     if (new_link != old_link) {

src/realm/dictionary.hpp

@@ -51,7 +51,7 @@ class Dictionary final : public CollectionBaseImpl<DictionaryBase>, public Colle
         : Base(parent, index)
     {
     }
-    Dictionary(ColKey col_key, size_t level = 1);
+    Dictionary(ColKey col_key, uint8_t level = 1);
     Dictionary(const Dictionary& other)
         : Base(static_cast<const Base&>(other))
         , CollectionParent(other.get_level())

src/realm/list.cpp

@@ -408,8 +408,12 @@ Mixed Lst<Mixed>::set(size_t ndx, Mixed value)
     if (Replication* repl = Base::get_replication()) {
         repl->list_set(*this, ndx, value);
     }
-    if (!(old.is_same_type(value) && old == value)) {
+    if (!value.is_same_type(old) || value != old) {
         do_set(ndx, value);
+        if (value.is_type(type_Dictionary, type_List)) {
+            m_tree->ensure_keys();
+            set_key(*m_tree, ndx);
+        }
         bump_content_version();
     }
     return old;
@@ -427,6 +431,10 @@ void Lst<Mixed>::insert(size_t ndx, Mixed value)
         repl->list_insert(*this, ndx, value, sz);
     }
     do_insert(ndx, value);
+    if (value.is_type(type_Dictionary, type_List)) {
+        m_tree->ensure_keys();
+        set_key(*m_tree, ndx);
+    }
     bump_content_version();
 }
 
@@ -529,37 +537,17 @@ void Lst<Mixed>::insert_collection(const PathElement& path_elem, CollectionType
     if (dict_or_list == CollectionType::Set) {
         throw IllegalOperation("Set nested in List<Mixed> is not supported");
     }
-
-    ensure_created();
     check_level();
-    m_tree->ensure_keys();
     insert(path_elem.get_ndx(), Mixed(0, dict_or_list));
-    set_key(*m_tree, path_elem.get_ndx());
-    bump_content_version();
 }
 
 void Lst<Mixed>::set_collection(const PathElement& path_elem, CollectionType dict_or_list)
 {
     if (dict_or_list == CollectionType::Set) {
         throw IllegalOperation("Set nested in List<Mixed> is not supported");
     }
-
-    auto ndx = path_elem.get_ndx();
-    // get will check for ndx out of bounds
-    Mixed old_val = do_get(ndx, "set_collection()");
-    Mixed new_val(0, dict_or_list);
-
     check_level();
-
-    if (old_val != new_val) {
-        m_tree->ensure_keys();
-        set(ndx, new_val);
-        int64_t key = m_tree->get_key(ndx);
-        if (key == 0) {
-            set_key(*m_tree, path_elem.get_ndx());
-        }
-        bump_content_version();
-    }
+    set(path_elem.get_ndx(), Mixed(0, dict_or_list));
 }
 
 DictionaryPtr Lst<Mixed>::get_dictionary(const PathElement& path_elem) const

src/realm/list.hpp

@@ -291,7 +291,7 @@ class Lst<Mixed> final : public CollectionBaseImpl<LstBase>, public CollectionPa
     {
         this->set_owner(owner, col_key);
     }
-    Lst(ColKey col_key, size_t level = 1)
+    Lst(ColKey col_key, uint8_t level = 1)
         : Base(col_key)
         , CollectionParent(level)
     {