database: Remove unused mm arg from init_non_system_keyspaces()

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>

database.cc

@@ -47,7 +47,7 @@
 #include <boost/container/static_vector.hpp>
 #include "frozen_mutation.hh"
 #include <seastar/core/do_with.hh>
-#include "service/migration_manager.hh"
+#include "service/migration_listener.hh"
 #include "message/messaging_service.hh"
 #include "cell_locking.hh"
 #include "view_info.hh"
@@ -762,7 +762,7 @@ do_parse_schema_tables(distributed<service::storage_proxy>& proxy, const sstring
     });
 }
 
-future<> database::parse_system_tables(distributed<service::storage_proxy>& proxy, distributed<service::migration_manager>& mm) {
+future<> database::parse_system_tables(distributed<service::storage_proxy>& proxy) {
     using namespace db::schema_tables;
     co_await do_parse_schema_tables(proxy, db::schema_tables::KEYSPACES, [&] (schema_result_value_type &v) -> future<> {
         auto ksm = create_keyspace_from_schema_partition(v);

database.hh

@@ -88,7 +88,6 @@ namespace service {
 class storage_proxy;
 class storage_service;
 class migration_notifier;
-class migration_manager;
 }
 
 namespace netw {
@@ -1386,7 +1385,7 @@ public:
 
     void set_enable_incremental_backups(bool val) { _enable_incremental_backups = val; }
 
-    future<> parse_system_tables(distributed<service::storage_proxy>&, distributed<service::migration_manager>&);
+    future<> parse_system_tables(distributed<service::storage_proxy>&);
     database(const db::config&, database_config dbcfg, service::migration_notifier& mn, gms::feature_service& feat, const locator::shared_token_metadata& stm, abort_source& as, sharded<semaphore>& sst_dir_sem);
     database(database&&) = delete;
     ~database();

distributed_loader.cc

@@ -669,10 +669,10 @@ future<> distributed_loader::ensure_system_table_directories(distributed<databas
 }
 
 future<> distributed_loader::init_non_system_keyspaces(distributed<database>& db,
-        distributed<service::storage_proxy>& proxy, distributed<service::migration_manager>& mm) {
-    return seastar::async([&db, &proxy, &mm] {
-        db.invoke_on_all([&proxy, &mm] (database& db) {
-            return db.parse_system_tables(proxy, mm);
+        distributed<service::storage_proxy>& proxy) {
+    return seastar::async([&db, &proxy] {
+        db.invoke_on_all([&proxy] (database& db) {
+            return db.parse_system_tables(proxy);
         }).get();
 
         const auto& cfg = db.local().get_config();

distributed_loader.hh

@@ -54,7 +54,6 @@ namespace service {
 
 class storage_proxy;
 class storage_service;
-class migration_manager;
 
 }
 
@@ -83,7 +82,7 @@ public:
     static future<> populate_keyspace(distributed<database>& db, sstring datadir, sstring ks_name);
     static future<> init_system_keyspace(distributed<database>& db, distributed<service::storage_service>& ss);
     static future<> ensure_system_table_directories(distributed<database>& db);
-    static future<> init_non_system_keyspaces(distributed<database>& db, distributed<service::storage_proxy>& proxy, distributed<service::migration_manager>& mm);
+    static future<> init_non_system_keyspaces(distributed<database>& db, distributed<service::storage_proxy>& proxy);
 private:
     static future<> cleanup_column_family_temp_sst_dirs(sstring sstdir);
     static future<> handle_sstables_pending_delete(sstring pending_deletes_dir);

main.cc

@@ -995,7 +995,7 @@ int main(int ac, char** av) {
             api::set_server_compaction_manager(ctx).get();
 
             supervisor::notify("loading non-system sstables");
-            distributed_loader::init_non_system_keyspaces(db, proxy, mm).get();
+            distributed_loader::init_non_system_keyspaces(db, proxy).get();
 
             supervisor::notify("starting view update generator");
             view_update_generator.start(std::ref(db)).get();

test/lib/cql_test_env.cc

@@ -662,7 +662,7 @@ public:
                 auto cfm = pair.second;
                 return ks.make_directory_for_column_family(cfm->cf_name(), cfm->id());
             }).get();
-            distributed_loader::init_non_system_keyspaces(db, proxy, mm).get();
+            distributed_loader::init_non_system_keyspaces(db, proxy).get();
 
             db.invoke_on_all([] (database& db) {
                 for (auto& x : db.get_column_families()) {

test/lib/cql_test_env.hh

@@ -55,6 +55,7 @@ namespace cql3 {
 namespace service {
 
 class client_state;
+class migration_manager;
 
 }