From 109e032f61cb643a15c70a2ea00a3ad2284ca1a8 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 3 Mar 2023 17:38:21 +0300 Subject: [PATCH] system_keyspace: Unstatic get_truncated_at() It's called from batchlog replayer which now has local system keyspace reference and can use it Signed-off-by: Pavel Emelyanov --- db/batchlog_manager.cc | 4 ++-- db/system_keyspace.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/batchlog_manager.cc b/db/batchlog_manager.cc index abfe76ec8f..0bc8b0f94d 100644 --- a/db/batchlog_manager.cc +++ b/db/batchlog_manager.cc @@ -190,8 +190,8 @@ future<> db::batchlog_manager::replay_all_failed_batches() { auto size = data.size(); - return map_reduce(*fms, [written_at] (canonical_mutation& fm) { - return system_keyspace::get_truncated_at(fm.column_family_id()).then([written_at, &fm] (db_clock::time_point t) -> + return map_reduce(*fms, [this, written_at] (canonical_mutation& fm) { + return _sys_ks.get_truncated_at(fm.column_family_id()).then([written_at, &fm] (db_clock::time_point t) -> std::optional> { if (written_at > t) { return { std::ref(fm) }; diff --git a/db/system_keyspace.hh b/db/system_keyspace.hh index 4da79dab48..fadc438c3a 100644 --- a/db/system_keyspace.hh +++ b/db/system_keyspace.hh @@ -333,7 +333,7 @@ public: static future<> save_truncation_record(table_id, db_clock::time_point truncated_at, db::replay_position); static future<> save_truncation_record(const replica::column_family&, db_clock::time_point truncated_at, db::replay_position); future get_truncated_position(table_id); - static future get_truncated_at(table_id); + future get_truncated_at(table_id); static future get_truncation_record(table_id cf_id); /**