diff --git a/CMakeLists.txt b/CMakeLists.txt index 81ced0fe8f..cd5c1419aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,7 +296,6 @@ set(scylla_sources api/system.cc api/task_manager.cc api/task_manager_test.cc - atomic_cell.cc auth/allow_all_authenticator.cc auth/allow_all_authorizer.cc auth/authenticated_user.cc @@ -317,7 +316,6 @@ set(scylla_sources auth/transitional.cc bytes.cc caching_options.cc - canonical_mutation.cc cdc/cdc_partitioner.cc cdc/generation.cc cdc/log.cc @@ -467,7 +465,6 @@ set(scylla_sources duration.cc exceptions/exceptions.cc readers/mutation_readers.cc - frozen_mutation.cc frozen_schema.cc generic_server.cc gms/application_state.cc @@ -507,11 +504,18 @@ set(scylla_sources replica/memtable.cc message/messaging_service.cc multishard_mutation_query.cc - mutation.cc - mutation_fragment.cc - mutation_partition.cc - mutation_partition_serializer.cc - mutation_partition_view.cc + mutation/atomic_cell.cc + mutation/canonical_mutation.cc + mutation/frozen_mutation.cc + mutation/mutation.cc + mutation/mutation_fragment.cc + mutation/mutation_partition.cc + mutation/mutation_partition_serializer.cc + mutation/mutation_partition_v2.cc + mutation/mutation_partition_view.cc + mutation/partition_version.cc + mutation/range_tombstone.cc + mutation/range_tombstone_list.cc mutation_query.cc readers/mutation_reader.cc mutation_writer/feed_writers.cc @@ -520,7 +524,6 @@ set(scylla_sources mutation_writer/shard_based_splitting_writer.cc mutation_writer/timestamp_based_splitting_writer.cc partition_slice_builder.cc - partition_version.cc querier.cc query.cc query_ranges_to_vnodes.cc @@ -531,8 +534,6 @@ set(scylla_sources raft/server.cc raft/tracker.cc service/broadcast_tables/experimental/lang.cc - range_tombstone.cc - range_tombstone_list.cc tombstone_gc_options.cc tombstone_gc.cc reader_concurrency_semaphore.cc diff --git a/alternator/serialization.cc b/alternator/serialization.cc index fb995ee8e9..ede5e08f93 100644 --- a/alternator/serialization.cc +++ b/alternator/serialization.cc @@ -14,7 +14,7 @@ #include "rapidjson/writer.h" #include "concrete_types.hh" #include "cql3/type_json.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" static logging::logger slogger("alternator-serialization"); diff --git a/alternator/ttl.cc b/alternator/ttl.cc index 0cd3bb794f..6bf06dcfca 100644 --- a/alternator/ttl.cc +++ b/alternator/ttl.cc @@ -33,7 +33,7 @@ #include "service/pager/query_pagers.hh" #include "gms/feature_service.hh" #include "sstables/types.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "types.hh" #include "types/map.hh" #include "utils/rjson.hh" diff --git a/auth/service.cc b/auth/service.cc index 8547962740..143d8e63bd 100644 --- a/auth/service.cc +++ b/auth/service.cc @@ -30,7 +30,7 @@ #include "utils/class_registrator.hh" #include "locator/abstract_replication_strategy.hh" #include "data_dictionary/keyspace_metadata.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" namespace auth { diff --git a/cache_flat_mutation_reader.hh b/cache_flat_mutation_reader.hh index c15d961c25..7992e6e42b 100644 --- a/cache_flat_mutation_reader.hh +++ b/cache_flat_mutation_reader.hh @@ -10,10 +10,10 @@ #include #include "row_cache.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "query-request.hh" #include "partition_snapshot_row_cursor.hh" -#include "range_tombstone_assembler.hh" +#include "mutation/range_tombstone_assembler.hh" #include "read_context.hh" #include "readers/delegating_v2.hh" #include "clustering_key_filter.hh" diff --git a/cdc/change_visitor.hh b/cdc/change_visitor.hh index 9e8ff1cbe2..32c1861caa 100644 --- a/cdc/change_visitor.hh +++ b/cdc/change_visitor.hh @@ -8,7 +8,7 @@ #pragma once -#include "mutation.hh" +#include "mutation/mutation.hh" /* * This file contains a general abstraction for walking over mutations, diff --git a/cdc/split.cc b/cdc/split.cc index ddb4b50a8e..f3e9df0e20 100644 --- a/cdc/split.cc +++ b/cdc/split.cc @@ -6,7 +6,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include "mutation.hh" +#include "mutation/mutation.hh" #include "schema.hh" #include "concrete_types.hh" diff --git a/cell_locking.hh b/cell_locking.hh index 53ad3bcf96..b634f6c346 100644 --- a/cell_locking.hh +++ b/cell_locking.hh @@ -11,7 +11,7 @@ #include #include "utils/small_vector.hh" -#include "mutation_partition.hh" +#include "mutation/mutation_partition.hh" #include "xx_hasher.hh" #include "db/timeout_clock.hh" diff --git a/clustering_interval_set.hh b/clustering_interval_set.hh index d3e8bfef80..ec9d411800 100644 --- a/clustering_interval_set.hh +++ b/clustering_interval_set.hh @@ -9,7 +9,7 @@ #pragma once #include "schema_fwd.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" #include // Represents a non-contiguous subset of clustering_key domain of a particular schema. diff --git a/clustering_ranges_walker.hh b/clustering_ranges_walker.hh index 666718da05..83b49b3550 100644 --- a/clustering_ranges_walker.hh +++ b/clustering_ranges_walker.hh @@ -12,8 +12,8 @@ #include "schema.hh" #include "query-request.hh" -#include "mutation_fragment.hh" -#include "mutation_fragment_v2.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/mutation_fragment_v2.hh" // Utility for in-order checking of overlap with position ranges. class clustering_ranges_walker { diff --git a/collection_mutation.cc b/collection_mutation.cc index d39d1eb9a2..f9f70f6492 100644 --- a/collection_mutation.cc +++ b/collection_mutation.cc @@ -9,7 +9,7 @@ #include "types/collection.hh" #include "types/user.hh" #include "concrete_types.hh" -#include "mutation_partition.hh" +#include "mutation/mutation_partition.hh" #include "compaction/compaction_garbage_collector.hh" #include "combine.hh" diff --git a/collection_mutation.hh b/collection_mutation.hh index ffefd87fd2..2894bc65f2 100644 --- a/collection_mutation.hh +++ b/collection_mutation.hh @@ -11,7 +11,7 @@ #include "utils/chunked_vector.hh" #include "schema_fwd.hh" #include "gc_clock.hh" -#include "atomic_cell.hh" +#include "mutation/atomic_cell.hh" #include #include diff --git a/compaction/compaction.cc b/compaction/compaction.cc index ad51692fc6..5621231605 100644 --- a/compaction/compaction.cc +++ b/compaction/compaction.cc @@ -39,14 +39,14 @@ #include "db/system_keyspace.hh" #include "service/priority_manager.hh" #include "db_clock.hh" -#include "mutation_compactor.hh" +#include "mutation/mutation_compactor.hh" #include "leveled_manifest.hh" #include "dht/token.hh" #include "dht/partition_filter.hh" #include "mutation_writer/shard_based_splitting_writer.hh" #include "mutation_writer/partition_based_splitting_writer.hh" -#include "mutation_source_metadata.hh" -#include "mutation_fragment_stream_validator.hh" +#include "mutation/mutation_source_metadata.hh" +#include "mutation/mutation_fragment_stream_validator.hh" #include "utils/UUID_gen.hh" #include "utils/utf8.hh" #include "utils/fmt-compat.hh" diff --git a/compaction/time_window_compaction_strategy.cc b/compaction/time_window_compaction_strategy.cc index 89fa1f349f..30a4d898e0 100644 --- a/compaction/time_window_compaction_strategy.cc +++ b/compaction/time_window_compaction_strategy.cc @@ -9,7 +9,7 @@ #include "time_window_compaction_strategy.hh" #include "leveled_manifest.hh" #include "mutation_writer/timestamp_based_splitting_writer.hh" -#include "mutation_source_metadata.hh" +#include "mutation/mutation_source_metadata.hh" #include #include diff --git a/configure.py b/configure.py index 4ae41087a0..f5d6755c60 100755 --- a/configure.py +++ b/configure.py @@ -660,8 +660,19 @@ scylla_core = (['message/messaging_service.cc', 'replica/memtable.cc', 'replica/exceptions.cc', 'replica/dirty_memory_manager.cc', + 'mutation/atomic_cell.cc', + 'mutation/canonical_mutation.cc', + 'mutation/frozen_mutation.cc', + 'mutation/mutation.cc', + 'mutation/mutation_fragment.cc', + 'mutation/mutation_partition.cc', + 'mutation/mutation_partition_v2.cc', + 'mutation/mutation_partition_view.cc', + 'mutation/mutation_partition_serializer.cc', + 'mutation/partition_version.cc', + 'mutation/range_tombstone.cc', + 'mutation/range_tombstone_list.cc', 'absl-flat_hash_map.cc', - 'atomic_cell.cc', 'caching_options.cc', 'collection_mutation.cc', 'client_data.cc', @@ -672,12 +683,7 @@ scylla_core = (['message/messaging_service.cc', 'schema_registry.cc', 'bytes.cc', 'timeout_config.cc', - 'mutation.cc', - 'mutation_fragment.cc', - 'partition_version.cc', 'row_cache.cc', - 'canonical_mutation.cc', - 'frozen_mutation.cc', 'schema_mutations.cc', 'generic_server.cc', 'utils/array-search.cc', @@ -692,10 +698,6 @@ scylla_core = (['message/messaging_service.cc', 'utils/rjson.cc', 'utils/human_readable.cc', 'utils/histogram_metrics_helper.cc', - 'mutation_partition.cc', - 'mutation_partition_v2.cc', - 'mutation_partition_view.cc', - 'mutation_partition_serializer.cc', 'converting_mutation_partition_applier.cc', 'readers/combined.cc', 'readers/multishard.cc', @@ -991,8 +993,6 @@ scylla_core = (['message/messaging_service.cc', 'tracing/trace_state.cc', 'tracing/traced_file.cc', 'table_helper.cc', - 'range_tombstone.cc', - 'range_tombstone_list.cc', 'tombstone_gc_options.cc', 'tombstone_gc.cc', 'utils/disk-error-handler.cc', diff --git a/converting_mutation_partition_applier.cc b/converting_mutation_partition_applier.cc index c62fdcdfe3..ef8bcdc887 100644 --- a/converting_mutation_partition_applier.cc +++ b/converting_mutation_partition_applier.cc @@ -9,8 +9,8 @@ #include "converting_mutation_partition_applier.hh" #include "concrete_types.hh" -#include "mutation_partition_view.hh" -#include "mutation_partition.hh" +#include "mutation/mutation_partition_view.hh" +#include "mutation/mutation_partition.hh" #include "schema.hh" bool diff --git a/converting_mutation_partition_applier.hh b/converting_mutation_partition_applier.hh index 9746717e74..dfd0f81c5f 100644 --- a/converting_mutation_partition_applier.hh +++ b/converting_mutation_partition_applier.hh @@ -8,8 +8,8 @@ #pragma once -#include "mutation_partition_visitor.hh" -#include "atomic_cell.hh" +#include "mutation/mutation_partition_visitor.hh" +#include "mutation/atomic_cell.hh" #include "schema.hh" // temporary: bring in definition of `column_kind` class schema; diff --git a/counters.cc b/counters.cc index 31320225a1..d5b41e76ba 100644 --- a/counters.cc +++ b/counters.cc @@ -7,7 +7,7 @@ */ #include "counters.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "combine.hh" #include diff --git a/counters.hh b/counters.hh index 070390ebf9..bd71cb5896 100644 --- a/counters.hh +++ b/counters.hh @@ -12,7 +12,7 @@ #include #include -#include "atomic_cell.hh" +#include "mutation/atomic_cell.hh" #include "types.hh" #include "locator/host_id.hh" diff --git a/cql3/constants.hh b/cql3/constants.hh index 321f88222e..59753a5f0e 100644 --- a/cql3/constants.hh +++ b/cql3/constants.hh @@ -15,7 +15,7 @@ #include "cql3/update_parameters.hh" #include "cql3/operation.hh" #include "cql3/values.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include namespace service::broadcast_tables { diff --git a/cql3/statements/alter_type_statement.cc b/cql3/statements/alter_type_statement.cc index 876925610c..7d7bb44bfd 100644 --- a/cql3/statements/alter_type_statement.cc +++ b/cql3/statements/alter_type_statement.cc @@ -13,7 +13,7 @@ #include "cql3/column_identifier.hh" #include "prepared_statement.hh" #include "schema_builder.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "service/migration_manager.hh" #include "service/storage_proxy.hh" #include "data_dictionary/data_dictionary.hh" diff --git a/cql3/statements/cas_request.cc b/cql3/statements/cas_request.cc index 8faa5cd42c..54a974d3e6 100644 --- a/cql3/statements/cas_request.cc +++ b/cql3/statements/cas_request.cc @@ -8,7 +8,7 @@ * SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0) */ -#include "mutation.hh" +#include "mutation/mutation.hh" #include "modification_statement.hh" #include "cas_request.hh" #include diff --git a/cql3/statements/create_aggregate_statement.cc b/cql3/statements/create_aggregate_statement.cc index 73af35dc08..dd414ba726 100644 --- a/cql3/statements/create_aggregate_statement.cc +++ b/cql3/statements/create_aggregate_statement.cc @@ -14,7 +14,7 @@ #include "service/migration_manager.hh" #include "service/storage_proxy.hh" #include "data_dictionary/data_dictionary.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "cql3/query_processor.hh" #include "gms/feature_service.hh" diff --git a/cql3/statements/create_index_statement.cc b/cql3/statements/create_index_statement.cc index 4d4793d28c..a239cecbbc 100644 --- a/cql3/statements/create_index_statement.cc +++ b/cql3/statements/create_index_statement.cc @@ -25,7 +25,7 @@ #include "cql3/index_name.hh" #include "cql3/statements/index_prop_defs.hh" #include "index/secondary_index_manager.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include #include diff --git a/cql3/statements/create_keyspace_statement.cc b/cql3/statements/create_keyspace_statement.cc index 57cab4a110..ea94acb5f9 100644 --- a/cql3/statements/create_keyspace_statement.cc +++ b/cql3/statements/create_keyspace_statement.cc @@ -14,7 +14,7 @@ #include "prepared_statement.hh" #include "data_dictionary/data_dictionary.hh" #include "data_dictionary/keyspace_metadata.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "service/migration_manager.hh" #include "service/storage_proxy.hh" #include "transport/messages/result_message.hh" diff --git a/cql3/statements/create_type_statement.cc b/cql3/statements/create_type_statement.cc index e1000b36ff..bf18b844a7 100644 --- a/cql3/statements/create_type_statement.cc +++ b/cql3/statements/create_type_statement.cc @@ -16,7 +16,7 @@ #include "data_dictionary/user_types_metadata.hh" #include "cql3/query_processor.hh" #include "cql3/column_identifier.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" namespace cql3 { diff --git a/cql3/statements/delete_statement.cc b/cql3/statements/delete_statement.cc index aebc63bd66..c2a13e2301 100644 --- a/cql3/statements/delete_statement.cc +++ b/cql3/statements/delete_statement.cc @@ -15,7 +15,7 @@ #include "delete_statement.hh" #include "raw/delete_statement.hh" #include "utils/overloaded_functor.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "cql3/expr/expression.hh" namespace cql3 { diff --git a/cql3/statements/drop_aggregate_statement.cc b/cql3/statements/drop_aggregate_statement.cc index ad9bafeb8c..05799e0dec 100644 --- a/cql3/statements/drop_aggregate_statement.cc +++ b/cql3/statements/drop_aggregate_statement.cc @@ -13,7 +13,7 @@ #include "prepared_statement.hh" #include "service/migration_manager.hh" #include "cql3/query_processor.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" namespace cql3 { diff --git a/cql3/statements/drop_function_statement.cc b/cql3/statements/drop_function_statement.cc index a8cbef9920..a6aa661f35 100644 --- a/cql3/statements/drop_function_statement.cc +++ b/cql3/statements/drop_function_statement.cc @@ -13,7 +13,7 @@ #include "prepared_statement.hh" #include "service/migration_manager.hh" #include "cql3/query_processor.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" namespace cql3 { diff --git a/cql3/statements/drop_index_statement.cc b/cql3/statements/drop_index_statement.cc index 5cf6cff6cb..0ec23424d0 100644 --- a/cql3/statements/drop_index_statement.cc +++ b/cql3/statements/drop_index_statement.cc @@ -15,7 +15,7 @@ #include "service/storage_proxy.hh" #include "schema_builder.hh" #include "data_dictionary/data_dictionary.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "gms/feature_service.hh" #include "cql3/query_processor.hh" #include "cql3/index_name.hh" diff --git a/cql3/statements/drop_keyspace_statement.cc b/cql3/statements/drop_keyspace_statement.cc index 57ecf5b210..d8c59c4004 100644 --- a/cql3/statements/drop_keyspace_statement.cc +++ b/cql3/statements/drop_keyspace_statement.cc @@ -15,7 +15,7 @@ #include "service/migration_manager.hh" #include "service/storage_proxy.hh" #include "transport/event.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" namespace cql3 { diff --git a/cql3/statements/drop_table_statement.cc b/cql3/statements/drop_table_statement.cc index 0d871d3162..dd2fe82241 100644 --- a/cql3/statements/drop_table_statement.cc +++ b/cql3/statements/drop_table_statement.cc @@ -14,7 +14,7 @@ #include "cql3/query_processor.hh" #include "service/migration_manager.hh" #include "service/storage_proxy.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" namespace cql3 { diff --git a/cql3/statements/drop_type_statement.cc b/cql3/statements/drop_type_statement.cc index 4441b3d31f..fa53c0412c 100644 --- a/cql3/statements/drop_type_statement.cc +++ b/cql3/statements/drop_type_statement.cc @@ -19,7 +19,7 @@ #include "data_dictionary/data_dictionary.hh" #include "data_dictionary/keyspace_metadata.hh" #include "data_dictionary/user_types_metadata.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" namespace cql3 { diff --git a/cql3/statements/schema_altering_statement.cc b/cql3/statements/schema_altering_statement.cc index 27bfaf686e..fd54e14f3e 100644 --- a/cql3/statements/schema_altering_statement.cc +++ b/cql3/statements/schema_altering_statement.cc @@ -12,7 +12,7 @@ #include "cql3/statements/schema_altering_statement.hh" #include "locator/abstract_replication_strategy.hh" #include "data_dictionary/data_dictionary.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "cql3/query_processor.hh" #include "transport/messages/result_message.hh" #include "service/raft/raft_group_registry.hh" diff --git a/cql3/update_parameters.hh b/cql3/update_parameters.hh index 7dde328d15..79482bcf38 100644 --- a/cql3/update_parameters.hh +++ b/cql3/update_parameters.hh @@ -13,8 +13,8 @@ #include "gc_clock.hh" #include "timestamp.hh" #include "schema_fwd.hh" -#include "atomic_cell.hh" -#include "tombstone.hh" +#include "mutation/atomic_cell.hh" +#include "mutation/tombstone.hh" #include "exceptions/exceptions.hh" #include "cql3/query_options.hh" #include "cql3/selection/selection.hh" diff --git a/db/batchlog_manager.cc b/db/batchlog_manager.cc index bd037f679f..5845ea6391 100644 --- a/db/batchlog_manager.cc +++ b/db/batchlog_manager.cc @@ -20,7 +20,7 @@ #include #include "batchlog_manager.hh" -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "service/storage_proxy.hh" #include "system_keyspace.hh" #include "utils/rate_limiter.hh" diff --git a/db/batchlog_manager.hh b/db/batchlog_manager.hh index 15f25cfb47..53a0d925ca 100644 --- a/db/batchlog_manager.hh +++ b/db/batchlog_manager.hh @@ -20,7 +20,7 @@ #include #include "db_clock.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "utils/UUID.hh" #include diff --git a/db/cache_tracker.hh b/db/cache_tracker.hh index 66398766c9..eb6deafaa7 100644 --- a/db/cache_tracker.hh +++ b/db/cache_tracker.hh @@ -10,8 +10,8 @@ #include "utils/lru.hh" #include "utils/logalloc.hh" -#include "partition_version.hh" -#include "mutation_cleaner.hh" +#include "mutation/partition_version.hh" +#include "mutation/mutation_cleaner.hh" #include diff --git a/db/commitlog/commitlog_entry.hh b/db/commitlog/commitlog_entry.hh index 2411eab539..b913e3c3a8 100644 --- a/db/commitlog/commitlog_entry.hh +++ b/db/commitlog/commitlog_entry.hh @@ -11,7 +11,7 @@ #include #include "commitlog_types.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "schema_fwd.hh" class commitlog_entry { diff --git a/db/commitlog/commitlog_replayer.cc b/db/commitlog/commitlog_replayer.cc index b9f82bb1da..c9b4929346 100644 --- a/db/commitlog/commitlog_replayer.cc +++ b/db/commitlog/commitlog_replayer.cc @@ -29,7 +29,7 @@ #include "db/extensions.hh" #include "utils/fragmented_temporary_buffer.hh" #include "validation.hh" -#include "mutation_partition_view.hh" +#include "mutation/mutation_partition_view.hh" static logging::logger rlogger("commitlog_replayer"); diff --git a/db/hints/manager.cc b/db/hints/manager.cc index c8c8c4eb0b..8986a28ef7 100644 --- a/db/hints/manager.cc +++ b/db/hints/manager.cc @@ -31,7 +31,7 @@ #include "service_permit.hh" #include "utils/directories.hh" #include "locator/abstract_replication_strategy.hh" -#include "mutation_partition_view.hh" +#include "mutation/mutation_partition_view.hh" #include "utils/runtime.hh" #include "utils/error_injection.hh" diff --git a/db/schema_tables.hh b/db/schema_tables.hh index 912842603d..dcd34fe5e1 100644 --- a/db/schema_tables.hh +++ b/db/schema_tables.hh @@ -9,7 +9,7 @@ #pragma once -#include "mutation.hh" +#include "mutation/mutation.hh" #include "db/commitlog/replay_position.hh" #include "schema_fwd.hh" #include "schema_features.hh" diff --git a/db/size_estimates_virtual_reader.cc b/db/size_estimates_virtual_reader.cc index 66c109d996..4976252b78 100644 --- a/db/size_estimates_virtual_reader.cc +++ b/db/size_estimates_virtual_reader.cc @@ -20,7 +20,7 @@ #include "dht/i_partitioner.hh" #include "partition_range_compat.hh" #include "range.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "sstables/sstables.hh" #include "replica/database.hh" diff --git a/db/view/build_progress_virtual_reader.hh b/db/view/build_progress_virtual_reader.hh index a04c741c06..8d81f031f1 100644 --- a/db/view/build_progress_virtual_reader.hh +++ b/db/view/build_progress_virtual_reader.hh @@ -11,7 +11,7 @@ #include "db/timeout_clock.hh" #include "dht/i_partitioner.hh" #include "readers/flat_mutation_reader_v2.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "query-request.hh" #include "schema_fwd.hh" #include "tracing/tracing.hh" diff --git a/db/view/view.cc b/db/view/view.cc index 2a402febfa..b6385e400f 100644 --- a/db/view/view.cc +++ b/db/view/view.cc @@ -43,8 +43,8 @@ #include "gms/inet_address.hh" #include "keys.hh" #include "locator/network_topology_strategy.hh" -#include "mutation.hh" -#include "mutation_partition.hh" +#include "mutation/mutation.hh" +#include "mutation/mutation_partition.hh" #include "service/migration_manager.hh" #include "service/storage_proxy.hh" #include "utils/small_vector.hh" diff --git a/db/view/view.hh b/db/view/view.hh index 24067171e4..36ded7c404 100644 --- a/db/view/view.hh +++ b/db/view/view.hh @@ -13,7 +13,7 @@ #include "query-request.hh" #include "schema_fwd.hh" #include "readers/flat_mutation_reader_v2.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" class frozen_mutation_and_schema; diff --git a/db/view/view_updating_consumer.hh b/db/view/view_updating_consumer.hh index 77250ceb88..530e2757ff 100644 --- a/db/view/view_updating_consumer.hh +++ b/db/view/view_updating_consumer.hh @@ -10,14 +10,14 @@ #include "dht/i_partitioner.hh" #include "schema_fwd.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "sstables/shared_sstable.hh" #include "reader_permit.hh" #include "db/view/row_locking.hh" #include #include -#include "mutation.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation.hh" +#include "mutation/mutation_rebuilder.hh" class evictable_reader_handle; class evictable_reader_handle_v2; diff --git a/frozen_schema.cc b/frozen_schema.cc index 746df634ff..7ea5b0e220 100644 --- a/frozen_schema.cc +++ b/frozen_schema.cc @@ -8,7 +8,7 @@ #include "frozen_schema.hh" #include "db/schema_tables.hh" -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "schema_mutations.hh" #include "idl/frozen_schema.dist.hh" #include "idl/frozen_schema.dist.impl.hh" diff --git a/frozen_schema.hh b/frozen_schema.hh index b6e6bcd00a..44fa4480ba 100644 --- a/frozen_schema.hh +++ b/frozen_schema.hh @@ -9,7 +9,7 @@ #pragma once #include "schema_fwd.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "bytes_ostream.hh" namespace db { diff --git a/full_position.hh b/full_position.hh index 031a98f87a..f27fd06266 100644 --- a/full_position.hh +++ b/full_position.hh @@ -9,7 +9,7 @@ #pragma once #include "keys.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" struct full_position; diff --git a/hashing_partition_visitor.hh b/hashing_partition_visitor.hh index 1aa79d97d9..a7bb91bd0f 100644 --- a/hashing_partition_visitor.hh +++ b/hashing_partition_visitor.hh @@ -8,13 +8,13 @@ #pragma once -#include "mutation_partition_visitor.hh" +#include "mutation/mutation_partition_visitor.hh" #include "hashing.hh" #include "schema.hh" -#include "atomic_cell_hash.hh" +#include "mutation/atomic_cell_hash.hh" #include "keys.hh" #include "counters.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" // Calculates a hash of a mutation_partition which is consistent with // mutation equality. For any equal mutations, no matter which schema diff --git a/idl/frozen_schema.idl.hh b/idl/frozen_schema.idl.hh index 37b357b7b4..7f1919edf6 100644 --- a/idl/frozen_schema.idl.hh +++ b/idl/frozen_schema.idl.hh @@ -6,7 +6,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "schema_mutations.hh" #include "frozen_schema.hh" diff --git a/idl/mutation.idl.hh b/idl/mutation.idl.hh index 0a2d50d899..288872f070 100644 --- a/idl/mutation.idl.hh +++ b/idl/mutation.idl.hh @@ -7,7 +7,7 @@ */ #include "counters.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "idl/uuid.idl.hh" #include "idl/keys.idl.hh" diff --git a/index/built_indexes_virtual_reader.hh b/index/built_indexes_virtual_reader.hh index 1e22c92e0a..d8016b981f 100644 --- a/index/built_indexes_virtual_reader.hh +++ b/index/built_indexes_virtual_reader.hh @@ -9,7 +9,7 @@ #include "replica/database.hh" #include "db/system_keyspace.hh" #include "readers/flat_mutation_reader_v2.hh" -#include "mutation_fragment_v2.hh" +#include "mutation/mutation_fragment_v2.hh" #include "query-request.hh" #include "schema_fwd.hh" #include "secondary_index_manager.hh" diff --git a/message/messaging_service.cc b/message/messaging_service.cc index bba49ce341..9407f24c61 100644 --- a/message/messaging_service.cc +++ b/message/messaging_service.cc @@ -21,7 +21,7 @@ #include "query-request.hh" #include "query-result.hh" #include -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "schema_mutations.hh" #include "db/config.hh" #include "db/view/view_update_backlog.hh" @@ -107,7 +107,7 @@ #include "partition_range_compat.hh" #include #include -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "streaming/stream_manager.hh" #include "streaming/stream_mutation_fragments_cmd.hh" #include "idl/partition_checksum.dist.impl.hh" diff --git a/atomic_cell.cc b/mutation/atomic_cell.cc similarity index 100% rename from atomic_cell.cc rename to mutation/atomic_cell.cc diff --git a/atomic_cell.hh b/mutation/atomic_cell.hh similarity index 99% rename from atomic_cell.hh rename to mutation/atomic_cell.hh index 331fba88fc..531b9dbe7d 100644 --- a/atomic_cell.hh +++ b/mutation/atomic_cell.hh @@ -10,7 +10,7 @@ #include "bytes.hh" #include "timestamp.hh" -#include "tombstone.hh" +#include "mutation/tombstone.hh" #include "gc_clock.hh" #include "utils/managed_bytes.hh" #include diff --git a/atomic_cell_hash.hh b/mutation/atomic_cell_hash.hh similarity index 100% rename from atomic_cell_hash.hh rename to mutation/atomic_cell_hash.hh diff --git a/atomic_cell_or_collection.hh b/mutation/atomic_cell_or_collection.hh similarity index 100% rename from atomic_cell_or_collection.hh rename to mutation/atomic_cell_or_collection.hh diff --git a/canonical_mutation.cc b/mutation/canonical_mutation.cc similarity index 100% rename from canonical_mutation.cc rename to mutation/canonical_mutation.cc diff --git a/canonical_mutation.hh b/mutation/canonical_mutation.hh similarity index 100% rename from canonical_mutation.hh rename to mutation/canonical_mutation.hh diff --git a/frozen_mutation.cc b/mutation/frozen_mutation.cc similarity index 100% rename from frozen_mutation.cc rename to mutation/frozen_mutation.cc diff --git a/frozen_mutation.hh b/mutation/frozen_mutation.hh similarity index 100% rename from frozen_mutation.hh rename to mutation/frozen_mutation.hh diff --git a/mutation.cc b/mutation/mutation.cc similarity index 100% rename from mutation.cc rename to mutation/mutation.cc diff --git a/mutation.hh b/mutation/mutation.hh similarity index 100% rename from mutation.hh rename to mutation/mutation.hh diff --git a/mutation_cleaner.hh b/mutation/mutation_cleaner.hh similarity index 100% rename from mutation_cleaner.hh rename to mutation/mutation_cleaner.hh diff --git a/mutation_compactor.hh b/mutation/mutation_compactor.hh similarity index 100% rename from mutation_compactor.hh rename to mutation/mutation_compactor.hh diff --git a/mutation_consumer.hh b/mutation/mutation_consumer.hh similarity index 100% rename from mutation_consumer.hh rename to mutation/mutation_consumer.hh diff --git a/mutation_consumer_concepts.hh b/mutation/mutation_consumer_concepts.hh similarity index 100% rename from mutation_consumer_concepts.hh rename to mutation/mutation_consumer_concepts.hh diff --git a/mutation_fragment.cc b/mutation/mutation_fragment.cc similarity index 100% rename from mutation_fragment.cc rename to mutation/mutation_fragment.cc diff --git a/mutation_fragment.hh b/mutation/mutation_fragment.hh similarity index 100% rename from mutation_fragment.hh rename to mutation/mutation_fragment.hh diff --git a/mutation_fragment_fwd.hh b/mutation/mutation_fragment_fwd.hh similarity index 100% rename from mutation_fragment_fwd.hh rename to mutation/mutation_fragment_fwd.hh diff --git a/mutation_fragment_stream_validator.hh b/mutation/mutation_fragment_stream_validator.hh similarity index 100% rename from mutation_fragment_stream_validator.hh rename to mutation/mutation_fragment_stream_validator.hh diff --git a/mutation_fragment_v2.hh b/mutation/mutation_fragment_v2.hh similarity index 100% rename from mutation_fragment_v2.hh rename to mutation/mutation_fragment_v2.hh diff --git a/mutation_partition.cc b/mutation/mutation_partition.cc similarity index 100% rename from mutation_partition.cc rename to mutation/mutation_partition.cc diff --git a/mutation_partition.hh b/mutation/mutation_partition.hh similarity index 100% rename from mutation_partition.hh rename to mutation/mutation_partition.hh diff --git a/mutation_partition_serializer.cc b/mutation/mutation_partition_serializer.cc similarity index 100% rename from mutation_partition_serializer.cc rename to mutation/mutation_partition_serializer.cc diff --git a/mutation_partition_serializer.hh b/mutation/mutation_partition_serializer.hh similarity index 100% rename from mutation_partition_serializer.hh rename to mutation/mutation_partition_serializer.hh diff --git a/mutation_partition_v2.cc b/mutation/mutation_partition_v2.cc similarity index 100% rename from mutation_partition_v2.cc rename to mutation/mutation_partition_v2.cc diff --git a/mutation_partition_v2.hh b/mutation/mutation_partition_v2.hh similarity index 100% rename from mutation_partition_v2.hh rename to mutation/mutation_partition_v2.hh diff --git a/mutation_partition_view.cc b/mutation/mutation_partition_view.cc similarity index 100% rename from mutation_partition_view.cc rename to mutation/mutation_partition_view.cc diff --git a/mutation_partition_view.hh b/mutation/mutation_partition_view.hh similarity index 100% rename from mutation_partition_view.hh rename to mutation/mutation_partition_view.hh diff --git a/mutation_partition_visitor.hh b/mutation/mutation_partition_visitor.hh similarity index 100% rename from mutation_partition_visitor.hh rename to mutation/mutation_partition_visitor.hh diff --git a/mutation_rebuilder.hh b/mutation/mutation_rebuilder.hh similarity index 100% rename from mutation_rebuilder.hh rename to mutation/mutation_rebuilder.hh diff --git a/mutation_source_metadata.hh b/mutation/mutation_source_metadata.hh similarity index 100% rename from mutation_source_metadata.hh rename to mutation/mutation_source_metadata.hh diff --git a/partition_version.cc b/mutation/partition_version.cc similarity index 100% rename from partition_version.cc rename to mutation/partition_version.cc diff --git a/partition_version.hh b/mutation/partition_version.hh similarity index 100% rename from partition_version.hh rename to mutation/partition_version.hh diff --git a/partition_version_list.hh b/mutation/partition_version_list.hh similarity index 100% rename from partition_version_list.hh rename to mutation/partition_version_list.hh diff --git a/position_in_partition.hh b/mutation/position_in_partition.hh similarity index 100% rename from position_in_partition.hh rename to mutation/position_in_partition.hh diff --git a/range_tombstone.cc b/mutation/range_tombstone.cc similarity index 97% rename from range_tombstone.cc rename to mutation/range_tombstone.cc index 27d62d4d9b..de15133116 100644 --- a/range_tombstone.cc +++ b/mutation/range_tombstone.cc @@ -7,8 +7,8 @@ */ #include "range_tombstone.hh" -#include "mutation_fragment.hh" -#include "mutation_fragment_v2.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/mutation_fragment_v2.hh" #include diff --git a/range_tombstone.hh b/mutation/range_tombstone.hh similarity index 99% rename from range_tombstone.hh rename to mutation/range_tombstone.hh index a1c0fb5e62..d075c42d15 100644 --- a/range_tombstone.hh +++ b/mutation/range_tombstone.hh @@ -12,9 +12,9 @@ #include #include "hashing.hh" #include "keys.hh" -#include "tombstone.hh" +#include "mutation/tombstone.hh" #include "clustering_bounds_comparator.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" namespace bi = boost::intrusive; diff --git a/range_tombstone_assembler.hh b/mutation/range_tombstone_assembler.hh similarity index 98% rename from range_tombstone_assembler.hh rename to mutation/range_tombstone_assembler.hh index a9374f5651..aecde854ac 100644 --- a/range_tombstone_assembler.hh +++ b/mutation/range_tombstone_assembler.hh @@ -11,7 +11,7 @@ #include #include -#include "mutation_fragment_v2.hh" +#include "mutation/mutation_fragment_v2.hh" /// Converts a stream of range_tombstone_change fragments to an equivalent stream of range_tombstone objects. /// The input fragments must be ordered by their position(). diff --git a/range_tombstone_change_generator.hh b/mutation/range_tombstone_change_generator.hh similarity index 99% rename from range_tombstone_change_generator.hh rename to mutation/range_tombstone_change_generator.hh index 6f98be5dce..652e3df53b 100644 --- a/range_tombstone_change_generator.hh +++ b/mutation/range_tombstone_change_generator.hh @@ -8,7 +8,7 @@ #pragma once -#include "mutation_fragment_v2.hh" +#include "mutation/mutation_fragment_v2.hh" #include "range_tombstone_list.hh" template diff --git a/range_tombstone_list.cc b/mutation/range_tombstone_list.cc similarity index 100% rename from range_tombstone_list.cc rename to mutation/range_tombstone_list.cc diff --git a/range_tombstone_list.hh b/mutation/range_tombstone_list.hh similarity index 100% rename from range_tombstone_list.hh rename to mutation/range_tombstone_list.hh diff --git a/range_tombstone_splitter.hh b/mutation/range_tombstone_splitter.hh similarity index 96% rename from range_tombstone_splitter.hh rename to mutation/range_tombstone_splitter.hh index 0d2ea48a9d..a573ddd77f 100644 --- a/range_tombstone_splitter.hh +++ b/mutation/range_tombstone_splitter.hh @@ -9,7 +9,7 @@ #pragma once #include "clustering_ranges_walker.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" template concept SplitterFragmentConsumer = std::invocable; diff --git a/tombstone.hh b/mutation/tombstone.hh similarity index 100% rename from tombstone.hh rename to mutation/tombstone.hh diff --git a/mutation_query.cc b/mutation_query.cc index d474aeb0b5..46d4322e37 100644 --- a/mutation_query.cc +++ b/mutation_query.cc @@ -8,7 +8,7 @@ #include "mutation_query.hh" #include "gc_clock.hh" -#include "mutation_partition_serializer.hh" +#include "mutation/mutation_partition_serializer.hh" #include "service/priority_manager.hh" #include "query-result-writer.hh" diff --git a/mutation_query.hh b/mutation_query.hh index 7a7f706a23..ed74e2ff4c 100644 --- a/mutation_query.hh +++ b/mutation_query.hh @@ -10,11 +10,11 @@ #include "query-request.hh" #include "query-result.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "db/timeout_clock.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "utils/chunked_vector.hh" -#include "range_tombstone_assembler.hh" +#include "mutation/range_tombstone_assembler.hh" class reconcilable_result; class frozen_reconcilable_result; diff --git a/mutation_writer/multishard_writer.cc b/mutation_writer/multishard_writer.cc index 9d601ab2f6..212995b132 100644 --- a/mutation_writer/multishard_writer.cc +++ b/mutation_writer/multishard_writer.cc @@ -7,7 +7,7 @@ */ #include "mutation_writer/multishard_writer.hh" -#include "mutation_fragment_v2.hh" +#include "mutation/mutation_fragment_v2.hh" #include "schema_registry.hh" #include "reader_concurrency_semaphore.hh" #include "readers/foreign.hh" diff --git a/mutation_writer/partition_based_splitting_writer.cc b/mutation_writer/partition_based_splitting_writer.cc index 4c3513ec39..f6e3bc7439 100644 --- a/mutation_writer/partition_based_splitting_writer.cc +++ b/mutation_writer/partition_based_splitting_writer.cc @@ -7,7 +7,7 @@ */ #include "mutation_writer/partition_based_splitting_writer.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_rebuilder.hh" #include "replica/memtable.hh" #include diff --git a/partition_builder.hh b/partition_builder.hh index e0dc02bbfb..53c85d990c 100644 --- a/partition_builder.hh +++ b/partition_builder.hh @@ -9,11 +9,11 @@ #pragma once #include "schema.hh" -#include "mutation_partition.hh" -#include "mutation_partition_visitor.hh" -#include "tombstone.hh" -#include "atomic_cell.hh" -#include "range_tombstone.hh" +#include "mutation/mutation_partition.hh" +#include "mutation/mutation_partition_visitor.hh" +#include "mutation/tombstone.hh" +#include "mutation/atomic_cell.hh" +#include "mutation/range_tombstone.hh" #include "collection_mutation.hh" // Partition visitor which builds mutation_partition corresponding to the data its fed with. diff --git a/partition_snapshot_reader.hh b/partition_snapshot_reader.hh index db5bdf4230..2aa428e19f 100644 --- a/partition_snapshot_reader.hh +++ b/partition_snapshot_reader.hh @@ -8,7 +8,7 @@ #pragma once -#include "partition_version.hh" +#include "mutation/partition_version.hh" #include "readers/flat_mutation_reader_fwd.hh" #include "readers/flat_mutation_reader_v2.hh" #include "readers/range_tombstone_change_merger.hh" diff --git a/partition_snapshot_row_cursor.hh b/partition_snapshot_row_cursor.hh index 88490a62e7..20bf9abcbd 100644 --- a/partition_snapshot_row_cursor.hh +++ b/partition_snapshot_row_cursor.hh @@ -8,7 +8,7 @@ #pragma once -#include "partition_version.hh" +#include "mutation/partition_version.hh" #include "row_cache.hh" #include "utils/small_vector.hh" #include diff --git a/querier.hh b/querier.hh index 3a0312f50a..b837e85809 100644 --- a/querier.hh +++ b/querier.hh @@ -10,7 +10,7 @@ #include -#include "mutation_compactor.hh" +#include "mutation/mutation_compactor.hh" #include "reader_concurrency_semaphore.hh" #include "readers/mutation_source.hh" #include "full_position.hh" diff --git a/query-result-set.cc b/query-result-set.cc index b9009aa703..478286f964 100644 --- a/query-result-set.cc +++ b/query-result-set.cc @@ -9,7 +9,7 @@ #include "query-result-set.hh" #include "query-result-reader.hh" #include "partition_slice_builder.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "types/map.hh" #include "utils/exceptions.hh" #include "mutation_query.hh" diff --git a/query-result-writer.hh b/query-result-writer.hh index eec7450fdb..ea9344e354 100644 --- a/query-result-writer.hh +++ b/query-result-writer.hh @@ -9,7 +9,7 @@ #pragma once #include "types.hh" -#include "atomic_cell.hh" +#include "mutation/atomic_cell.hh" #include "query-request.hh" #include "query-result.hh" #include "digest_algorithm.hh" diff --git a/query.cc b/query.cc index 1bcae03ea9..f768b916c2 100644 --- a/query.cc +++ b/query.cc @@ -17,7 +17,7 @@ #include "seastar/core/thread.hh" #include "to_string.hh" #include "bytes.hh" -#include "mutation_partition_serializer.hh" +#include "mutation/mutation_partition_serializer.hh" #include "query-result-reader.hh" #include "query_result_merger.hh" #include "partition_slice_builder.hh" diff --git a/read_context.hh b/read_context.hh index f96aabc9f7..3334971e77 100644 --- a/read_context.hh +++ b/read_context.hh @@ -11,8 +11,8 @@ #include "schema_fwd.hh" #include "query-request.hh" #include "partition_slice_builder.hh" -#include "mutation_fragment.hh" -#include "partition_version.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/partition_version.hh" #include "tracing/tracing.hh" #include "row_cache.hh" diff --git a/readers/flat_mutation_reader_v2.hh b/readers/flat_mutation_reader_v2.hh index 92ea12a0a0..d591365099 100644 --- a/readers/flat_mutation_reader_v2.hh +++ b/readers/flat_mutation_reader_v2.hh @@ -13,9 +13,9 @@ #include #include "dht/i_partitioner.hh" -#include "mutation_fragment_v2.hh" -#include "mutation.hh" -#include "mutation_consumer_concepts.hh" +#include "mutation/mutation_fragment_v2.hh" +#include "mutation/mutation.hh" +#include "mutation/mutation_consumer_concepts.hh" #include "reader_permit.hh" using seastar::future; diff --git a/readers/from_mutations_v2.hh b/readers/from_mutations_v2.hh index 925c76d61c..d2b9cd23fa 100644 --- a/readers/from_mutations_v2.hh +++ b/readers/from_mutations_v2.hh @@ -10,7 +10,7 @@ #include "schema_fwd.hh" #include #include "dht/i_partitioner_fwd.hh" -#include "mutation_fragment_fwd.hh" +#include "mutation/mutation_fragment_fwd.hh" #include "readers/flat_mutation_reader_fwd.hh" #include "readers/flat_mutation_reader_v2.hh" diff --git a/readers/generating_v2.hh b/readers/generating_v2.hh index 1fc66bfe11..4516580648 100644 --- a/readers/generating_v2.hh +++ b/readers/generating_v2.hh @@ -10,7 +10,7 @@ #include "schema_fwd.hh" #include #include -#include "mutation_fragment_fwd.hh" +#include "mutation/mutation_fragment_fwd.hh" using namespace seastar; diff --git a/readers/mutation_fragment_v1_stream.hh b/readers/mutation_fragment_v1_stream.hh index 39b126e0c2..acf39ff6d8 100644 --- a/readers/mutation_fragment_v1_stream.hh +++ b/readers/mutation_fragment_v1_stream.hh @@ -1,10 +1,10 @@ #pragma once #include "flat_mutation_reader_v2.hh" -#include "mutation_fragment.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/mutation_rebuilder.hh" #include "reader_permit.hh" -#include "range_tombstone_assembler.hh" +#include "mutation/range_tombstone_assembler.hh" class mutation_fragment_v1_stream final { flat_mutation_reader_v2 _reader; diff --git a/readers/mutation_reader.cc b/readers/mutation_reader.cc index 575a8a62c0..709e7dd42e 100644 --- a/readers/mutation_reader.cc +++ b/readers/mutation_reader.cc @@ -9,8 +9,8 @@ #include #include "readers/flat_mutation_reader_v2.hh" -#include "mutation_rebuilder.hh" -#include "mutation_fragment_stream_validator.hh" +#include "mutation/mutation_rebuilder.hh" +#include "mutation/mutation_fragment_stream_validator.hh" #include "schema_upgrader.hh" logging::logger mrlog("mutation_reader"); diff --git a/readers/mutation_readers.cc b/readers/mutation_readers.cc index d0ec32e1d2..282842cc42 100644 --- a/readers/mutation_readers.cc +++ b/readers/mutation_readers.cc @@ -9,11 +9,11 @@ #include "clustering_key_filter.hh" #include "clustering_ranges_walker.hh" #include "dht/i_partitioner.hh" -#include "mutation.hh" -#include "mutation_partition.hh" -#include "mutation_compactor.hh" -#include "range_tombstone_assembler.hh" -#include "range_tombstone_splitter.hh" +#include "mutation/mutation.hh" +#include "mutation/mutation_partition.hh" +#include "mutation/mutation_compactor.hh" +#include "mutation/range_tombstone_assembler.hh" +#include "mutation/range_tombstone_splitter.hh" #include "readers/combined.hh" #include "readers/delegating_v2.hh" #include "readers/empty_v2.hh" diff --git a/readers/range_tombstone_change_merger.hh b/readers/range_tombstone_change_merger.hh index ecb2aa936b..06ca65c073 100644 --- a/readers/range_tombstone_change_merger.hh +++ b/readers/range_tombstone_change_merger.hh @@ -8,7 +8,7 @@ #pragma once -#include "tombstone.hh" +#include "mutation/tombstone.hh" // Merges range tombstone changes coming from different streams (readers). // diff --git a/readers/upgrading_consumer.hh b/readers/upgrading_consumer.hh index 7497354502..2bb96f0c91 100644 --- a/readers/upgrading_consumer.hh +++ b/readers/upgrading_consumer.hh @@ -8,8 +8,8 @@ #pragma once -#include "mutation_fragment_v2.hh" -#include "range_tombstone_change_generator.hh" +#include "mutation/mutation_fragment_v2.hh" +#include "mutation/range_tombstone_change_generator.hh" template requires requires(EndConsumer& c, mutation_fragment_v2 mf) { diff --git a/redis/mutation_utils.cc b/redis/mutation_utils.cc index 9bac16d6ca..63eb0ecbed 100644 --- a/redis/mutation_utils.cc +++ b/redis/mutation_utils.cc @@ -13,7 +13,7 @@ #include #include "redis/keyspace_utils.hh" #include "redis/options.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "service_permit.hh" using namespace seastar; diff --git a/repair/repair.cc b/repair/repair.cc index ed4c246b43..293b47d08d 100644 --- a/repair/repair.cc +++ b/repair/repair.cc @@ -9,7 +9,7 @@ #include "repair.hh" #include "repair/row_level.hh" -#include "atomic_cell_hash.hh" +#include "mutation/atomic_cell_hash.hh" #include "dht/sharder.hh" #include "streaming/stream_reason.hh" #include "gms/inet_address.hh" diff --git a/repair/repair.hh b/repair/repair.hh index ab865877a7..d28c3c3c47 100644 --- a/repair/repair.hh +++ b/repair/repair.hh @@ -22,7 +22,7 @@ #include "locator/abstract_replication_strategy.hh" #include "replica/database_fwd.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "utils/UUID.hh" #include "utils/hash.hh" #include "streaming/stream_reason.hh" diff --git a/repair/row.hh b/repair/row.hh index 572bc63ed8..56105301ef 100644 --- a/repair/row.hh +++ b/repair/row.hh @@ -8,7 +8,7 @@ #pragma once #include -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include #include #include "repair/decorated_key_with_hash.hh" diff --git a/repair/row_level.cc b/repair/row_level.cc index 703612cf3e..1e949f233c 100644 --- a/repair/row_level.cc +++ b/repair/row_level.cc @@ -12,7 +12,7 @@ #include "repair/repair_task.hh" #include "sstables/sstables.hh" #include "sstables/sstables_manager.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "mutation_writer/multishard_writer.hh" #include "dht/i_partitioner.hh" #include "dht/sharder.hh" @@ -36,7 +36,7 @@ #include "gms/i_endpoint_state_change_subscriber.hh" #include "gms/gossiper.hh" #include "repair/row_level.hh" -#include "mutation_source_metadata.hh" +#include "mutation/mutation_source_metadata.hh" #include "utils/stall_free.hh" #include "service/migration_manager.hh" #include "streaming/consumer.hh" diff --git a/repair/sync_boundary.hh b/repair/sync_boundary.hh index 3e5e687c19..6a6a803f50 100644 --- a/repair/sync_boundary.hh +++ b/repair/sync_boundary.hh @@ -8,7 +8,7 @@ #pragma once #include "dht/i_partitioner.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" // Represent a position of a mutation_fragment read from a flat mutation // reader. Repair nodes negotiate a small range identified by two diff --git a/replica/database.cc b/replica/database.cc index 5364419a31..56d94872c4 100644 --- a/replica/database.cc +++ b/replica/database.cc @@ -35,7 +35,7 @@ #include #include #include -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include #include "service/migration_listener.hh" #include "cell_locking.hh" diff --git a/replica/memtable.cc b/replica/memtable.cc index 76086c6051..e0aac0a668 100644 --- a/replica/memtable.cc +++ b/replica/memtable.cc @@ -8,10 +8,10 @@ #include "memtable.hh" #include "replica/database.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "partition_snapshot_reader.hh" #include "partition_builder.hh" -#include "mutation_partition_view.hh" +#include "mutation/mutation_partition_view.hh" #include "readers/empty_v2.hh" #include "readers/forwardable_v2.hh" diff --git a/replica/memtable.hh b/replica/memtable.hh index b49da2bd62..4c184b9a1c 100644 --- a/replica/memtable.hh +++ b/replica/memtable.hh @@ -19,7 +19,7 @@ #include "db/commitlog/replay_position.hh" #include "db/commitlog/rp_set.hh" #include "utils/extremum_tracking.hh" -#include "mutation_cleaner.hh" +#include "mutation/mutation_cleaner.hh" #include "sstables/types.hh" #include "utils/double-decker.hh" #include "readers/empty_v2.hh" diff --git a/replica/table.cc b/replica/table.cc index 2763ad22b0..be9126cb4a 100644 --- a/replica/table.cc +++ b/replica/table.cc @@ -40,7 +40,7 @@ #include "utils/error_injection.hh" #include "utils/histogram_metrics_helper.hh" #include "utils/fb_utilities.hh" -#include "mutation_source_metadata.hh" +#include "mutation/mutation_source_metadata.hh" #include "gms/gossiper.hh" #include "db/config.hh" #include "db/commitlog/commitlog.hh" diff --git a/row_cache.hh b/row_cache.hh index c81549c7f2..8d9ecd1114 100644 --- a/row_cache.hh +++ b/row_cache.hh @@ -15,13 +15,13 @@ #include #include -#include "mutation_partition.hh" +#include "mutation/mutation_partition.hh" #include "utils/phased_barrier.hh" #include "utils/histogram.hh" -#include "partition_version.hh" +#include "mutation/partition_version.hh" #include "tracing/trace_state.hh" #include -#include "mutation_cleaner.hh" +#include "mutation/mutation_cleaner.hh" #include "utils/double-decker.hh" #include "db/cache_tracker.hh" #include "readers/empty_v2.hh" diff --git a/schema_mutations.cc b/schema_mutations.cc index dde76feb58..4869fc9cd0 100644 --- a/schema_mutations.cc +++ b/schema_mutations.cc @@ -7,7 +7,7 @@ */ #include "schema_mutations.hh" -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "db/schema_tables.hh" #include "hashers.hh" #include "utils/UUID_gen.hh" diff --git a/schema_mutations.hh b/schema_mutations.hh index 2ed8b0abfb..033c2cca51 100644 --- a/schema_mutations.hh +++ b/schema_mutations.hh @@ -9,9 +9,9 @@ #pragma once #include -#include "mutation.hh" +#include "mutation/mutation.hh" #include "schema_fwd.hh" -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" // Commutative representation of table schema // Equality ignores tombstones. diff --git a/schema_upgrader.hh b/schema_upgrader.hh index 7729ab0d0c..d2ada0480f 100644 --- a/schema_upgrader.hh +++ b/schema_upgrader.hh @@ -8,8 +8,8 @@ #pragma once -#include "mutation_fragment.hh" -#include "mutation_fragment_v2.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/mutation_fragment_v2.hh" #include "converting_mutation_partition_applier.hh" // A StreamedMutationTransformer which transforms the stream to a different schema diff --git a/service/pager/paging_state.hh b/service/pager/paging_state.hh index 9afc7f3975..4b0ec703f7 100644 --- a/service/pager/paging_state.hh +++ b/service/pager/paging_state.hh @@ -17,7 +17,7 @@ #include "query-request.hh" #include "dht/i_partitioner.hh" #include "db/read_repair_decision.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" #include "locator/host_id.hh" namespace service { diff --git a/service/paxos/proposal.hh b/service/paxos/proposal.hh index 7b2d123e0c..c2a8184b8d 100644 --- a/service/paxos/proposal.hh +++ b/service/paxos/proposal.hh @@ -8,7 +8,7 @@ */ #pragma once #include "utils/UUID_gen.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" namespace service { diff --git a/service/raft/group0_state_machine.cc b/service/raft/group0_state_machine.cc index c0b6f3a709..7e7c6bb05d 100644 --- a/service/raft/group0_state_machine.cc +++ b/service/raft/group0_state_machine.cc @@ -6,12 +6,12 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ #include "service/raft/group0_state_machine.hh" -#include "atomic_cell.hh" +#include "mutation/atomic_cell.hh" #include "cql3/selection/selection.hh" #include "dht/i_partitioner.hh" #include "dht/token.hh" #include "message/messaging_service.hh" -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "service/broadcast_tables/experimental/query_result.hh" #include "schema_mutations.hh" #include "frozen_schema.hh" diff --git a/service/raft/group0_state_machine.hh b/service/raft/group0_state_machine.hh index 237bc6b2e1..b1d41fda5b 100644 --- a/service/raft/group0_state_machine.hh +++ b/service/raft/group0_state_machine.hh @@ -10,7 +10,7 @@ #include "service/broadcast_tables/experimental/lang.hh" #include "raft/raft.hh" #include "utils/UUID_gen.hh" -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "service/raft/raft_state_machine.hh" namespace service { diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc index 4ddf08f4cb..c22e87ff76 100644 --- a/service/storage_proxy.cc +++ b/service/storage_proxy.cc @@ -16,8 +16,8 @@ #include "db/commitlog/commitlog.hh" #include "storage_proxy.hh" #include "unimplemented.hh" -#include "mutation.hh" -#include "frozen_mutation.hh" +#include "mutation/mutation.hh" +#include "mutation/frozen_mutation.hh" #include "supervisor.hh" #include "query_result_merger.hh" #include @@ -78,11 +78,11 @@ #include #include "locator/abstract_replication_strategy.hh" #include "service/paxos/cas_request.hh" -#include "mutation_partition_view.hh" +#include "mutation/mutation_partition_view.hh" #include "service/paxos/paxos_state.hh" #include "gms/feature_service.hh" #include "db/virtual_table.hh" -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "schema_mutations.hh" #include "idl/frozen_schema.dist.hh" #include "idl/frozen_schema.dist.impl.hh" diff --git a/sstables/disk_types.hh b/sstables/disk_types.hh index b10cdecf11..b61c0802db 100644 --- a/sstables/disk_types.hh +++ b/sstables/disk_types.hh @@ -16,7 +16,7 @@ #include #include #include -#include "atomic_cell.hh" +#include "mutation/atomic_cell.hh" namespace sstables { diff --git a/sstables/index_entry.hh b/sstables/index_entry.hh index f489388922..e07699c736 100644 --- a/sstables/index_entry.hh +++ b/sstables/index_entry.hh @@ -9,7 +9,7 @@ #pragma once #include #include -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" #include "utils/overloaded_functor.hh" #include "utils/lsa/chunked_managed_vector.hh" #include "reader_permit.hh" diff --git a/sstables/liveness_info.hh b/sstables/liveness_info.hh index d0e13ce1c2..577f0628cf 100644 --- a/sstables/liveness_info.hh +++ b/sstables/liveness_info.hh @@ -13,7 +13,7 @@ #include "gc_clock.hh" #include "sstables/m_format_read_helpers.hh" #include "sstables/types.hh" -#include "mutation_partition.hh" +#include "mutation/mutation_partition.hh" namespace sstables { diff --git a/sstables/metadata_collector.cc b/sstables/metadata_collector.cc index f6bcc52a94..1b39ee4a4c 100644 --- a/sstables/metadata_collector.cc +++ b/sstables/metadata_collector.cc @@ -8,7 +8,7 @@ #include "log.hh" #include "metadata_collector.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" logging::logger mdclogger("metadata_collector"); diff --git a/sstables/metadata_collector.hh b/sstables/metadata_collector.hh index c7e1d5209e..69b144a7b9 100644 --- a/sstables/metadata_collector.hh +++ b/sstables/metadata_collector.hh @@ -16,7 +16,7 @@ #include "hyperloglog.hh" #include "db/commitlog/replay_position.hh" #include "clustering_bounds_comparator.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" #include "db/cache_tracker.hh" #include "locator/host_id.hh" diff --git a/sstables/mutation_fragment_filter.hh b/sstables/mutation_fragment_filter.hh index ef35469e49..0805fe7975 100644 --- a/sstables/mutation_fragment_filter.hh +++ b/sstables/mutation_fragment_filter.hh @@ -8,7 +8,7 @@ #pragma once -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "clustering_ranges_walker.hh" #include "clustering_key_filter.hh" #include "readers/flat_mutation_reader_fwd.hh" diff --git a/sstables/mx/parsers.hh b/sstables/mx/parsers.hh index e1ab8ae00e..124d8137a0 100644 --- a/sstables/mx/parsers.hh +++ b/sstables/mx/parsers.hh @@ -12,7 +12,7 @@ #include "sstables/types.hh" #include "sstables/column_translation.hh" #include "sstables/m_format_read_helpers.hh" -#include "position_in_partition.hh" +#include "mutation/position_in_partition.hh" namespace sstables { namespace mc { diff --git a/sstables/mx/writer.cc b/sstables/mx/writer.cc index 4b1e055ea1..f01d8555ba 100644 --- a/sstables/mx/writer.cc +++ b/sstables/mx/writer.cc @@ -10,12 +10,12 @@ #include "sstables/writer.hh" #include "encoding_stats.hh" #include "schema.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "vint-serialization.hh" #include "sstables/types.hh" #include "sstables/mx/types.hh" #include "db/config.hh" -#include "atomic_cell.hh" +#include "mutation/atomic_cell.hh" #include "utils/exceptions.hh" #include "db/large_data_handler.hh" diff --git a/sstables/sstable_mutation_reader.hh b/sstables/sstable_mutation_reader.hh index 4dda0e5061..1a8c8edf31 100644 --- a/sstables/sstable_mutation_reader.hh +++ b/sstables/sstable_mutation_reader.hh @@ -5,7 +5,7 @@ /* * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include "mutation.hh" +#include "mutation/mutation.hh" #include "types.hh" #include #include diff --git a/sstables/sstable_writer.hh b/sstables/sstable_writer.hh index 649493830a..bf810804c0 100644 --- a/sstables/sstable_writer.hh +++ b/sstables/sstable_writer.hh @@ -12,8 +12,8 @@ #include #include #include "schema_fwd.hh" -#include "mutation_fragment.hh" -#include "mutation_fragment_v2.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/mutation_fragment_v2.hh" struct encoding_stats; diff --git a/sstables/sstables.cc b/sstables/sstables.cc index 35150aa0b6..5d51a21558 100644 --- a/sstables/sstables.cc +++ b/sstables/sstables.cc @@ -54,7 +54,7 @@ #include #include #include -#include "range_tombstone_list.hh" +#include "mutation/range_tombstone_list.hh" #include "counters.hh" #include "binary_search.hh" #include "utils/bloom_filter.hh" diff --git a/sstables/sstables.hh b/sstables/sstables.hh index f5fd040fb1..120abd1b58 100644 --- a/sstables/sstables.hh +++ b/sstables/sstables.hh @@ -34,7 +34,7 @@ #include "utils/observable.hh" #include "sstables/shareable_components.hh" #include "sstables/generation_type.hh" -#include "mutation_fragment_stream_validator.hh" +#include "mutation/mutation_fragment_stream_validator.hh" #include "readers/flat_mutation_reader_fwd.hh" #include "tracing/trace_state.hh" #include "utils/updateable_value.hh" diff --git a/sstables/types.hh b/sstables/types.hh index d14adf723a..f35f56e16c 100644 --- a/sstables/types.hh +++ b/sstables/types.hh @@ -12,7 +12,7 @@ #include #include "bytes.hh" #include "gc_clock.hh" -#include "tombstone.hh" +#include "mutation/tombstone.hh" #include "utils/streaming_histogram.hh" #include "utils/estimated_histogram.hh" #include "sstables/key.hh" diff --git a/sstables/writer_impl.hh b/sstables/writer_impl.hh index f3233a25a5..229ef89942 100644 --- a/sstables/writer_impl.hh +++ b/sstables/writer_impl.hh @@ -11,9 +11,9 @@ #include "sstable_writer.hh" #include "sstables_manager.hh" #include "schema_fwd.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "metadata_collector.hh" -#include "mutation_fragment_stream_validator.hh" +#include "mutation/mutation_fragment_stream_validator.hh" namespace sstables { diff --git a/streaming/consumer.cc b/streaming/consumer.cc index 30b74ebd13..c5871bd181 100644 --- a/streaming/consumer.cc +++ b/streaming/consumer.cc @@ -9,7 +9,7 @@ #include #include "consumer.hh" -#include "mutation_source_metadata.hh" +#include "mutation/mutation_source_metadata.hh" #include "service/priority_manager.hh" #include "db/view/view_update_generator.hh" #include "db/view/view_update_checks.hh" diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc index 68d6b98288..743c508f87 100644 --- a/streaming/stream_session.cc +++ b/streaming/stream_session.cc @@ -32,7 +32,7 @@ #include #include #include "../db/view/view_update_generator.hh" -#include "mutation_source_metadata.hh" +#include "mutation/mutation_source_metadata.hh" #include "streaming/stream_mutation_fragments_cmd.hh" #include "consumer.hh" #include "readers/generating_v2.hh" diff --git a/streaming/stream_transfer_task.cc b/streaming/stream_transfer_task.cc index 27ab0a6275..2a140335b3 100644 --- a/streaming/stream_transfer_task.cc +++ b/streaming/stream_transfer_task.cc @@ -17,9 +17,9 @@ #include "streaming/stream_reason.hh" #include "streaming/stream_mutation_fragments_cmd.hh" #include "readers/mutation_fragment_v1_stream.hh" -#include "mutation_fragment_stream_validator.hh" -#include "frozen_mutation.hh" -#include "mutation.hh" +#include "mutation/mutation_fragment_stream_validator.hh" +#include "mutation/frozen_mutation.hh" +#include "mutation/mutation.hh" #include "message/messaging_service.hh" #include "range.hh" #include "dht/i_partitioner.hh" diff --git a/test/boost/cache_flat_mutation_reader_test.cc b/test/boost/cache_flat_mutation_reader_test.cc index dc8e465988..45a9a6fc6e 100644 --- a/test/boost/cache_flat_mutation_reader_test.cc +++ b/test/boost/cache_flat_mutation_reader_test.cc @@ -14,9 +14,9 @@ #include #include "schema_builder.hh" #include "keys.hh" -#include "mutation_partition.hh" -#include "partition_version.hh" -#include "mutation.hh" +#include "mutation/mutation_partition.hh" +#include "mutation/partition_version.hh" +#include "mutation/mutation.hh" #include "replica/memtable.hh" #include "row_cache.hh" diff --git a/test/boost/canonical_mutation_test.cc b/test/boost/canonical_mutation_test.cc index 6a20bbae96..68dbbb0bf7 100644 --- a/test/boost/canonical_mutation_test.cc +++ b/test/boost/canonical_mutation_test.cc @@ -9,7 +9,7 @@ #include -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "test/lib/mutation_source_test.hh" #include "test/lib/mutation_assertions.hh" diff --git a/test/boost/cell_locker_test.cc b/test/boost/cell_locker_test.cc index eb1dab0590..d164d0eb81 100644 --- a/test/boost/cell_locker_test.cc +++ b/test/boost/cell_locker_test.cc @@ -11,7 +11,7 @@ #include #include "cell_locking.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "schema_builder.hh" using namespace std::literals::chrono_literals; diff --git a/test/boost/counter_test.cc b/test/boost/counter_test.cc index 8d04201463..98cf514705 100644 --- a/test/boost/counter_test.cc +++ b/test/boost/counter_test.cc @@ -19,9 +19,9 @@ #include "test/lib/random_utils.hh" #include "schema_builder.hh" #include "keys.hh" -#include "mutation.hh" -#include "frozen_mutation.hh" -#include "mutation_partition_view.hh" +#include "mutation/mutation.hh" +#include "mutation/frozen_mutation.hh" +#include "mutation/mutation_partition_view.hh" void verify_shard_order(counter_cell_view ccv) { if (ccv.shards().begin() == ccv.shards().end()) { diff --git a/test/boost/database_test.cc b/test/boost/database_test.cc index 0fea9c2937..3722eebea2 100644 --- a/test/boost/database_test.cc +++ b/test/boost/database_test.cc @@ -24,7 +24,7 @@ #include "replica/database.hh" #include "utils/lister.hh" #include "partition_slice_builder.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "test/lib/mutation_source_test.hh" #include "schema_registry.hh" #include "service/migration_manager.hh" diff --git a/test/boost/flat_mutation_reader_test.cc b/test/boost/flat_mutation_reader_test.cc index a31f197b2d..d54447b410 100644 --- a/test/boost/flat_mutation_reader_test.cc +++ b/test/boost/flat_mutation_reader_test.cc @@ -12,8 +12,8 @@ #include #include -#include "mutation.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation.hh" +#include "mutation/mutation_fragment.hh" #include "readers/flat_mutation_reader_v2.hh" #include "test/lib/mutation_source_test.hh" #include "readers/reversing_v2.hh" @@ -24,8 +24,8 @@ #include "row_cache.hh" #include "test/lib/tmpdir.hh" #include "repair/repair.hh" -#include "mutation_partition_view.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_partition_view.hh" +#include "mutation/mutation_rebuilder.hh" #include "test/lib/simple_schema.hh" #include "test/lib/flat_mutation_reader_assertions.hh" diff --git a/test/boost/frozen_mutation_test.cc b/test/boost/frozen_mutation_test.cc index de00c3004e..395b5d042d 100644 --- a/test/boost/frozen_mutation_test.cc +++ b/test/boost/frozen_mutation_test.cc @@ -13,9 +13,9 @@ #include #include -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "schema_builder.hh" -#include "mutation_partition_view.hh" +#include "mutation/mutation_partition_view.hh" #include "test/lib/mutation_assertions.hh" #include "test/lib/mutation_source_test.hh" #include "test/lib/reader_concurrency_semaphore.hh" diff --git a/test/boost/mutation_fragment_test.cc b/test/boost/mutation_fragment_test.cc index 40165b81d1..a8aac70ef0 100644 --- a/test/boost/mutation_fragment_test.cc +++ b/test/boost/mutation_fragment_test.cc @@ -14,15 +14,15 @@ #include #include "test/lib/mutation_source_test.hh" -#include "mutation_fragment.hh" -#include "frozen_mutation.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/frozen_mutation.hh" #include "test/lib/test_services.hh" #include "schema_builder.hh" #include "test/boost/total_order_check.hh" #include "schema_upgrader.hh" #include "readers/combined.hh" #include "replica/memtable.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_rebuilder.hh" #include "test/lib/mutation_assertions.hh" #include "test/lib/reader_concurrency_semaphore.hh" diff --git a/test/boost/mutation_query_test.cc b/test/boost/mutation_query_test.cc index c3bf6afd8e..fe2421cde7 100644 --- a/test/boost/mutation_query_test.cc +++ b/test/boost/mutation_query_test.cc @@ -29,7 +29,7 @@ #include "schema_builder.hh" #include "partition_slice_builder.hh" #include "readers/from_mutations_v2.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_rebuilder.hh" #include "readers/mutation_source.hh" #include "service/priority_manager.hh" diff --git a/test/boost/mutation_reader_test.cc b/test/boost/mutation_reader_test.cc index abda99a822..7a546a13c3 100644 --- a/test/boost/mutation_reader_test.cc +++ b/test/boost/mutation_reader_test.cc @@ -45,7 +45,7 @@ #include "schema_registry.hh" #include "service/priority_manager.hh" #include "utils/ranges.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_rebuilder.hh" #include #include "readers/from_mutations_v2.hh" diff --git a/test/boost/mutation_test.cc b/test/boost/mutation_test.cc index 166ce241c8..38140a9920 100644 --- a/test/boost/mutation_test.cc +++ b/test/boost/mutation_test.cc @@ -52,8 +52,8 @@ #include "types/set.hh" #include "types/user.hh" #include "concrete_types.hh" -#include "mutation_rebuilder.hh" -#include "mutation_partition.hh" +#include "mutation/mutation_rebuilder.hh" +#include "mutation/mutation_partition.hh" #include "clustering_key_filter.hh" #include "readers/from_mutations_v2.hh" #include "readers/from_fragments_v2.hh" diff --git a/test/boost/mutation_writer_test.cc b/test/boost/mutation_writer_test.cc index 60c7124a54..457e946336 100644 --- a/test/boost/mutation_writer_test.cc +++ b/test/boost/mutation_writer_test.cc @@ -13,8 +13,8 @@ #include #include -#include "mutation_fragment.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/mutation_rebuilder.hh" #include "test/lib/mutation_source_test.hh" #include "test/lib/reader_concurrency_semaphore.hh" #include "readers/from_mutations_v2.hh" diff --git a/test/boost/mvcc_test.cc b/test/boost/mvcc_test.cc index 130f203cf1..03e0f0fd6c 100644 --- a/test/boost/mvcc_test.cc +++ b/test/boost/mvcc_test.cc @@ -14,7 +14,7 @@ #include #include -#include "partition_version.hh" +#include "mutation/partition_version.hh" #include "partition_snapshot_row_cursor.hh" #include "partition_snapshot_reader.hh" #include "clustering_interval_set.hh" diff --git a/test/boost/per_partition_rate_limit_test.cc b/test/boost/per_partition_rate_limit_test.cc index 6419ff5b4e..230dde4d14 100644 --- a/test/boost/per_partition_rate_limit_test.cc +++ b/test/boost/per_partition_rate_limit_test.cc @@ -6,7 +6,7 @@ #include "test/lib/cql_test_env.hh" #include "test/lib/cql_assertions.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include "service/storage_proxy.hh" SEASTAR_TEST_CASE(test_internal_operation_filtering) { diff --git a/test/boost/range_tombstone_list_assertions.hh b/test/boost/range_tombstone_list_assertions.hh index c911899046..7c279e711b 100644 --- a/test/boost/range_tombstone_list_assertions.hh +++ b/test/boost/range_tombstone_list_assertions.hh @@ -9,7 +9,7 @@ #pragma once #include -#include "range_tombstone_list.hh" +#include "mutation/range_tombstone_list.hh" class range_tombstone_list_assertions { const schema& _s; diff --git a/test/boost/range_tombstone_list_test.cc b/test/boost/range_tombstone_list_test.cc index 9ed13eb381..8debd31e1a 100644 --- a/test/boost/range_tombstone_list_test.cc +++ b/test/boost/range_tombstone_list_test.cc @@ -13,7 +13,7 @@ #include #include "keys.hh" #include "schema_builder.hh" -#include "range_tombstone_list.hh" +#include "mutation/range_tombstone_list.hh" #include "test/boost/range_tombstone_list_assertions.hh" #include "test/lib/log.hh" diff --git a/test/boost/row_cache_test.cc b/test/boost/row_cache_test.cc index cdc3d05be0..532a16aab8 100644 --- a/test/boost/row_cache_test.cc +++ b/test/boost/row_cache_test.cc @@ -27,7 +27,7 @@ #include #include "replica/memtable.hh" #include "partition_slice_builder.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_rebuilder.hh" #include "service/migration_manager.hh" #include "test/lib/cql_test_env.hh" #include "test/lib/memtable_snapshot_source.hh" diff --git a/test/boost/sstable_compaction_test.cc b/test/boost/sstable_compaction_test.cc index 162eb845e3..502ca0cf4d 100644 --- a/test/boost/sstable_compaction_test.cc +++ b/test/boost/sstable_compaction_test.cc @@ -49,12 +49,12 @@ #include "test/lib/make_random_string.hh" #include "test/lib/sstable_run_based_compaction_strategy_for_tests.hh" #include "compatible_ring_position.hh" -#include "mutation_compactor.hh" +#include "mutation/mutation_compactor.hh" #include "service/priority_manager.hh" #include "db/config.hh" #include "mutation_writer/partition_based_splitting_writer.hh" #include "compaction/table_state.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_rebuilder.hh" #include #include diff --git a/test/boost/sstable_datafile_test.cc b/test/boost/sstable_datafile_test.cc index 69ff83c038..d2fa0e9092 100644 --- a/test/boost/sstable_datafile_test.cc +++ b/test/boost/sstable_datafile_test.cc @@ -42,7 +42,7 @@ #include "test/lib/flat_mutation_reader_assertions.hh" #include "test/lib/make_random_string.hh" #include "compatible_ring_position.hh" -#include "mutation_compactor.hh" +#include "mutation/mutation_compactor.hh" #include "service/priority_manager.hh" #include "db/config.hh" #include "mutation_writer/partition_based_splitting_writer.hh" diff --git a/test/lib/data_model.hh b/test/lib/data_model.hh index 924b038cac..edc17937c1 100644 --- a/test/lib/data_model.hh +++ b/test/lib/data_model.hh @@ -8,7 +8,7 @@ #pragma once -#include "mutation.hh" +#include "mutation/mutation.hh" #include "cql3/cql3_type.hh" #include "schema.hh" diff --git a/test/lib/fragment_scatterer.hh b/test/lib/fragment_scatterer.hh index c1a8e6378d..89dd4c82f0 100644 --- a/test/lib/fragment_scatterer.hh +++ b/test/lib/fragment_scatterer.hh @@ -6,8 +6,8 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include "mutation.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation.hh" +#include "mutation/mutation_rebuilder.hh" // A StreamedMutationConsumer which distributes fragments randomly into several mutations. class fragment_scatterer { diff --git a/test/lib/mutation_assertions.hh b/test/lib/mutation_assertions.hh index aafb9cd3d8..7b4ffee105 100644 --- a/test/lib/mutation_assertions.hh +++ b/test/lib/mutation_assertions.hh @@ -10,11 +10,11 @@ #include -#include "mutation.hh" -#include "mutation_fragment_stream_validator.hh" +#include "mutation/mutation.hh" +#include "mutation/mutation_fragment_stream_validator.hh" #include "log.hh" #include "clustering_interval_set.hh" -#include "mutation_partition_v2.hh" +#include "mutation/mutation_partition_v2.hh" extern logging::logger testlog; diff --git a/test/lib/mutation_source_test.cc b/test/lib/mutation_source_test.cc index b5ae6b08f6..8e1b416732 100644 --- a/test/lib/mutation_source_test.cc +++ b/test/lib/mutation_source_test.cc @@ -14,12 +14,12 @@ #include "test/lib/mutation_source_test.hh" #include "readers/mutation_source.hh" #include "counters.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_rebuilder.hh" #include "test/lib/simple_schema.hh" #include "readers/flat_mutation_reader_v2.hh" #include "test/lib/flat_mutation_reader_assertions.hh" #include "mutation_query.hh" -#include "mutation_rebuilder.hh" +#include "mutation/mutation_rebuilder.hh" #include "test/lib/random_utils.hh" #include "cql3/cql3_type.hh" #include "test/lib/make_random_string.hh" diff --git a/test/lib/random_schema.cc b/test/lib/random_schema.cc index a8445249c1..44bb89c314 100644 --- a/test/lib/random_schema.cc +++ b/test/lib/random_schema.cc @@ -11,8 +11,8 @@ #include #include "cql3/cql3_type.hh" -#include "mutation.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation.hh" +#include "mutation/mutation_fragment.hh" #include "schema_builder.hh" #include "test/lib/random_schema.hh" #include "test/lib/random_utils.hh" diff --git a/test/lib/simple_schema.hh b/test/lib/simple_schema.hh index 3771fd0169..4938470929 100644 --- a/test/lib/simple_schema.hh +++ b/test/lib/simple_schema.hh @@ -15,13 +15,13 @@ #include "schema.hh" #include "schema_registry.hh" #include "keys.hh" -#include "mutation_fragment.hh" -#include "mutation.hh" +#include "mutation/mutation_fragment.hh" +#include "mutation/mutation.hh" #include "schema_builder.hh" #include "reader_permit.hh" #include "types/map.hh" #include "test/lib/key_utils.hh" -#include "atomic_cell_or_collection.hh" +#include "mutation/atomic_cell_or_collection.hh" // Helper for working with the following table: // diff --git a/test/manual/enormous_table_scan_test.cc b/test/manual/enormous_table_scan_test.cc index 126c5952a2..b3450a2724 100644 --- a/test/manual/enormous_table_scan_test.cc +++ b/test/manual/enormous_table_scan_test.cc @@ -22,7 +22,7 @@ #include "clustering_bounds_comparator.hh" #include "dht/i_partitioner.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" #include "partition_range_compat.hh" #include "range.hh" #include "sstables/sstables.hh" diff --git a/test/manual/partition_data_test.cc b/test/manual/partition_data_test.cc index 8acd552d1c..74e60d46ee 100644 --- a/test/manual/partition_data_test.cc +++ b/test/manual/partition_data_test.cc @@ -16,7 +16,7 @@ #include "test/lib/random_utils.hh" #include "utils/disk-error-handler.hh" -#include "atomic_cell.hh" +#include "mutation/atomic_cell.hh" #include "types.hh" BOOST_AUTO_TEST_CASE(test_atomic_cell) { diff --git a/test/perf/memory_footprint_test.cc b/test/perf/memory_footprint_test.cc index 553f22eba6..900de7db8c 100644 --- a/test/perf/memory_footprint_test.cc +++ b/test/perf/memory_footprint_test.cc @@ -16,10 +16,10 @@ #include "schema_builder.hh" #include "replica/memtable.hh" #include "row_cache.hh" -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "test/lib/tmpdir.hh" #include "sstables/sstables.hh" -#include "canonical_mutation.hh" +#include "mutation/canonical_mutation.hh" #include "test/lib/sstable_utils.hh" #include "test/lib/test_services.hh" #include "test/lib/sstable_test_env.hh" diff --git a/test/perf/perf_idl.cc b/test/perf/perf_idl.cc index 9638eb8a35..2a48549a9b 100644 --- a/test/perf/perf_idl.cc +++ b/test/perf/perf_idl.cc @@ -11,8 +11,8 @@ #include "test/lib/simple_schema.hh" #include "test/perf/perf.hh" -#include "frozen_mutation.hh" -#include "mutation_partition_view.hh" +#include "mutation/frozen_mutation.hh" +#include "mutation/mutation_partition_view.hh" namespace tests { diff --git a/test/perf/perf_mutation_fragment.cc b/test/perf/perf_mutation_fragment.cc index 588b8fb23c..73d19e727b 100644 --- a/test/perf/perf_mutation_fragment.cc +++ b/test/perf/perf_mutation_fragment.cc @@ -11,7 +11,7 @@ #include "test/lib/simple_schema.hh" #include "test/perf/perf.hh" -#include "mutation_fragment.hh" +#include "mutation/mutation_fragment.hh" namespace tests { diff --git a/thrift/handler.cc b/thrift/handler.cc index 3b96663c83..348715ead9 100644 --- a/thrift/handler.cc +++ b/thrift/handler.cc @@ -18,7 +18,7 @@ #include "data_dictionary/data_dictionary.hh" #include #include -#include "frozen_mutation.hh" +#include "mutation/frozen_mutation.hh" #include "utils/UUID_gen.hh" #include #include @@ -36,7 +36,7 @@ #include "cql3/query_processor.hh" #include "cql3/column_identifier.hh" #include "timeout_config.hh" -#include "mutation.hh" +#include "mutation/mutation.hh" #include #include #include diff --git a/types.cc b/types.cc index 046adacbf6..6a428ba61f 100644 --- a/types.cc +++ b/types.cc @@ -46,7 +46,7 @@ #include "utils/ascii.hh" #include "utils/fragment_range.hh" #include "utils/managed_bytes.hh" -#include "mutation_partition.hh" +#include "mutation/mutation_partition.hh" #include "types/user.hh" #include "types/tuple.hh"