From a340caa3289fbacfa283ec05ef5ea43e434bdca4 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@scylladb.com>
Date: Wed, 7 Oct 2020 21:50:44 +0300
Subject: [PATCH] cql test env: Keep query processor reference on board

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
---
 test/lib/cql_test_env.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc
index 3a0a797df7..06f9f3c7a7 100644
--- a/test/lib/cql_test_env.cc
+++ b/test/lib/cql_test_env.cc
@@ -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(); });