diff --git a/service/storage_service.cc b/service/storage_service.cc index c89adf2187..9bee372f93 100644 --- a/service/storage_service.cc +++ b/service/storage_service.cc @@ -396,7 +396,7 @@ void storage_service::prepare_to_join(std::vector loaded_endpoints auto broadcast_rpc_address = utils::fb_utilities::get_broadcast_rpc_address(); auto& proxy = service::get_storage_proxy(); // Ensure we know our own actual Schema UUID in preparation for updates - auto schema_version = update_schema_version(proxy, cluster_schema_features()).get0(); + auto schema_version = update_schema_version(proxy, _feature_service.cluster_schema_features()).get0(); app_states.emplace(gms::application_state::NET_VERSION, value_factory.network_version()); app_states.emplace(gms::application_state::HOST_ID, value_factory.host_id(local_host_id)); app_states.emplace(gms::application_state::RPC_ADDRESS, value_factory.rpcaddress(broadcast_rpc_address)); @@ -3308,10 +3308,6 @@ void storage_service::notify_cql_change(inet_address endpoint, bool ready) } } -db::schema_features storage_service::cluster_schema_features() const { - return _feature_service.cluster_schema_features(); -} - future storage_service::is_cleanup_allowed(sstring keyspace) { return get_storage_service().invoke_on(0, [keyspace = std::move(keyspace)] (storage_service& ss) { auto my_address = ss.get_broadcast_address(); diff --git a/service/storage_service.hh b/service/storage_service.hh index f1d91c3375..be58b3932d 100644 --- a/service/storage_service.hh +++ b/service/storage_service.hh @@ -2256,105 +2256,6 @@ public: sstring get_known_features(); std::set get_known_features_set(); - bool cluster_supports_range_tombstones() const { - return _feature_service.cluster_supports_range_tombstones(); - } - - bool cluster_supports_large_partitions() const { - return _feature_service.cluster_supports_large_partitions(); - } - - bool cluster_supports_materialized_views() const { - return _feature_service.cluster_supports_materialized_views(); - } - - bool cluster_supports_counters() const { - return _feature_service.cluster_supports_counters(); - } - - bool cluster_supports_indexes() const { - return _feature_service.cluster_supports_indexes(); - } - - bool cluster_supports_digest_multipartition_reads() const { - return _feature_service.cluster_supports_digest_multipartition_reads(); - } - - bool cluster_supports_correct_counter_order() const { - return _feature_service.cluster_supports_correct_counter_order(); - } - - const gms::feature& cluster_supports_schema_tables_v3() const { - return _feature_service.cluster_supports_schema_tables_v3(); - } - - bool cluster_supports_reading_correctly_serialized_range_tombstones() const { - return _feature_service.cluster_supports_reading_correctly_serialized_range_tombstones(); - } - - bool cluster_supports_write_failure_reply() const { - return _feature_service.cluster_supports_write_failure_reply(); - } - - bool cluster_supports_xxhash_digest_algorithm() const { - return _feature_service.cluster_supports_xxhash_digest_algorithm(); - } - - bool cluster_supports_user_defined_functions() const { - return _feature_service.cluster_supports_user_defined_functions(); - } - - bool cluster_supports_roles() const { - return _feature_service.cluster_supports_roles(); - } - - bool cluster_supports_stream_with_rpc_stream() const { - return _feature_service.cluster_supports_stream_with_rpc_stream(); - } - - const gms::feature& cluster_supports_cdc() const { - return _feature_service.cluster_supports_cdc(); - } - - bool cluster_supports_row_level_repair() const { - return _feature_service.cluster_supports_row_level_repair(); - } - gms::feature& cluster_supports_truncation_table() { - return _feature_service.cluster_supports_truncation_table(); - } - const gms::feature& cluster_supports_truncation_table() const { - return _feature_service.cluster_supports_truncation_table(); - } - const gms::feature& cluster_supports_correct_static_compact_in_mc() const { - return _feature_service.cluster_supports_correct_static_compact_in_mc(); - } - - const gms::feature& cluster_supports_view_virtual_columns() const { - return _feature_service.cluster_supports_view_virtual_columns(); - } - const gms::feature& cluster_supports_digest_insensitive_to_expiry() const { - return _feature_service.cluster_supports_digest_insensitive_to_expiry(); - } - - bool cluster_supports_computed_columns() const { - return _feature_service.cluster_supports_computed_columns(); - } - - bool cluster_supports_nonfrozen_udts() const { - return _feature_service.cluster_supports_nonfrozen_udts(); - } - - bool cluster_supports_hinted_handoff_separate_connection() { - return _feature_service.cluster_supports_hinted_handoff_separate_connection(); - } - - bool cluster_supports_lwt() { - return _feature_service.cluster_supports_lwt(); - } - - // Returns schema features which all nodes in the cluster advertise as supported. - db::schema_features cluster_schema_features() const; - private: future<> set_cql_ready(bool ready); private: