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

database: Move database, keyspace, table classes to replica/ directory

Browse Source 
The database, keyspace, and table classes represent the replica-only
part of the objects after which they are named. Reading from a table
doesn't give you the full data, just the replica's view, and it is not
consistent since reconciliation is applied on the coordinator.

As a first step in acknowledging this, move the related files to
a replica/ subdirectory.
This commit is contained in:
Avi Kivity
2022-01-03 13:09:19 +02:00
parent 6e2d29300c
commit ae3a360725
127 changed files with 129 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -436,7 +436,6 @@ set(scylla_sources
cql3/ut_name.cc cql3/ut_name.cc
cql3/values.cc cql3/values.cc
data_dictionary/data_dictionary.cc data_dictionary/data_dictionary.cc
database.cc
db/batchlog_manager.cc db/batchlog_manager.cc
db/commitlog/commitlog.cc db/commitlog/commitlog.cc
db/commitlog/commitlog_entry.cc db/commitlog/commitlog_entry.cc
@@ -555,6 +554,8 @@ set(scylla_sources
release.cc release.cc
repair/repair.cc repair/repair.cc
repair/row_level.cc repair/row_level.cc
replica/database.cc
replica/table.cc
row_cache.cc row_cache.cc
schema.cc schema.cc
schema_mutations.cc schema_mutations.cc
@@ -611,7 +612,6 @@ set(scylla_sources
streaming/stream_summary.cc streaming/stream_summary.cc
streaming/stream_task.cc streaming/stream_task.cc
streaming/stream_transfer_task.cc streaming/stream_transfer_task.cc
table.cc
table_helper.cc table_helper.cc
thrift/controller.cc thrift/controller.cc
thrift/handler.cc thrift/handler.cc

2
alternator/auth.cc
View File

@@ -34,7 +34,7 @@
#include "service/storage_proxy.hh" #include "service/storage_proxy.hh"
#include "alternator/executor.hh" #include "alternator/executor.hh"
#include "cql3/selection/selection.hh" #include "cql3/selection/selection.hh"
#include "database.hh" #include "replica/database.hh"
#include "query-result-set.hh" #include "query-result-set.hh"
#include "cql3/result_set.hh" #include "cql3/result_set.hh"
#include <seastar/core/coroutine.hh> #include <seastar/core/coroutine.hh>

2
alternator/executor.cc
View File

@@ -29,7 +29,7 @@
#include "schema_builder.hh" #include "schema_builder.hh"
#include "exceptions/exceptions.hh" #include "exceptions/exceptions.hh"
#include "timestamp.hh" #include "timestamp.hh"
#include "database.hh" #include "replica/database.hh"
#include "types/map.hh" #include "types/map.hh"
#include "schema.hh" #include "schema.hh"
#include "query-request.hh" #include "query-request.hh"

2
alternator/streams.cc
View File

@@ -28,7 +28,7 @@
#include "utils/base64.hh" #include "utils/base64.hh"
#include "log.hh" #include "log.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/config.hh" #include "db/config.hh"
#include "cdc/log.hh" #include "cdc/log.hh"

2
alternator/ttl.cc
View File

@@ -35,7 +35,7 @@
#include "locator/abstract_replication_strategy.hh" #include "locator/abstract_replication_strategy.hh"
#include "log.hh" #include "log.hh"
#include "gc_clock.hh" #include "gc_clock.hh"
#include "database.hh" #include "replica/database.hh"
#include "service_permit.hh" #include "service_permit.hh"
#include "timestamp.hh" #include "timestamp.hh"
#include "service/storage_proxy.hh" #include "service/storage_proxy.hh"

2
api/api_init.hh
View File

@@ -23,7 +23,7 @@
#include <seastar/http/httpd.hh> #include <seastar/http/httpd.hh>
#include <seastar/core/future.hh> #include <seastar/core/future.hh>
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "seastarx.hh" #include "seastarx.hh"
namespace service { namespace service {

2
api/column_family.hh
View File

@@ -23,7 +23,7 @@
#include "api.hh" #include "api.hh"
#include "api/api-doc/column_family.json.hh" #include "api/api-doc/column_family.json.hh"
#include "database.hh" #include "replica/database.hh"
#include <seastar/core/future-util.hh> #include <seastar/core/future-util.hh>
#include <any> #include <any>

2
api/commitlog.cc
View File

@@ -22,7 +22,7 @@
#include "commitlog.hh" #include "commitlog.hh"
#include "db/commitlog/commitlog.hh" #include "db/commitlog/commitlog.hh"
#include "api/api-doc/commitlog.json.hh" #include "api/api-doc/commitlog.json.hh"
#include "database.hh" #include "replica/database.hh"
#include <vector> #include <vector>
namespace api { namespace api {

2
api/lsa.cc
View File

@@ -26,7 +26,7 @@
#include <seastar/http/exception.hh> #include <seastar/http/exception.hh>
#include "utils/logalloc.hh" #include "utils/logalloc.hh"
#include "log.hh" #include "log.hh"
#include "database.hh" #include "replica/database.hh"
namespace api { namespace api {

2
api/storage_proxy.cc
View File

@@ -26,7 +26,7 @@
#include "service/storage_service.hh" #include "service/storage_service.hh"
#include "db/config.hh" #include "db/config.hh"
#include "utils/histogram.hh" #include "utils/histogram.hh"
#include "database.hh" #include "replica/database.hh"
#include "seastar/core/scheduling_specific.hh" #include "seastar/core/scheduling_specific.hh"
namespace api { namespace api {

2
api/storage_service.cc
View File

@@ -46,7 +46,7 @@
#include "release.hh" #include "release.hh"
#include "compaction/compaction_manager.hh" #include "compaction/compaction_manager.hh"
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/extensions.hh" #include "db/extensions.hh"
#include "db/snapshot-ctl.hh" #include "db/snapshot-ctl.hh"
#include "transport/controller.hh" #include "transport/controller.hh"

2
api/system.cc
View File

@@ -25,7 +25,7 @@
#include <seastar/core/reactor.hh> #include <seastar/core/reactor.hh>
#include <seastar/http/exception.hh> #include <seastar/http/exception.hh>
#include "log.hh" #include "log.hh"
#include "database.hh" #include "replica/database.hh"
extern logging::logger apilog; extern logging::logger apilog;

2
auth/common.cc
View File

@@ -25,7 +25,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 "database.hh" #include "replica/database.hh"
#include "schema_builder.hh" #include "schema_builder.hh"
#include "service/migration_manager.hh" #include "service/migration_manager.hh"
#include "timeout_config.hh" #include "timeout_config.hh"

2
auth/default_authorizer.cc
View File

@@ -61,7 +61,7 @@ extern "C" {
#include "cql3/untyped_result_set.hh" #include "cql3/untyped_result_set.hh"
#include "exceptions/exceptions.hh" #include "exceptions/exceptions.hh"
#include "log.hh" #include "log.hh"
#include "database.hh" #include "replica/database.hh"
#include "utils/class_registrator.hh" #include "utils/class_registrator.hh"
namespace auth { namespace auth {

2
auth/password_authenticator.cc
View File

@@ -58,7 +58,7 @@
#include "log.hh" #include "log.hh"
#include "service/migration_manager.hh" #include "service/migration_manager.hh"
#include "utils/class_registrator.hh" #include "utils/class_registrator.hh"
#include "database.hh" #include "replica/database.hh"
#include "cql3/query_processor.hh" #include "cql3/query_processor.hh"
namespace auth { namespace auth {

2
auth/standard_role_manager.cc
View File

@@ -40,7 +40,7 @@
#include "exceptions/exceptions.hh" #include "exceptions/exceptions.hh"
#include "log.hh" #include "log.hh"
#include "utils/class_registrator.hh" #include "utils/class_registrator.hh"
#include "database.hh" #include "replica/database.hh"
namespace auth { namespace auth {

2
canonical_mutation.hh
View File

@@ -23,7 +23,7 @@
#include "bytes.hh" #include "bytes.hh"
#include "schema_fwd.hh" #include "schema_fwd.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "bytes_ostream.hh" #include "bytes_ostream.hh"
#include <iosfwd> #include <iosfwd>

2
cdc/generation.cc
View File

@@ -28,7 +28,7 @@
#include "keys.hh" #include "keys.hh"
#include "schema_builder.hh" #include "schema_builder.hh"
#include "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"
#include "dht/token-sharding.hh" #include "dht/token-sharding.hh"

2
cdc/generation.hh
View File

@@ -36,7 +36,7 @@
#include <unordered_set> #include <unordered_set>
#include <seastar/util/noncopyable_function.hh> #include <seastar/util/noncopyable_function.hh>
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "db_clock.hh" #include "db_clock.hh"
#include "dht/token.hh" #include "dht/token.hh"
#include "locator/token_metadata.hh" #include "locator/token_metadata.hh"

2
cdc/log.cc
View File

@@ -34,7 +34,7 @@
#include "cdc/change_visitor.hh" #include "cdc/change_visitor.hh"
#include "cdc/metadata.hh" #include "cdc/metadata.hh"
#include "bytes.hh" #include "bytes.hh"
#include "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.hh"

2
cdc/split.hh
View File

@@ -24,7 +24,7 @@
#include <vector> #include <vector>
#include <boost/dynamic_bitset.hpp> #include <boost/dynamic_bitset.hpp>
#include "schema_fwd.hh" #include "schema_fwd.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "timestamp.hh" #include "timestamp.hh"
#include "bytes.hh" #include "bytes.hh"
#include <seastar/util/noncopyable_function.hh> #include <seastar/util/noncopyable_function.hh>

2
compaction/compaction_manager.cc
View File

@@ -24,7 +24,7 @@
#include "compaction_backlog_manager.hh" #include "compaction_backlog_manager.hh"
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "sstables/sstables_manager.hh" #include "sstables/sstables_manager.hh"
#include "database.hh" #include "replica/database.hh"
#include <seastar/core/metrics.hh> #include <seastar/core/metrics.hh>
#include <seastar/core/coroutine.hh> #include <seastar/core/coroutine.hh>
#include "sstables/exceptions.hh" #include "sstables/exceptions.hh"

4
configure.py
View File

@@ -666,9 +666,9 @@ scylla_raft_core = [
'raft/log.cc', 'raft/log.cc',
] ]
scylla_core = (['database.cc', scylla_core = (['replica/database.cc',
'replica/table.cc',
'absl-flat_hash_map.cc', 'absl-flat_hash_map.cc',
'table.cc',
'atomic_cell.cc', 'atomic_cell.cc',
'caching_options.cc', 'caching_options.cc',
'collection_mutation.cc', 'collection_mutation.cc',

2
connection_notifier.cc
View File

@@ -21,7 +21,7 @@
#include "connection_notifier.hh" #include "connection_notifier.hh"
#include "cql3/constants.hh" #include "cql3/constants.hh"
#include "database.hh" #include "replica/database.hh"
#include "service/storage_proxy.hh" #include "service/storage_proxy.hh"
#include <stdexcept> #include <stdexcept>

2
cql3/expr/expression.hh
View File

@@ -41,7 +41,7 @@
#include "utils/overloaded_functor.hh" #include "utils/overloaded_functor.hh"
#include "utils/variant_element.hh" #include "utils/variant_element.hh"
#include "cql3/values.hh" #include "cql3/values.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
class row; class row;

2
cql3/statements/create_function_statement.cc
View File

@@ -28,7 +28,7 @@
#include "service/storage_proxy.hh" #include "service/storage_proxy.hh"
#include "lang/lua.hh" #include "lang/lua.hh"
#include "data_dictionary/data_dictionary.hh" #include "data_dictionary/data_dictionary.hh"
#include "database.hh" // for wasm #include "replica/database.hh" // for wasm
#include "cql3/query_processor.hh" #include "cql3/query_processor.hh"
namespace cql3 { namespace cql3 {

2
db/commitlog/commitlog_replayer.cc
View File

@@ -50,7 +50,7 @@
#include "commitlog.hh" #include "commitlog.hh"
#include "commitlog_replayer.hh" #include "commitlog_replayer.hh"
#include "database.hh" #include "replica/database.hh"
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "db/system_keyspace.hh" #include "db/system_keyspace.hh"
#include "log.hh" #include "log.hh"

2
db/consistency_level.cc
View File

@@ -48,7 +48,7 @@
#include "exceptions/exceptions.hh" #include "exceptions/exceptions.hh"
#include <seastar/core/sstring.hh> #include <seastar/core/sstring.hh>
#include "schema.hh" #include "schema.hh"
#include "database.hh" #include "replica/database.hh"
#include "unimplemented.hh" #include "unimplemented.hh"
#include "db/read_repair_decision.hh" #include "db/read_repair_decision.hh"
#include "locator/abstract_replication_strategy.hh" #include "locator/abstract_replication_strategy.hh"

2
db/consistency_level.hh
View File

@@ -47,7 +47,7 @@
#include "gms/inet_address.hh" #include "gms/inet_address.hh"
#include "inet_address_vectors.hh" #include "inet_address_vectors.hh"
#include "log.hh" #include "log.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include <iosfwd> #include <iosfwd>
#include <vector> #include <vector>

2
db/cql_type_parser.cc
View File

@@ -41,7 +41,7 @@
#include <boost/range/adaptor/map.hpp> #include <boost/range/adaptor/map.hpp>
#include <boost/range/adaptor/sliced.hpp> #include <boost/range/adaptor/sliced.hpp>
#include "database.hh" #include "replica/database.hh"
#include "service/storage_proxy.hh" #include "service/storage_proxy.hh"
#include "cql3/CqlParser.hpp" #include "cql3/CqlParser.hpp"
#include "cql3/util.hh" #include "cql3/util.hh"

2
db/data_listeners.cc
View File

@@ -20,7 +20,7 @@
*/ */
#include "db/data_listeners.hh" #include "db/data_listeners.hh"
#include "database.hh" #include "replica/database.hh"
#include "db_clock.hh" #include "db_clock.hh"
#include <tuple> #include <tuple>

2
db/hints/manager.cc
View File

@@ -39,7 +39,7 @@
#include "lister.hh" #include "lister.hh"
#include "db/timeout_clock.hh" #include "db/timeout_clock.hh"
#include "service/priority_manager.hh" #include "service/priority_manager.hh"
#include "database.hh" #include "replica/database.hh"
#include "service_permit.hh" #include "service_permit.hh"
#include "utils/directories.hh" #include "utils/directories.hh"
#include "locator/abstract_replication_strategy.hh" #include "locator/abstract_replication_strategy.hh"

2
db/legacy_schema_migrator.cc
View File

@@ -56,7 +56,7 @@
#include <unordered_set> #include <unordered_set>
#include <chrono> #include <chrono>
#include "database.hh" #include "replica/database.hh"
#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"

2
db/schema_tables.cc
View File

@@ -86,7 +86,7 @@
#include "view_info.hh" #include "view_info.hh"
#include "cql_type_parser.hh" #include "cql_type_parser.hh"
#include "db/timeout_clock.hh" #include "db/timeout_clock.hh"
#include "database.hh" #include "replica/database.hh"
#include "data_dictionary/user_types_metadata.hh" #include "data_dictionary/user_types_metadata.hh"
#include "index/target_parser.hh" #include "index/target_parser.hh"

4
db/size_estimates_virtual_reader.cc
View File

@@ -28,14 +28,14 @@
#include <boost/range/algorithm/sort.hpp> #include <boost/range/algorithm/sort.hpp>
#include "clustering_bounds_comparator.hh" #include "clustering_bounds_comparator.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "db/system_keyspace.hh" #include "db/system_keyspace.hh"
#include "dht/i_partitioner.hh" #include "dht/i_partitioner.hh"
#include "partition_range_compat.hh" #include "partition_range_compat.hh"
#include "range.hh" #include "range.hh"
#include "mutation_fragment.hh" #include "mutation_fragment.hh"
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/size_estimates_virtual_reader.hh" #include "db/size_estimates_virtual_reader.hh"

2
db/snapshot-ctl.cc
View File

@@ -40,7 +40,7 @@
#include <boost/range/adaptors.hpp> #include <boost/range/adaptors.hpp>
#include "db/snapshot-ctl.hh" #include "db/snapshot-ctl.hh"
#include "database.hh" #include "replica/database.hh"
namespace db { namespace db {

2
db/snapshot-ctl.hh
View File

@@ -44,7 +44,7 @@
#include <seastar/core/sharded.hh> #include <seastar/core/sharded.hh>
#include <seastar/core/future.hh> #include <seastar/core/future.hh>
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include <seastar/core/gate.hh> #include <seastar/core/gate.hh>
#include <seastar/core/rwlock.hh> #include <seastar/core/rwlock.hh>

2
db/sstables-format-selector.cc
View File

@@ -22,7 +22,7 @@
#include "sstables-format-selector.hh" #include "sstables-format-selector.hh"
#include "log.hh" #include "log.hh"
#include "database.hh" #include "replica/database.hh"
#include "gms/gossiper.hh" #include "gms/gossiper.hh"
#include "gms/feature_service.hh" #include "gms/feature_service.hh"
#include "gms/versioned_value.hh" #include "gms/versioned_value.hh"

2
db/system_distributed_keyspace.cc
View File

@@ -22,7 +22,7 @@
#include "db/system_distributed_keyspace.hh" #include "db/system_distributed_keyspace.hh"
#include "cql3/untyped_result_set.hh" #include "cql3/untyped_result_set.hh"
#include "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_builder.hh"

2
db/view/build_progress_virtual_reader.hh
View File

@@ -19,7 +19,7 @@
* along with Scylla. If not, see <http://www.gnu.org/licenses/>. * along with Scylla. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "database.hh" #include "replica/database.hh"
#include "db/system_keyspace.hh" #include "db/system_keyspace.hh"
#include "db/timeout_clock.hh" #include "db/timeout_clock.hh"
#include "dht/i_partitioner.hh" #include "dht/i_partitioner.hh"

2
db/view/view.cc
View File

@@ -57,7 +57,7 @@
#include <seastar/core/coroutine.hh> #include <seastar/core/coroutine.hh>
#include <seastar/coroutine/maybe_yield.hh> #include <seastar/coroutine/maybe_yield.hh>
#include "database.hh" #include "replica/database.hh"
#include "clustering_bounds_comparator.hh" #include "clustering_bounds_comparator.hh"
#include "cql3/statements/select_statement.hh" #include "cql3/statements/select_statement.hh"
#include "cql3/util.hh" #include "cql3/util.hh"

2
db/view/view_builder.hh
View File

@@ -26,7 +26,7 @@
#include "service/migration_listener.hh" #include "service/migration_listener.hh"
#include "utils/serialized_action.hh" #include "utils/serialized_action.hh"
#include "utils/UUID.hh" #include "utils/UUID.hh"
#include "database.hh" #include "replica/database.hh"
#include <seastar/core/abort_source.hh> #include <seastar/core/abort_source.hh>
#include <seastar/core/future.hh> #include <seastar/core/future.hh>

2
db/view/view_update_generator.hh
View File

@@ -21,7 +21,7 @@
#pragma once #pragma once
#include "database.hh" #include "replica/database.hh"
#include "sstables/shared_sstable.hh" #include "sstables/shared_sstable.hh"
#include <seastar/core/abort_source.hh> #include <seastar/core/abort_source.hh>

2
db/virtual_table.hh
View File

@@ -24,7 +24,7 @@
#include "mutation_reader.hh" #include "mutation_reader.hh"
#include "memtable.hh" #include "memtable.hh"
#include "schema.hh" #include "schema.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
namespace db { namespace db {

2
dht/boot_strapper.cc
View File

@@ -44,7 +44,7 @@
#include "gms/gossiper.hh" #include "gms/gossiper.hh"
#include "log.hh" #include "log.hh"
#include "db/config.hh" #include "db/config.hh"
#include "database.hh" #include "replica/database.hh"
#include "streaming/stream_reason.hh" #include "streaming/stream_reason.hh"
#include "locator/abstract_replication_strategy.hh" #include "locator/abstract_replication_strategy.hh"

2
dht/boot_strapper.hh
View File

@@ -40,7 +40,7 @@
#include "locator/token_metadata.hh" #include "locator/token_metadata.hh"
#include "dht/i_partitioner.hh" #include "dht/i_partitioner.hh"
#include <unordered_set> #include <unordered_set>
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "streaming/stream_reason.hh" #include "streaming/stream_reason.hh"
#include <seastar/core/distributed.hh> #include <seastar/core/distributed.hh>
#include <seastar/core/abort_source.hh> #include <seastar/core/abort_source.hh>

2
dht/range_streamer.cc
View File

@@ -40,7 +40,7 @@
#include "dht/range_streamer.hh" #include "dht/range_streamer.hh"
#include "utils/fb_utilities.hh" #include "utils/fb_utilities.hh"
#include "locator/snitch_base.hh" #include "locator/snitch_base.hh"
#include "database.hh" #include "replica/database.hh"
#include "gms/gossiper.hh" #include "gms/gossiper.hh"
#include "gms/failure_detector.hh" #include "gms/failure_detector.hh"
#include "log.hh" #include "log.hh"

2
dirty_memory_manager.hh
View File

@@ -26,7 +26,7 @@
#include <seastar/core/future.hh> #include <seastar/core/future.hh>
#include <seastar/core/metrics_registration.hh> #include <seastar/core/metrics_registration.hh>
#include <seastar/core/semaphore.hh> #include <seastar/core/semaphore.hh>
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "utils/logalloc.hh" #include "utils/logalloc.hh"
class dirty_memory_manager; class dirty_memory_manager;

2
distributed_loader.cc
View File

@@ -21,7 +21,7 @@
#include <seastar/util/closeable.hh> #include <seastar/util/closeable.hh>
#include "distributed_loader.hh" #include "distributed_loader.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/config.hh" #include "db/config.hh"
#include "db/system_keyspace.hh" #include "db/system_keyspace.hh"
#include "db/system_distributed_keyspace.hh" #include "db/system_distributed_keyspace.hh"

2
frozen_mutation.hh
View File

@@ -22,7 +22,7 @@
#pragma once #pragma once
#include "dht/i_partitioner.hh" #include "dht/i_partitioner.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "mutation_fragment.hh" #include "mutation_fragment.hh"
class mutation; class mutation;

2
gms/failure_detector.cc
View File

@@ -47,7 +47,7 @@
#include "db/config.hh" #include "db/config.hh"
#include <iostream> #include <iostream>
#include <chrono> #include <chrono>
#include "database.hh" #include "replica/database.hh"
namespace gms { namespace gms {

2
index/built_indexes_virtual_reader.hh
View File

@@ -19,7 +19,7 @@
* along with Scylla. If not, see <http://www.gnu.org/licenses/>. * along with Scylla. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "database.hh" #include "replica/database.hh"
#include "db/system_keyspace.hh" #include "db/system_keyspace.hh"
#include "flat_mutation_reader.hh" #include "flat_mutation_reader.hh"
#include "mutation_fragment.hh" #include "mutation_fragment.hh"

2
index/secondary_index_manager.cc
View File

@@ -47,7 +47,7 @@
#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_builder.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/view/view.hh" #include "db/view/view.hh"
#include <boost/range/adaptor/map.hpp> #include <boost/range/adaptor/map.hpp>

2
index/secondary_index_manager.hh
View File

@@ -43,7 +43,7 @@
#include "schema.hh" #include "schema.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include <vector> #include <vector>
#include <set> #include <set>

2
keys.hh
View File

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

2
locator/abstract_replication_strategy.hh
View File

@@ -32,7 +32,7 @@
#include <seastar/util/bool_class.hh> #include <seastar/util/bool_class.hh>
#include "utils/maybe_yield.hh" #include "utils/maybe_yield.hh"
// forward declaration since database.hh includes this file // forward declaration since replica/database.hh includes this file
class keyspace; class keyspace;
namespace locator { namespace locator {

2
locator/local_strategy.hh
View File

@@ -26,7 +26,7 @@
#include <optional> #include <optional>
#include <set> #include <set>
// forward declaration since database.hh includes this file // forward declaration since replica/database.hh includes this file
class keyspace; class keyspace;
namespace locator { namespace locator {

2
locator/token_metadata.hh
View File

@@ -53,7 +53,7 @@
#include <seastar/core/shared_ptr.hh> #include <seastar/core/shared_ptr.hh>
#include <seastar/core/semaphore.hh> #include <seastar/core/semaphore.hh>
// forward declaration since database.hh includes this file // forward declaration since replica/database.hh includes this file
class keyspace; class keyspace;
namespace locator { namespace locator {

2
main.cc
View File

@@ -24,7 +24,7 @@
#include <seastar/util/closeable.hh> #include <seastar/util/closeable.hh>
#include "utils/build_id.hh" #include "utils/build_id.hh"
#include "supervisor.hh" #include "supervisor.hh"
#include "database.hh" #include "replica/database.hh"
#include <seastar/core/reactor.hh> #include <seastar/core/reactor.hh>
#include <seastar/core/app-template.hh> #include <seastar/core/app-template.hh>
#include <seastar/core/distributed.hh> #include <seastar/core/distributed.hh>

2
memtable.cc
View File

@@ -20,7 +20,7 @@
*/ */
#include "memtable.hh" #include "memtable.hh"
#include "database.hh" #include "replica/database.hh"
#include "frozen_mutation.hh" #include "frozen_mutation.hh"
#include "partition_snapshot_reader.hh" #include "partition_snapshot_reader.hh"
#include "partition_builder.hh" #include "partition_builder.hh"

2
memtable.hh
View File

@@ -24,7 +24,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include <iosfwd> #include <iosfwd>
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "dht/i_partitioner.hh" #include "dht/i_partitioner.hh"
#include "schema_fwd.hh" #include "schema_fwd.hh"
#include "encoding_stats.hh" #include "encoding_stats.hh"

2
multishard_mutation_query.cc
View File

@@ -22,7 +22,7 @@
#include "schema_registry.hh" #include "schema_registry.hh"
#include "service/priority_manager.hh" #include "service/priority_manager.hh"
#include "multishard_mutation_query.hh" #include "multishard_mutation_query.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/config.hh" #include "db/config.hh"
#include "query-result-writer.hh" #include "query-result-writer.hh"

2
multishard_mutation_query.hh
View File

@@ -21,7 +21,7 @@
#pragma once #pragma once
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "schema_fwd.hh" #include "schema_fwd.hh"
#include "cache_temperature.hh" #include "cache_temperature.hh"
#include "db/timeout_clock.hh" #include "db/timeout_clock.hh"

2
mutation_partition_serializer.hh
View File

@@ -21,7 +21,7 @@
#pragma once #pragma once
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "bytes_ostream.hh" #include "bytes_ostream.hh"
#include "mutation_fragment.hh" #include "mutation_fragment.hh"

2
mutation_partition_view.hh
View File

@@ -21,7 +21,7 @@
#pragma once #pragma once
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "mutation_partition_visitor.hh" #include "mutation_partition_visitor.hh"
#include "utils/input_stream.hh" #include "utils/input_stream.hh"
#include "atomic_cell.hh" #include "atomic_cell.hh"

2
redis/controller.cc
View File

@@ -27,7 +27,7 @@
#include "db/config.hh" #include "db/config.hh"
#include "log.hh" #include "log.hh"
#include "auth/common.hh" #include "auth/common.hh"
#include "database.hh" #include "replica/database.hh"
static logging::logger slogger("controller"); static logging::logger slogger("controller");

2
redis/keyspace_utils.cc
View File

@@ -35,7 +35,7 @@
#include "transport/server.hh" #include "transport/server.hh"
#include "db/system_keyspace.hh" #include "db/system_keyspace.hh"
#include "schema.hh" #include "schema.hh"
#include "database.hh" #include "replica/database.hh"
#include "gms/gossiper.hh" #include "gms/gossiper.hh"
#include <seastar/core/print.hh> #include <seastar/core/print.hh>
#include "db/config.hh" #include "db/config.hh"

2
redis/options.cc
View File

@@ -23,7 +23,7 @@
#include "types.hh" #include "types.hh"
#include "service/storage_proxy.hh" #include "service/storage_proxy.hh"
#include "schema.hh" #include "schema.hh"
#include "database.hh" #include "replica/database.hh"
#include <seastar/core/print.hh> #include <seastar/core/print.hh>
#include "redis/keyspace_utils.hh" #include "redis/keyspace_utils.hh"

2
repair/repair.cc
View File

@@ -31,7 +31,7 @@
#include "service/priority_manager.hh" #include "service/priority_manager.hh"
#include "message/messaging_service.hh" #include "message/messaging_service.hh"
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/config.hh" #include "db/config.hh"
#include "hashers.hh" #include "hashers.hh"
#include "locator/network_topology_strategy.hh" #include "locator/network_topology_strategy.hh"

2
repair/repair.hh
View File

@@ -33,7 +33,7 @@
#include <seastar/core/condition-variable.hh> #include <seastar/core/condition-variable.hh>
#include <seastar/core/gate.hh> #include <seastar/core/gate.hh>
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "frozen_mutation.hh" #include "frozen_mutation.hh"
#include "utils/UUID.hh" #include "utils/UUID.hh"
#include "utils/hash.hh" #include "utils/hash.hh"

2
repair/row_level.cc
View File

@@ -33,7 +33,7 @@
#include "utils/UUID.hh" #include "utils/UUID.hh"
#include "utils/hash.hh" #include "utils/hash.hh"
#include "service/priority_manager.hh" #include "service/priority_manager.hh"
#include "database.hh" #include "replica/database.hh"
#include <seastar/util/bool_class.hh> #include <seastar/util/bool_class.hh>
#include <seastar/core/metrics_registration.hh> #include <seastar/core/metrics_registration.hh>
#include <seastar/core/coroutine.hh> #include <seastar/core/coroutine.hh>

2
database.cc → replica/database.cc
View File

@@ -21,7 +21,7 @@
#include "log.hh" #include "log.hh"
#include "lister.hh" #include "lister.hh"
#include "database.hh" #include "replica/database.hh"
#include <seastar/core/future-util.hh> #include <seastar/core/future-util.hh>
#include "db/system_keyspace.hh" #include "db/system_keyspace.hh"
#include "db/system_distributed_keyspace.hh" #include "db/system_distributed_keyspace.hh"

0
database.hh → replica/database.hh
View File

2
database_fwd.hh → replica/database_fwd.hh
View File

@@ -21,7 +21,7 @@
#pragma once #pragma once
// database.hh // replica/database.hh
class database; class database;
class keyspace; class keyspace;
class table; class table;

2
table.cc → replica/table.cc
View File

@@ -24,7 +24,7 @@
#include <seastar/coroutine/maybe_yield.hh> #include <seastar/coroutine/maybe_yield.hh>
#include <seastar/util/closeable.hh> #include <seastar/util/closeable.hh>
#include "database.hh" #include "replica/database.hh"
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "sstables/sstables_manager.hh" #include "sstables/sstables_manager.hh"
#include "service/priority_manager.hh" #include "service/priority_manager.hh"

2
schema.cc
View File

@@ -36,7 +36,7 @@
#include <boost/algorithm/cxx11/any_of.hpp> #include <boost/algorithm/cxx11/any_of.hpp>
#include "view_info.hh" #include "view_info.hh"
#include "partition_slice_builder.hh" #include "partition_slice_builder.hh"
#include "database.hh" #include "replica/database.hh"
#include "dht/i_partitioner.hh" #include "dht/i_partitioner.hh"
#include "dht/token-sharding.hh" #include "dht/token-sharding.hh"
#include "cdc/cdc_extension.hh" #include "cdc/cdc_extension.hh"

2
schema_builder.hh
View File

@@ -22,7 +22,7 @@
#pragma once #pragma once
#include "schema.hh" #include "schema.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "cdc/log.hh" #include "cdc/log.hh"
#include "dht/i_partitioner.hh" #include "dht/i_partitioner.hh"
#include "tombstone_gc_options.hh" #include "tombstone_gc_options.hh"

2
service/cache_hitrate_calculator.hh
View File

@@ -21,7 +21,7 @@
#pragma once #pragma once
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "utils/UUID.hh" #include "utils/UUID.hh"
#include <seastar/core/timer.hh> #include <seastar/core/timer.hh>
#include <seastar/core/sharded.hh> #include <seastar/core/sharded.hh>

2
service/client_state.cc
View File

@@ -50,7 +50,7 @@
#include "db/schema_tables.hh" #include "db/schema_tables.hh"
#include "tracing/trace_keyspace_helper.hh" #include "tracing/trace_keyspace_helper.hh"
#include "db/system_distributed_keyspace.hh" #include "db/system_distributed_keyspace.hh"
#include "database.hh" #include "replica/database.hh"
#include "cdc/log.hh" #include "cdc/log.hh"
#include "utils/overloaded_functor.hh" #include "utils/overloaded_functor.hh"
#include <seastar/core/coroutine.hh> #include <seastar/core/coroutine.hh>

2
service/client_state.hh
View File

@@ -47,7 +47,7 @@
#include "timeout_config.hh" #include "timeout_config.hh"
#include "timestamp.hh" #include "timestamp.hh"
#include "db_clock.hh" #include "db_clock.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "auth/authenticated_user.hh" #include "auth/authenticated_user.hh"
#include "auth/authenticator.hh" #include "auth/authenticator.hh"
#include "auth/permission.hh" #include "auth/permission.hh"

2
service/load_broadcaster.hh
View File

@@ -40,7 +40,7 @@
#pragma once #pragma once
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "gms/i_endpoint_state_change_subscriber.hh" #include "gms/i_endpoint_state_change_subscriber.hh"
#include "gms/gossiper.hh" #include "gms/gossiper.hh"

2
service/migration_manager.cc
View File

@@ -53,7 +53,7 @@
#include "gms/gossiper.hh" #include "gms/gossiper.hh"
#include "view_info.hh" #include "view_info.hh"
#include "schema_builder.hh" #include "schema_builder.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/schema_tables.hh" #include "db/schema_tables.hh"
#include "types/user.hh" #include "types/user.hh"
#include "db/schema_tables.hh" #include "db/schema_tables.hh"

2
service/misc_services.cc
View File

@@ -46,7 +46,7 @@
#include "gms/application_state.hh" #include "gms/application_state.hh"
#include "service/storage_proxy.hh" #include "service/storage_proxy.hh"
#include "service/view_update_backlog_broker.hh" #include "service/view_update_backlog_broker.hh"
#include "database.hh" #include "replica/database.hh"
#include "locator/abstract_replication_strategy.hh" #include "locator/abstract_replication_strategy.hh"
#include <cstdlib> #include <cstdlib>

2
service/paxos/paxos_state.cc
View File

@@ -26,7 +26,7 @@
#include "service/paxos/paxos_state.hh" #include "service/paxos/paxos_state.hh"
#include "db/system_keyspace.hh" #include "db/system_keyspace.hh"
#include "schema_registry.hh" #include "schema_registry.hh"
#include "database.hh" #include "replica/database.hh"
#include "utils/error_injection.hh" #include "utils/error_injection.hh"

2
service/storage_proxy.cc
View File

@@ -90,7 +90,7 @@
#include <seastar/core/execution_stage.hh> #include <seastar/core/execution_stage.hh>
#include "db/timeout_clock.hh" #include "db/timeout_clock.hh"
#include "multishard_mutation_query.hh" #include "multishard_mutation_query.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/consistency_level_validations.hh" #include "db/consistency_level_validations.hh"
#include "cdc/log.hh" #include "cdc/log.hh"
#include "cdc/stats.hh" #include "cdc/stats.hh"

2
service/storage_proxy.hh
View File

@@ -41,7 +41,7 @@
#pragma once #pragma once
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "data_dictionary/data_dictionary.hh" #include "data_dictionary/data_dictionary.hh"
#include "message/messaging_service_fwd.hh" #include "message/messaging_service_fwd.hh"
#include "query-request.hh" #include "query-request.hh"

2
service/storage_service.cc
View File

@@ -80,7 +80,7 @@
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "db/config.hh" #include "db/config.hh"
#include "db/schema_tables.hh" #include "db/schema_tables.hh"
#include "database.hh" #include "replica/database.hh"
#include <seastar/core/metrics.hh> #include <seastar/core/metrics.hh>
#include "cdc/generation.hh" #include "cdc/generation.hh"
#include "cdc/generation_service.hh" #include "cdc/generation_service.hh"

2
service/storage_service.hh
View File

@@ -53,7 +53,7 @@
#include <seastar/core/gate.hh> #include <seastar/core/gate.hh>
#include "utils/fb_utilities.hh" #include "utils/fb_utilities.hh"
#include "utils/serialized_action.hh" #include "utils/serialized_action.hh"
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "db/schema_features.hh" #include "db/schema_features.hh"
#include "streaming/stream_state.hh" #include "streaming/stream_state.hh"
#include "streaming/stream_reason.hh" #include "streaming/stream_reason.hh"

2
sstables/key.hh
View File

@@ -23,7 +23,7 @@
#include "bytes.hh" #include "bytes.hh"
#include "schema_fwd.hh" #include "schema_fwd.hh"
#include <seastar/core/future.hh> #include <seastar/core/future.hh>
#include "database_fwd.hh" #include "replica/database_fwd.hh"
#include "keys.hh" #include "keys.hh"
#include "compound_compat.hh" #include "compound_compat.hh"
#include "dht/i_partitioner.hh" #include "dht/i_partitioner.hh"

2
sstables/sstable_directory.cc
View File

@@ -26,7 +26,7 @@
#include "log.hh" #include "log.hh"
#include "sstable_directory.hh" #include "sstable_directory.hh"
#include "lister.hh" #include "lister.hh"
#include "database.hh" #include "replica/database.hh"
static logging::logger dirlog("sstable_directory"); static logging::logger dirlog("sstable_directory");

2
sstables/sstable_set.cc
View File

@@ -33,7 +33,7 @@
#include "sstable_set_impl.hh" #include "sstable_set_impl.hh"
#include "database.hh" #include "replica/database.hh"
namespace sstables { namespace sstables {

2
sstables_loader.cc
View File

@@ -23,7 +23,7 @@
#include <seastar/rpc/rpc.hh> #include <seastar/rpc/rpc.hh>
#include "sstables_loader.hh" #include "sstables_loader.hh"
#include "distributed_loader.hh" #include "distributed_loader.hh"
#include "database.hh" #include "replica/database.hh"
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "gms/inet_address.hh" #include "gms/inet_address.hh"
#include "streaming/stream_mutation_fragments_cmd.hh" #include "streaming/stream_mutation_fragments_cmd.hh"

2
streaming/stream_transfer_task.cc
View File

@@ -57,7 +57,7 @@
#include <boost/icl/interval.hpp> #include <boost/icl/interval.hpp>
#include <boost/icl/interval_set.hpp> #include <boost/icl/interval_set.hpp>
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "database.hh" #include "replica/database.hh"
#include "gms/feature_service.hh" #include "gms/feature_service.hh"
namespace streaming { namespace streaming {

2
table_helper.cc
View File

@@ -24,7 +24,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 "cql3/statements/modification_statement.hh" #include "cql3/statements/modification_statement.hh"
#include "database.hh" #include "replica/database.hh"
#include "service/migration_manager.hh" #include "service/migration_manager.hh"
future<> table_helper::setup_table(cql3::query_processor& qp) const { future<> table_helper::setup_table(cql3::query_processor& qp) const {

2
test/boost/database_test.cc
View File

@@ -32,7 +32,7 @@
#include "test/lib/log.hh" #include "test/lib/log.hh"
#include "test/lib/random_utils.hh" #include "test/lib/random_utils.hh"
#include "database.hh" #include "replica/database.hh"
#include "lister.hh" #include "lister.hh"
#include "partition_slice_builder.hh" #include "partition_slice_builder.hh"
#include "frozen_mutation.hh" #include "frozen_mutation.hh"

2
test/boost/memtable_test.cc
View File

@@ -21,7 +21,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include "service/priority_manager.hh" #include "service/priority_manager.hh"
#include "database.hh" #include "replica/database.hh"
#include "db/config.hh" #include "db/config.hh"
#include "utils/UUID_gen.hh" #include "utils/UUID_gen.hh"
#include <seastar/testing/test_case.hh> #include <seastar/testing/test_case.hh>

2
test/boost/mutation_reader_test.cc
View File

@@ -52,7 +52,7 @@
#include "cell_locking.hh" #include "cell_locking.hh"
#include "sstables/sstables.hh" #include "sstables/sstables.hh"
#include "sstables/sstable_set_impl.hh" #include "sstables/sstable_set_impl.hh"
#include "database.hh" #include "replica/database.hh"
#include "partition_slice_builder.hh" #include "partition_slice_builder.hh"
#include "schema_registry.hh" #include "schema_registry.hh"
#include "service/priority_manager.hh" #include "service/priority_manager.hh"

2
test/boost/mutation_test.cc
View File

@@ -35,7 +35,7 @@
#include <seastar/util/alloc_failure_injector.hh> #include <seastar/util/alloc_failure_injector.hh>
#include <seastar/util/closeable.hh> #include <seastar/util/closeable.hh>
#include "database.hh" #include "replica/database.hh"
#include "utils/UUID_gen.hh" #include "utils/UUID_gen.hh"
#include "mutation_reader.hh" #include "mutation_reader.hh"
#include "clustering_interval_set.hh" #include "clustering_interval_set.hh"

2
test/boost/sstable_compaction_test.cc
View File

@@ -34,7 +34,7 @@
#include <seastar/testing/thread_test_case.hh> #include <seastar/testing/thread_test_case.hh>
#include "schema.hh" #include "schema.hh"
#include "schema_builder.hh" #include "schema_builder.hh"
#include "database.hh" #include "replica/database.hh"
#include "compaction/leveled_manifest.hh" #include "compaction/leveled_manifest.hh"
#include "sstables/metadata_collector.hh" #include "sstables/metadata_collector.hh"
#include "sstables/sstable_writer.hh" #include "sstables/sstable_writer.hh"

2
test/boost/sstable_datafile_test.cc
View File

@@ -32,7 +32,7 @@
#include <seastar/testing/thread_test_case.hh> #include <seastar/testing/thread_test_case.hh>
#include "schema.hh" #include "schema.hh"
#include "schema_builder.hh" #include "schema_builder.hh"
#include "database.hh" #include "replica/database.hh"
#include "sstables/metadata_collector.hh" #include "sstables/metadata_collector.hh"
#include "sstables/sstable_writer.hh" #include "sstables/sstable_writer.hh"
#include <memory> #include <memory>

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