Merge branch 'cmd_reps' of https://github.com/jackyyyyyssss/kvrocks i…

…nto cmd_reps
jackyyyyyssss · Jul 22, 2024 · 311eecd · 311eecd
2 parents fb8dd45 + 80c9b9d
commit 311eecd
Show file tree

Hide file tree

Showing 10 changed files with 134 additions and 138 deletions.
diff --git a/cmake/cpptrace.cmake b/cmake/cpptrace.cmake
@@ -20,8 +20,8 @@ include_guard()
 include(cmake/utils.cmake)
 
 FetchContent_DeclareGitHubWithMirror(cpptrace
- jeremy-rifkin/cpptrace v0.6.2
- MD5=b13786adcc1785cb900746ea96c50bee
+ jeremy-rifkin/cpptrace v0.6.3
+ MD5=32f3c0087c676f3d96df4d53e42ca5e9
 )
 
 if (SYMBOLIZE_BACKEND STREQUAL "libbacktrace")

diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake
@@ -20,8 +20,8 @@ include_guard()
 include(cmake/utils.cmake)
 
 FetchContent_DeclareGitHubWithMirror(gtest
- google/googletest v1.14.0
- MD5=b4911e882c51cba34bebfb5df500a650
+ google/googletest v1.15.0
+ MD5=94dafd2b785621e2eeffde85ac9198b7
 )
 
 FetchContent_MakeAvailableWithArgs(gtest

diff --git a/kvrocks.conf b/kvrocks.conf
@@ -308,7 +308,7 @@ max-bitmap-to-string-mb 16
 # Whether to enable SCAN-like cursor compatible with Redis. 
 # If enabled, the cursor will be unsigned 64-bit integers.
 # If disabled, the cursor will be a string.
-# Default: no
+# Default: yes
 redis-cursor-compatible yes
 
 # Whether to enable the RESP3 protocol.

diff --git a/src/commands/cmd_stream.cc b/src/commands/cmd_stream.cc
@@ -1107,7 +1107,7 @@ class CommandXRead : public Commander,
  redis::StreamRangeOptions options;
  options.reverse = false;
  options.start = ids_[i];
- options.end = StreamEntryID{UINT64_MAX, UINT64_MAX};
+ options.end = StreamEntryID::Maximum();
  options.with_count = with_count_;
  options.count = count_;
  options.exclude_start = true;
@@ -1218,7 +1218,7 @@ class CommandXRead : public Commander,
  redis::StreamRangeOptions options;
  options.reverse = false;
  options.start = ids_[i];
- options.end = StreamEntryID{UINT64_MAX, UINT64_MAX};
+ options.end = StreamEntryID::Maximum();
  options.with_count = with_count_;
  options.count = count_;
  options.exclude_start = true;
@@ -1405,7 +1405,7 @@ class CommandXReadGroup : public Commander,
  redis::StreamRangeOptions options;
  options.reverse = false;
  options.start = ids_[i];
- options.end = StreamEntryID{UINT64_MAX, UINT64_MAX};
+ options.end = StreamEntryID::Maximum();
  options.with_count = with_count_;
  options.count = count_;
  options.exclude_start = true;
@@ -1510,7 +1510,7 @@ class CommandXReadGroup : public Commander,
  redis::StreamRangeOptions options;
  options.reverse = false;
  options.start = ids_[i];
- options.end = StreamEntryID{UINT64_MAX, UINT64_MAX};
+ options.end = StreamEntryID::Maximum();
  options.with_count = with_count_;
  options.count = count_;
  options.exclude_start = true;

diff --git a/src/config/config.cc b/src/config/config.cc
@@ -184,7 +184,7 @@ Config::Config() {
  {"unixsocketperm", true, new OctalField(&unixsocketperm, 0777, 1, INT_MAX)},
  {"log-retention-days", false, new IntField(&log_retention_days, -1, -1, INT_MAX)},
  {"persist-cluster-nodes-enabled", false, new YesNoField(&persist_cluster_nodes_enabled, true)},
- {"redis-cursor-compatible", false, new YesNoField(&redis_cursor_compatible, false)},
+ {"redis-cursor-compatible", false, new YesNoField(&redis_cursor_compatible, true)},
  {"resp3-enabled", false, new YesNoField(&resp3_enabled, false)},
  {"repl-namespace-enabled", false, new YesNoField(&repl_namespace_enabled, false)},
  {"json-max-nesting-depth", false, new IntField(&json_max_nesting_depth, 1024, 0, INT_MAX)},