raft_group0_client: uninclude "db/system_keyspace.hh"
It doesn't need it apart from a forward declaration. Files that lost necessary includes are adjusted, and some users of auth_version_t are redirected to the definition outside system_keyspace.
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "auth/authenticator.hh"
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
namespace cql3 {
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<auth::authenticated_user>& user, const prepared_cache_key_type& key) {
|
||||
if (user) {
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
#include "types/user.hh"
|
||||
#include "concrete_types.hh"
|
||||
#include "validation.hh"
|
||||
#include "dht/i_partitioner.hh"
|
||||
#include <optional>
|
||||
|
||||
namespace cql3 {
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "gms/feature_service.hh"
|
||||
#include <fmt/core.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <fmt/std.h>
|
||||
#include <ios>
|
||||
#include <ostream>
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
|
||||
@@ -36,6 +36,12 @@ namespace service {
|
||||
class storage_service;
|
||||
}
|
||||
|
||||
namespace locator {
|
||||
|
||||
class shared_token_metadata;
|
||||
|
||||
}
|
||||
|
||||
namespace qos {
|
||||
/**
|
||||
* a structure to hold a service level
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "replica/database.hh"
|
||||
#include "utils/assert.hh"
|
||||
#include "utils/to_string.hh"
|
||||
#include "db/system_keyspace.hh"
|
||||
|
||||
|
||||
namespace service {
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <seastar/core/abort_source.hh>
|
||||
#include <seastar/core/rwlock.hh>
|
||||
#include <seastar/core/condition-variable.hh>
|
||||
#include <seastar/coroutine/generator.hh>
|
||||
#include <string>
|
||||
|
||||
#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.
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <boost/multiprecision/cpp_int.hpp>
|
||||
|
||||
#include <fmt/ranges.h>
|
||||
#include <fmt/std.h>
|
||||
|
||||
#include <seastar/net/inet_address.hh>
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "test/lib/scylla_test_case.hh"
|
||||
|
||||
#include <fmt/ranges.h>
|
||||
#include <fmt/std.h>
|
||||
|
||||
#include "transport/request.hh"
|
||||
#include "transport/response.hh"
|
||||
|
||||
Reference in New Issue
Block a user