mirror of
https://github.com/scylladb/scylladb.git
synced 2026-04-21 00:50:35 +00:00
This reverts commit c42a91ec72.
A significant performance regression was observed due to this change.
From Avi:
> perf-simple-query --smp 1
>
> before:
>
> 216489.88 tps ( 61.1 allocs/op, 13.1 tasks/op, 43558 insns/op, 0 errors)
> 217708.69 tps ( 61.1 allocs/op, 13.1 tasks/op, 43542 insns/op, 0 errors)
> 219495.02 tps ( 61.1 allocs/op, 13.1 tasks/op, 43538 insns/op, 0 errors)
> 216863.84 tps ( 61.1 allocs/op, 13.1 tasks/op, 43567 insns/op, 0 errors)
> 218936.48 tps ( 61.1 allocs/op, 13.1 tasks/op, 43546 insns/op, 0 errors)
>
> after:
>
> 201773.52 tps ( 63.1 allocs/op, 15.1 tasks/op, 44600 insns/op, 0 errors)
> 210875.48 tps ( 63.1 allocs/op, 15.1 tasks/op, 44558 insns/op, 0 errors)
> 210186.55 tps ( 63.1 allocs/op, 15.1 tasks/op, 44588 insns/op, 0 errors)
> 211021.76 tps ( 63.1 allocs/op, 15.1 tasks/op, 44569 insns/op, 0 errors)
> 208597.52 tps ( 63.1 allocs/op, 15.1 tasks/op, 44587 insns/op, 0 errors)
>
> Two extra allocations, two extra tasks, 1k extra instructions, for
> something that is DDL only.
Fixes #14590
89 lines
2.8 KiB
C++
89 lines
2.8 KiB
C++
/*
|
|
* Copyright (C) 2015-present ScyllaDB
|
|
*
|
|
* Modified by ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
|
|
*/
|
|
|
|
#include <seastar/core/coroutine.hh>
|
|
#include "cql3/statements/schema_altering_statement.hh"
|
|
#include "locator/abstract_replication_strategy.hh"
|
|
#include "data_dictionary/data_dictionary.hh"
|
|
#include "mutation/mutation.hh"
|
|
#include "cql3/query_processor.hh"
|
|
#include "transport/messages/result_message.hh"
|
|
#include "service/raft/raft_group_registry.hh"
|
|
#include "service/migration_manager.hh"
|
|
|
|
namespace cql3 {
|
|
|
|
namespace statements {
|
|
|
|
schema_altering_statement::schema_altering_statement(timeout_config_selector timeout_selector)
|
|
: cf_statement(cf_name())
|
|
, cql_statement_no_metadata(timeout_selector)
|
|
, _is_column_family_level{false}
|
|
{
|
|
}
|
|
|
|
schema_altering_statement::schema_altering_statement(cf_name name, timeout_config_selector timeout_selector)
|
|
: cf_statement{std::move(name)}
|
|
, cql_statement_no_metadata(timeout_selector)
|
|
, _is_column_family_level{true}
|
|
{
|
|
}
|
|
|
|
future<> schema_altering_statement::grant_permissions_to_creator(const service::client_state&) const {
|
|
return make_ready_future<>();
|
|
}
|
|
|
|
bool schema_altering_statement::depends_on(std::string_view ks_name, std::optional<std::string_view> cf_name) const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
uint32_t schema_altering_statement::get_bound_terms() const
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void schema_altering_statement::prepare_keyspace(const service::client_state& state)
|
|
{
|
|
if (_is_column_family_level) {
|
|
cf_statement::prepare_keyspace(state);
|
|
}
|
|
}
|
|
|
|
future<::shared_ptr<messages::result_message>>
|
|
schema_altering_statement::execute(query_processor& qp, service::query_state& state, const query_options& options) const {
|
|
bool internal = state.get_client_state().is_internal();
|
|
if (internal) {
|
|
auto replication_type = locator::replication_strategy_type::everywhere_topology;
|
|
data_dictionary::database db = qp.db();
|
|
if (_cf_name && _cf_name->has_keyspace()) {
|
|
const auto& ks = db.find_keyspace(_cf_name->get_keyspace());
|
|
replication_type = ks.get_replication_strategy().get_type();
|
|
}
|
|
if (replication_type != locator::replication_strategy_type::local) {
|
|
sstring info = _cf_name ? _cf_name->to_string() : "schema";
|
|
throw std::logic_error(format("Attempted to modify {} via internal query: such schema changes are not propagated and thus illegal", info));
|
|
}
|
|
}
|
|
|
|
return qp.execute_schema_statement(*this, state, options).then([this, &state, internal](::shared_ptr<messages::result_message> result) {
|
|
auto permissions_granted_fut = internal
|
|
? make_ready_future<>()
|
|
: grant_permissions_to_creator(state.get_client_state());
|
|
return permissions_granted_fut.then([result = std::move(result)] {
|
|
return result;
|
|
});
|
|
});
|
|
}
|
|
|
|
}
|
|
|
|
}
|