From e26d983453ce73d4b4b72aede116cb8cf3292abe Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sat, 23 May 2026 18:03:25 +0300 Subject: [PATCH 1/2] mutation_fragment_v1_stream: make consume() methods public The MutationFragmentConsumerV2 concept checks that these methods exist. Clang 23 tightened [1] the rules to verify that the methods are publicly accessible. Make them public so we don't fail the build. [1] https://github.com/llvm/llvm-project/commit/ac3c588739a09ebb0f80a22ee10282592d858b47 --- readers/mutation_fragment_v1_stream.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readers/mutation_fragment_v1_stream.hh b/readers/mutation_fragment_v1_stream.hh index 44d429d188..e9efe59569 100644 --- a/readers/mutation_fragment_v1_stream.hh +++ b/readers/mutation_fragment_v1_stream.hh @@ -14,7 +14,7 @@ class mutation_fragment_v1_stream final { range_tombstone_assembler _rt_assembler; std::optional _row; - friend class mutation_fragment_v2; // so it sees our consumer methods +public: // consume() methods need to be visible to concepts like MutationFragmentConsumerV2 mutation_fragment_opt consume(static_row mf) { return wrap(std::move(mf)); } @@ -41,7 +41,7 @@ class mutation_fragment_v1_stream final { _rt_assembler.on_end_of_stream(); return wrap(std::move(mf)); } - +private: future read_from_underlying() { auto mfp = co_await _reader(); if (!mfp) [[unlikely]] { From 35d7cc7c3e0bb83d24d1a0df53fc73d92fbe4c20 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sat, 23 May 2026 18:03:25 +0300 Subject: [PATCH 2/2] compacting_reader: make consume() methods public The CompactedFragmentsConsumer concept checks that these methods exist. Clang 23 tightened [1] the rules to verify that the methods are publicly accessible. Make them public so we don't fail the build. [1] https://github.com/llvm/llvm-project/commit/ac3c588739a09ebb0f80a22ee10282592d858b47 --- readers/mutation_readers.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readers/mutation_readers.cc b/readers/mutation_readers.cc index 8ab42b2369..2a0eb084ab 100644 --- a/readers/mutation_readers.cc +++ b/readers/mutation_readers.cc @@ -1424,13 +1424,13 @@ private: // Compacted stream bool _has_compacted_partition_start = false; -private: void maybe_push_partition_start() { if (_has_compacted_partition_start) { push_mutation_fragment(mutation_fragment_v2(*_schema, _permit, std::move(_last_uncompacted_partition_start))); _has_compacted_partition_start = false; } } +public: // Needed for CompactedFragmentsConsumer concept void consume_new_partition(const dht::decorated_key& dk) { _has_compacted_partition_start = true; // We need to reset the partition's tombstone here. If the tombstone is @@ -1464,6 +1464,7 @@ private: } void consume_end_of_stream() { } +private: streamed_mutation::forwarding _fwd; public: