GC unused methods and members in distributormanager config, part 1

2 files changed, 2 insertions, 25 deletions

diff --git a/storage/src/vespa/storage/config/distributorconfiguration.cpp b/storage/src/vespa/storage/config/distributorconfiguration.cpp
index 83be5d71b23..3169e2b5b2f 100644
--- a/storage/src/vespa/storage/config/distributorconfiguration.cpp
+++ b/storage/src/vespa/storage/config/distributorconfiguration.cpp
@@ -21,7 +21,6 @@ DistributorConfiguration::DistributorConfiguration(StorageComponent& component)
       _docCountJoinLimit(0),
       _minimalBucketSplit(16),
       _maxIdealStateOperations(100),
-      _idealStateChunkSize(1000),
       _maxNodesPerMerge(16),
       _max_consecutively_inhibited_maintenance_ticks(20),
       _max_activation_inhibited_out_of_sync_groups(0),
@@ -31,7 +30,6 @@ DistributorConfiguration::DistributorConfiguration(StorageComponent& component)
       _maxPendingMaintenanceOps(1000),
       _maxVisitorsPerNodePerClientVisitor(4),
       _minBucketsPerVisitor(5),
-      _num_distributor_stripes(0),
       _maxClusterClockSkew(0),
       _inhibitMergeSendingOnBusyNodeDuration(60s),
       _simulated_db_pruning_latency(0),
@@ -193,8 +191,6 @@ DistributorConfiguration::configure(const vespa::config::content::core::StorDist
     _simulated_db_pruning_latency = std::chrono::milliseconds(std::max(0, config.simulatedDbPruningLatencyMsec));
     _simulated_db_merging_latency = std::chrono::milliseconds(std::max(0, config.simulatedDbMergingLatencyMsec));
 
-    _num_distributor_stripes = std::max(0, config.numDistributorStripes); // TODO STRIPE test
-    
     LOG(debug,
         "Distributor now using new configuration parameters. Split limits: %d docs/%d bytes. "
         "Join limits: %d docs/%d bytes. Minimal bucket split %d. "
diff --git a/storage/src/vespa/storage/config/distributorconfiguration.h b/storage/src/vespa/storage/config/distributorconfiguration.h
index 9d879fa62d5..0f286d4bf0a 100644
--- a/storage/src/vespa/storage/config/distributorconfiguration.h
+++ b/storage/src/vespa/storage/config/distributorconfiguration.h
@@ -9,8 +9,6 @@
 
 namespace storage {
 
-namespace distributor { struct LegacyDistributorTest; }
-
 class DistributorConfiguration {
 public: 
     explicit DistributorConfiguration(StorageComponent& component);
@@ -37,7 +35,6 @@ public:
     using DistrConfig = vespa::config::content::core::StorDistributormanagerConfig;
     
     void configure(const DistrConfig& config);
-
     void configure(const vespa::config::content::core::StorVisitordispatcherConfig& config);
 
 
@@ -227,9 +224,6 @@ public:
     bool merge_operations_disabled() const noexcept {
         return _merge_operations_disabled;
     }
-    void set_merge_operations_disabled(bool disabled) noexcept {
-        _merge_operations_disabled = disabled;
-    }
 
     void set_use_weak_internal_read_consistency_for_client_gets(bool use_weak) noexcept {
         _use_weak_internal_read_consistency_for_client_gets = use_weak;
@@ -249,9 +243,6 @@ public:
         return _max_consecutively_inhibited_maintenance_ticks;
     }
 
-    void set_prioritize_global_bucket_merges(bool prioritize) noexcept {
-        _prioritize_global_bucket_merges = prioritize;
-    }
     bool prioritize_global_bucket_merges() const noexcept {
         return _prioritize_global_bucket_merges;
     }
@@ -272,9 +263,7 @@ public:
     [[nodiscard]] bool use_unordered_merge_chaining() const noexcept {
         return _use_unordered_merge_chaining;
     }
-    void set_inhibit_default_merges_when_global_merges_pending(bool inhibit) noexcept {
-        _inhibit_default_merges_when_global_merges_pending = inhibit;
-    }
+
     [[nodiscard]] bool inhibit_default_merges_when_global_merges_pending() const noexcept {
         return _inhibit_default_merges_when_global_merges_pending;
     }
@@ -290,15 +279,11 @@ public:
     [[nodiscard]] bool enable_condition_probing() const noexcept {
         return _enable_condition_probing;
     }
-    void set_enable_operation_cancellation(bool enable) noexcept {
-        _enable_operation_cancellation = enable;
-    }
+
     [[nodiscard]] bool enable_operation_cancellation() const noexcept {
         return _enable_operation_cancellation;
     }
 
-    uint32_t num_distributor_stripes() const noexcept { return _num_distributor_stripes; }
-
     bool containsTimeStatement(const std::string& documentSelection) const;
     
 private:
@@ -313,7 +298,6 @@ private:
     uint32_t _docCountJoinLimit;
     uint32_t _minimalBucketSplit;
     uint32_t _maxIdealStateOperations;
-    uint32_t _idealStateChunkSize;
     uint32_t _maxNodesPerMerge;
     uint32_t _max_consecutively_inhibited_maintenance_ticks;
     uint32_t _max_activation_inhibited_out_of_sync_groups;
@@ -331,8 +315,6 @@ private:
     uint32_t _maxVisitorsPerNodePerClientVisitor;
     uint32_t _minBucketsPerVisitor;
 
-    uint32_t _num_distributor_stripes;
-
     MaintenancePriorities _maintenancePriorities;
     std::chrono::seconds _maxClusterClockSkew;
     std::chrono::seconds _inhibitMergeSendingOnBusyNodeDuration;
@@ -360,7 +342,6 @@ private:
 
     DistrConfig::MinimumReplicaCountingMode _minimumReplicaCountingMode;
 
-    friend struct distributor::LegacyDistributorTest;
     void configureMaintenancePriorities(
             const vespa::config::content::core::StorDistributormanagerConfig&);
 };