Introduce mutation/ module

Move mutation-related files to a new mutation/ directory. The names
are kept in the global namespace to reduce churn; the names are
unambiguous in any case.

mutation_reader remains in the readers/ module.

mutation_partition_v2.cc was missing from CMakeLists.txt; it's added in this
patch.

This is a step forward towards librarization or modularization of the
source base.

Closes #12788

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

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");
 

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"

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 {
 

cache_flat_mutation_reader.hh

@@ -10,10 +10,10 @@
 
 #include <vector>
 #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"

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,

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"

cell_locking.hh

@@ -11,7 +11,7 @@
 #include <boost/intrusive/unordered_set.hpp>
 
 #include "utils/small_vector.hh"
-#include "mutation_partition.hh"
+#include "mutation/mutation_partition.hh"
 #include "xx_hasher.hh"
 
 #include "db/timeout_clock.hh"

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 <boost/icl/interval_set.hpp>
 
 // Represents a non-contiguous subset of clustering_key domain of a particular schema.

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 {

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"
 

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 <iosfwd>
 #include <forward_list>
 

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"

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 <boost/range/algorithm/find.hpp>
 #include <boost/range/algorithm/remove_if.hpp>

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',

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

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;

counters.cc

@@ -7,7 +7,7 @@
  */
 
 #include "counters.hh"
-#include "mutation.hh"
+#include "mutation/mutation.hh"
 #include "combine.hh"
 
 #include <boost/range/algorithm/sort.hpp>

counters.hh

@@ -12,7 +12,7 @@
 #include <boost/range/algorithm/find_if.hpp>
 #include <boost/range/numeric.hpp>
 
-#include "atomic_cell.hh"
+#include "mutation/atomic_cell.hh"
 #include "types.hh"
 #include "locator/host_id.hh"
 

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 <seastar/core/shared_ptr.hh>
 
 namespace service::broadcast_tables {

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"

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 <seastar/core/sleep.hh>

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"
 

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 <boost/range/adaptor/transformed.hpp>
 #include <boost/algorithm/string/join.hpp>

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"

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 {
 

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 {

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 {
 

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 {
 

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"

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 {
 

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 {
 

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 {
 

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"

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"

db/batchlog_manager.cc

@@ -20,7 +20,7 @@
 #include <boost/range/adaptor/sliced.hpp>
 
 #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"

db/batchlog_manager.hh

@@ -20,7 +20,7 @@
 #include <seastar/core/abort_source.hh>
 
 #include "db_clock.hh"
-#include "mutation.hh"
+#include "mutation/mutation.hh"
 #include "utils/UUID.hh"
 
 #include <chrono>

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 <seastar/core/metrics_registration.hh>
 

db/commitlog/commitlog_entry.hh

@@ -11,7 +11,7 @@
 #include <optional>
 
 #include "commitlog_types.hh"
-#include "frozen_mutation.hh"
+#include "mutation/frozen_mutation.hh"
 #include "schema_fwd.hh"
 
 class commitlog_entry {

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");
 

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"
 

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"

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"
 

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"

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"

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;
 

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 <seastar/core/abort_source.hh>
 #include <seastar/core/circular_buffer.hh>
-#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;

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"

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 {

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;
 

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

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"
 

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"

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"

message/messaging_service.cc

@@ -21,7 +21,7 @@
 #include "query-request.hh"
 #include "query-result.hh"
 #include <seastar/rpc/rpc.hh>
-#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 <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/indirected.hpp>
-#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"

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 <seastar/net//byteorder.hh>

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 <boost/range/algorithm/upper_bound.hpp>
 

mutation/range_tombstone.hh

@@ -12,9 +12,9 @@
 #include <optional>
 #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;
 

mutation/range_tombstone_assembler.hh

@@ -11,7 +11,7 @@
 #include <exception>
 #include <seastar/core/print.hh>
 
-#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().

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<typename T>

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<typename T>
 concept SplitterFragmentConsumer = std::invocable<T, mutation_fragment>;

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"
 

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;

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"