From a579ac173b1667922e7b4aede3bf111bd33a0ca7 Mon Sep 17 00:00:00 2001 From: Aleks Lozovyuk Date: Wed, 10 May 2023 17:15:58 +0300 Subject: [PATCH 1/2] Bump fmtlib to 10.0.0 --- cmake/fmt.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/fmt.cmake b/cmake/fmt.cmake index 094930e4d50..59c37b3ebca 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) From 90eef06f804816aab672fe17587bfbbe2e68b798 Mon Sep 17 00:00:00 2001 From: Aleks Lozovyuk Date: Fri, 12 May 2023 12:40:47 +0300 Subject: [PATCH 2/2] Update slot_migrate.cc --- src/cluster/slot_migrate.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cluster/slot_migrate.cc b/src/cluster/slot_migrate.cc index 8f418495c82..f70c97a2d81 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;