chore: update jsoncons version to 0.178

Signed-off-by: Roman Gershman <[email protected]>
dragonflydb · Dec 25, 2024 · 004e090 · 004e090
1 parent c88c707
commit 004e090
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -74,10 +74,8 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex")
 add_third_party(
   jsoncons
   GIT_REPOSITORY https://github.com/dragonflydb/jsoncons
-  # URL https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.171.1.tar.gz
-  GIT_TAG Dragonfly
+  GIT_TAG Dragonfly.178
   GIT_SHALLOW 1
-  # PATCH_COMMAND patch -p1 -i "${CMAKE_SOURCE_DIR}/patches/jsoncons-v0.171.0.patch"
   CMAKE_PASS_FLAGS "-DJSONCONS_BUILD_TESTS=OFF -DJSONCONS_HAS_POLYMORPHIC_ALLOCATOR=ON"
   LIB "none"
 )

diff --git a/src/server/json_family.cc b/src/server/json_family.cc
@@ -1326,14 +1326,13 @@ OpResult<bool> OpSet(const OpArgs& op_args, string_view key, string_view path,
   bool path_exists = false;
   bool operation_result = false;
   const JsonType& new_json = parsed_json.value();
-  auto cb = [&](std::optional<std::string_view>, JsonType* val) -> MutateCallbackResult<> {
+
+  auto cb = [&](std::optional<string_view>, JsonType* val) -> MutateCallbackResult<> {
     path_exists = true;
     if (!is_nx_condition) {
       operation_result = true;
-      static_assert(
-          std::is_same_v<std::allocator_traits<JsonType>::propagate_on_container_copy_assignment,
-                         std::false_type>);
-      *val = new_json;
+      *val =
+          JsonType(new_json, std::pmr::polymorphic_allocator<char>{CompactObj::memory_resource()});
     }
     return {};
   };