diff options
| author | Remi Collet <remi@remirepo.net> | 2025-09-09 07:30:53 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-09-09 07:30:53 +0200 |
| commit | eb4fa12a31beba0624158bf2e065e0019405ebf1 (patch) | |
| tree | 534eee04bc456fcc22c740e9ed4b386e47d71c47 | |
| parent | 0f8fbb33ca003f55c76c90c059c951ae1eb49cca (diff) | |
| -rw-r--r-- | valkey-json-format.patch | 24 | ||||
| -rw-r--r-- | valkey-json.spec | 11 |
2 files changed, 33 insertions, 2 deletions
diff --git a/valkey-json-format.patch b/valkey-json-format.patch new file mode 100644 index 0000000..e2f2afb --- /dev/null +++ b/valkey-json-format.patch @@ -0,0 +1,24 @@ +diff -up ./src/json/dom.cc.old ./src/json/dom.cc +--- ./src/json/dom.cc.old 2025-09-09 07:19:08.709298501 +0200 ++++ ./src/json/dom.cc 2025-09-09 07:19:25.086387780 +0200 +@@ -1513,7 +1513,7 @@ JValue rdbLoadJValue(load_params *params + return array; + } + default: +- ValkeyModule_LogIOError(params->rdb, "error", "Invalid metadata code %llx", code); ++ ValkeyModule_LogIOError(params->rdb, "error", "Invalid metadata code %lx", code); + params->status = JSONUTIL_INVALID_RDB_FORMAT; + return JValue(); + } +diff -up ./src/json/keytable.cc.old ./src/json/keytable.cc +--- ./src/json/keytable.cc.old 2025-09-09 07:19:55.230594177 +0200 ++++ ./src/json/keytable.cc 2025-09-09 07:20:07.570088017 +0200 +@@ -302,7 +302,7 @@ struct KeyTable_Shard { + if (duration == 0) duration = 1; + uint64_t keys_per_second = (size / duration) * 1000; + ValkeyModule_Log(nullptr, "notice", +- "Keytable Resize to %zu completed in %llu ms (%llu / sec)", ++ "Keytable Resize to %zu completed in %lu ms (%lu / sec)", + capacity, duration, keys_per_second); + } + diff --git a/valkey-json.spec b/valkey-json.spec index 6f6d486..4c1ad62 100644 --- a/valkey-json.spec +++ b/valkey-json.spec @@ -22,9 +22,9 @@ %global rapidjson_commit ebd87cb468fb4cb060b37e579718c4a4125416c1 Name: valkey-json -Version: 1.0.1 +Version: 1.0.2 %forgemeta -Release: 2%{?dist} +Release: 1%{?dist} Summary: JSON as native data type # this module is BSD-3-Clause # RapidJSON is MIT @@ -36,6 +36,8 @@ Source1: %{rapidjson_url}/archive/%{rapidjson_commit}/rapidjson-%{rapi # use header from valkey-devel to avoid downloading valkey sources # use rapidjson git snapshot to avoid download Patch0: %{name}-offline.patch +# see https://github.com/valkey-io/valkey-json/issues/83 +Patch1: %{name}-format.patch BuildRequires: valkey-devel >= 8.0 BuildRequires: cmake >= 3.17 @@ -70,6 +72,8 @@ See https://rapidjson.org/ %prep %setup -q -n %{gh_proj}-%{version} -a1 %patch -P0 -p1 -b .offline +%patch -P1 -p1 -b .format +sed -e 's/-Wno-format//' -i CMakeLists.txt : Configuration file cat << EOF | tee %{cfgname} @@ -109,6 +113,9 @@ install -Dpm640 %{cfgname} %{buildroot}%{valkey_modules_cfg}/%{cfgna %changelog +* Tue Sep 9 2025 Remi Collet <remi@remirepo.net> - 1.0.2-1 +- update to 1.0.2 + * Wed Aug 6 2025 Remi Collet <remi@remirepo.net> - 1.0.1-2 - improve patch for offlilne build and submit upstream: https://github.com/valkey-io/valkey-json/pull/73 |