Merge tag 'v14.10.2' into next-major

Author: jedelbo

CHANGELOG.md

@@ -21,6 +21,29 @@
 
 ----------------------------------------------
 
+# 14.10.2 Release notes
+
+### Enhancements
+* None.
+
+### Fixed
+* `DB::compact()` on an encrypted Realm without explicitly specifying a new encryption key would only work if the old key happened to be a valid nul-terminated string ([#7842](https://github.com/realm/realm-core/issues/7842), since v14.10.0).
+* You could get unexpected merge results when assigning to a nested collection ([#7809](https://github.com/realm/realm-core/issues/7809), since v14.0.0)
+
+### Breaking changes
+* None.
+
+### 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.
+
+-----------
+
+### Internals
+* FLX download estimates are now tracked in a multiprocess-compatible manner ([PR #7780](https://github.com/realm/realm-core/pull/7780)).
+* Fixed util::FlatMap so it uses the custom Compare for both ordering and equality checking so you can use util::FlatMap with case-insensitive string keys ([PR #7845](https://github.com/realm/realm-core/pull/7845)).
+
+----------------------------------------------
+
 # 14.10.1 Release notes
 
 ### Enhancements

Package.swift

@@ -3,7 +3,7 @@
 import PackageDescription
 import Foundation
 
-let versionStr = "14.10.1"
+let versionStr = "14.10.2"
 let versionPieces = versionStr.split(separator: "-")
 let versionCompontents = versionPieces[0].split(separator: ".")
 let versionExtra = versionPieces.count > 1 ? versionPieces[1] : ""

dependencies.yml

@@ -1,5 +1,5 @@
 PACKAGE_NAME: realm-core
-VERSION: 14.10.1
+VERSION: 14.10.2
 OPENSSL_VERSION: 3.2.0
 ZLIB_VERSION: 1.2.13
 # https://github.com/10gen/baas/commits

doc/development/how-to-release.md

@@ -4,15 +4,15 @@ The core release process is automated with github [actions](https://github.com/r
   - Select the base branch that you would like to make a release from (usually this will be "master") in the drop down.
   - Enter the version of the new release (eg. "10.123.1" or "4.5.0-CustDemo")
 
-2. This will create a PR, which you should look over and get someone else on the team to review. Verify the changelog by checking the PR description which has a list of commits since the last tag was made. If any changes are required, commit them to this PR's branch.
+2. This will create a PR, which you should look over and get someone else on the team to review. Verify the changelog by checking the PR description which has a list of commits since the last tag was made. If any changes are required, commit them to this PR's branch (please reorder commits such that the version change comes last as the last commit will be the one tagged). Verify that the base commit on the branch you are releasing has passed evergreen checks (or that the failures are known to be spurious and are tracked).
 
-3. When ready, merge the PR. You can squash if there are only "prepare release" changes, but use a "merge-commit" strategy if there are functional changes added manually to the PR (note that if using a merge strategy, the last commit after merge will be the one tagged, so you may want to reorder the commits so that the 'prepare' commit comes last). On merge, the "make-release" action will run. This will:
+3. When ready, merge the PR. You can squash if there are only "prepare release" changes, but use a "merge-commit" strategy if there are functional changes added manually to the PR. On merge, the "make-release" action will run which triggers a Github deployment. Someone from the `@realm/realm-core-team` must approve the deployment for this step to run. Find the Github [deployment](https://github.com/realm/realm-core/actions/workflows/make-release.yml) and approve it. This will:
   - Make a tag
   - Publish the release on Github
   - Open a PR to update the Changelog with the new template section
   - Announce the release in the #appx-releases slack channel
 
-4. Find the newly generated PR that adds the new changelog section. Approve it and merge it.
+4. Find the newly generated PR that adds the new changelog section. Approve it and merge it. It has been discussed by the team that this PR can be approved and merged without initiating evergreen checks because it is an automated change that only affects CHANGELOG.md and originates from an approved template.
 
 ## Previous process
 

src/realm/db.cpp

@@ -1626,7 +1626,7 @@ bool DB::compact(bool bump_version_number, std::optional<const char*> output_enc
     }
     auto info = m_info;
     Durability dura = Durability(info->durability);
-    std::string key_buffer;
+    std::unique_ptr<char[]> key_buffer;
     const char* write_key = nullptr;
     if (output_encryption_key) {
         if (*output_encryption_key) {
@@ -1635,8 +1635,9 @@ bool DB::compact(bool bump_version_number, std::optional<const char*> output_enc
     }
 #if REALM_ENABLE_ENCRYPTION
     else if (auto encryption = m_alloc.get_file().get_encryption()) {
-        key_buffer = encryption->get_key();
-        write_key = key_buffer.data();
+        key_buffer = std::make_unique<char[]>(64);
+        memcpy(key_buffer.get(), encryption->get_key(), 64);
+        write_key = key_buffer.get();
     }
 #endif
     {
@@ -2184,14 +2185,15 @@ void DB::enable_wait_for_change()
     m_wait_for_change_enabled = true;
 }
 
-bool DB::needs_file_format_upgrade(const std::string& file, const std::vector<char>& encryption_key)
+bool DB::needs_file_format_upgrade(const std::string& file, Span<const char> encryption_key)
 {
     SlabAlloc alloc;
     SlabAlloc::Config cfg;
     cfg.session_initiator = false;
     cfg.read_only = true;
     cfg.no_create = true;
     if (!encryption_key.empty()) {
+        REALM_ASSERT(encryption_key.size() == 64);
         cfg.encryption_key = encryption_key.data();
     }
     try {

src/realm/db.hpp

@@ -167,7 +167,7 @@ class DB : public std::enable_shared_from_this<DB> {
 
     bool is_attached() const noexcept;
 
-    static bool needs_file_format_upgrade(const std::string& file, const std::vector<char>& encryption_key);
+    static bool needs_file_format_upgrade(const std::string& file, util::Span<const char> encryption_key);
 
     Allocator& get_alloc()
     {

src/realm/dictionary.cpp

@@ -823,10 +823,12 @@ 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();
+    Replication* repl = Base::get_replication();
+    if (repl && (sz > 0 || !m_col_key.is_collection() || m_level > 1)) {
+        repl->dictionary_clear(*this);
+    }
+    if (sz > 0) {
         CascadeState cascade_state(CascadeState::Mode::Strong);
         bool recurse = remove_backlinks(cascade_state);
 

src/realm/list.cpp

@@ -503,10 +503,12 @@ void Lst<Mixed>::remove(size_t from, size_t to)
 
 void Lst<Mixed>::clear()
 {
-    if (size() > 0) {
-        if (Replication* repl = Base::get_replication()) {
-            repl->list_clear(*this);
-        }
+    auto sz = size();
+    Replication* repl = Base::get_replication();
+    if (repl && (sz > 0 || !m_col_key.is_collection() || m_level > 1)) {
+        repl->list_clear(*this);
+    }
+    if (sz > 0) {
         CascadeState state;
         bool recurse = remove_backlinks(state);