You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kvrocks.apache.org by hu...@apache.org on 2023/05/13 02:18:50 UTC

[incubator-kvrocks] branch unstable updated: Bump fmtlib to 10.0.0 (#1435)

This is an automated email from the ASF dual-hosted git repository.

hulk pushed a commit to branch unstable
in repository https://gitbox.apache.org/repos/asf/incubator-kvrocks.git


The following commit(s) were added to refs/heads/unstable by this push:
     new 255019c7 Bump fmtlib to 10.0.0 (#1435)
255019c7 is described below

commit 255019c76f03c7b15bf83315fbbf663e255f5008
Author: Aleks Lozovyuk <al...@gmail.com>
AuthorDate: Sat May 13 05:18:43 2023 +0300

    Bump fmtlib to 10.0.0 (#1435)
---
 cmake/fmt.cmake             | 4 ++--
 src/cluster/slot_migrate.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/fmt.cmake b/cmake/fmt.cmake
index 094930e4..59c37b3e 100644
--- a/cmake/fmt.cmake
+++ b/cmake/fmt.cmake
@@ -20,8 +20,8 @@ include_guard()
 include(cmake/utils.cmake)
 
 FetchContent_DeclareGitHubWithMirror(fmt
-  fmtlib/fmt 9.1.0
-  MD5=e6754011ff56bfc37631fcc90961e377
+  fmtlib/fmt 10.0.0
+  MD5=89eafbfa3dba82054fb2034644015396
 )
 
 FetchContent_MakeAvailableWithArgs(fmt)
diff --git a/src/cluster/slot_migrate.cc b/src/cluster/slot_migrate.cc
index 8f418495..f70c97a2 100644
--- a/src/cluster/slot_migrate.cc
+++ b/src/cluster/slot_migrate.cc
@@ -385,7 +385,7 @@ Status SlotMigrator::finishSuccessfulMigration() {
   std::string dst_ip_port = dst_ip_ + ":" + std::to_string(dst_port_);
   s = svr_->cluster->SetSlotMigrated(migrating_slot_, dst_ip_port);
   if (!s.IsOK()) {
-    return s.Prefixed(fmt::format("failed to set slot {} as migrated to {}", migrating_slot_, dst_ip_port));
+    return s.Prefixed(fmt::format("failed to set slot {} as migrated to {}", migrating_slot_.load(), dst_ip_port));
   }
 
   migrate_failed_slot_ = -1;