Files
scylladb/test/lib/test_services.cc
Avi Kivity ee9df91a76 Merge "Allow setting partitioner per table" from Piotr
"
This PR makes it possible to enable the usage of different partitioner for each table. If no table-specific partitioner is set for a given table then a default partitioner is used.

The PR is composed of the following parts:

 - Introduction of schema::get_partitioner that still returns dht::global_partitioner
 - Replacement of all the usage of dht::global_partitioner with schema::get_partitioner
 - Making it possible to set table-specific partitioner in a schema_builder
 - Remove all the places that were setting default partitioner except for main.cc (mostly tests)
 - Move default partitioner from i_partitioner to schema.cc and hide it from the rest of the codebase
 - Remove dht::global_partitioner

After this PR there's no such thing as global partitioner at all. There is only a default partitioner but it still has to be accessed through schema::get_partitioner.

There are some intermediate states in which i_partitioner is stored as shared_ptr in the schema but the final version keeps it by const&.

The PR does not enable per table partitioner end-to-end. Just the internals of the single node are covered. I still have to deal with:

 - Making sure a table has the same partitioner on each node
 - Allowing user to set up a table-specific partitioner on table
 - Signal driver about what partitioner is used by a given table
 - Persist partitioner info for each table that does not use default partitioner.
Fixes #5493

Tests: unit(dev, release, debug), dtest(byo)
"

* 'per_table_partitioner' of https://github.com/haaawk/scylla:
  schema: drop optional from _partitioner field
  make_multishard_combining_reader: stop taking partitioner
  split_range_to_single_shard: stop taking partitioner as argument
  tests: remove unused murmur3 includes
  partitioner: move default_partitioner to schema.cc
  partitioner: hide dht::default_partitioner
  schema: include partitioner name in scylla tables mutation
  schema: make it possible to set custom partitioner
  scylla_tables: add partitioner column
  schema_features: add PER_TABLE_PARTITIONERS feature
  features: add PER_TABLE_PARTITIONERS feature
2020-03-16 11:13:47 +02:00

130 lines
5.2 KiB
C++

/*
* Copyright (C) 2019 ScyllaDB
*/
/*
* This file is part of Scylla.
*
* Scylla is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Scylla is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
*/
#include "test/lib/test_services.hh"
#include "auth/service.hh"
#include "db/config.hh"
#include "db/system_distributed_keyspace.hh"
#include "db/view/view_update_generator.hh"
#include "dht/i_partitioner.hh"
#include "gms/feature_service.hh"
#include "gms/gossiper.hh"
#include "message/messaging_service.hh"
#include "service/storage_service.hh"
class storage_service_for_tests::impl {
sharded<abort_source> _abort_source;
sharded<gms::feature_service> _feature_service;
sharded<gms::gossiper> _gossiper;
distributed<database> _db;
db::config _cfg;
sharded<auth::service> _auth_service;
sharded<locator::token_metadata> _token_metadata;
sharded<service::migration_notifier> _mnotif;
sharded<db::system_distributed_keyspace> _sys_dist_ks;
sharded<db::view::view_update_generator> _view_update_generator;
public:
impl() {
auto thread = seastar::thread_impl::get();
assert(thread);
_cfg.broadcast_to_all_shards().get();
utils::fb_utilities::set_broadcast_address(gms::inet_address("localhost"));
utils::fb_utilities::set_broadcast_rpc_address(gms::inet_address("localhost"));
_abort_source.start().get();
_token_metadata.start().get();
_mnotif.start().get();
_feature_service.start(gms::feature_config_from_db_config(_cfg)).get();
_gossiper.start(std::ref(_abort_source), std::ref(_feature_service), std::ref(_token_metadata), std::ref(_cfg)).get();
netw::get_messaging_service().start(gms::inet_address("127.0.0.1"), 7000, false).get();
service::storage_service_config sscfg;
sscfg.available_memory = memory::stats().total_memory();
service::get_storage_service().start(std::ref(_abort_source), std::ref(_db), std::ref(_gossiper), std::ref(_auth_service), std::ref(_sys_dist_ks), std::ref(_view_update_generator), std::ref(_feature_service), sscfg, std::ref(_mnotif), std::ref(_token_metadata), true).get();
service::get_storage_service().invoke_on_all([] (auto& ss) {
ss.enable_all_features();
}).get();
}
~impl() {
service::get_storage_service().stop().get();
netw::get_messaging_service().stop().get();
_db.stop().get();
_gossiper.stop().get();
_mnotif.stop().get();
_token_metadata.stop().get();
_feature_service.stop().get();
_abort_source.stop().get();
}
};
storage_service_for_tests::storage_service_for_tests() : _impl(std::make_unique<impl>()) {
}
storage_service_for_tests::~storage_service_for_tests() = default;
dht::token create_token_from_key(const dht::i_partitioner& partitioner, sstring key) {
sstables::key_view key_view = sstables::key_view(bytes_view(reinterpret_cast<const signed char*>(key.c_str()), key.size()));
dht::token token = partitioner.get_token(key_view);
assert(token == partitioner.get_token(key_view));
return token;
}
range<dht::token> create_token_range_from_keys(const dht::i_partitioner& partitioner, sstring start_key, sstring end_key) {
dht::token start = create_token_from_key(partitioner, start_key);
assert(engine().cpu_id() == partitioner.shard_of(start));
dht::token end = create_token_from_key(partitioner, end_key);
assert(engine().cpu_id() == partitioner.shard_of(end));
assert(end >= start);
return range<dht::token>::make(start, end);
}
static const sstring some_keyspace("ks");
static const sstring some_column_family("cf");
db::nop_large_data_handler nop_lp_handler;
db::config test_db_config;
gms::feature_service test_feature_service(gms::feature_config_from_db_config(test_db_config));
thread_local sstables::sstables_manager test_sstables_manager(nop_lp_handler, test_db_config, test_feature_service);
column_family::config column_family_test_config() {
column_family::config cfg;
cfg.sstables_manager = &test_sstables_manager;
return cfg;
}
column_family_for_tests::column_family_for_tests()
: column_family_for_tests(
schema_builder(some_keyspace, some_column_family)
.with_column(utf8_type->decompose("p1"), utf8_type, column_kind::partition_key)
.build()
)
{ }
column_family_for_tests::column_family_for_tests(schema_ptr s)
: _data(make_lw_shared<data>())
{
_data->s = s;
_data->cfg = column_family_test_config();
_data->cfg.enable_disk_writes = false;
_data->cfg.enable_commitlog = false;
_data->cf = make_lw_shared<column_family>(_data->s, _data->cfg, column_family::no_commitlog(), _data->cm, _data->cl_stats, _data->tracker);
_data->cf->mark_ready_for_writes();
}