mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-29 11:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

cql test env: Keep query processor reference on board

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2020-10-07 21:50:44 +03:00
parent 8989021dc3
commit a340caa328
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/lib/cql_test_env.cc
View File

@@ -113,6 +113,7 @@ public:
private:
sharded<gms::feature_service>& _feature_service;
sharded<database>& _db;
sharded<cql3::query_processor>& _qp;
sharded<auth::service>& _auth_service;
sharded<db::view::view_builder>& _view_builder;
sharded<db::view::view_update_generator>& _view_update_generator;
@@ -143,12 +144,14 @@ public:
single_node_cql_env(
sharded<gms::feature_service>& feature_service,
sharded<database>& db,
sharded<cql3::query_processor>& qp,
sharded<auth::service>& auth_service,
sharded<db::view::view_builder>& view_builder,
sharded<db::view::view_update_generator>& view_update_generator,
sharded<service::migration_notifier>& mnotifier)
: _feature_service(feature_service)
, _db(db)
, _qp(qp)
, _auth_service(auth_service)
, _view_builder(view_builder)
, _view_update_generator(view_update_generator)
@@ -308,7 +311,7 @@ public:
}
cql3::query_processor& local_qp() override {
return cql3::get_local_query_processor();
return _qp.local();
}
sharded<database>& db() override {
@@ -316,7 +319,7 @@ public:
}
distributed<cql3::query_processor>& qp() override {
return cql3::get_query_processor();
return _qp;
}
auth::service& local_auth_service() override {
@@ -614,7 +617,7 @@ public:
// The default user may already exist if this `cql_test_env` is starting with previously populated data.
}
single_node_cql_env env(feature_service, db, auth_service, view_builder, view_update_generator, mm_notif);
single_node_cql_env env(feature_service, db, qp, auth_service, view_builder, view_update_generator, mm_notif);
env.start().get();
auto stop_env = defer([&env] { env.stop().get(); });