tree: remove mutation_reader.hh include

In most files it was unused. We should move these to the patch which moved out the last interesting reader from mutation_reader.hh (and added the corresponding new header include) but its probably not worth the effort. Some other files still relied on mutation_reader.hh to provide reader concurrency semaphore and some other misc reader related definitions.
mixellent · Mar 30, 2022 · b029bd3 · b029bd3
1 parent 20c9e55
commit b029bd3
Show file tree

Hide file tree

Showing 28 changed files with 5 additions and 27 deletions.
diff --git a/cache_flat_mutation_reader.hh b/cache_flat_mutation_reader.hh
@@ -10,7 +10,6 @@
 
 #include <vector>
 #include "row_cache.hh"
-#include "mutation_reader.hh"
 #include "mutation_fragment.hh"
 #include "query-request.hh"
 #include "partition_snapshot_row_cursor.hh"

diff --git a/compaction/compaction.cc b/compaction/compaction.cc
@@ -33,7 +33,6 @@
 #include "sstables/sstables_manager.hh"
 #include "compaction.hh"
 #include "compaction_manager.hh"
-#include "mutation_reader.hh"
 #include "schema.hh"
 #include "db/system_keyspace.hh"
 #include "service/priority_manager.hh"

diff --git a/db/data_listeners.hh b/db/data_listeners.hh
@@ -16,7 +16,6 @@
 #include "utils/hash.hh"
 #include "schema_fwd.hh"
 #include "readers/flat_mutation_reader_v2.hh"
-#include "mutation_reader.hh"
 #include "utils/top_k.hh"
 #include "schema_registry.hh"
 

diff --git a/db/view/build_progress_virtual_reader.hh b/db/view/build_progress_virtual_reader.hh
@@ -12,7 +12,6 @@
 #include "dht/i_partitioner.hh"
 #include "readers/flat_mutation_reader_v2.hh"
 #include "mutation_fragment.hh"
-#include "mutation_reader.hh"
 #include "query-request.hh"
 #include "schema_fwd.hh"
 #include "tracing/tracing.hh"

diff --git a/index/built_indexes_virtual_reader.hh b/index/built_indexes_virtual_reader.hh
@@ -10,7 +10,6 @@
 #include "db/system_keyspace.hh"
 #include "readers/flat_mutation_reader_v2.hh"
 #include "mutation_fragment_v2.hh"
-#include "mutation_reader.hh"
 #include "query-request.hh"
 #include "schema_fwd.hh"
 #include "secondary_index_manager.hh"

diff --git a/mutation_writer/shard_based_splitting_writer.cc b/mutation_writer/shard_based_splitting_writer.cc
@@ -13,8 +13,6 @@
 #include <boost/range/algorithm/min_element.hpp>
 #include <seastar/core/shared_mutex.hh>
 
-#include "mutation_reader.hh"
-
 namespace mutation_writer {
 
 class shard_based_splitting_mutation_writer {

diff --git a/mutation_writer/timestamp_based_splitting_writer.cc b/mutation_writer/timestamp_based_splitting_writer.cc
@@ -13,8 +13,6 @@
 #include <boost/range/algorithm/min_element.hpp>
 #include <seastar/core/shared_mutex.hh>
 
-#include "mutation_reader.hh"
-
 namespace mutation_writer {
 
 namespace {

diff --git a/readers/mutation_readers.cc b/readers/mutation_readers.cc
@@ -11,7 +11,6 @@
 #include "dht/i_partitioner.hh"
 #include "mutation.hh"
 #include "mutation_partition.hh"
-#include "mutation_reader.hh"
 #include "mutation_compactor.hh"
 #include "range_tombstone_assembler.hh"
 #include "range_tombstone_splitter.hh"

diff --git a/replica/database.hh b/replica/database.hh
@@ -39,7 +39,6 @@
 #include "db/snapshot-ctl.hh"
 #include "gms/feature.hh"
 #include "memtable.hh"
-#include "mutation_reader.hh"
 #include "row_cache.hh"
 #include "compaction/compaction_strategy.hh"
 #include "utils/estimated_histogram.hh"

diff --git a/sstables/sstable_mutation_reader.hh b/sstables/sstable_mutation_reader.hh
@@ -23,6 +23,7 @@
 #include "binary_search.hh"
 #include "../dht/i_partitioner.hh"
 #include "readers/flat_mutation_reader_v2.hh"
+#include "readers/flat_mutation_reader.hh"
 #include "sstables/mx/partition_reversing_data_source.hh"
 
 namespace sstables {

diff --git a/sstables/sstables.cc b/sstables/sstables.cc
@@ -74,6 +74,7 @@
 #include "utils/bit_cast.hh"
 #include "utils/cached_file.hh"
 #include "tombstone_gc.hh"
+#include "reader_concurrency_semaphore.hh"
 #include "readers/reversing.hh"
 #include "readers/forwardable.hh"
 

diff --git a/sstables/sstables.hh b/sstables/sstables.hh
@@ -32,7 +32,6 @@
 #include "encoding_stats.hh"
 #include "filter.hh"
 #include "exceptions.hh"
-#include "mutation_reader.hh"
 #include "query-request.hh"
 #include "compound_compat.hh"
 #include "utils/disk-error-handler.hh"
@@ -48,6 +47,8 @@
 #include "sstables/open_info.hh"
 #include "query-request.hh"
 #include "mutation_fragment_stream_validator.hh"
+#include "readers/flat_mutation_reader_fwd.hh"
+#include "tracing/trace_state.hh"
 
 #include <seastar/util/optimized_optional.hh>
 

diff --git a/streaming/stream_detail.hh b/streaming/stream_detail.hh
@@ -11,7 +11,6 @@
 #pragma once
 
 #include "query-request.hh"
-#include "mutation_reader.hh"
 #include "utils/UUID.hh"
 #include <vector>
 #include "range.hh"

diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc
@@ -14,7 +14,6 @@
 #include "streaming/prepare_message.hh"
 #include "streaming/stream_result_future.hh"
 #include "streaming/stream_manager.hh"
-#include "mutation_reader.hh"
 #include "dht/i_partitioner.hh"
 #include "utils/fb_utilities.hh"
 #include "streaming/stream_plan.hh"

diff --git a/streaming/stream_transfer_task.cc b/streaming/stream_transfer_task.cc
@@ -15,7 +15,6 @@
 #include "streaming/stream_manager.hh"
 #include "streaming/stream_reason.hh"
 #include "streaming/stream_mutation_fragments_cmd.hh"
-#include "mutation_reader.hh"
 #include "readers/flat_mutation_reader.hh"
 #include "mutation_fragment_stream_validator.hh"
 #include "frozen_mutation.hh"

diff --git a/test/boost/flat_mutation_reader_test.cc b/test/boost/flat_mutation_reader_test.cc
@@ -21,7 +21,6 @@
 #include "readers/delegating.hh"
 #include "readers/multi_range.hh"
 #include "readers/from_mutations.hh"
-#include "mutation_reader.hh"
 #include "schema_builder.hh"
 #include "replica/memtable.hh"
 #include "row_cache.hh"

diff --git a/test/boost/multishard_combining_reader_as_mutation_source_test.cc b/test/boost/multishard_combining_reader_as_mutation_source_test.cc
@@ -24,7 +24,6 @@
 #include "test/lib/log.hh"
 
 #include "dht/sharder.hh"
-#include "mutation_reader.hh"
 #include "schema_registry.hh"
 #include "service/priority_manager.hh"
 #include "readers/forwardable_v2.hh"

diff --git a/test/boost/mutation_reader_test.cc b/test/boost/mutation_reader_test.cc
@@ -34,7 +34,6 @@
 #include "test/lib/simple_position_reader_queue.hh"
 
 #include "dht/sharder.hh"
-#include "mutation_reader.hh"
 #include "schema_builder.hh"
 #include "cell_locking.hh"
 #include "sstables/sstables.hh"

diff --git a/test/boost/mutation_test.cc b/test/boost/mutation_test.cc
@@ -24,7 +24,6 @@
 
 #include "replica/database.hh"
 #include "utils/UUID_gen.hh"
-#include "mutation_reader.hh"
 #include "clustering_interval_set.hh"
 #include "schema_builder.hh"
 #include "query-result-set.hh"

diff --git a/test/boost/schema_changes_test.cc b/test/boost/schema_changes_test.cc
@@ -14,7 +14,6 @@
 #include "sstables/sstables.hh"
 #include "timestamp.hh"
 #include "schema_builder.hh"
-#include "mutation_reader.hh"
 #include "test/lib/mutation_source_test.hh"
 #include "test/lib/flat_mutation_reader_assertions.hh"
 #include "test/lib/sstable_utils.hh"

diff --git a/test/boost/sstable_mutation_test.cc b/test/boost/sstable_mutation_test.cc
@@ -21,7 +21,6 @@
 #include "replica/database.hh"
 #include "timestamp.hh"
 #include "schema_builder.hh"
-#include "mutation_reader.hh"
 #include "test/lib/mutation_source_test.hh"
 #include "partition_slice_builder.hh"
 #include "test/lib/tmpdir.hh"

diff --git a/test/boost/sstable_resharding_test.cc b/test/boost/sstable_resharding_test.cc
@@ -14,7 +14,6 @@
 #include "replica/database.hh"
 #include "dht/murmur3_partitioner.hh"
 #include "compaction/compaction_manager.hh"
-#include "mutation_reader.hh"
 #include "test/boost/sstable_test.hh"
 #include "test/lib/tmpdir.hh"
 #include "cell_locking.hh"

diff --git a/test/lib/mutation_source_test.hh b/test/lib/mutation_source_test.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "mutation_reader.hh"
 #include "test/lib/sstable_utils.hh"
 
 using populate_fn = std::function<mutation_source(schema_ptr s, const std::vector<mutation>&)>;

diff --git a/test/lib/normalizing_reader.hh b/test/lib/normalizing_reader.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "mutation_reader.hh"
 #include <seastar/core/future.hh>
 #include "readers/flat_mutation_reader.hh"
 

diff --git a/test/manual/enormous_table_scan_test.cc b/test/manual/enormous_table_scan_test.cc
@@ -23,7 +23,6 @@
 #include "clustering_bounds_comparator.hh"
 #include "dht/i_partitioner.hh"
 #include "mutation_fragment.hh"
-#include "mutation_reader.hh"
 #include "partition_range_compat.hh"
 #include "range.hh"
 #include "sstables/sstables.hh"

diff --git a/test/perf/perf_mutation_readers.cc b/test/perf/perf_mutation_readers.cc
@@ -16,7 +16,6 @@
 #include "test/lib/simple_position_reader_queue.hh"
 #include "test/perf/perf.hh"
 
-#include "mutation_reader.hh"
 #include "readers/flat_mutation_reader.hh"
 #include "readers/from_mutations_v2.hh"
 #include "readers/empty_v2.hh"

diff --git a/test/perf/perf_sstable.hh b/test/perf/perf_sstable.hh
@@ -14,7 +14,6 @@
 #include "compaction/compaction_manager.hh"
 #include "compaction/time_window_compaction_strategy.hh"
 #include "cell_locking.hh"
-#include "mutation_reader.hh"
 #include "test/lib/sstable_utils.hh"
 #include "test/lib/test_services.hh"
 #include "test/lib/random_utils.hh"

diff --git a/tools/scylla-sstable.cc b/tools/scylla-sstable.cc
@@ -17,6 +17,7 @@
 #include "db/config.hh"
 #include "db/large_data_handler.hh"
 #include "gms/feature_service.hh"
+#include "reader_concurrency_semaphore.hh"
 #include "readers/combined.hh"
 #include "schema_builder.hh"
 #include "sstables/index_reader.hh"