diff --git a/CMakeLists.txt b/CMakeLists.txt index bdcbe99463..180c7e1dbe 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/alternator/executor.cc b/alternator/executor.cc index 85a138232c..6ed9e86c3e 100644 --- a/alternator/executor.cc +++ b/alternator/executor.cc @@ -13,12 +13,12 @@ #include #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 #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 #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" diff --git a/alternator/serialization.hh b/alternator/serialization.hh index 9a0863a9f7..dc81f1ebf7 100644 --- a/alternator/serialization.hh +++ b/alternator/serialization.hh @@ -12,7 +12,7 @@ #include #include #include "types.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "keys.hh" #include "utils/rjson.hh" #include "utils/big_decimal.hh" diff --git a/alternator/streams.cc b/alternator/streams.cc index 94ea9aaa27..3d75de0ccf 100644 --- a/alternator/streams.cc +++ b/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" diff --git a/auth/common.cc b/auth/common.cc index 380677a1e2..00784aa503 100644 --- a/auth/common.cc +++ b/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" diff --git a/cdc/cdc_extension.hh b/cdc/cdc_extension.hh index 978773a52d..bc20d4339b 100644 --- a/cdc/cdc_extension.hh +++ b/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 { diff --git a/cdc/cdc_partitioner.cc b/cdc/cdc_partitioner.cc index 69166a4a93..8fd133fe48 100644 --- a/cdc/cdc_partitioner.cc +++ b/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" diff --git a/cdc/generation.cc b/cdc/generation.cc index e49b5832fe..b77eebd8ea 100644 --- a/cdc/generation.cc +++ b/cdc/generation.cc @@ -14,7 +14,7 @@ #include #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" diff --git a/cdc/log.cc b/cdc/log.cc index aa8cc8f7c9..48fda0e43a 100644 --- a/cdc/log.cc +++ b/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" diff --git a/cdc/split.cc b/cdc/split.cc index f3e9df0e20..cabb6903b9 100644 --- a/cdc/split.cc +++ b/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" diff --git a/cdc/split.hh b/cdc/split.hh index b0f637a5cd..2fadd7178c 100644 --- a/cdc/split.hh +++ b/cdc/split.hh @@ -10,7 +10,7 @@ #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "replica/database_fwd.hh" #include "timestamp.hh" #include "bytes.hh" diff --git a/clustering_bounds_comparator.hh b/clustering_bounds_comparator.hh index 2944f788b2..694b2ad5e8 100644 --- a/clustering_bounds_comparator.hh +++ b/clustering_bounds_comparator.hh @@ -11,7 +11,7 @@ #include #include "keys.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "range.hh" /** diff --git a/clustering_interval_set.hh b/clustering_interval_set.hh index ec9d411800..fd7e6263b4 100644 --- a/clustering_interval_set.hh +++ b/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 diff --git a/clustering_key_filter.hh b/clustering_key_filter.hh index a670c0b130..4ad611c2f3 100644 --- a/clustering_key_filter.hh +++ b/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 { diff --git a/clustering_ranges_walker.hh b/clustering_ranges_walker.hh index 83b49b3550..5636be57c7 100644 --- a/clustering_ranges_walker.hh +++ b/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" diff --git a/collection_mutation.hh b/collection_mutation.hh index 2894bc65f2..1ad0cd6a6d 100644 --- a/collection_mutation.hh +++ b/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 diff --git a/compaction/compaction.cc b/compaction/compaction.cc index 5621231605..0d8a3c0e43 100644 --- a/compaction/compaction.cc +++ b/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" diff --git a/compaction/compaction_garbage_collector.hh b/compaction/compaction_garbage_collector.hh index 45eb7d3026..e59d95032b 100644 --- a/compaction/compaction_garbage_collector.hh +++ b/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; diff --git a/compaction/compaction_strategy.cc b/compaction/compaction_strategy.cc index ae35ef65b1..f626b04978 100644 --- a/compaction/compaction_strategy.cc +++ b/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 #include diff --git a/compaction/compaction_strategy.hh b/compaction/compaction_strategy.hh index 5d528b6e3e..a62a9250ce 100644 --- a/compaction/compaction_strategy.hh +++ b/compaction/compaction_strategy.hh @@ -12,7 +12,7 @@ #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "sstables/shared_sstable.hh" #include "exceptions/exceptions.hh" #include "compaction_strategy_type.hh" diff --git a/compaction/table_state.hh b/compaction/table_state.hh index 9821e58293..fa6c86e1f4 100644 --- a/compaction/table_state.hh +++ b/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; diff --git a/compound_compat.hh b/compound_compat.hh index 18e17f0503..edbfc9063c 100644 --- a/compound_compat.hh +++ b/compound_compat.hh @@ -12,7 +12,7 @@ #include #include #include "compound.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "sstables/version.hh" #include "log.hh" diff --git a/configure.py b/configure.py index f5d6755c60..271c34acd0 100755 --- a/configure.py +++ b/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', diff --git a/converting_mutation_partition_applier.cc b/converting_mutation_partition_applier.cc index ef8bcdc887..5ec8ed7f12 100644 --- a/converting_mutation_partition_applier.cc +++ b/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) { diff --git a/converting_mutation_partition_applier.hh b/converting_mutation_partition_applier.hh index dfd0f81c5f..0aaaad64fd 100644 --- a/converting_mutation_partition_applier.hh +++ b/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; diff --git a/cql3/column_identifier.hh b/cql3/column_identifier.hh index b7478470d2..4dd5718ed3 100644 --- a/cql3/column_identifier.hh +++ b/cql3/column_identifier.hh @@ -10,7 +10,7 @@ #pragma once -#include "schema.hh" +#include "schema/schema.hh" #include #include diff --git a/cql3/restrictions/statement_restrictions.hh b/cql3/restrictions/statement_restrictions.hh index d832f0a87d..a0542fafc0 100644 --- a/cql3/restrictions/statement_restrictions.hh +++ b/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" diff --git a/cql3/selection/selectable.hh b/cql3/selection/selectable.hh index 3bf0f31ca0..f5652807be 100644 --- a/cql3/selection/selectable.hh +++ b/cql3/selection/selectable.hh @@ -10,7 +10,7 @@ #pragma once -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include "cql3/selection/selector.hh" #include "cql3/cql3_type.hh" diff --git a/cql3/selection/selection.hh b/cql3/selection/selection.hh index 60c6fee98b..ac546337cb 100644 --- a/cql3/selection/selection.hh +++ b/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" diff --git a/cql3/selection/selector.hh b/cql3/selection/selector.hh index 768cb239df..57bf4e0682 100644 --- a/cql3/selection/selector.hh +++ b/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 { diff --git a/cql3/selection/selector_factories.hh b/cql3/selection/selector_factories.hh index ea3027c6a1..34fd6e8e8d 100644 --- a/cql3/selection/selector_factories.hh +++ b/cql3/selection/selector_factories.hh @@ -14,7 +14,7 @@ #include #include #include "cql3/selection/selector.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "query-request.hh" namespace cql3 { diff --git a/cql3/statements/alter_type_statement.cc b/cql3/statements/alter_type_statement.cc index 7d7bb44bfd..7d72ae5837 100644 --- a/cql3/statements/alter_type_statement.cc +++ b/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" diff --git a/cql3/statements/alter_type_statement.hh b/cql3/statements/alter_type_statement.hh index 14ea139bd6..194eb4bc91 100644 --- a/cql3/statements/alter_type_statement.hh +++ b/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; diff --git a/cql3/statements/cf_prop_defs.hh b/cql3/statements/cf_prop_defs.hh index 0f6f7e4e09..f9ab137fa3 100644 --- a/cql3/statements/cf_prop_defs.hh +++ b/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" diff --git a/cql3/statements/create_index_statement.cc b/cql3/statements/create_index_statement.cc index a239cecbbc..5299368843 100644 --- a/cql3/statements/create_index_statement.cc +++ b/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" diff --git a/cql3/statements/create_index_statement.hh b/cql3/statements/create_index_statement.hh index 0f1fa29cf8..806d2c28ee 100644 --- a/cql3/statements/create_index_statement.hh +++ b/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 diff --git a/cql3/statements/create_table_statement.cc b/cql3/statements/create_table_statement.cc index 8c247273ce..af955f5b40 100644 --- a/cql3/statements/create_table_statement.cc +++ b/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" diff --git a/cql3/statements/create_table_statement.hh b/cql3/statements/create_table_statement.hh index bf354a127f..5299d1653f 100644 --- a/cql3/statements/create_table_statement.hh +++ b/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 diff --git a/cql3/statements/create_view_statement.cc b/cql3/statements/create_view_statement.cc index 2f72db22b9..1cce45248c 100644 --- a/cql3/statements/create_view_statement.cc +++ b/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" diff --git a/cql3/statements/drop_index_statement.cc b/cql3/statements/drop_index_statement.cc index 0ec23424d0..be60fb8385 100644 --- a/cql3/statements/drop_index_statement.cc +++ b/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" diff --git a/cql3/statements/drop_index_statement.hh b/cql3/statements/drop_index_statement.hh index 1a7e7cf56a..950e4845c5 100644 --- a/cql3/statements/drop_index_statement.hh +++ b/cql3/statements/drop_index_statement.hh @@ -16,7 +16,7 @@ #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" namespace cql3 { diff --git a/cql3/update_parameters.hh b/cql3/update_parameters.hh index 79482bcf38..43e3b8cc4f 100644 --- a/cql3/update_parameters.hh +++ b/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" diff --git a/data_dictionary/data_dictionary.cc b/data_dictionary/data_dictionary.cc index ed4c8863e9..81dbb19913 100644 --- a/data_dictionary/data_dictionary.cc +++ b/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 diff --git a/data_dictionary/data_dictionary.hh b/data_dictionary/data_dictionary.hh index 61c4ab57d7..33f6baeeb2 100644 --- a/data_dictionary/data_dictionary.hh +++ b/data_dictionary/data_dictionary.hh @@ -14,7 +14,7 @@ #include #include #include "seastarx.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" namespace replica { class database; // For transition; remove diff --git a/data_dictionary/keyspace_metadata.hh b/data_dictionary/keyspace_metadata.hh index b68eaeafda..d0f6c26228 100644 --- a/data_dictionary/keyspace_metadata.hh +++ b/data_dictionary/keyspace_metadata.hh @@ -13,7 +13,7 @@ #include #include -#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" diff --git a/db/batchlog_manager.cc b/db/batchlog_manager.cc index 5845ea6391..c59e4969ad 100644 --- a/db/batchlog_manager.cc +++ b/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" diff --git a/db/commitlog/commitlog_entry.hh b/db/commitlog/commitlog_entry.hh index b913e3c3a8..b3c994935b 100644 --- a/db/commitlog/commitlog_entry.hh +++ b/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 _mapping; diff --git a/db/commitlog/commitlog_replayer.cc b/db/commitlog/commitlog_replayer.cc index c9b4929346..40af884d8e 100644 --- a/db/commitlog/commitlog_replayer.cc +++ b/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" diff --git a/db/commitlog/replay_position.hh b/db/commitlog/replay_position.hh index 8fe5f73279..c9cbd66ec1 100644 --- a/db/commitlog/replay_position.hh +++ b/db/commitlog/replay_position.hh @@ -11,7 +11,7 @@ #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "utils/hash.hh" #include "sstables/version.hh" diff --git a/db/consistency_level.cc b/db/consistency_level.cc index 982719f7aa..ca5ed8321e 100644 --- a/db/consistency_level.cc +++ b/db/consistency_level.cc @@ -16,7 +16,7 @@ #include #include "exceptions/exceptions.hh" #include -#include "schema.hh" +#include "schema/schema.hh" #include "replica/database.hh" #include "unimplemented.hh" #include "db/read_repair_decision.hh" diff --git a/db/data_listeners.hh b/db/data_listeners.hh index 7a245eee7b..2d9f4eddae 100755 --- a/db/data_listeners.hh +++ b/db/data_listeners.hh @@ -14,10 +14,10 @@ #include #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 #include diff --git a/db/extensions.cc b/db/extensions.cc index 4d65be7925..173e9cc90e 100644 --- a/db/extensions.cc +++ b/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 #include diff --git a/db/extensions.hh b/db/extensions.hh index 97cfe7f610..eb0d0d5d52 100644 --- a/db/extensions.hh +++ b/db/extensions.hh @@ -19,7 +19,7 @@ #include #include "bytes.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" namespace sstables { class file_io_extension; diff --git a/db/large_data_handler.hh b/db/large_data_handler.hh index 3572d13dc4..fb115b8eec 100644 --- a/db/large_data_handler.hh +++ b/db/large_data_handler.hh @@ -9,7 +9,7 @@ #pragma once #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "system_keyspace.hh" #include "sstables/shared_sstable.hh" #include "utils/updateable_value.hh" diff --git a/db/legacy_schema_migrator.cc b/db/legacy_schema_migrator.cc index 444d55377b..3a05309963 100644 --- a/db/legacy_schema_migrator.cc +++ b/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" diff --git a/db/paxos_grace_seconds_extension.hh b/db/paxos_grace_seconds_extension.hh index 5dcacf176c..843d1ddf4d 100644 --- a/db/paxos_grace_seconds_extension.hh +++ b/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; diff --git a/db/per_partition_rate_limit_extension.hh b/db/per_partition_rate_limit_extension.hh index dc2464d39a..723f61ff3b 100644 --- a/db/per_partition_rate_limit_extension.hh +++ b/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 { diff --git a/db/per_partition_rate_limit_options.cc b/db/per_partition_rate_limit_options.cc index fb2107c80e..56a2dca4c0 100644 --- a/db/per_partition_rate_limit_options.cc +++ b/db/per_partition_rate_limit_options.cc @@ -10,7 +10,7 @@ #include #include "serializer.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "log.hh" namespace db { diff --git a/db/schema_tables.cc b/db/schema_tables.cc index e6bcd50ade..09770226c5 100644 --- a/db/schema_tables.cc +++ b/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 #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" diff --git a/db/schema_tables.hh b/db/schema_tables.hh index dcd34fe5e1..eb2a2b9681 100644 --- a/db/schema_tables.hh +++ b/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" diff --git a/db/system_distributed_keyspace.cc b/db/system_distributed_keyspace.cc index 257889993f..0c0465876a 100644 --- a/db/system_distributed_keyspace.cc +++ b/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" diff --git a/db/system_distributed_keyspace.hh b/db/system_distributed_keyspace.hh index de63ec2289..1590bdd63f 100644 --- a/db/system_distributed_keyspace.hh +++ b/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" diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc index cec6d8ffce..16a9ddc6c0 100644 --- a/db/system_keyspace.cc +++ b/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" diff --git a/db/system_keyspace.hh b/db/system_keyspace.hh index cf71e9d3d3..f3449b8eb2 100644 --- a/db/system_keyspace.hh +++ b/db/system_keyspace.hh @@ -13,7 +13,7 @@ #include #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "utils/UUID.hh" #include "gms/inet_address.hh" #include "query-result-set.hh" diff --git a/db/tags/extension.hh b/db/tags/extension.hh index bc1c7e594b..624231049c 100644 --- a/db/tags/extension.hh +++ b/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 { diff --git a/db/tags/utils.cc b/db/tags/utils.cc index d299053828..c888f12d55 100644 --- a/db/tags/utils.cc +++ b/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 { diff --git a/db/tags/utils.hh b/db/tags/utils.hh index 72db23658d..2b3d28fa8f 100644 --- a/db/tags/utils.hh +++ b/db/tags/utils.hh @@ -15,7 +15,7 @@ #include #include "seastarx.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "service/client_state.hh" #include "service/migration_manager.hh" diff --git a/db/view/build_progress_virtual_reader.hh b/db/view/build_progress_virtual_reader.hh index 8d81f031f1..ddc90a2f12 100644 --- a/db/view/build_progress_virtual_reader.hh +++ b/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 diff --git a/db/view/row_locking.hh b/db/view/row_locking.hh index 773c70e2c0..f472520d98 100644 --- a/db/view/row_locking.hh +++ b/db/view/row_locking.hh @@ -26,7 +26,7 @@ #include #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" diff --git a/db/view/view.hh b/db/view/view.hh index 36ded7c404..0308b92333 100644 --- a/db/view/view.hh +++ b/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" diff --git a/db/view/view_updating_consumer.hh b/db/view/view_updating_consumer.hh index 530e2757ff..886c2a52b5 100644 --- a/db/view/view_updating_consumer.hh +++ b/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" diff --git a/db/virtual_table.hh b/db/virtual_table.hh index 0f87ca1abf..16c3d4af82 100644 --- a/db/virtual_table.hh +++ b/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 { diff --git a/frozen_schema.hh b/frozen_schema.hh index 44fa4480ba..85fd94ae9f 100644 --- a/frozen_schema.hh +++ b/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" diff --git a/hashing_partition_visitor.hh b/hashing_partition_visitor.hh index a7bb91bd0f..d6c9324d71 100644 --- a/hashing_partition_visitor.hh +++ b/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" diff --git a/idl/uuid.idl.hh b/idl/uuid.idl.hh index 5d9cb97b81..567a30c610 100644 --- a/idl/uuid.idl.hh +++ b/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" diff --git a/index/built_indexes_virtual_reader.hh b/index/built_indexes_virtual_reader.hh index d8016b981f..6669cfd9d4 100644 --- a/index/built_indexes_virtual_reader.hh +++ b/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" diff --git a/index/secondary_index_manager.cc b/index/secondary_index_manager.cc index 68af5f9c98..16c51d053c 100644 --- a/index/secondary_index_manager.cc +++ b/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" diff --git a/index/secondary_index_manager.hh b/index/secondary_index_manager.hh index 6598eac8e5..d9ed0f61ed 100644 --- a/index/secondary_index_manager.hh +++ b/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" diff --git a/keys.hh b/keys.hh index 84221f005e..e93a5b1e28 100644 --- a/keys.hh +++ b/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 // diff --git a/message/messaging_service.hh b/message/messaging_service.hh index 1a2a29df61..58fa70b6f6 100644 --- a/message/messaging_service.hh +++ b/message/messaging_service.hh @@ -19,7 +19,7 @@ #include #include "range.hh" #include "tracing/tracing.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "streaming/stream_fwd.hh" #include diff --git a/multishard_mutation_query.cc b/multishard_mutation_query.cc index e4b6407939..66b554f3f7 100644 --- a/multishard_mutation_query.cc +++ b/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" diff --git a/multishard_mutation_query.hh b/multishard_mutation_query.hh index 26d5549233..2d5c4315e1 100644 --- a/multishard_mutation_query.hh +++ b/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" diff --git a/mutation/atomic_cell_or_collection.hh b/mutation/atomic_cell_or_collection.hh index 769877ebc9..970c985f00 100644 --- a/mutation/atomic_cell_or_collection.hh +++ b/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. diff --git a/mutation/canonical_mutation.hh b/mutation/canonical_mutation.hh index 07349447ab..6551fe1a12 100644 --- a/mutation/canonical_mutation.hh +++ b/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 diff --git a/mutation/frozen_mutation.cc b/mutation/frozen_mutation.cc index 80adfb0052..395393f7c4 100644 --- a/mutation/frozen_mutation.cc +++ b/mutation/frozen_mutation.cc @@ -8,7 +8,7 @@ #include #include "frozen_mutation.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "mutation_partition.hh" #include "mutation.hh" #include "counters.hh" diff --git a/mutation/frozen_mutation.hh b/mutation/frozen_mutation.hh index cc4725ca44..a2dc1fc1fc 100644 --- a/mutation/frozen_mutation.hh +++ b/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; diff --git a/mutation/mutation.hh b/mutation/mutation.hh index db643fbbf3..de9eabc016 100644 --- a/mutation/mutation.hh +++ b/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" diff --git a/mutation/mutation_partition.hh b/mutation/mutation_partition.hh index 834793b8c4..eba01e0911 100644 --- a/mutation/mutation_partition.hh +++ b/mutation/mutation_partition.hh @@ -18,7 +18,7 @@ #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "tombstone.hh" #include "keys.hh" #include "position_in_partition.hh" diff --git a/mutation/mutation_partition_view.cc b/mutation/mutation_partition_view.cc index 2d4a10a2cd..fe578b518d 100644 --- a/mutation/mutation_partition_view.cc +++ b/mutation/mutation_partition_view.cc @@ -11,7 +11,7 @@ #include #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" diff --git a/mutation/mutation_partition_visitor.hh b/mutation/mutation_partition_visitor.hh index 3b49d763dc..fe2d8a982b 100644 --- a/mutation/mutation_partition_visitor.hh +++ b/mutation/mutation_partition_visitor.hh @@ -10,7 +10,7 @@ #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" class atomic_cell_view; class collection_mutation_view; diff --git a/mutation_writer/multishard_writer.cc b/mutation_writer/multishard_writer.cc index 212995b132..6d11eba48f 100644 --- a/mutation_writer/multishard_writer.cc +++ b/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" diff --git a/mutation_writer/multishard_writer.hh b/mutation_writer/multishard_writer.hh index d278a597c9..4843e3a0ff 100644 --- a/mutation_writer/multishard_writer.hh +++ b/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" diff --git a/partition_builder.hh b/partition_builder.hh index 53c85d990c..c35d4a0681 100644 --- a/partition_builder.hh +++ b/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" diff --git a/partition_slice_builder.hh b/partition_slice_builder.hh index c71cbcaad5..7f798db96f 100644 --- a/partition_slice_builder.hh +++ b/partition_slice_builder.hh @@ -12,7 +12,7 @@ #include #include "query-request.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" // // Fluent builder for query::partition_slice. diff --git a/querier.cc b/querier.cc index 1a27f5a1ec..dd8a2ec93a 100644 --- a/querier.cc +++ b/querier.cc @@ -10,7 +10,7 @@ #include "querier.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "log.hh" #include diff --git a/query-result-set.hh b/query-result-set.hh index d570a8d2e4..ab5002cfe4 100644 --- a/query-result-set.hh +++ b/query-result-set.hh @@ -11,7 +11,7 @@ #include #include "types.hh" -#include "schema.hh" +#include "schema/schema.hh" #include #include diff --git a/query.cc b/query.cc index f768b916c2..a02e712fe5 100644 --- a/query.cc +++ b/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 { diff --git a/query_ranges_to_vnodes.hh b/query_ranges_to_vnodes.hh index e6c2ebe0e1..8bca4e30dc 100644 --- a/query_ranges_to_vnodes.hh +++ b/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; diff --git a/read_context.hh b/read_context.hh index 3334971e77..fe1ad71d5e 100644 --- a/read_context.hh +++ b/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" diff --git a/reader_concurrency_semaphore.cc b/reader_concurrency_semaphore.cc index 84414a548d..82f5454ae1 100644 --- a/reader_concurrency_semaphore.cc +++ b/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"); diff --git a/reader_permit.hh b/reader_permit.hh index 11ff44100a..9291ec0286 100644 --- a/reader_permit.hh +++ b/reader_permit.hh @@ -12,7 +12,7 @@ #include "seastarx.hh" #include "db/timeout_clock.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "query_class_config.hh" namespace seastar { diff --git a/readers/empty_v2.hh b/readers/empty_v2.hh index 4dd58e64e5..710eff9a80 100644 --- a/readers/empty_v2.hh +++ b/readers/empty_v2.hh @@ -7,7 +7,7 @@ */ #pragma once -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" class flat_mutation_reader_v2; class reader_permit; diff --git a/readers/evictable.hh b/readers/evictable.hh index 21267dc3a6..c29bdb79c8 100644 --- a/readers/evictable.hh +++ b/readers/evictable.hh @@ -10,7 +10,7 @@ #include "dht/i_partitioner.hh" #include "readers/flat_mutation_reader_fwd.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "seastarx.hh" namespace seastar { diff --git a/readers/foreign.hh b/readers/foreign.hh index 3b1a03a0fb..8bf7d3978b 100644 --- a/readers/foreign.hh +++ b/readers/foreign.hh @@ -11,7 +11,7 @@ #include #include "readers/flat_mutation_reader_fwd.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" class reader_permit; diff --git a/readers/from_fragments_v2.hh b/readers/from_fragments_v2.hh index d57819f10b..b5456a7eb0 100644 --- a/readers/from_fragments_v2.hh +++ b/readers/from_fragments_v2.hh @@ -7,7 +7,7 @@ */ #pragma once -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include "dht/i_partitioner_fwd.hh" diff --git a/readers/from_mutations_v2.hh b/readers/from_mutations_v2.hh index d2b9cd23fa..e7ff71c2d5 100644 --- a/readers/from_mutations_v2.hh +++ b/readers/from_mutations_v2.hh @@ -7,7 +7,7 @@ */ #pragma once -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include "dht/i_partitioner_fwd.hh" #include "mutation/mutation_fragment_fwd.hh" diff --git a/readers/generating_v2.hh b/readers/generating_v2.hh index 4516580648..7c15b7b81c 100644 --- a/readers/generating_v2.hh +++ b/readers/generating_v2.hh @@ -7,7 +7,7 @@ */ #pragma once -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include #include "mutation/mutation_fragment_fwd.hh" diff --git a/readers/multi_range.hh b/readers/multi_range.hh index b60fbeb535..df6fca6ee5 100644 --- a/readers/multi_range.hh +++ b/readers/multi_range.hh @@ -7,7 +7,7 @@ */ #pragma once -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "dht/i_partitioner_fwd.hh" #include #include diff --git a/readers/multishard.cc b/readers/multishard.cc index c774e76947..f17e0a1f94 100644 --- a/readers/multishard.cc +++ b/readers/multishard.cc @@ -19,7 +19,7 @@ #include "readers/multishard.hh" #include "readers/mutation_source.hh" #include "readers/queue.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" extern logger mrlog; diff --git a/redis/keyspace_utils.cc b/redis/keyspace_utils.cc index 4c61d1d267..6ceca41972 100644 --- a/redis/keyspace_utils.cc +++ b/redis/keyspace_utils.cc @@ -9,7 +9,7 @@ #include #include #include "redis/keyspace_utils.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "types.hh" #include "exceptions/exceptions.hh" #include "cql3/statements/ks_prop_defs.hh" @@ -23,7 +23,7 @@ #include "service/client_state.hh" #include "transport/server.hh" #include "db/system_keyspace.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "gms/gossiper.hh" #include #include "db/config.hh" diff --git a/redis/mutation_utils.cc b/redis/mutation_utils.cc index 63eb0ecbed..c6289747eb 100644 --- a/redis/mutation_utils.cc +++ b/redis/mutation_utils.cc @@ -9,7 +9,7 @@ #include "redis/mutation_utils.hh" #include "types.hh" #include "service/storage_proxy.hh" -#include "schema.hh" +#include "schema/schema.hh" #include #include "redis/keyspace_utils.hh" #include "redis/options.hh" diff --git a/redis/options.cc b/redis/options.cc index 52b810c4a0..6470f6486e 100644 --- a/redis/options.cc +++ b/redis/options.cc @@ -10,7 +10,7 @@ #include "types.hh" #include "service/storage_proxy.hh" #include "data_dictionary/data_dictionary.hh" -#include "schema.hh" +#include "schema/schema.hh" #include #include "redis/keyspace_utils.hh" diff --git a/redis/options.hh b/redis/options.hh index 2ac01596bf..b64e1195ad 100644 --- a/redis/options.hh +++ b/redis/options.hh @@ -13,7 +13,7 @@ #include "db/consistency_level_type.hh" #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "service/client_state.hh" #include "auth/service.hh" diff --git a/repair/hash.hh b/repair/hash.hh index 8569f99126..2de67597b7 100644 --- a/repair/hash.hh +++ b/repair/hash.hh @@ -2,7 +2,7 @@ #include #include #include -#include "schema.hh" +#include "schema/schema.hh" class decorated_key_with_hash; class mutation_fragment; diff --git a/repair/writer.hh b/repair/writer.hh index cab1988938..62e23f6c5f 100644 --- a/repair/writer.hh +++ b/repair/writer.hh @@ -2,7 +2,7 @@ #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include "reader_permit.hh" #include "streaming/stream_reason.hh" diff --git a/replica/database.hh b/replica/database.hh index 75fc94ac3c..aa74f8b272 100644 --- a/replica/database.hh +++ b/replica/database.hh @@ -33,7 +33,7 @@ #include "db/commitlog/replay_position.hh" #include "db/commitlog/commitlog_types.hh" #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "db/view/view.hh" #include "db/snapshot-ctl.hh" #include "memtable.hh" diff --git a/replica/database_fwd.hh b/replica/database_fwd.hh index 18eb25e227..1e517027e6 100644 --- a/replica/database_fwd.hh +++ b/replica/database_fwd.hh @@ -24,7 +24,7 @@ class memtable_list; class mutation; class mutation_partition; -// schema.hh +// schema/schema.hh class schema; class column_definition; class column_mapping; diff --git a/replica/memtable.hh b/replica/memtable.hh index 4c184b9a1c..8f6cb1bfa3 100644 --- a/replica/memtable.hh +++ b/replica/memtable.hh @@ -13,7 +13,7 @@ #include #include "replica/database_fwd.hh" #include "dht/i_partitioner.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "encoding_stats.hh" #include "dirty_memory_manager.hh" #include "db/commitlog/replay_position.hh" diff --git a/caching_options.cc b/schema/caching_options.cc similarity index 100% rename from caching_options.cc rename to schema/caching_options.cc diff --git a/caching_options.hh b/schema/caching_options.hh similarity index 100% rename from caching_options.hh rename to schema/caching_options.hh diff --git a/schema.cc b/schema/schema.cc similarity index 100% rename from schema.cc rename to schema/schema.cc diff --git a/schema.hh b/schema/schema.hh similarity index 100% rename from schema.hh rename to schema/schema.hh diff --git a/schema_builder.hh b/schema/schema_builder.hh similarity index 100% rename from schema_builder.hh rename to schema/schema_builder.hh diff --git a/schema_fwd.hh b/schema/schema_fwd.hh similarity index 100% rename from schema_fwd.hh rename to schema/schema_fwd.hh diff --git a/schema_registry.cc b/schema/schema_registry.cc similarity index 100% rename from schema_registry.cc rename to schema/schema_registry.cc diff --git a/schema_registry.hh b/schema/schema_registry.hh similarity index 100% rename from schema_registry.hh rename to schema/schema_registry.hh diff --git a/schema_mutations.hh b/schema_mutations.hh index 033c2cca51..6174399750 100644 --- a/schema_mutations.hh +++ b/schema_mutations.hh @@ -10,7 +10,7 @@ #include #include "mutation/mutation.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "mutation/canonical_mutation.hh" // Commutative representation of table schema diff --git a/service/cache_hitrate_calculator.hh b/service/cache_hitrate_calculator.hh index b9c38538d9..414a802f6d 100644 --- a/service/cache_hitrate_calculator.hh +++ b/service/cache_hitrate_calculator.hh @@ -9,7 +9,7 @@ #pragma once #include "replica/database_fwd.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include diff --git a/service/forward_service.cc b/service/forward_service.cc index 5dd0cdbb9f..5b4ccc829b 100644 --- a/service/forward_service.cc +++ b/service/forward_service.cc @@ -25,8 +25,8 @@ #include "query-request.hh" #include "query_ranges_to_vnodes.hh" #include "replica/database.hh" -#include "schema.hh" -#include "schema_registry.hh" +#include "schema/schema.hh" +#include "schema/schema_registry.hh" #include "seastar/core/do_with.hh" #include "seastar/core/future.hh" #include "seastar/core/on_internal_error.hh" diff --git a/service/migration_manager.cc b/service/migration_manager.cc index 020e64bff7..d8d9bcadfc 100644 --- a/service/migration_manager.cc +++ b/service/migration_manager.cc @@ -12,7 +12,7 @@ #include #include #include -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "service/migration_manager.hh" #include "service/storage_proxy.hh" #include "service/raft/group0_state_machine.hh" @@ -23,7 +23,7 @@ #include "utils/runtime.hh" #include "gms/gossiper.hh" #include "view_info.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "replica/database.hh" #include "db/schema_tables.hh" #include "types/user.hh" diff --git a/service/migration_manager.hh b/service/migration_manager.hh index 96f2cae1a9..6fefe55628 100644 --- a/service/migration_manager.hh +++ b/service/migration_manager.hh @@ -20,7 +20,7 @@ #include "gms/feature.hh" #include "gms/i_endpoint_state_change_subscriber.hh" #include "message/msg_addr.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "utils/serialized_action.hh" #include "service/raft/raft_group_registry.hh" #include "service/raft/raft_group0_client.hh" diff --git a/service/pager/query_pagers.hh b/service/pager/query_pagers.hh index b2bb8ab963..6eb59a1576 100644 --- a/service/pager/query_pagers.hh +++ b/service/pager/query_pagers.hh @@ -13,7 +13,7 @@ #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "query-result.hh" #include "query-request.hh" #include "service/query_state.hh" diff --git a/service/paxos/paxos_state.cc b/service/paxos/paxos_state.cc index b3b6d5a19c..a479b0bf12 100644 --- a/service/paxos/paxos_state.cc +++ b/service/paxos/paxos_state.cc @@ -12,7 +12,7 @@ #include "service/paxos/proposal.hh" #include "service/paxos/paxos_state.hh" #include "db/system_keyspace.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "replica/database.hh" #include "utils/error_injection.hh" diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc index c22e87ff76..2acfad13f7 100644 --- a/service/storage_proxy.cc +++ b/service/storage_proxy.cc @@ -53,9 +53,9 @@ #include #include #include "utils/latency.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "query_ranges_to_vnodes.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include #include #include diff --git a/sstables/column_translation.hh b/sstables/column_translation.hh index 943e244209..383196fe70 100644 --- a/sstables/column_translation.hh +++ b/sstables/column_translation.hh @@ -11,7 +11,7 @@ #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "sstables/types.hh" #include "db/marshal/type_parser.hh" diff --git a/sstables/key.hh b/sstables/key.hh index 6428dcf2e0..22ac34acee 100644 --- a/sstables/key.hh +++ b/sstables/key.hh @@ -8,7 +8,7 @@ #pragma once #include "bytes.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include "replica/database_fwd.hh" #include "keys.hh" diff --git a/sstables/mx/bsearch_clustered_cursor.hh b/sstables/mx/bsearch_clustered_cursor.hh index 072cca537f..b269fb1303 100644 --- a/sstables/mx/bsearch_clustered_cursor.hh +++ b/sstables/mx/bsearch_clustered_cursor.hh @@ -12,7 +12,7 @@ #include "sstables/column_translation.hh" #include "sstables/promoted_index_blocks_reader.hh" #include "parsers.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "utils/cached_file.hh" #include diff --git a/sstables/mx/writer.cc b/sstables/mx/writer.cc index f01d8555ba..71e3c4926b 100644 --- a/sstables/mx/writer.cc +++ b/sstables/mx/writer.cc @@ -9,7 +9,7 @@ #include "sstables/mx/writer.hh" #include "sstables/writer.hh" #include "encoding_stats.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "mutation/mutation_fragment.hh" #include "vint-serialization.hh" #include "sstables/types.hh" diff --git a/sstables/scanning_clustered_index_cursor.hh b/sstables/scanning_clustered_index_cursor.hh index 4db8109875..e98af95e39 100644 --- a/sstables/scanning_clustered_index_cursor.hh +++ b/sstables/scanning_clustered_index_cursor.hh @@ -10,7 +10,7 @@ #include "sstables/index_entry.hh" #include "sstables/promoted_index_blocks_reader.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "log.hh" namespace sstables { diff --git a/sstables/sstable_writer.hh b/sstables/sstable_writer.hh index bf810804c0..e21cec0b7d 100644 --- a/sstables/sstable_writer.hh +++ b/sstables/sstable_writer.hh @@ -11,7 +11,7 @@ #include #include #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "mutation/mutation_fragment.hh" #include "mutation/mutation_fragment_v2.hh" diff --git a/sstables/sstables.hh b/sstables/sstables.hh index 120abd1b58..d938a8781f 100644 --- a/sstables/sstables.hh +++ b/sstables/sstables.hh @@ -21,7 +21,7 @@ #include #include #include "types.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include "encoding_stats.hh" #include "filter.hh" diff --git a/sstables/writer_impl.hh b/sstables/writer_impl.hh index 229ef89942..401501423f 100644 --- a/sstables/writer_impl.hh +++ b/sstables/writer_impl.hh @@ -10,7 +10,7 @@ #include "sstable_writer.hh" #include "sstables_manager.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "mutation/mutation_fragment.hh" #include "metadata_collector.hh" #include "mutation/mutation_fragment_stream_validator.hh" diff --git a/sstables_loader.hh b/sstables_loader.hh index 63dd254258..5db085898a 100644 --- a/sstables_loader.hh +++ b/sstables_loader.hh @@ -9,7 +9,7 @@ #pragma once #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "sstables/shared_sstable.hh" using namespace seastar; diff --git a/streaming/stream_detail.hh b/streaming/stream_detail.hh index 7236514f01..2ea6e66590 100644 --- a/streaming/stream_detail.hh +++ b/streaming/stream_detail.hh @@ -11,7 +11,7 @@ #pragma once #include "query-request.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include #include "range.hh" #include "dht/i_partitioner.hh" diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc index 743c508f87..413ff865ee 100644 --- a/streaming/stream_session.cc +++ b/streaming/stream_session.cc @@ -25,7 +25,7 @@ #include "service/priority_manager.hh" #include "service/migration_manager.hh" #include "query-request.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "mutation_writer/multishard_writer.hh" #include "sstables/sstable_set.hh" #include "db/view/view_update_checks.hh" diff --git a/streaming/stream_summary.hh b/streaming/stream_summary.hh index ffdc3fec3c..552e58cff2 100644 --- a/streaming/stream_summary.hh +++ b/streaming/stream_summary.hh @@ -10,7 +10,7 @@ #pragma once -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include namespace streaming { diff --git a/streaming/stream_task.hh b/streaming/stream_task.hh index b9e46868e5..4507c151fc 100644 --- a/streaming/stream_task.hh +++ b/streaming/stream_task.hh @@ -10,7 +10,7 @@ #pragma once -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "streaming/stream_summary.hh" #include #include diff --git a/test/boost/cache_flat_mutation_reader_test.cc b/test/boost/cache_flat_mutation_reader_test.cc index 45a9a6fc6e..9f28ebe2b5 100644 --- a/test/boost/cache_flat_mutation_reader_test.cc +++ b/test/boost/cache_flat_mutation_reader_test.cc @@ -12,7 +12,7 @@ #include "test/lib/scylla_test_case.hh" #include -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "keys.hh" #include "mutation/mutation_partition.hh" #include "mutation/partition_version.hh" diff --git a/test/boost/caching_options_test.cc b/test/boost/caching_options_test.cc index e2b8484c2a..039707bd87 100644 --- a/test/boost/caching_options_test.cc +++ b/test/boost/caching_options_test.cc @@ -10,7 +10,7 @@ #include #include -#include "caching_options.hh" +#include "schema/caching_options.hh" BOOST_AUTO_TEST_CASE(test_caching_options) { using string_map = std::map; diff --git a/test/boost/cdc_test.cc b/test/boost/cdc_test.cc index c9d5b29997..136b2ca0df 100644 --- a/test/boost/cdc_test.cc +++ b/test/boost/cdc_test.cc @@ -14,7 +14,7 @@ #include "cdc/log.hh" #include "cdc/cdc_extension.hh" #include "db/config.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/lib/cql_assertions.hh" #include "test/lib/cql_test_env.hh" #include "test/lib/exception_utils.hh" diff --git a/test/boost/cell_locker_test.cc b/test/boost/cell_locker_test.cc index d164d0eb81..9bd9bb041d 100644 --- a/test/boost/cell_locker_test.cc +++ b/test/boost/cell_locker_test.cc @@ -12,7 +12,7 @@ #include "cell_locking.hh" #include "mutation/mutation.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" using namespace std::literals::chrono_literals; diff --git a/test/boost/compound_test.cc b/test/boost/compound_test.cc index f991f6629a..b4d73bed0e 100644 --- a/test/boost/compound_test.cc +++ b/test/boost/compound_test.cc @@ -13,7 +13,7 @@ #include "compound.hh" #include "compound_compat.hh" #include "test/boost/range_assert.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "dht/murmur3_partitioner.hh" static std::vector to_bytes_vec(std::vector values) { diff --git a/test/boost/counter_test.cc b/test/boost/counter_test.cc index 98cf514705..a544c8f74c 100644 --- a/test/boost/counter_test.cc +++ b/test/boost/counter_test.cc @@ -17,7 +17,7 @@ #include "test/lib/scylla_test_case.hh" #include "test/lib/random_utils.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "keys.hh" #include "mutation/mutation.hh" #include "mutation/frozen_mutation.hh" diff --git a/test/boost/cql_functions_test.cc b/test/boost/cql_functions_test.cc index a5bbc3a4b7..baca07ec68 100644 --- a/test/boost/cql_functions_test.cc +++ b/test/boost/cql_functions_test.cc @@ -27,7 +27,7 @@ #include "types/map.hh" #include "types/list.hh" #include "types/set.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" using namespace std::literals::chrono_literals; diff --git a/test/boost/cql_query_group_test.cc b/test/boost/cql_query_group_test.cc index 3de464ba0b..9c4cce9676 100644 --- a/test/boost/cql_query_group_test.cc +++ b/test/boost/cql_query_group_test.cc @@ -29,7 +29,7 @@ #include "types/list.hh" #include "types/set.hh" #include "test/lib/exception_utils.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" using namespace std::literals::chrono_literals; diff --git a/test/boost/cql_query_large_test.cc b/test/boost/cql_query_large_test.cc index 77aad61aaf..034ef20249 100644 --- a/test/boost/cql_query_large_test.cc +++ b/test/boost/cql_query_large_test.cc @@ -29,7 +29,7 @@ #include "db/config.hh" #include "compaction/compaction_manager.hh" #include "test/lib/exception_utils.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" using namespace std::literals::chrono_literals; diff --git a/test/boost/cql_query_like_test.cc b/test/boost/cql_query_like_test.cc index 6e1f4035a5..76103d4aa4 100644 --- a/test/boost/cql_query_like_test.cc +++ b/test/boost/cql_query_like_test.cc @@ -25,7 +25,7 @@ #include "types/list.hh" #include "types/set.hh" #include "test/lib/exception_utils.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "cql3/query_options.hh" using namespace std::literals::chrono_literals; diff --git a/test/boost/cql_query_test.cc b/test/boost/cql_query_test.cc index 8c81855bde..df0e9cd1f3 100644 --- a/test/boost/cql_query_test.cc +++ b/test/boost/cql_query_test.cc @@ -37,7 +37,7 @@ #include "test/lib/exception_utils.hh" #include "utils/rjson.hh" #include "utils/fmt-compat.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "service/migration_manager.hh" #include #include "gms/feature.hh" diff --git a/test/boost/database_test.cc b/test/boost/database_test.cc index 3722eebea2..a8b9e82190 100644 --- a/test/boost/database_test.cc +++ b/test/boost/database_test.cc @@ -26,7 +26,7 @@ #include "partition_slice_builder.hh" #include "mutation/frozen_mutation.hh" #include "test/lib/mutation_source_test.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "service/migration_manager.hh" #include "sstables/sstables.hh" #include "sstables/generation_type.hh" diff --git a/test/boost/flat_mutation_reader_test.cc b/test/boost/flat_mutation_reader_test.cc index d54447b410..72e21a0f27 100644 --- a/test/boost/flat_mutation_reader_test.cc +++ b/test/boost/flat_mutation_reader_test.cc @@ -19,7 +19,7 @@ #include "readers/reversing_v2.hh" #include "readers/delegating_v2.hh" #include "readers/multi_range.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "replica/memtable.hh" #include "row_cache.hh" #include "test/lib/tmpdir.hh" diff --git a/test/boost/frozen_mutation_test.cc b/test/boost/frozen_mutation_test.cc index 395b5d042d..734531c5e5 100644 --- a/test/boost/frozen_mutation_test.cc +++ b/test/boost/frozen_mutation_test.cc @@ -14,7 +14,7 @@ #include #include "mutation/frozen_mutation.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "mutation/mutation_partition_view.hh" #include "test/lib/mutation_assertions.hh" #include "test/lib/mutation_source_test.hh" diff --git a/test/boost/keys_test.cc b/test/boost/keys_test.cc index 295dbfea42..4f0908d664 100644 --- a/test/boost/keys_test.cc +++ b/test/boost/keys_test.cc @@ -11,8 +11,8 @@ #include #include #include "keys.hh" -#include "schema.hh" -#include "schema_builder.hh" +#include "schema/schema.hh" +#include "schema/schema_builder.hh" #include "types.hh" #include "idl/keys.dist.hh" diff --git a/test/boost/memtable_test.cc b/test/boost/memtable_test.cc index 12ff2ce6ff..756d3e7f41 100644 --- a/test/boost/memtable_test.cc +++ b/test/boost/memtable_test.cc @@ -13,7 +13,7 @@ #include "utils/UUID_gen.hh" #include "test/lib/scylla_test_case.hh" #include -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include #include "service/migration_manager.hh" diff --git a/test/boost/multishard_combining_reader_as_mutation_source_test.cc b/test/boost/multishard_combining_reader_as_mutation_source_test.cc index 65281c45c6..715cd4e8e2 100644 --- a/test/boost/multishard_combining_reader_as_mutation_source_test.cc +++ b/test/boost/multishard_combining_reader_as_mutation_source_test.cc @@ -24,7 +24,7 @@ #include "test/lib/log.hh" #include "dht/sharder.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "service/priority_manager.hh" #include "readers/forwardable_v2.hh" diff --git a/test/boost/multishard_mutation_query_test.cc b/test/boost/multishard_mutation_query_test.cc index bce3343d14..1f221a72b0 100644 --- a/test/boost/multishard_mutation_query_test.cc +++ b/test/boost/multishard_mutation_query_test.cc @@ -7,7 +7,7 @@ */ #include "multishard_mutation_query.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "db/config.hh" #include "partition_slice_builder.hh" #include "serializer_impl.hh" diff --git a/test/boost/mutation_fragment_test.cc b/test/boost/mutation_fragment_test.cc index a8aac70ef0..c934f80bac 100644 --- a/test/boost/mutation_fragment_test.cc +++ b/test/boost/mutation_fragment_test.cc @@ -17,7 +17,7 @@ #include "mutation/mutation_fragment.hh" #include "mutation/frozen_mutation.hh" #include "test/lib/test_services.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/boost/total_order_check.hh" #include "schema_upgrader.hh" #include "readers/combined.hh" diff --git a/test/boost/mutation_query_test.cc b/test/boost/mutation_query_test.cc index fe2421cde7..6fffdb1508 100644 --- a/test/boost/mutation_query_test.cc +++ b/test/boost/mutation_query_test.cc @@ -26,7 +26,7 @@ #include "mutation_query.hh" #include #include -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "partition_slice_builder.hh" #include "readers/from_mutations_v2.hh" #include "mutation/mutation_rebuilder.hh" diff --git a/test/boost/mutation_reader_test.cc b/test/boost/mutation_reader_test.cc index 7a546a13c3..aa2d9ddb7b 100644 --- a/test/boost/mutation_reader_test.cc +++ b/test/boost/mutation_reader_test.cc @@ -36,13 +36,13 @@ #include "test/lib/key_utils.hh" #include "dht/sharder.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "cell_locking.hh" #include "sstables/sstables.hh" #include "sstables/sstable_set_impl.hh" #include "replica/database.hh" #include "partition_slice_builder.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "service/priority_manager.hh" #include "utils/ranges.hh" #include "mutation/mutation_rebuilder.hh" diff --git a/test/boost/mutation_test.cc b/test/boost/mutation_test.cc index 38140a9920..5526927ed3 100644 --- a/test/boost/mutation_test.cc +++ b/test/boost/mutation_test.cc @@ -25,7 +25,7 @@ #include "replica/database.hh" #include "utils/UUID_gen.hh" #include "clustering_interval_set.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "query-result-set.hh" #include "query-result-reader.hh" #include "partition_slice_builder.hh" diff --git a/test/boost/nonwrapping_range_test.cc b/test/boost/nonwrapping_range_test.cc index 6c79abace1..084931ea67 100644 --- a/test/boost/nonwrapping_range_test.cc +++ b/test/boost/nonwrapping_range_test.cc @@ -13,7 +13,7 @@ #include "boost/icl/interval_map.hpp" #include -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "locator/token_metadata.hh" diff --git a/test/boost/partitioner_test.cc b/test/boost/partitioner_test.cc index 191fac1e7d..b452217bee 100644 --- a/test/boost/partitioner_test.cc +++ b/test/boost/partitioner_test.cc @@ -13,9 +13,9 @@ #include "dht/i_partitioner.hh" #include "dht/sharder.hh" #include "dht/murmur3_partitioner.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "types.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "utils/div_ceil.hh" #include "test/lib/simple_schema.hh" diff --git a/test/boost/range_test.cc b/test/boost/range_test.cc index cedf56c212..cf9dbc7d93 100644 --- a/test/boost/range_test.cc +++ b/test/boost/range_test.cc @@ -14,7 +14,7 @@ #include #include "query-request.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "locator/token_metadata.hh" diff --git a/test/boost/range_tombstone_list_test.cc b/test/boost/range_tombstone_list_test.cc index 8debd31e1a..60ae82e220 100644 --- a/test/boost/range_tombstone_list_test.cc +++ b/test/boost/range_tombstone_list_test.cc @@ -12,7 +12,7 @@ #include #include #include "keys.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.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 532a16aab8..afdbb966bd 100644 --- a/test/boost/row_cache_test.cc +++ b/test/boost/row_cache_test.cc @@ -21,7 +21,7 @@ #include "test/lib/mutation_source_test.hh" #include "test/lib/key_utils.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/lib/simple_schema.hh" #include "row_cache.hh" #include diff --git a/test/boost/schema_change_test.cc b/test/boost/schema_change_test.cc index c0ce94ee48..40ac5250da 100644 --- a/test/boost/schema_change_test.cc +++ b/test/boost/schema_change_test.cc @@ -18,8 +18,8 @@ #include "test/lib/result_set_assertions.hh" #include "service/migration_manager.hh" #include "service/storage_proxy.hh" -#include "schema_builder.hh" -#include "schema_registry.hh" +#include "schema/schema_builder.hh" +#include "schema/schema_registry.hh" #include "db/schema_tables.hh" #include "types/list.hh" #include "types/user.hh" diff --git a/test/boost/schema_changes_test.cc b/test/boost/schema_changes_test.cc index f1d911e7c6..33bad7b0b5 100644 --- a/test/boost/schema_changes_test.cc +++ b/test/boost/schema_changes_test.cc @@ -13,7 +13,7 @@ #include #include "sstables/sstables.hh" #include "timestamp.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/lib/mutation_source_test.hh" #include "test/lib/flat_mutation_reader_assertions.hh" #include "test/lib/sstable_utils.hh" diff --git a/test/boost/schema_registry_test.cc b/test/boost/schema_registry_test.cc index 2b25f2540a..7e88f28c49 100644 --- a/test/boost/schema_registry_test.cc +++ b/test/boost/schema_registry_test.cc @@ -12,8 +12,8 @@ #include "test/lib/scylla_test_case.hh" #include #include "data_dictionary/user_types_metadata.hh" -#include "schema_registry.hh" -#include "schema_builder.hh" +#include "schema/schema_registry.hh" +#include "schema/schema_builder.hh" #include "test/lib/mutation_source_test.hh" #include "db/config.hh" #include "db/schema_tables.hh" diff --git a/test/boost/sstable_3_x_test.cc b/test/boost/sstable_3_x_test.cc index f73737eec3..a8d5740241 100644 --- a/test/boost/sstable_3_x_test.cc +++ b/test/boost/sstable_3_x_test.cc @@ -23,7 +23,7 @@ #include "cell_locking.hh" #include "compress.hh" #include "counters.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/boost/sstable_test.hh" #include "test/lib/flat_mutation_reader_assertions.hh" #include "test/lib/tmpdir.hh" @@ -35,7 +35,7 @@ #include "types.hh" #include "types/user.hh" #include "partition_slice_builder.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "utils/UUID_gen.hh" #include "encoding_stats.hh" #include "sstables/mx/writer.hh" diff --git a/test/boost/sstable_compaction_test.cc b/test/boost/sstable_compaction_test.cc index 502ca0cf4d..3440e5a0d3 100644 --- a/test/boost/sstable_compaction_test.cc +++ b/test/boost/sstable_compaction_test.cc @@ -19,8 +19,8 @@ #include "compaction/compaction.hh" #include "test/lib/scylla_test_case.hh" #include -#include "schema.hh" -#include "schema_builder.hh" +#include "schema/schema.hh" +#include "schema/schema_builder.hh" #include "replica/database.hh" #include "compaction/leveled_manifest.hh" #include "sstables/metadata_collector.hh" diff --git a/test/boost/sstable_datafile_test.cc b/test/boost/sstable_datafile_test.cc index d2fa0e9092..286baa7740 100644 --- a/test/boost/sstable_datafile_test.cc +++ b/test/boost/sstable_datafile_test.cc @@ -17,8 +17,8 @@ #include "sstables/compress.hh" #include "test/lib/scylla_test_case.hh" #include -#include "schema.hh" -#include "schema_builder.hh" +#include "schema/schema.hh" +#include "schema/schema_builder.hh" #include "replica/database.hh" #include "sstables/metadata_collector.hh" #include "sstables/sstable_writer.hh" diff --git a/test/boost/sstable_mutation_test.cc b/test/boost/sstable_mutation_test.cc index 536b91da17..f3b20e66d3 100644 --- a/test/boost/sstable_mutation_test.cc +++ b/test/boost/sstable_mutation_test.cc @@ -20,7 +20,7 @@ #include "sstables/sstables.hh" #include "replica/database.hh" #include "timestamp.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/lib/mutation_source_test.hh" #include "partition_slice_builder.hh" #include "test/lib/tmpdir.hh" diff --git a/test/boost/sstable_resharding_test.cc b/test/boost/sstable_resharding_test.cc index 38e64f5830..1f7060deac 100644 --- a/test/boost/sstable_resharding_test.cc +++ b/test/boost/sstable_resharding_test.cc @@ -9,7 +9,7 @@ #include "types/map.hh" #include "sstables/sstables.hh" #include "test/lib/scylla_test_case.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "replica/database.hh" #include "dht/murmur3_partitioner.hh" #include "compaction/compaction_manager.hh" diff --git a/test/boost/sstable_test.cc b/test/boost/sstable_test.cc index 25a8d924a7..89ed937d35 100644 --- a/test/boost/sstable_test.cc +++ b/test/boost/sstable_test.cc @@ -20,7 +20,7 @@ #include "test/lib/sstable_utils.hh" #include "test/lib/reader_concurrency_semaphore.hh" #include "test/lib/scylla_test_case.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "compress.hh" #include "replica/database.hh" #include diff --git a/test/boost/sstable_test.hh b/test/boost/sstable_test.hh index a4c450142b..edd98c279b 100644 --- a/test/boost/sstable_test.hh +++ b/test/boost/sstable_test.hh @@ -12,8 +12,8 @@ #include "types/map.hh" #include "sstables/sstables.hh" #include "replica/database.hh" -#include "schema.hh" -#include "schema_builder.hh" +#include "schema/schema.hh" +#include "schema/schema_builder.hh" #include "types/set.hh" #include "types/list.hh" #include diff --git a/test/boost/storage_proxy_test.cc b/test/boost/storage_proxy_test.cc index 69ab510999..ac0d56987c 100644 --- a/test/boost/storage_proxy_test.cc +++ b/test/boost/storage_proxy_test.cc @@ -17,7 +17,7 @@ #include "service/storage_proxy.hh" #include "query_ranges_to_vnodes.hh" #include "partition_slice_builder.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" // Returns random keys sorted in ring order. // The schema must have a single bytes_type partition key column. diff --git a/test/boost/view_build_test.cc b/test/boost/view_build_test.cc index bdb02c3f17..20bd4f37fc 100644 --- a/test/boost/view_build_test.cc +++ b/test/boost/view_build_test.cc @@ -23,7 +23,7 @@ #include "test/lib/cql_test_env.hh" #include "test/lib/cql_assertions.hh" #include "test/lib/sstable_utils.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "service/priority_manager.hh" #include "test/lib/test_services.hh" #include "test/lib/data_model.hh" diff --git a/test/boost/virtual_table_mutation_source_test.cc b/test/boost/virtual_table_mutation_source_test.cc index eae41e1f91..7cd8cf9eee 100644 --- a/test/boost/virtual_table_mutation_source_test.cc +++ b/test/boost/virtual_table_mutation_source_test.cc @@ -9,7 +9,7 @@ #include #include "db/virtual_table.hh" #include "db/system_keyspace.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "test/lib/mutation_source_test.hh" diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc index 773e7c4b96..50111f91a8 100644 --- a/test/lib/cql_test_env.cc +++ b/test/lib/cql_test_env.cc @@ -41,7 +41,7 @@ #include "auth/common.hh" #include "db/config.hh" #include "db/batchlog_manager.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/lib/tmpdir.hh" #include "db/query_context.hh" #include "test/lib/test_services.hh" diff --git a/test/lib/cql_test_env.hh b/test/lib/cql_test_env.hh index 89967824e9..8ba85f7858 100644 --- a/test/lib/cql_test_env.hh +++ b/test/lib/cql_test_env.hh @@ -23,7 +23,7 @@ #include "cql3/prepared_statements_cache.hh" #include "cql3/query_processor.hh" #include "bytes.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "test/lib/eventually.hh" namespace replica { diff --git a/test/lib/data_model.cc b/test/lib/data_model.cc index 5658f2eb84..f69ea99c1b 100644 --- a/test/lib/data_model.cc +++ b/test/lib/data_model.cc @@ -11,7 +11,7 @@ #include #include -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "concrete_types.hh" namespace tests::data_model { diff --git a/test/lib/data_model.hh b/test/lib/data_model.hh index edc17937c1..2e90565c1f 100644 --- a/test/lib/data_model.hh +++ b/test/lib/data_model.hh @@ -10,7 +10,7 @@ #include "mutation/mutation.hh" #include "cql3/cql3_type.hh" -#include "schema.hh" +#include "schema/schema.hh" namespace tests::data_model { diff --git a/test/lib/flat_mutation_reader_assertions.hh b/test/lib/flat_mutation_reader_assertions.hh index 1a11806e95..9e5755be32 100644 --- a/test/lib/flat_mutation_reader_assertions.hh +++ b/test/lib/flat_mutation_reader_assertions.hh @@ -12,7 +12,7 @@ #include #include "readers/flat_mutation_reader_v2.hh" #include "mutation_assertions.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "test/lib/log.hh" inline bool trim_range_tombstone(const schema& s, range_tombstone& rt, const query::clustering_row_ranges& ck_ranges) { diff --git a/test/lib/index_reader_assertions.hh b/test/lib/index_reader_assertions.hh index e45750d77a..ee4939bde2 100644 --- a/test/lib/index_reader_assertions.hh +++ b/test/lib/index_reader_assertions.hh @@ -11,7 +11,7 @@ #include #include "dht/i_partitioner.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "sstables/index_reader.hh" #include "reader_concurrency_semaphore.hh" diff --git a/test/lib/mutation_source_test.cc b/test/lib/mutation_source_test.cc index 8e1b416732..decb4d3735 100644 --- a/test/lib/mutation_source_test.cc +++ b/test/lib/mutation_source_test.cc @@ -10,7 +10,7 @@ #include #include #include "partition_slice_builder.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/lib/mutation_source_test.hh" #include "readers/mutation_source.hh" #include "counters.hh" diff --git a/test/lib/random_schema.cc b/test/lib/random_schema.cc index 44bb89c314..0970529354 100644 --- a/test/lib/random_schema.cc +++ b/test/lib/random_schema.cc @@ -13,7 +13,7 @@ #include "cql3/cql3_type.hh" #include "mutation/mutation.hh" #include "mutation/mutation_fragment.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/lib/random_schema.hh" #include "test/lib/random_utils.hh" #include "types/list.hh" diff --git a/test/lib/random_schema.hh b/test/lib/random_schema.hh index 820bfe68cd..3f7c45af06 100644 --- a/test/lib/random_schema.hh +++ b/test/lib/random_schema.hh @@ -8,7 +8,7 @@ #pragma once -#include "schema.hh" +#include "schema/schema.hh" #include "dht/i_partitioner.hh" #include "test/lib/data_model.hh" diff --git a/test/lib/simple_schema.hh b/test/lib/simple_schema.hh index 4938470929..d3f3c72eb7 100644 --- a/test/lib/simple_schema.hh +++ b/test/lib/simple_schema.hh @@ -12,12 +12,12 @@ #include -#include "schema.hh" -#include "schema_registry.hh" +#include "schema/schema.hh" +#include "schema/schema_registry.hh" #include "keys.hh" #include "mutation/mutation_fragment.hh" #include "mutation/mutation.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "reader_permit.hh" #include "types/map.hh" #include "test/lib/key_utils.hh" diff --git a/test/lib/test_services.hh b/test/lib/test_services.hh index 9360663735..c40ef85e5f 100644 --- a/test/lib/test_services.hh +++ b/test/lib/test_services.hh @@ -25,8 +25,8 @@ #include #include -#include "schema.hh" -#include "schema_builder.hh" +#include "schema/schema.hh" +#include "schema/schema_builder.hh" #include "row_cache.hh" #include "replica/database.hh" #include "cell_locking.hh" diff --git a/test/manual/enormous_table_scan_test.cc b/test/manual/enormous_table_scan_test.cc index b3450a2724..26c4f39b59 100644 --- a/test/manual/enormous_table_scan_test.cc +++ b/test/manual/enormous_table_scan_test.cc @@ -26,7 +26,7 @@ #include "partition_range_compat.hh" #include "range.hh" #include "sstables/sstables.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "readers/forwardable_v2.hh" class enormous_table_reader final : public flat_mutation_reader_v2::impl { diff --git a/test/manual/hint_test.cc b/test/manual/hint_test.cc index ccee8d788b..45235ae98a 100644 --- a/test/manual/hint_test.cc +++ b/test/manual/hint_test.cc @@ -30,7 +30,7 @@ #include "db/commitlog/commitlog.hh" #include "db/commitlog/rp_set.hh" #include "log.hh" -#include "schema.hh" +#include "schema/schema.hh" using namespace db; diff --git a/test/manual/row_locker_test.cc b/test/manual/row_locker_test.cc index b7f52e2245..fabb0f7292 100644 --- a/test/manual/row_locker_test.cc +++ b/test/manual/row_locker_test.cc @@ -11,7 +11,7 @@ #include #include "db/view/row_locking.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" static row_locker::stats row_locker_stats; diff --git a/test/manual/sstable_scan_footprint_test.cc b/test/manual/sstable_scan_footprint_test.cc index 5c2ed0686f..23d20f4dda 100644 --- a/test/manual/sstable_scan_footprint_test.cc +++ b/test/manual/sstable_scan_footprint_test.cc @@ -11,7 +11,7 @@ #include "test/lib/random_utils.hh" #include "test/lib/log.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "row_cache.hh" #include "replica/database.hh" #include "db/config.hh" diff --git a/test/perf/memory_footprint_test.cc b/test/perf/memory_footprint_test.cc index 900de7db8c..a7b34f564f 100644 --- a/test/perf/memory_footprint_test.cc +++ b/test/perf/memory_footprint_test.cc @@ -13,7 +13,7 @@ #include #include "partition_slice_builder.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "replica/memtable.hh" #include "row_cache.hh" #include "mutation/frozen_mutation.hh" diff --git a/test/perf/perf_commitlog.cc b/test/perf/perf_commitlog.cc index 8f4bfff807..874f7be727 100644 --- a/test/perf/perf_commitlog.cc +++ b/test/perf/perf_commitlog.cc @@ -24,7 +24,7 @@ #include "test/lib/random_utils.hh" #include "db/config.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "release.hh" #include "db/config.hh" #include "db/extensions.hh" diff --git a/test/perf/perf_fast_forward.cc b/test/perf/perf_fast_forward.cc index cbd5911f11..5c7c53f860 100644 --- a/test/perf/perf_fast_forward.cc +++ b/test/perf/perf_fast_forward.cc @@ -19,7 +19,7 @@ #include "test/lib/reader_concurrency_semaphore.hh" #include "test/perf/perf.hh" #include -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "replica/database.hh" #include "release.hh" #include "db/config.hh" diff --git a/test/perf/perf_mutation.cc b/test/perf/perf_mutation.cc index 14c7fbe27e..f14bfa912b 100644 --- a/test/perf/perf_mutation.cc +++ b/test/perf/perf_mutation.cc @@ -8,7 +8,7 @@ */ #include "replica/database.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "test/perf/perf.hh" #include #include diff --git a/test/perf/perf_row_cache_reads.cc b/test/perf/perf_row_cache_reads.cc index 4451e7d498..b06d7fc5d3 100644 --- a/test/perf/perf_row_cache_reads.cc +++ b/test/perf/perf_row_cache_reads.cc @@ -17,7 +17,7 @@ #include "utils/UUID_gen.hh" #include "row_cache.hh" #include "partition_slice_builder.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "replica/memtable.hh" #include "test/lib/memtable_snapshot_source.hh" #include "test/perf/perf.hh" diff --git a/test/perf/perf_row_cache_update.cc b/test/perf/perf_row_cache_update.cc index 18c27ad567..e7874ff29d 100644 --- a/test/perf/perf_row_cache_update.cc +++ b/test/perf/perf_row_cache_update.cc @@ -17,7 +17,7 @@ #include "utils/UUID_gen.hh" #include "row_cache.hh" #include "log.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "readers/combined.hh" #include "readers/mutation_fragment_v1_stream.hh" #include "replica/memtable.hh" diff --git a/test/perf/perf_simple_query.cc b/test/perf/perf_simple_query.cc index 0368ffc8dc..26dbf1e99c 100644 --- a/test/perf/perf_simple_query.cc +++ b/test/perf/perf_simple_query.cc @@ -19,7 +19,7 @@ #include "test/lib/random_utils.hh" #include "db/config.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "release.hh" #include #include "service/storage_proxy.hh" diff --git a/test/unit/row_cache_alloc_stress_test.cc b/test/unit/row_cache_alloc_stress_test.cc index 066b84d0e0..cf599b8804 100644 --- a/test/unit/row_cache_alloc_stress_test.cc +++ b/test/unit/row_cache_alloc_stress_test.cc @@ -16,7 +16,7 @@ #include "utils/logalloc.hh" #include "row_cache.hh" #include "log.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "replica/memtable.hh" #include "test/lib/reader_concurrency_semaphore.hh" diff --git a/thrift/handler.cc b/thrift/handler.cc index 348715ead9..105081e200 100644 --- a/thrift/handler.cc +++ b/thrift/handler.cc @@ -27,9 +27,9 @@ #include "service/storage_proxy.hh" #include "utils/class_registrator.hh" #include "noexcept_traits.hh" -#include "schema_registry.hh" +#include "schema/schema_registry.hh" #include "thrift/utils.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "thrift/thrift_validation.hh" #include "service/storage_service.hh" #include "service/query_state.hh" diff --git a/thrift/thrift_validation.hh b/thrift/thrift_validation.hh index 71315d8736..590778e5a6 100644 --- a/thrift/thrift_validation.hh +++ b/thrift/thrift_validation.hh @@ -10,7 +10,7 @@ #pragma once -#include "schema.hh" +#include "schema/schema.hh" #include "bytes.hh" #include "Cassandra.h" diff --git a/tombstone_gc.cc b/tombstone_gc.cc index e4d851aec6..c894fb4698 100644 --- a/tombstone_gc.cc +++ b/tombstone_gc.cc @@ -9,7 +9,7 @@ #include #include #include -#include "schema.hh" +#include "schema/schema.hh" #include "dht/i_partitioner.hh" #include "gc_clock.hh" #include "tombstone_gc.hh" diff --git a/tombstone_gc.hh b/tombstone_gc.hh index 4070c8b48b..02965bef76 100644 --- a/tombstone_gc.hh +++ b/tombstone_gc.hh @@ -11,7 +11,7 @@ #include #include "gc_clock.hh" #include "dht/token.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "range.hh" #include "interval.hh" diff --git a/tombstone_gc_extension.hh b/tombstone_gc_extension.hh index 3597319138..0134c77faf 100644 --- a/tombstone_gc_extension.hh +++ b/tombstone_gc_extension.hh @@ -14,7 +14,7 @@ #include "bytes.hh" #include "serializer.hh" #include "db/extensions.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "serializer_impl.hh" #include "tombstone_gc_options.hh" diff --git a/tools/json_writer.hh b/tools/json_writer.hh index b2265f80ca..96b62e5607 100644 --- a/tools/json_writer.hh +++ b/tools/json_writer.hh @@ -7,7 +7,7 @@ */ #include "dht/i_partitioner.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "sstables/sstables.hh" #include "utils/rjson.hh" diff --git a/tools/lua_sstable_consumer.cc b/tools/lua_sstable_consumer.cc index b3dff5a6e8..dd2842b0f8 100644 --- a/tools/lua_sstable_consumer.cc +++ b/tools/lua_sstable_consumer.cc @@ -16,7 +16,7 @@ #include "lang/lua_scylla_types.hh" #include "reader_permit.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "sstables/sstables.hh" #include "tools/json_writer.hh" #include "tools/lua_sstable_consumer.hh" diff --git a/tools/lua_sstable_consumer.hh b/tools/lua_sstable_consumer.hh index 1acfbd711b..4b47f2fbfe 100644 --- a/tools/lua_sstable_consumer.hh +++ b/tools/lua_sstable_consumer.hh @@ -10,7 +10,7 @@ #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "tools/sstable_consumer.hh" class reader_permit; diff --git a/tools/schema_loader.hh b/tools/schema_loader.hh index 2559137f4a..7608369be5 100644 --- a/tools/schema_loader.hh +++ b/tools/schema_loader.hh @@ -10,7 +10,7 @@ #include #include "seastarx.hh" -#include "schema.hh" +#include "schema/schema.hh" namespace tools { diff --git a/tools/scylla-sstable.cc b/tools/scylla-sstable.cc index 8fb511fc90..65b2c79389 100644 --- a/tools/scylla-sstable.cc +++ b/tools/scylla-sstable.cc @@ -22,7 +22,7 @@ #include "reader_concurrency_semaphore.hh" #include "readers/combined.hh" #include "readers/generating_v2.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "sstables/index_reader.hh" #include "sstables/sstables_manager.hh" #include "sstables/sstable_directory.hh" diff --git a/tools/scylla-types.cc b/tools/scylla-types.cc index 5479e43ba6..a0b3c74067 100644 --- a/tools/scylla-types.cc +++ b/tools/scylla-types.cc @@ -13,7 +13,7 @@ #include "compound.hh" #include "db/marshal/type_parser.hh" #include "log.hh" -#include "schema_builder.hh" +#include "schema/schema_builder.hh" #include "tools/utils.hh" #include "utils/logalloc.hh" diff --git a/types/collection.hh b/types/collection.hh index 3ac65b9371..8369d40912 100644 --- a/types/collection.hh +++ b/types/collection.hh @@ -14,7 +14,7 @@ #include "types.hh" #include "collection_mutation.hh" #include "utils/chunked_vector.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "log.hh" #include "exceptions/exceptions.hh" diff --git a/validation.cc b/validation.cc index 526d6510f3..9dd9dbf74f 100644 --- a/validation.cc +++ b/validation.cc @@ -9,7 +9,7 @@ */ #include "validation.hh" -#include "schema.hh" +#include "schema/schema.hh" #include "keys.hh" #include "data_dictionary/data_dictionary.hh" #include "exceptions/exceptions.hh" diff --git a/validation.hh b/validation.hh index 9e93ca3078..95bba8521c 100644 --- a/validation.hh +++ b/validation.hh @@ -11,7 +11,7 @@ #pragma once #include -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" using namespace seastar; diff --git a/view_info.hh b/view_info.hh index 06b5ea9c9c..123164db7c 100644 --- a/view_info.hh +++ b/view_info.hh @@ -10,7 +10,7 @@ #include "dht/i_partitioner.hh" #include "query-request.hh" -#include "schema_fwd.hh" +#include "schema/schema_fwd.hh" #include "db/view/view.hh" namespace cql3::statements {