From b029bd3db70be3249d43e06774beb3d98d214b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Botond=20D=C3=A9nes?= Date: Tue, 29 Mar 2022 12:44:26 +0300 Subject: [PATCH] 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. --- cache_flat_mutation_reader.hh | 1 - compaction/compaction.cc | 1 - db/data_listeners.hh | 1 - db/view/build_progress_virtual_reader.hh | 1 - index/built_indexes_virtual_reader.hh | 1 - mutation_writer/shard_based_splitting_writer.cc | 2 -- mutation_writer/timestamp_based_splitting_writer.cc | 2 -- readers/mutation_readers.cc | 1 - replica/database.hh | 1 - sstables/sstable_mutation_reader.hh | 1 + sstables/sstables.cc | 1 + sstables/sstables.hh | 3 ++- streaming/stream_detail.hh | 1 - streaming/stream_session.cc | 1 - streaming/stream_transfer_task.cc | 1 - test/boost/flat_mutation_reader_test.cc | 1 - .../multishard_combining_reader_as_mutation_source_test.cc | 1 - test/boost/mutation_reader_test.cc | 1 - test/boost/mutation_test.cc | 1 - test/boost/schema_changes_test.cc | 1 - test/boost/sstable_mutation_test.cc | 1 - test/boost/sstable_resharding_test.cc | 1 - test/lib/mutation_source_test.hh | 1 - test/lib/normalizing_reader.hh | 1 - test/manual/enormous_table_scan_test.cc | 1 - test/perf/perf_mutation_readers.cc | 1 - test/perf/perf_sstable.hh | 1 - tools/scylla-sstable.cc | 1 + 28 files changed, 5 insertions(+), 27 deletions(-) diff --git a/cache_flat_mutation_reader.hh b/cache_flat_mutation_reader.hh index c47dcc9bed..a891ef5e99 100644 --- a/cache_flat_mutation_reader.hh +++ b/cache_flat_mutation_reader.hh @@ -10,7 +10,6 @@ #include #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 index de52585b63..28a6c5d1d6 100644 --- 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 index a1d0d0fff7..7a245eee7b 100755 --- 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 index f13c22836d..a04c741c06 100644 --- 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 index a548b50d01..1e22c92e0a 100644 --- 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 index b5006fa21e..2175a36b88 100644 --- a/mutation_writer/shard_based_splitting_writer.cc +++ b/mutation_writer/shard_based_splitting_writer.cc @@ -13,8 +13,6 @@ #include #include -#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 index 9ab5f0391b..249c7262f6 100644 --- a/mutation_writer/timestamp_based_splitting_writer.cc +++ b/mutation_writer/timestamp_based_splitting_writer.cc @@ -13,8 +13,6 @@ #include #include -#include "mutation_reader.hh" - namespace mutation_writer { namespace { diff --git a/readers/mutation_readers.cc b/readers/mutation_readers.cc index b8d3a4800f..86731bde5b 100644 --- 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 index 9eaf7bbe25..b20e2498fb 100644 --- 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 index 6e2d65139b..626628437c 100644 --- 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 index b532ca6dad..bf895a20fd 100644 --- 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 index 409bf1de0b..21afd5f63e 100644 --- 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 diff --git a/streaming/stream_detail.hh b/streaming/stream_detail.hh index ffd8d4edd9..2dc19fe6f8 100644 --- 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 #include "range.hh" diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc index ae09761a7c..2b5d986f45 100644 --- 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 index f232675710..ec0121c1c1 100644 --- 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 index afe7236e71..408b0cdf27 100644 --- 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 index c713bf4efc..482179a0fb 100644 --- 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 index 35a19e8cd7..fea73ed1f7 100644 --- 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 index 5ce0b50964..5248177060 100644 --- 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 index 55f8bcab3b..6510252771 100644 --- 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 index 80ea6670ee..32197cbf7b 100644 --- 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 index 5de5810836..f4d261a69d 100644 --- 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 index a3c5e864dc..ae9a812dc9 100644 --- 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&)>; diff --git a/test/lib/normalizing_reader.hh b/test/lib/normalizing_reader.hh index 00c068f50b..b55dcfeeb9 100644 --- a/test/lib/normalizing_reader.hh +++ b/test/lib/normalizing_reader.hh @@ -8,7 +8,6 @@ #pragma once -#include "mutation_reader.hh" #include #include "readers/flat_mutation_reader.hh" diff --git a/test/manual/enormous_table_scan_test.cc b/test/manual/enormous_table_scan_test.cc index 1a2c42a8e2..fd7a96a502 100644 --- 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 index f04b5f2d0f..bbf23b7843 100644 --- 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 index bf93f5837f..0a7938b7b2 100644 --- 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 index b854d32ca6..74c2534a1a 100644 --- 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"