diff --git a/auth/certificate_authenticator.hh b/auth/certificate_authenticator.hh index a404ddc1df..1939e0f4a8 100644 --- a/auth/certificate_authenticator.hh +++ b/auth/certificate_authenticator.hh @@ -10,6 +10,7 @@ #pragma once #include "auth/authenticator.hh" +#include namespace cql3 { diff --git a/auth/common.cc b/auth/common.cc index 7e0b94ef19..5dcefb05ab 100644 --- a/auth/common.cc +++ b/auth/common.cc @@ -25,6 +25,7 @@ #include "service/raft/group0_state_machine.hh" #include "timeout_config.hh" #include "utils/error_injection.hh" +#include "db/system_keyspace.hh" namespace auth { @@ -40,7 +41,7 @@ constinit const std::string_view AUTH_PACKAGE_NAME("org.apache.cassandra.auth.") static logging::logger auth_log("auth"); bool legacy_mode(cql3::query_processor& qp) { - return qp.auth_version < db::system_keyspace::auth_version_t::v2; + return qp.auth_version < db::auth_version_t::v2; } std::string_view get_auth_ks_name(cql3::query_processor& qp) { diff --git a/cql3/query_processor.hh b/cql3/query_processor.hh index 2677ad004e..0c6ff85f35 100644 --- a/cql3/query_processor.hh +++ b/cql3/query_processor.hh @@ -32,6 +32,7 @@ #include "utils/observable.hh" #include "service/raft/raft_group0_client.hh" #include "types/types.hh" +#include "db/auth_version.hh" namespace lang { class manager; } @@ -175,7 +176,7 @@ public: lang::manager& lang() { return _lang_manager; } - db::system_keyspace::auth_version_t auth_version; + db::auth_version_t auth_version; statements::prepared_statement::checked_weak_ptr get_prepared(const std::optional& user, const prepared_cache_key_type& key) { if (user) { diff --git a/cql3/statements/update_statement.cc b/cql3/statements/update_statement.cc index 603ef81c52..17a65800e3 100644 --- a/cql3/statements/update_statement.cc +++ b/cql3/statements/update_statement.cc @@ -32,6 +32,7 @@ #include "types/user.hh" #include "concrete_types.hh" #include "validation.hh" +#include "dht/i_partitioner.hh" #include namespace cql3 { diff --git a/data_dictionary/data_dictionary.cc b/data_dictionary/data_dictionary.cc index 0f226c329c..79dfa79ebc 100644 --- a/data_dictionary/data_dictionary.cc +++ b/data_dictionary/data_dictionary.cc @@ -16,6 +16,7 @@ #include "gms/feature_service.hh" #include #include +#include #include #include #include diff --git a/service/qos/service_level_controller.hh b/service/qos/service_level_controller.hh index de2424f485..72eeedb63f 100644 --- a/service/qos/service_level_controller.hh +++ b/service/qos/service_level_controller.hh @@ -36,6 +36,12 @@ namespace service { class storage_service; } +namespace locator { + +class shared_token_metadata; + +} + namespace qos { /** * a structure to hold a service level diff --git a/service/raft/raft_group0_client.cc b/service/raft/raft_group0_client.cc index cd4e823e42..a4224f0f2d 100644 --- a/service/raft/raft_group0_client.cc +++ b/service/raft/raft_group0_client.cc @@ -24,6 +24,7 @@ #include "replica/database.hh" #include "utils/assert.hh" #include "utils/to_string.hh" +#include "db/system_keyspace.hh" namespace service { diff --git a/service/raft/raft_group0_client.hh b/service/raft/raft_group0_client.hh index 7b6e6ca8c2..ed3844317f 100644 --- a/service/raft/raft_group0_client.hh +++ b/service/raft/raft_group0_client.hh @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "service/broadcast_tables/experimental/query_result.hh" @@ -24,10 +25,16 @@ #include "utils/UUID.hh" #include "timestamp.hh" #include "gc_clock.hh" +#include "mutation/mutation.hh" #include "service/raft/group0_state_machine.hh" -#include "db/system_keyspace.hh" #include "service/maintenance_mode.hh" +namespace db { + +class system_keyspace; + +} + namespace service { // Obtaining this object means that all previously finished operations on group 0 are visible on this node. diff --git a/test/boost/commitlog_cleanup_test.cc b/test/boost/commitlog_cleanup_test.cc index 83bfbb9950..145b91a331 100644 --- a/test/boost/commitlog_cleanup_test.cc +++ b/test/boost/commitlog_cleanup_test.cc @@ -12,6 +12,7 @@ #include "db/commitlog/commitlog_replayer.hh" #include "db/commitlog/commitlog.hh" #include "db/config.hh" +#include "db/system_keyspace.hh" // Test that `canonical_token_range(tr)` contains the same tokens as `tr`. SEASTAR_TEST_CASE(test_canonical_token_range) { diff --git a/test/boost/cql_query_test.cc b/test/boost/cql_query_test.cc index f338845cc5..1e4cca524a 100644 --- a/test/boost/cql_query_test.cc +++ b/test/boost/cql_query_test.cc @@ -15,6 +15,7 @@ #include #include +#include #include diff --git a/test/boost/database_test.cc b/test/boost/database_test.cc index a78b92421e..f5d4dd8ed2 100644 --- a/test/boost/database_test.cc +++ b/test/boost/database_test.cc @@ -43,6 +43,7 @@ #include "test/lib/tmpdir.hh" #include "db/data_listeners.hh" #include "multishard_mutation_query.hh" +#include "mutation_query.hh" #include "transport/messages/result_message.hh" #include "compaction/compaction_manager.hh" #include "db/snapshot-ctl.hh" diff --git a/test/boost/group0_cmd_merge_test.cc b/test/boost/group0_cmd_merge_test.cc index f14a411532..8099f7ce73 100644 --- a/test/boost/group0_cmd_merge_test.cc +++ b/test/boost/group0_cmd_merge_test.cc @@ -12,6 +12,7 @@ #include "test/lib/cql_test_env.hh" #include "db/config.hh" +#include "db/system_keyspace.hh" #include "service/migration_manager.hh" #include "service/raft/raft_group_registry.hh" #include "service/raft/group0_state_machine.hh" diff --git a/test/boost/transport_test.cc b/test/boost/transport_test.cc index fa9bdcf573..78bdabd748 100644 --- a/test/boost/transport_test.cc +++ b/test/boost/transport_test.cc @@ -9,6 +9,7 @@ #include "test/lib/scylla_test_case.hh" #include +#include #include "transport/request.hh" #include "transport/response.hh"