bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Introduce schema/ module

Browse Source 
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
This commit is contained in:
Avi Kivity
2023-02-14 22:43:41 +02:00
committed by Nadav Har'El
parent c0114d8b02
commit 69a385fd9d
225 changed files with 246 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

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

8
alternator/executor.cc
View File

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

2
alternator/serialization.hh
View File

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

2
alternator/streams.cc
View File

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

2
auth/common.cc
View File

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

2
cdc/cdc_extension.hh
View File

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

2
cdc/cdc_partitioner.cc
View File

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

2
cdc/generation.cc
View File

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

4
cdc/log.cc
View File

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

2
cdc/split.cc
View File

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

2
cdc/split.hh
View File

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

2
clustering_bounds_comparator.hh
View File

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

2
clustering_interval_set.hh
View File

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

2
clustering_key_filter.hh
View File

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

2
clustering_ranges_walker.hh
View File

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

2
collection_mutation.hh
View File

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

2
compaction/compaction.cc
View File

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

2
compaction/compaction_garbage_collector.hh
View File

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

2
compaction/compaction_strategy.cc
View File

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

2
compaction/compaction_strategy.hh
View File

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

2
compaction/table_state.hh
View File

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

2
compound_compat.hh
View File

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

6
configure.py
View File

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

2
converting_mutation_partition_applier.cc
View File

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

2
converting_mutation_partition_applier.hh
View File

@@ -10,7 +10,7 @@
#include "mutation/mutation_partition_visitor.hh" #include "mutation/mutation_partition_visitor.hh"
#include "mutation/atomic_cell.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 schema;
class row; class row;

2
cql3/column_identifier.hh
View File

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

2
cql3/restrictions/statement_restrictions.hh
View File

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

2
cql3/selection/selectable.hh
View File

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

2
cql3/selection/selection.hh
View File

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

2
cql3/selection/selector.hh
View File

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

2
cql3/selection/selector_factories.hh
View File

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

2
cql3/statements/alter_type_statement.cc
View File

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

2
cql3/statements/alter_type_statement.hh
View File

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

2
cql3/statements/cf_prop_defs.hh
View File

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

4
cql3/statements/create_index_statement.cc
View File

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

2
cql3/statements/create_index_statement.hh
View File

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

2
cql3/statements/create_table_statement.cc
View File

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

2
cql3/statements/create_table_statement.hh
View File

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

2
cql3/statements/create_view_statement.cc
View File

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

2
cql3/statements/drop_index_statement.cc
View File

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

2
cql3/statements/drop_index_statement.hh
View File

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

2
cql3/update_parameters.hh
View File

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

2
data_dictionary/data_dictionary.cc
View File

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

2
data_dictionary/data_dictionary.hh
View File

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

2
data_dictionary/keyspace_metadata.hh
View File

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

2
db/batchlog_manager.cc
View File

@@ -29,7 +29,7 @@
#include "unimplemented.hh" #include "unimplemented.hh"
#include "gms/failure_detector.hh" #include "gms/failure_detector.hh"
#include "gms/gossiper.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.hh"
#include "idl/frozen_schema.dist.impl.hh" #include "idl/frozen_schema.dist.impl.hh"
#include "db/schema_tables.hh" #include "db/schema_tables.hh"

2
db/commitlog/commitlog_entry.hh
View File

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

2
db/commitlog/commitlog_replayer.cc
View File

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

2
db/commitlog/replay_position.hh
View File

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

2
db/consistency_level.cc
View File

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

4
db/data_listeners.hh
View File

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

2
db/extensions.cc
View File

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

2
db/extensions.hh
View File

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

2
db/large_data_handler.hh
View File

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

2
db/legacy_schema_migrator.cc
View File

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

2
db/paxos_grace_seconds_extension.hh
View File

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

2
db/per_partition_rate_limit_extension.hh
View File

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

2
db/per_partition_rate_limit_options.cc
View File

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

4
db/schema_tables.cc
View File

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

2
db/schema_tables.hh
View File

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

2
db/system_distributed_keyspace.cc
View File

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

2
db/system_distributed_keyspace.hh
View File

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

2
db/system_keyspace.cc
View File

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

2
db/system_keyspace.hh
View File

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

2
db/tags/extension.hh
View File

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

4
db/tags/utils.cc
View File

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

2
db/tags/utils.hh
View File

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

2
db/view/build_progress_virtual_reader.hh
View File

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

2
db/view/row_locking.hh
View File

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

2
db/view/view.hh
View File

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

2
db/view/view_updating_consumer.hh
View File

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

2
db/virtual_table.hh
View File

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

2
frozen_schema.hh
View File

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

2
hashing_partition_visitor.hh
View File

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

2
idl/uuid.idl.hh
View File

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

2
index/built_indexes_virtual_reader.hh
View File

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

2
index/secondary_index_manager.cc
View File

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

2
index/secondary_index_manager.hh
View File

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

2
keys.hh
View File

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

2
message/messaging_service.hh
View File

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

2
multishard_mutation_query.cc
View File

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

2
multishard_mutation_query.hh
View File

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

2
mutation/atomic_cell_or_collection.hh
View File

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

2
mutation/canonical_mutation.hh
View File

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

2
mutation/frozen_mutation.cc
View File

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

2
mutation/frozen_mutation.hh
View File

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

2
mutation/mutation.hh
View File

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

2
mutation/mutation_partition.hh
View File

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

2
mutation/mutation_partition_view.cc
View File

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

2
mutation/mutation_partition_visitor.hh
View File

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

2
mutation_writer/multishard_writer.cc
View File

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

2
mutation_writer/multishard_writer.hh
View File

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

2
partition_builder.hh
View File

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

2
partition_slice_builder.hh
View File

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

2
querier.cc
View File

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

2
query-result-set.hh
View File

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

2
query.cc
View File

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

2
query_ranges_to_vnodes.hh
View File

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

2
read_context.hh
View File

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

2
reader_concurrency_semaphore.cc
View File

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

Some files were not shown because too many files have changed in this diff Show More