diff --git a/cdc/generation.cc b/cdc/generation.cc index 2689b7bf4d..e49b5832fe 100644 --- a/cdc/generation.cc +++ b/cdc/generation.cc @@ -583,7 +583,7 @@ future<> generation_service::maybe_rewrite_streams_descriptions() { co_return; } - if (co_await db::system_keyspace::cdc_is_rewritten()) { + if (co_await _sys_ks.local().cdc_is_rewritten()) { co_return; } diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc index de1cea2742..485e506fdc 100644 --- a/db/system_keyspace.cc +++ b/db/system_keyspace.cc @@ -1806,7 +1806,7 @@ future<> system_keyspace::cdc_set_rewritten(std::optional future system_keyspace::cdc_is_rewritten() { // We don't care about the actual timestamp; it's additional information for debugging purposes. - return qctx->execute_cql(format("SELECT key FROM system.{} WHERE key = ?", v3::CDC_LOCAL), CDC_REWRITTEN_KEY) + return execute_cql(format("SELECT key FROM system.{} WHERE key = ?", v3::CDC_LOCAL), CDC_REWRITTEN_KEY) .then([] (::shared_ptr msg) { return !msg->empty(); }); diff --git a/db/system_keyspace.hh b/db/system_keyspace.hh index 1a8b4fb916..a884d11949 100644 --- a/db/system_keyspace.hh +++ b/db/system_keyspace.hh @@ -418,7 +418,7 @@ public: */ static future> get_cdc_generation_id(); - static future cdc_is_rewritten(); + future cdc_is_rewritten(); future<> cdc_set_rewritten(std::optional); static future<> enable_features_on_startup(sharded& feat);