From 828862bdff9e0c697d934d66ffae72e2d2e2dd2e Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Sat, 25 May 2024 16:21:02 +0300 Subject: [PATCH] cql3: Define prepared_statement weak pointer as const The pointer points to immutable prepared_statement, so tune up the type respectively. Tracing has its own alieas for it, fix one too. Signed-off-by: Pavel Emelyanov --- cql3/statements/prepared_statement.hh | 4 ++-- tracing/trace_state.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cql3/statements/prepared_statement.hh b/cql3/statements/prepared_statement.hh index 734a8ec54e..a1a7c49bd8 100644 --- a/cql3/statements/prepared_statement.hh +++ b/cql3/statements/prepared_statement.hh @@ -33,7 +33,7 @@ struct invalidated_prepared_usage_attempt { class prepared_statement : public seastar::weakly_referencable { public: - typedef seastar::checked_ptr> checked_weak_ptr; + typedef seastar::checked_ptr> checked_weak_ptr; public: const seastar::shared_ptr statement; @@ -51,7 +51,7 @@ public: prepared_statement(seastar::shared_ptr&& statement_); - checked_weak_ptr checked_weak_from_this() { + checked_weak_ptr checked_weak_from_this() const { return checked_weak_ptr(this->weak_from_this()); } }; diff --git a/tracing/trace_state.hh b/tracing/trace_state.hh index 3ef4feab81..69d02142dc 100644 --- a/tracing/trace_state.hh +++ b/tracing/trace_state.hh @@ -35,7 +35,7 @@ namespace tracing { extern logging::logger trace_state_logger; -using prepared_checked_weak_ptr = seastar::checked_ptr>; +using prepared_checked_weak_ptr = seastar::checked_ptr>; class trace_state final { public: