Merge branch 'master' of github.com:realm/realm-core into next-major

Author: nicola-cab

Android.bp

@@ -83,6 +83,7 @@ cc_object {
         "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid_from_int.c",
         "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid_round.c",
     ],
+    vendor: true
 }
 
 cc_object {
@@ -110,6 +111,7 @@ cc_object {
         "-Wno-unused-local-typedefs",
         "-Wno-unused-parameter",
     ],
+    vendor: true
 }
 
 genrule {
@@ -135,11 +137,11 @@ cc_defaults {
     },
     shared_libs: [
         "liblog",
-        "libandroid",
         "libz",
         "libcrypto",
         "libssl",
     ],
+    vendor: true
 }
 
 cc_defaults {
@@ -154,6 +156,7 @@ cc_defaults {
         "-DREALM_ENABLE_SYNC=1",
         "-DREALM_ENABLE_GEOSPATIAL=1",
         "-DREALM_HAVE_EPOLL=1",
+        "-DREALM_AOSP_VENDOR=1",
         "-Wno-non-virtual-dtor",
         "-Wno-missing-field-initializers",
     ],
@@ -193,4 +196,5 @@ cc_library_static {
         "src/realm/object-store/sync/impl/emscripten/**/*",
     ],
     export_shared_lib_headers: ["libcrypto"],
+    vendor: true
 }

CHANGELOG.md

@@ -20,6 +20,31 @@
 
 ----------------------------------------------
 
+# 14.7.0 Release notes
+
+### Enhancements
+* Nested collections have full support for automatic client reset ([PR #7683](https://github.com/realm/realm-core/pull/7683)).
+
+### Fixed
+* Having links in a nested collections would leave the file inconsistent if the top object is removed. ([#7657](https://github.com/realm/realm-core/issues/7657), since 14.0.0)
+* Accessing App::current_user() from within a notification produced by App:switch_user() (which includes notifications for a newly logged in user) would deadlock ([#7670](https://github.com/realm/realm-core/issues/7670), since v14.6.0).
+* Inserting the same typed link to the same key in a dictionary more than once would incorrectly create multiple backlinks to the object. This did not appear to cause any crashes later, but would have affecting explicit backlink count queries (eg: `...@links.@count`) and possibly notifications ([#7676](https://github.com/realm/realm-core/issues/7676) since v14.5.2).
+* Automatic client reset recovery would crash when recovering AddInteger instructions on a Mixed property if its type was changed to non-integer ([PR #7683](https://github.com/realm/realm-core/pull/7683), since v11.16.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
+* (bindgen) Exposing a function `app_user_as_sync_user` to cast the opposite way as `sync_user_as_app_user`. ([PR #7684](https://github.com/realm/realm-core/pull/7684) as a follow-up to [PR #7634](https://github.com/realm/realm-core/pull/7634))
+* Protocol version bumped to 13.
+
+----------------------------------------------
+
 # 14.6.2 Release notes
 
 ### Enhancements
@@ -28,7 +53,6 @@
 ### Fixed
 * Fixed a bug when running a IN query on a String/Int/UUID/ObjectId property that was indexed. ([7642](https://github.com/realm/realm-core/issues/7642) since v14.6.0)
 * Fixed a bug when running a IN query on a integer property where double/float parameters were ignored. ([7642](https://github.com/realm/realm-core/issues/7642) since v14.6.0)
-* Having links in a nested collections would leave the file inconsistent if the top object is removed. ([#7657](https://github.com/realm/realm-core/issues/7657), since 14.0.0)
 
 ### Breaking changes
 * None.

Package.swift

@@ -3,7 +3,7 @@
 import PackageDescription
 import Foundation
 
-let versionStr = "14.6.2"
+let versionStr = "14.7.0"
 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.6.2
+VERSION: 14.7.0
 OPENSSL_VERSION: 3.2.0
 ZLIB_VERSION: 1.2.13
 # https://github.com/10gen/baas/commits

evergreen/config.yml

@@ -434,7 +434,10 @@ functions:
       script: |-
         if ls crash-*> /dev/null 2>&1; then
           echo "Found crash file"
+          #Rename the crash file and the realm file. 
+          #If there is a crash, this will signal that something needs to be uploaded.
           mv crash-* realm-fuzzer-crash.txt
+          mv fuzz-realm.realm fuzzer_realm.realm
         fi
 
   - command: s3.put
@@ -447,14 +450,29 @@ functions:
       bucket: mciuploads
       permissions: public-read
       content_type: text/plain
-      display_name: Fuzzer crash report
+      display_name: Crash input file
+      optional: true
+
+  - command: s3.put
+    params:
+      working_dir: realm-core/build/test/realm-fuzzer
+      aws_key: '${artifacts_aws_access_key}'
+      aws_secret: '${artifacts_aws_secret_key}'
+      local_file: 'realm-core/build/test/realm-fuzzer/fuzzer_realm.realm'
+      remote_file: '${project}/${branch_name}/${task_id}/${execution}/fuzzer_realm.realm'
+      bucket: mciuploads
+      permissions: public-read
+      content_type: application/x-binary
+      display_name: Realm File 
       optional: true
 
   - command: shell.exec
     params:
       working_dir: realm-core/build/test/realm-fuzzer
       script: |-
+        #remove the crash file and the realm produced by the fuzzer run
         rm realm-fuzzer-crash.txt
+        rm fuzzer_realm.realm
 
   "run hang analyzer":
   - command: shell.exec
@@ -745,6 +763,7 @@ tasks:
   - command: shell.exec
     params:
       working_dir: realm-core
+      shell: bash
       script: |-
         set -o errexit
         if [[ -n "${cmake_bindir}" ]]; then
@@ -1124,6 +1143,56 @@ tasks:
       script: |-
         ${cmake_build_type|Debug}/realm-libfuzz -rss_limit_mb=0 -max_total_time=3600
 
+- name: generate-sync-corpus
+  tags: [ "for_nightly_tests" ]
+  exec_timeout_secs: 1800
+  commands:
+  - func: "fetch source"
+  - func: "fetch binaries"
+  - func: "compile"
+    vars:
+      target_to_build: "SyncTests"
+  - command: shell.exec
+    params:
+      working_dir: realm-core
+      shell: bash
+      script: |-
+          set -o errexit
+          set -o verbose
+
+          if [[ -n "${c_compiler}" && "$(basename ${c_compiler})" = "clang" && -f "$(dirname ${c_compiler})/llvm-symbolizer" ]]; then
+              LLVM_SYMBOLIZER="$(dirname ${c_compiler})/llvm-symbolizer"
+              export ASAN_SYMBOLIZER_PATH="$(./evergreen/abspath.sh $LLVM_SYMBOLIZER)"
+              export TSAN_OPTIONS="external_symbolizer_path=$(./evergreen/abspath.sh $LLVM_SYMBOLIZER)"
+          fi
+
+          export UNITTEST_EVERGREEN_TEST_RESULTS="$(./evergreen/abspath.sh ${task_name}_results.json)"
+          if [[ -n "$UNITTEST_EVERGREEN_TEST_RESULTS" && -f "$UNITTEST_EVERGREEN_TEST_RESULTS" ]]; then
+              rm "$UNITTEST_EVERGREEN_TEST_RESULTS"
+          fi
+          export UNITTEST_PROGRESS=1
+          export UNITTEST_FILTER="Array_Example Transform_* EmbeddedObjects_*"
+          export UNITTEST_DUMP_TRANSFORM="changeset_dump"
+
+          export TSAN_OPTIONS="suppressions=$(pwd)/test/tsan.suppress history_size=4 $TSAN_OPTIONS"
+          export UBSAN_OPTIONS="print_stacktrace=1"
+
+          ./build/test/${cmake_build_type}/realm-sync-tests
+
+          CHANGESET_DUMP_DIR="$(find . -type d -name changeset_dump -print -quit)"
+          mv "$CHANGESET_DUMP_DIR" changeset_dump
+          tar -czvf changeset_dump.tgz changeset_dump
+  - command: s3.put
+    params:
+      aws_key: '${artifacts_aws_access_key}'
+      aws_secret: '${artifacts_aws_secret_key}'
+      local_file: 'realm-core/changeset_dump.tgz'
+      remote_file: 'realm-core-stable/${branch_name}/${task_id}/${execution}/changeset_dump.tgz'
+      bucket: mciuploads
+      permissions: public-read
+      content_type: application/gzip
+      display_name: changeset dump tarball
+
 task_groups:
 - name: core_tests_group
   setup_group_can_fail_task: true
@@ -1347,9 +1416,10 @@ buildvariants:
   - name: core_tests_group
 
 # TODO RCORE-2085 ubuntu2004-release/ubuntu2004-arm64 build variants are here until we've established
-# a new baseline for the updated ubuntu 2204/clang 18 builders.
+# a new baseline for the updated ubuntu 2204/clang 18 builders and to generate artifacts for the baas
+# team.
 - name: ubuntu2004-release
-  display_name: "Ubuntu 20.04 x86_64 (Clang 11 release benchmarks)"
+  display_name: "Ubuntu 20.04 x86_64 (Clang 11 release benchmarks/baas artifacts)"
   run_on: ubuntu2004-large
   expansions:
     clang_url: "https://s3.amazonaws.com/static.realm.io/evergreen-assets/clang%2Bllvm-11.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz"
@@ -1362,7 +1432,9 @@ buildvariants:
     cxx_compiler: "./clang_binaries/bin/clang++"
     python3: /opt/mongodbtoolchain/v3/bin/python3
   tasks:
+  - name: compile_test_and_package 
   - name: benchmarks
+  - name: generate-sync-corpus
 
 - name: ubuntu2004-arm64
   display_name: "Ubuntu 20.04 ARM64 (Clang 11 release benchmarks)"
@@ -1519,21 +1591,6 @@ buildvariants:
 #   tasks:
 #   - name: network_tests
 
-- name: rhel70
-  display_name: "RHEL 7 x86_64"
-  run_on: rhel70-large
-  expansions:
-    c_compiler: /opt/mongodbtoolchain/v3/bin/gcc
-    cxx_compiler: /opt/mongodbtoolchain/v3/bin/g++
-    cmake_url: "https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-linux-x86_64.tar.gz"
-    cmake_bindir: "./cmake_binaries/bin"
-    fetch_missing_dependencies: On
-    curl: "/opt/mongodbtoolchain/v3/bin/curl"
-    python3: "/opt/mongodbtoolchain/v3/bin/python3"
-    ninja: "/opt/mongodbtoolchain/v4/bin/ninja"
-  tasks:
-  - name: compile_test_and_package
-
 - name: ubuntu-valgrind
   display_name: "Ubuntu 22.04 x86_64 (Valgrind)"
   run_on: ubuntu2204-large

src/realm/exec/CMakeLists.txt

@@ -87,7 +87,7 @@ set_target_properties(Realm2JSON PROPERTIES
     OUTPUT_NAME "realm2json"
     DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}
 )
-target_link_libraries(Realm2JSON Storage QueryParser Sync)
+target_link_libraries(Realm2JSON Sync QueryParser)
 list(APPEND ExecTargetsToInstall Realm2JSON)
 endif()