Introduce schema/ module

Schema related files are moved there. This excludes schema files that
also interact with mutations, because the mutation module depends on
the schema. Those files will have to go into a separate module.

Closes #12858

CMakeLists.txt

@@ -252,7 +252,6 @@ set(scylla_sources
     auth/standard_role_manager.cc
     auth/transitional.cc
     bytes.cc
-    caching_options.cc
     cdc/cdc_partitioner.cc
     cdc/generation.cc
     cdc/log.cc
@@ -398,9 +397,10 @@ set(scylla_sources
     replica/database.cc
     replica/table.cc
     row_cache.cc
-    schema.cc
+    schema/caching_options.cc
+    schema/schema.cc
+    schema/schema_registry.cc
     schema_mutations.cc
-    schema_registry.cc
     serializer.cc
     service/client_state.cc
     service/forward_service.cc

alternator/executor.cc

@@ -13,12 +13,12 @@
 #include <seastar/core/sleep.hh>
 #include "alternator/executor.hh"
 #include "log.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "data_dictionary/keyspace_metadata.hh"
 #include "exceptions/exceptions.hh"
 #include "timestamp.hh"
 #include "types/map.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "query-request.hh"
 #include "query-result-reader.hh"
 #include "cql3/selection/selection.hh"
@@ -41,7 +41,7 @@
 #include <boost/algorithm/cxx11/any_of.hpp>
 #include "collection_mutation.hh"
 #include "db/query_context.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "db/tags/extension.hh"
 #include "db/tags/utils.hh"
 #include "alternator/rmw_operation.hh"
@@ -51,7 +51,7 @@
 #include <unordered_set>
 #include "service/storage_proxy.hh"
 #include "gms/gossiper.hh"
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 #include "utils/error_injection.hh"
 #include "db/schema_tables.hh"
 #include "utils/rjson.hh"

alternator/serialization.hh

@@ -12,7 +12,7 @@
 #include <string_view>
 #include <optional>
 #include "types.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "keys.hh"
 #include "utils/rjson.hh"
 #include "utils/big_decimal.hh"

alternator/streams.cc

@@ -27,7 +27,7 @@
 #include "cql3/result_set.hh"
 #include "cql3/type_json.hh"
 #include "cql3/column_identifier.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "service/storage_proxy.hh"
 #include "gms/feature.hh"
 #include "gms/feature_service.hh"

auth/common.cc

@@ -14,7 +14,7 @@
 #include "cql3/query_processor.hh"
 #include "cql3/statements/create_table_statement.hh"
 #include "replica/database.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "service/migration_manager.hh"
 #include "timeout_config.hh"
 

cdc/cdc_extension.hh

@@ -15,7 +15,7 @@
 #include "serializer.hh"
 #include "db/extensions.hh"
 #include "cdc/cdc_options.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "serializer_impl.hh"
 
 namespace cdc {

cdc/cdc_partitioner.cc

@@ -8,7 +8,7 @@
 
 #include "cdc_partitioner.hh"
 #include "dht/token.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "sstables/key.hh"
 #include "utils/class_registrator.hh"
 #include "cdc/generation.hh"

cdc/generation.cc

@@ -14,7 +14,7 @@
 #include <seastar/core/coroutine.hh>
 
 #include "keys.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "replica/database.hh"
 #include "db/system_keyspace.hh"
 #include "db/system_distributed_keyspace.hh"

cdc/log.cc

@@ -25,8 +25,8 @@
 #include "replica/database.hh"
 #include "db/schema_tables.hh"
 #include "partition_slice_builder.hh"
-#include "schema.hh"
-#include "schema_builder.hh"
+#include "schema/schema.hh"
+#include "schema/schema_builder.hh"
 #include "service/migration_listener.hh"
 #include "service/storage_proxy.hh"
 #include "types/tuple.hh"

cdc/split.cc

@@ -7,7 +7,7 @@
  */
 
 #include "mutation/mutation.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 
 #include "concrete_types.hh"
 #include "types/user.hh"

cdc/split.hh

@@ -10,7 +10,7 @@
 
 #include <vector>
 #include <boost/dynamic_bitset.hpp>
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "replica/database_fwd.hh"
 #include "timestamp.hh"
 #include "bytes.hh"

clustering_bounds_comparator.hh

@@ -11,7 +11,7 @@
 
 #include <functional>
 #include "keys.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "range.hh"
 
 /**

clustering_interval_set.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "mutation/position_in_partition.hh"
 #include <boost/icl/interval_set.hpp>
 

clustering_key_filter.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "query-request.hh"
 
 namespace query {

clustering_ranges_walker.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "query-request.hh"
 #include "mutation/mutation_fragment.hh"
 #include "mutation/mutation_fragment_v2.hh"

collection_mutation.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "utils/chunked_vector.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "gc_clock.hh"
 #include "mutation/atomic_cell.hh"
 #include <iosfwd>

compaction/compaction.cc

@@ -35,7 +35,7 @@
 #include "sstables/sstables_manager.hh"
 #include "compaction.hh"
 #include "compaction_manager.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "db/system_keyspace.hh"
 #include "service/priority_manager.hh"
 #include "db_clock.hh"

compaction/compaction_garbage_collector.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 class atomic_cell;
 class row_marker;

compaction/compaction_strategy.cc

@@ -16,7 +16,7 @@
 #include "compaction.hh"
 #include "compaction_strategy.hh"
 #include "compaction_strategy_impl.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "sstables/sstable_set.hh"
 #include <boost/range/algorithm/find.hpp>
 #include <boost/range/algorithm/remove_if.hpp>

compaction/compaction_strategy.hh

@@ -12,7 +12,7 @@
 #include <seastar/util/noncopyable_function.hh>
 #include <seastar/core/file.hh>
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "sstables/shared_sstable.hh"
 #include "exceptions/exceptions.hh"
 #include "compaction_strategy_type.hh"

compaction/table_state.hh

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "compaction_descriptor.hh"
 
 class reader_permit;

compound_compat.hh

@@ -12,7 +12,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <compare>
 #include "compound.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "sstables/version.hh"
 #include "log.hh"
 

configure.py

@@ -673,14 +673,14 @@ scylla_core = (['message/messaging_service.cc',
                 'mutation/range_tombstone.cc',
                 'mutation/range_tombstone_list.cc',
                 'absl-flat_hash_map.cc',
-                'caching_options.cc',
                 'collection_mutation.cc',
                 'client_data.cc',
                 'debug.cc',
                 'hashers.cc',
-                'schema.cc',
+                'schema/caching_options.cc',
+                'schema/schema.cc',
+                'schema/schema_registry.cc',
                 'frozen_schema.cc',
-                'schema_registry.cc',
                 'bytes.cc',
                 'timeout_config.cc',
                 'row_cache.cc',

converting_mutation_partition_applier.cc

@@ -11,7 +11,7 @@
 
 #include "mutation/mutation_partition_view.hh"
 #include "mutation/mutation_partition.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 
 bool
 converting_mutation_partition_applier::is_compatible(const column_definition& new_def, const abstract_type& old_type, column_kind kind) {

converting_mutation_partition_applier.hh

@@ -10,7 +10,7 @@
 
 #include "mutation/mutation_partition_visitor.hh"
 #include "mutation/atomic_cell.hh"
-#include "schema.hh" // temporary: bring in definition of `column_kind`
+#include "schema/schema.hh" // temporary: bring in definition of `column_kind`
 
 class schema;
 class row;

cql3/column_identifier.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema/schema.hh"
 
 #include <algorithm>
 #include <functional>

cql3/restrictions/statement_restrictions.hh

@@ -16,7 +16,7 @@
 #include "cql3/expr/expression.hh"
 #include "cql3/expr/restrictions.hh"
 #include "to_string.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "cql3/prepare_context.hh"
 #include "cql3/statements/statement_type.hh"
 #include "query-request.hh"

cql3/selection/selectable.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include <seastar/core/shared_ptr.hh>
 #include "cql3/selection/selector.hh"
 #include "cql3/cql3_type.hh"

cql3/selection/selection.hh

@@ -11,7 +11,7 @@
 #pragma once
 
 #include "bytes.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "query-result-reader.hh"
 #include "cql3/column_specification.hh"
 #include "cql3/selection/selector.hh"

cql3/selection/selector.hh

@@ -14,7 +14,7 @@
 #include "cql3/assignment_testable.hh"
 #include "query-request.hh"
 #include "types.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "counters.hh"
 
 namespace cql3 {

cql3/selection/selector_factories.hh

@@ -14,7 +14,7 @@
 #include <stdexcept>
 #include <vector>
 #include "cql3/selection/selector.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "query-request.hh"
 
 namespace cql3 {

cql3/statements/alter_type_statement.cc

@@ -12,7 +12,7 @@
 #include "cql3/query_processor.hh"
 #include "cql3/column_identifier.hh"
 #include "prepared_statement.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "mutation/mutation.hh"
 #include "service/migration_manager.hh"
 #include "service/storage_proxy.hh"

cql3/statements/alter_type_statement.hh

@@ -14,7 +14,7 @@
 #include "cql3/cql3_type.hh"
 #include "cql3/ut_name.hh"
 #include "data_dictionary/data_dictionary.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 
 namespace service {
 class migration_manager;

cql3/statements/cf_prop_defs.hh

@@ -12,7 +12,7 @@
 
 #include "cql3/statements/property_definitions.hh"
  
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "compaction/compaction_strategy.hh"
 #include "utils/UUID.hh"
 

cql3/statements/create_index_statement.cc

@@ -15,8 +15,8 @@
 #include "validation.hh"
 #include "service/storage_proxy.hh"
 #include "service/migration_manager.hh"
-#include "schema.hh"
-#include "schema_builder.hh"
+#include "schema/schema.hh"
+#include "schema/schema_builder.hh"
 #include "request_validations.hh"
 #include "data_dictionary/data_dictionary.hh"
 #include "index/target_parser.hh"

cql3/statements/create_index_statement.hh

@@ -13,7 +13,7 @@
 #include "schema_altering_statement.hh"
 #include "index_target.hh"
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 #include <seastar/core/shared_ptr.hh>
 

cql3/statements/create_table_statement.cc

@@ -22,7 +22,7 @@
 
 #include "auth/resource.hh"
 #include "auth/service.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "db/extensions.hh"
 #include "data_dictionary/data_dictionary.hh"
 #include "types/user.hh"

cql3/statements/create_table_statement.hh

@@ -15,7 +15,7 @@
 #include "cql3/statements/raw/cf_statement.hh"
 #include "cql3/cql3_type.hh"
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 #include <seastar/core/shared_ptr.hh>
 

cql3/statements/create_view_statement.cc

@@ -29,7 +29,7 @@
 #include "cql3/selection/writetime_or_ttl.hh"
 #include "cql3/query_processor.hh"
 #include "cql3/util.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "service/storage_proxy.hh"
 #include "validation.hh"
 #include "db/extensions.hh"

cql3/statements/drop_index_statement.cc

@@ -13,7 +13,7 @@
 #include "cql3/statements/prepared_statement.hh"
 #include "service/migration_manager.hh"
 #include "service/storage_proxy.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "data_dictionary/data_dictionary.hh"
 #include "mutation/mutation.hh"
 #include "gms/feature_service.hh"

cql3/statements/drop_index_statement.hh

@@ -16,7 +16,7 @@
 #include <optional>
 #include <memory>
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 namespace cql3 {
 

cql3/update_parameters.hh

@@ -12,7 +12,7 @@
 
 #include "gc_clock.hh"
 #include "timestamp.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "mutation/atomic_cell.hh"
 #include "mutation/tombstone.hh"
 #include "exceptions/exceptions.hh"

data_dictionary/data_dictionary.cc

@@ -10,7 +10,7 @@
 #include "impl.hh"
 #include "user_types_metadata.hh"
 #include "keyspace_metadata.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "utils/overloaded_functor.hh"
 #include "cql3/util.hh"
 #include <fmt/core.h>

data_dictionary/data_dictionary.hh

@@ -14,7 +14,7 @@
 #include <vector>
 #include <seastar/core/shared_ptr.hh>
 #include "seastarx.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 namespace replica {
 class database; // For transition; remove

data_dictionary/keyspace_metadata.hh

@@ -13,7 +13,7 @@
 #include <iosfwd>
 #include <seastar/core/sstring.hh>
 
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "locator/abstract_replication_strategy.hh"
 #include "data_dictionary/user_types_metadata.hh"
 #include "data_dictionary/storage_options.hh"

db/batchlog_manager.cc

@@ -29,7 +29,7 @@
 #include "unimplemented.hh"
 #include "gms/failure_detector.hh"
 #include "gms/gossiper.hh"
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 #include "idl/frozen_schema.dist.hh"
 #include "idl/frozen_schema.dist.impl.hh"
 #include "db/schema_tables.hh"

db/commitlog/commitlog_entry.hh

@@ -12,7 +12,7 @@
 
 #include "commitlog_types.hh"
 #include "mutation/frozen_mutation.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 class commitlog_entry {
     std::optional<column_mapping> _mapping;

db/commitlog/commitlog_replayer.cc

@@ -23,7 +23,7 @@
 #include "db/system_keyspace.hh"
 #include "log.hh"
 #include "converting_mutation_partition_applier.hh"
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 #include "commitlog_entry.hh"
 #include "service/priority_manager.hh"
 #include "db/extensions.hh"

db/commitlog/replay_position.hh

@@ -11,7 +11,7 @@
 
 #include <stdint.h>
 #include <seastar/core/shared_ptr.hh>
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "utils/hash.hh"
 #include "sstables/version.hh"
 

db/consistency_level.cc

@@ -16,7 +16,7 @@
 #include <boost/range/algorithm/transform.hpp>
 #include "exceptions/exceptions.hh"
 #include <seastar/core/sstring.hh>
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "replica/database.hh"
 #include "unimplemented.hh"
 #include "db/read_repair_decision.hh"

db/data_listeners.hh

@@ -14,10 +14,10 @@
 #include <seastar/core/weak_ptr.hh>
 
 #include "utils/hash.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "readers/flat_mutation_reader_v2.hh"
 #include "utils/top_k.hh"
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 
 #include <vector>
 #include <set>

db/extensions.cc

@@ -10,7 +10,7 @@
 #include "extensions.hh"
 #include "sstables/sstables.hh"
 #include "commitlog/commitlog_extensions.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 

db/extensions.hh

@@ -19,7 +19,7 @@
 #include <seastar/core/sstring.hh>
 
 #include "bytes.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 namespace sstables {
 class file_io_extension;

db/large_data_handler.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <cstdint>
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "system_keyspace.hh"
 #include "sstables/shared_sstable.hh"
 #include "utils/updateable_value.hh"

db/legacy_schema_migrator.cc

@@ -29,7 +29,7 @@
 #include "legacy_schema_migrator.hh"
 #include "system_keyspace.hh"
 #include "schema_tables.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "service/storage_proxy.hh"
 #include "utils/rjson.hh"
 #include "utils/fmt-compat.hh"

db/paxos_grace_seconds_extension.hh

@@ -8,7 +8,7 @@
 #pragma once
 
 #include "serializer.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "log.hh"
 
 extern logging::logger dblog;

db/per_partition_rate_limit_extension.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "db/per_partition_rate_limit_options.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "serializer.hh"
 
 namespace db {

db/per_partition_rate_limit_options.cc

@@ -10,7 +10,7 @@
 #include <boost/range/adaptor/map.hpp>
 
 #include "serializer.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "log.hh"
 
 namespace db {

db/schema_tables.cc

@@ -18,13 +18,13 @@
 #include "query_context.hh"
 #include "query-result-set.hh"
 #include "query-result-writer.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "map_difference.hh"
 #include "utils/UUID_gen.hh"
 #include <seastar/coroutine/all.hh>
 #include "log.hh"
 #include "frozen_schema.hh"
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 #include "mutation_query.hh"
 #include "system_keyspace.hh"
 #include "system_distributed_keyspace.hh"

db/schema_tables.hh

@@ -11,7 +11,7 @@
 
 #include "mutation/mutation.hh"
 #include "db/commitlog/replay_position.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "schema_features.hh"
 #include "hashing.hh"
 #include "schema_mutations.hh"

db/system_distributed_keyspace.cc

@@ -12,7 +12,7 @@
 #include "replica/database.hh"
 #include "db/consistency_level_type.hh"
 #include "db/system_keyspace.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "timeout_config.hh"
 #include "types.hh"
 #include "types/tuple.hh"

db/system_distributed_keyspace.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "bytes.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "service/qos/qos_common.hh"
 #include "utils/UUID.hh"
 #include "cdc/generation_id.hh"

db/system_keyspace.cc

@@ -36,7 +36,7 @@
 #include "db/config.hh"
 #include "gms/feature_service.hh"
 #include "system_keyspace_view_types.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "hashers.hh"
 #include "release.hh"
 #include "log.hh"

db/system_keyspace.hh

@@ -13,7 +13,7 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "utils/UUID.hh"
 #include "gms/inet_address.hh"
 #include "query-result-set.hh"

db/tags/extension.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "serializer.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "db/extensions.hh"
 
 namespace db {

db/tags/utils.cc

@@ -9,8 +9,8 @@
 #include "db/tags/utils.hh"
 
 #include "db/tags/extension.hh"
-#include "schema_builder.hh"
-#include "schema_registry.hh"
+#include "schema/schema_builder.hh"
+#include "schema/schema_registry.hh"
 
 namespace db {
 

db/tags/utils.hh

@@ -15,7 +15,7 @@
 #include <seastar/core/sstring.hh>
 #include "seastarx.hh"
 
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "service/client_state.hh"
 #include "service/migration_manager.hh"
 

db/view/build_progress_virtual_reader.hh

@@ -13,7 +13,7 @@
 #include "readers/flat_mutation_reader_v2.hh"
 #include "mutation/mutation_fragment.hh"
 #include "query-request.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "tracing/tracing.hh"
 
 #include <boost/range/iterator_range.hpp>

db/view/row_locking.hh

@@ -26,7 +26,7 @@
 #include <seastar/core/future.hh>
 
 #include "db/timeout_clock.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "dht/i_partitioner.hh"
 #include "query-request.hh"
 #include "utils/estimated_histogram.hh"

db/view/view.hh

@@ -11,7 +11,7 @@
 #include "dht/i_partitioner.hh"
 #include "gc_clock.hh"
 #include "query-request.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "readers/flat_mutation_reader_v2.hh"
 #include "mutation/frozen_mutation.hh"
 

db/view/view_updating_consumer.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "dht/i_partitioner.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "mutation/mutation_fragment.hh"
 #include "sstables/shared_sstable.hh"
 #include "reader_permit.hh"

db/virtual_table.hh

@@ -10,7 +10,7 @@
 
 #include "readers/filtering.hh"
 #include "replica/memtable.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "replica/database_fwd.hh"
 
 namespace db {

frozen_schema.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "mutation/frozen_mutation.hh"
 #include "bytes_ostream.hh"
 

hashing_partition_visitor.hh

@@ -10,7 +10,7 @@
 
 #include "mutation/mutation_partition_visitor.hh"
 #include "hashing.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "mutation/atomic_cell_hash.hh"
 #include "keys.hh"
 #include "counters.hh"

idl/uuid.idl.hh

@@ -7,7 +7,7 @@
  */
 
 #include "utils/UUID.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "query-request.hh"
 #include "locator/host_id.hh"
 #include "tasks/types.hh"

index/built_indexes_virtual_reader.hh

@@ -11,7 +11,7 @@
 #include "readers/flat_mutation_reader_v2.hh"
 #include "mutation/mutation_fragment_v2.hh"
 #include "query-request.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "secondary_index_manager.hh"
 #include "tracing/tracing.hh"
 #include "view_info.hh"

index/secondary_index_manager.cc

@@ -17,7 +17,7 @@
 #include "cql3/expr/expression.hh"
 #include "index/target_parser.hh"
 #include "db/query_context.hh"
-#include "schema_builder.hh"
+#include "schema/schema_builder.hh"
 #include "replica/database.hh"
 #include "db/view/view.hh"
 #include "concrete_types.hh"

index/secondary_index_manager.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema/schema.hh"
 
 #include "data_dictionary/data_dictionary.hh"
 #include "cql3/statements/index_target.hh"

keys.hh

@@ -14,7 +14,7 @@
 #include "utils/managed_bytes.hh"
 #include "hashing.hh"
 #include "replica/database_fwd.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include <compare>
 
 //

message/messaging_service.hh

@@ -19,7 +19,7 @@
 #include <unordered_map>
 #include "range.hh"
 #include "tracing/tracing.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "streaming/stream_fwd.hh"
 
 #include <list>

multishard_mutation_query.cc

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 #include "service/priority_manager.hh"
 #include "multishard_mutation_query.hh"
 #include "mutation_query.hh"

multishard_mutation_query.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "replica/database_fwd.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "cache_temperature.hh"
 #include "db/timeout_clock.hh"
 #include "dht/i_partitioner.hh"

mutation/atomic_cell_or_collection.hh

@@ -10,7 +10,7 @@
 
 #include "atomic_cell.hh"
 #include "collection_mutation.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 
 // A variant type that can hold either an atomic_cell, or a serialized collection.
 // Which type is stored is determined by the schema.

mutation/canonical_mutation.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "bytes.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "replica/database_fwd.hh"
 #include "bytes_ostream.hh"
 #include <iosfwd>

mutation/frozen_mutation.cc

@@ -8,7 +8,7 @@
 
 #include <seastar/core/coroutine.hh>
 #include "frozen_mutation.hh"
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 #include "mutation_partition.hh"
 #include "mutation.hh"
 #include "counters.hh"

mutation/frozen_mutation.hh

@@ -15,7 +15,7 @@
 #include "mutation_partition_view.hh"
 #include "mutation_consumer_concepts.hh"
 #include "range_tombstone_change_generator.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 
 class mutation;
 class flat_mutation_reader_v2;

mutation/mutation.hh

@@ -12,7 +12,7 @@
 
 #include "mutation_partition.hh"
 #include "keys.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "dht/i_partitioner.hh"
 #include "hashing.hh"
 #include "mutation_fragment_v2.hh"

mutation/mutation_partition.hh

@@ -18,7 +18,7 @@
 #include <seastar/core/bitset-iter.hh>
 #include <seastar/util/optimized_optional.hh>
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "tombstone.hh"
 #include "keys.hh"
 #include "position_in_partition.hh"

mutation/mutation_partition_view.cc

@@ -11,7 +11,7 @@
 #include <seastar/coroutine/maybe_yield.hh>
 
 #include "mutation_partition_view.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "atomic_cell.hh"
 #include "utils/data_input.hh"
 #include "mutation_partition_serializer.hh"

mutation/mutation_partition_visitor.hh

@@ -10,7 +10,7 @@
 
 #include <seastar/util/bool_class.hh>
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 class atomic_cell_view;
 class collection_mutation_view;

mutation_writer/multishard_writer.cc

@@ -8,7 +8,7 @@
 
 #include "mutation_writer/multishard_writer.hh"
 #include "mutation/mutation_fragment_v2.hh"
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 #include "reader_concurrency_semaphore.hh"
 #include "readers/foreign.hh"
 #include "readers/queue.hh"

mutation_writer/multishard_writer.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "readers/flat_mutation_reader_v2.hh"
 #include "dht/i_partitioner.hh"
 #include "utils/phased_barrier.hh"

partition_builder.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "mutation/mutation_partition.hh"
 #include "mutation/mutation_partition_visitor.hh"
 #include "mutation/tombstone.hh"

partition_slice_builder.hh

@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "query-request.hh"
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 
 //
 // Fluent builder for query::partition_slice.

querier.cc

@@ -10,7 +10,7 @@
 
 #include "querier.hh"
 
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "log.hh"
 
 #include <boost/range/adaptor/map.hpp>

query-result-set.hh

@@ -11,7 +11,7 @@
 
 #include <seastar/core/shared_ptr.hh>
 #include "types.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 
 #include <optional>
 #include <stdexcept>

query.cc

@@ -21,7 +21,7 @@
 #include "query-result-reader.hh"
 #include "query_result_merger.hh"
 #include "partition_slice_builder.hh"
-#include "schema_registry.hh"
+#include "schema/schema_registry.hh"
 #include "utils/overloaded_functor.hh"
 
 namespace query {

query_ranges_to_vnodes.hh

@@ -10,7 +10,7 @@
 
 #include "dht/i_partitioner.hh"
 #include "locator/token_metadata.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 
 class query_ranges_to_vnodes_generator {
     schema_ptr _s;

read_context.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "schema_fwd.hh"
+#include "schema/schema_fwd.hh"
 #include "query-request.hh"
 #include "partition_slice_builder.hh"
 #include "mutation/mutation_fragment.hh"

reader_concurrency_semaphore.cc

@@ -16,7 +16,7 @@
 
 #include "reader_concurrency_semaphore.hh"
 #include "utils/exceptions.hh"
-#include "schema.hh"
+#include "schema/schema.hh"
 #include "utils/human_readable.hh"
 
 logger rcslog("reader_concurrency_semaphore");