Merge branch 'unstable' into unstable

Author: hll1213181368

.github/workflows/kvrocks.yaml

@@ -239,6 +239,17 @@ jobs:
       FORCE_JAVASCRIPT_ACTIONS_TO_NODE20: true
       RISCV_PATH: "/opt/riscv"
     steps:
+      - name: Maximize build space
+        if: ${{ matrix.riscv_toolchain }}
+        run: |
+          # refer to https://github.com/easimon/maximize-build-space,
+          # we take some ideas from this action but don't use it directly.
+          sudo df -h
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          sudo df -h
+
       - name: Setup macOS
         if: ${{ startsWith(matrix.os, 'macos') }}
         run: |
@@ -272,6 +283,7 @@ jobs:
           sudo mkdir -p $RISCV_PATH
           wget "${{ matrix.riscv_toolchain_url }}" -O riscv-toolchain.tar.xz
           sudo tar -xvf riscv-toolchain.tar.xz -C $RISCV_PATH --strip-components=1
+          rm riscv-toolchain.tar.xz
           sudo sed -i "s|libdir='/mnt/riscv/riscv64-unknown-linux-gnu/lib'|libdir='$RISCV_PATH/riscv64-unknown-linux-gnu/lib'|g" \
             $RISCV_PATH/riscv64-unknown-linux-gnu/lib/libatomic.la
           echo "PATH=$RISCV_PATH/bin:$PATH" >> $GITHUB_ENV
@@ -491,9 +503,10 @@ jobs:
           - name: ArchLinux
             image: archlinux:base
             compiler: gcc
-          - name: Rocky Linux 8
-            image: rockylinux:8
-            compiler: gcc
+          # FIXME: disable it due to "No space left on device" issue
+          # - name: Rocky Linux 8
+          #   image: rockylinux:8
+          #   compiler: gcc
           - name: Rocky Linux 9
             image: rockylinux:9
             compiler: gcc

.gitignore

@@ -11,6 +11,12 @@
 *.gch
 *.pch
 
+# Linker files
+*.ilk
+
+# Debugger Files
+*.pdb
+
 # Compiled Dynamic libraries
 *.so
 *.dylib
@@ -31,19 +37,18 @@
 *.out
 *.app
 
-*.pyc
-*.swp
-*.swo
-.DS_Store
-version.h
+# debug information files
+*.dwo
 
-.idea
-.vscode
-.cache
+# for macOS
+.DS_Store
 
-compactdb
-testdb
+# for IDEs
+/.idea/
+/.vscode/
+/.cache/
 
-build
-cmake-build-*
-build-*
+# for build directories
+/build/
+/cmake-build-*/
+/build-*/

CMakeLists.txt

@@ -73,8 +73,12 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(DEPS_FETCH_PROXY "" CACHE STRING
-    "a template URL to proxy the traffic for fetching dependencies, e.g. with DEPS_FETCH_PROXY = https://some-proxy/,
+    "a template URL to proxy the traffic for fetching dependencies,
+     e.g. with DEPS_FETCH_PROXY = https://some-proxy/,
      https://example/some-dep.zip -> https://some-proxy/https://example/some-dep.zip")
+set(DEPS_FETCH_DIR "" CACHE PATH
+    "if specified, dependencies will be downloaded into this directory first,
+     and reused in subsequent builds")
 
 if(ENABLE_ASAN AND ENABLE_TSAN)
     message(FATAL_ERROR "ASan and TSan cannot be used at the same time")

cmake/pegtl.cmake

@@ -19,9 +19,9 @@ include_guard()
 
 include(cmake/utils.cmake)
 
-FetchContent_DeclareGitHubTarWithMirror(pegtl
+FetchContent_DeclareGitHubWithMirror(pegtl
   taocpp/PEGTL 3.2.8
-  MD5=50339029d1bb037909b28c382214033e
+  MD5=5c919edd001ef157b0d25fc9dcc8b3e1
 )
 
 FetchContent_MakeAvailableWithArgs(pegtl)

cmake/trie.cmake

@@ -20,8 +20,8 @@ include_guard()
 include(cmake/utils.cmake)
 
 FetchContent_DeclareGitHubWithMirror(trie
-  Tessil/hat-trie 906e6abd1e7063f1dacd3a6b270aa654b525eb0a
-  MD5=a930364e9f6b60371319664bddf78000
+  Tessil/hat-trie v0.7.1
+  MD5=0536f8c1970788863093504441089e6e
 )
 
 FetchContent_MakeAvailableWithArgs(trie)

cmake/utils.cmake

@@ -46,23 +46,29 @@ function(FetchContent_MakeAvailableWithArgs dep)
   endif()
 endfunction()
 
-function(FetchContent_DeclareWithMirror dep url hash)
-  FetchContent_Declare(${dep}
-    URL ${DEPS_FETCH_PROXY}${url}
-    URL_HASH ${hash}
-  )
-endfunction()
-
 function(FetchContent_DeclareGitHubWithMirror dep repo tag hash)
-  FetchContent_DeclareWithMirror(${dep}
-    https://github.com/${repo}/archive/${tag}.zip
-    ${hash}
-  )
-endfunction()
+  set(_dep_fetch_url "${DEPS_FETCH_PROXY}https://github.com/${repo}/archive/${tag}.zip")
+  if(DEPS_FETCH_DIR)
+    get_filename_component(_deps_fetch_dir ${DEPS_FETCH_DIR} ABSOLUTE)
+    set(_dep_fetch_dst ${_deps_fetch_dir}/${dep}-${tag}.zip)
 
-function(FetchContent_DeclareGitHubTarWithMirror dep repo tag hash)
-  FetchContent_DeclareWithMirror(${dep}
-    https://github.com/${repo}/archive/${tag}.tar.gz
-    ${hash}
-  )
+    if(NOT EXISTS ${_dep_fetch_dst})
+      message("Downloading ${_dep_fetch_url} to ${_dep_fetch_dst}...")
+      file(DOWNLOAD ${_dep_fetch_url} ${_dep_fetch_dst} STATUS _dep_download_status)
+      list(GET _dep_download_status 0 _dep_download_status_code)
+      if(NOT _dep_download_status_code EQUAL 0)
+        message(FATAL_ERROR "Failed to download ${_dep_fetch_url} to ${_dep_fetch_dst}")
+      endif()
+    endif()
+
+    FetchContent_Declare(${dep}
+      URL ${_dep_fetch_dst}
+      URL_HASH ${hash}
+    )
+  else()
+    FetchContent_Declare(${dep}
+      URL ${_dep_fetch_url}
+      URL_HASH ${hash}
+    )
+  endif()
 endfunction()

src/cluster/replication.cc

@@ -214,7 +214,9 @@ void FeedSlaveThread::loop() {
     //    kMaxDelayUpdates than latest sequence.
     if (is_first_repl_batch || batches_bulk.size() >= max_delay_bytes_ || updates_in_batches >= max_delay_updates_ ||
         srv_->storage->LatestSeqNumber() - batch.sequence <= max_delay_updates_) {
-      if (shouldSendGetAck(batch.sequence)) {
+      // get the last sequence number of the batch, because WAIT uses
+      // the last sequence number to wake up the connection.
+      if (shouldSendGetAck(batch.sequence + batch.writeBatchPtr->Count() - 1)) {
         batches_bulk += redis::BulkString("_getack");
       }
 

src/commands/cmd_tdigest.cc

@@ -176,7 +176,8 @@ class CommandTDigestAdd : public Commander {
   std::vector<double> values_;
 };
 
-class CommandTDigestRevRank : public Commander {
+template <bool reverse>
+class TDigestRankCommand : public Commander {
  public:
   Status Parse(const std::vector<std::string> &args) override {
     key_name_ = args[1];
@@ -201,7 +202,7 @@ class CommandTDigestRevRank : public Commander {
     TDigest tdigest(srv->storage, conn->GetNamespace());
     std::vector<int> result;
     result.reserve(origin_inputs_.size());
-    if (const auto s = tdigest.RevRank(ctx, key_name_, unique_inputs_, result); !s.ok()) {
+    if (const auto s = tdigest.Rank(ctx, key_name_, unique_inputs_, reverse, result); !s.ok()) {
       if (s.IsNotFound()) {
         return {Status::RedisExecErr, errKeyNotFound};
       }
@@ -224,6 +225,10 @@ class CommandTDigestRevRank : public Commander {
   std::vector<std::string> origin_inputs_;
 };
 
+class CommandTDigestRevRank : public TDigestRankCommand<true> {};
+
+class CommandTDigestRank : public TDigestRankCommand<false> {};
+
 class CommandTDigestMinMax : public Commander {
  public:
   explicit CommandTDigestMinMax(bool is_min) : is_min_(is_min) {}
@@ -418,6 +423,7 @@ REDIS_REGISTER_COMMANDS(TDigest, MakeCmdAttr<CommandTDigestCreate>("tdigest.crea
                         MakeCmdAttr<CommandTDigestMax>("tdigest.max", 2, "read-only", 1, 1, 1),
                         MakeCmdAttr<CommandTDigestMin>("tdigest.min", 2, "read-only", 1, 1, 1),
                         MakeCmdAttr<CommandTDigestRevRank>("tdigest.revrank", -3, "read-only", 1, 1, 1),
+                        MakeCmdAttr<CommandTDigestRank>("tdigest.rank", -3, "read-only", 1, 1, 1),
                         MakeCmdAttr<CommandTDigestQuantile>("tdigest.quantile", -3, "read-only", 1, 1, 1),
                         MakeCmdAttr<CommandTDigestReset>("tdigest.reset", 2, "write", 1, 1, 1),
                         MakeCmdAttr<CommandTDigestMerge>("tdigest.merge", -4, "write", GetMergeKeyRange));

src/commands/command_parser.h

@@ -33,7 +33,7 @@
 
 template <typename Iter>
 struct MoveIterator : Iter {
-  explicit MoveIterator(Iter iter) : Iter(iter){};
+  explicit MoveIterator(Iter iter) : Iter(iter) {}
 
   typename Iter::value_type&& operator*() const { return std::move(this->Iter::operator*()); }
 };

src/commands/commander.cc

@@ -27,6 +27,10 @@ namespace redis {
 
 RegisterToCommandTable::RegisterToCommandTable(CommandCategory category,
                                                std::initializer_list<CommandAttributes> list) {
+  if (category == CommandCategory::Disabled) {
+    return;
+  }
+
   for (auto attr : list) {
     attr.category = category;
     CommandTable::redis_command_table.emplace_back(attr);