Merge pull request #15823 from vespa-engine/balder/no-need-for-may-when-we-know

GC unused parameter. No need to say maybe when it is definitive.

15 files changed, 19 insertions, 27 deletions

diff --git a/config/src/apps/vespa-get-config/getconfig.cpp b/config/src/apps/vespa-get-config/getconfig.cpp
index 65dc800c275..e8ef1765473 100644
--- a/config/src/apps/vespa-get-config/getconfig.cpp
+++ b/config/src/apps/vespa-get-config/getconfig.cpp
@@ -216,8 +216,7 @@ GetConfig::Main()
         vespaVersion = VespaVersion::fromString(vespaVersionString);
     }
 
-    int protocolVersion = config::protocol::readProtocolVersion();
-    FRTConfigRequestFactory requestFactory(protocolVersion, traceLevel, vespaVersion, config::protocol::readProtocolCompressionType());
+    FRTConfigRequestFactory requestFactory(traceLevel, vespaVersion, config::protocol::readProtocolCompressionType());
     FRTConnection connection(spec, _server->supervisor(), TimingValues());
     ConfigKey key(configId, defName, defNamespace, defMD5, defSchema);
     ConfigState state(configMD5, generation, false);
diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp
index 0d70605fa62..6cffe079dae 100644
--- a/config/src/tests/frt/frt.cpp
+++ b/config/src/tests/frt/frt.cpp
@@ -218,7 +218,7 @@ namespace {
 
         FRTFixture(SourceFixture & f1)
             : result(2000, 10000),
-              requestFactory(1, 3, VespaVersion::fromString("1.2.3"), CompressionType::UNCOMPRESSED),
+              requestFactory(3, VespaVersion::fromString("1.2.3"), CompressionType::UNCOMPRESSED),
               src(ConnectionFactory::SP(new FactoryMock(&f1.conn)),
                   requestFactory,
                   ConfigAgent::UP(new AgentFixture(&result)),
diff --git a/config/src/vespa/config/frt/frtconfigrequestfactory.cpp b/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
index d32ae411125..fbc13556d14 100644
--- a/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
+++ b/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
@@ -10,7 +10,7 @@ namespace config {
 /**
  * Factory for creating config requests depending on protocol version;
  */
-FRTConfigRequestFactory::FRTConfigRequestFactory([[maybe_unused]] int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType)
+FRTConfigRequestFactory::FRTConfigRequestFactory(int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType)
     : _traceLevel(traceLevel),
       _vespaVersion(vespaVersion),
       _hostName(vespalib::HostName::get()),
@@ -18,8 +18,7 @@ FRTConfigRequestFactory::FRTConfigRequestFactory([[maybe_unused]] int protocolVe
 {
 }
 
-FRTConfigRequestFactory::~FRTConfigRequestFactory() {
-}
+FRTConfigRequestFactory::~FRTConfigRequestFactory() = default;
 
 FRTConfigRequest::UP
 FRTConfigRequestFactory::createConfigRequest(const ConfigKey & key, Connection * connection,
diff --git a/config/src/vespa/config/frt/frtconfigrequestfactory.h b/config/src/vespa/config/frt/frtconfigrequestfactory.h
index c70b8920fdd..7c37ecd76b2 100644
--- a/config/src/vespa/config/frt/frtconfigrequestfactory.h
+++ b/config/src/vespa/config/frt/frtconfigrequestfactory.h
@@ -18,7 +18,7 @@ namespace config {
 class FRTConfigRequestFactory
 {
 public:
-    FRTConfigRequestFactory(int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
+    FRTConfigRequestFactory(int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
     ~FRTConfigRequestFactory();
 
     FRTConfigRequest::UP createConfigRequest(const ConfigKey & key, Connection * connection, const ConfigState & state, int64_t serverTimeout) const;
diff --git a/config/src/vespa/config/frt/frtsourcefactory.cpp b/config/src/vespa/config/frt/frtsourcefactory.cpp
index c58571e3ac4..67e973562db 100644
--- a/config/src/vespa/config/frt/frtsourcefactory.cpp
+++ b/config/src/vespa/config/frt/frtsourcefactory.cpp
@@ -4,9 +4,9 @@
 
 namespace config {
 
-FRTSourceFactory::FRTSourceFactory(ConnectionFactory::UP connectionFactory, const TimingValues & timingValues, int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType)
+FRTSourceFactory::FRTSourceFactory(ConnectionFactory::UP connectionFactory, const TimingValues & timingValues, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType)
     : _connectionFactory(std::move(connectionFactory)),
-      _requestFactory(protocolVersion, traceLevel, vespaVersion, compressionType),
+      _requestFactory(traceLevel, vespaVersion, compressionType),
       _timingValues(timingValues)
 {
 }
diff --git a/config/src/vespa/config/frt/frtsourcefactory.h b/config/src/vespa/config/frt/frtsourcefactory.h
index 23596c1c6cd..4bbcbcb366d 100644
--- a/config/src/vespa/config/frt/frtsourcefactory.h
+++ b/config/src/vespa/config/frt/frtsourcefactory.h
@@ -14,7 +14,7 @@ namespace config {
 class FRTSourceFactory : public SourceFactory
 {
 public:
-    FRTSourceFactory(ConnectionFactory::UP connectionFactory, const TimingValues & timingValues, int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
+    FRTSourceFactory(ConnectionFactory::UP connectionFactory, const TimingValues & timingValues, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
 
     /**
      * Create source handling config described by key.
diff --git a/config/src/vespa/config/subscription/sourcespec.cpp b/config/src/vespa/config/subscription/sourcespec.cpp
index 326b3191fd0..e355e0c1bd6 100644
--- a/config/src/vespa/config/subscription/sourcespec.cpp
+++ b/config/src/vespa/config/subscription/sourcespec.cpp
@@ -121,7 +121,7 @@ ServerSpec::createSourceFactory(const TimingValues & timingValues) const
 {
     const auto vespaVersion = VespaVersion::getCurrentVersion();
     return std::make_unique<FRTSourceFactory>(std::make_unique<FRTConnectionPool>(*this, timingValues), timingValues,
-                                              _protocolVersion, _traceLevel, vespaVersion, _compressionType);
+                                              _traceLevel, vespaVersion, _compressionType);
 }
 
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index c7b5aaafbfc..40f698ff033 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -176,7 +176,7 @@ DocumentDB::DocumentDB(const vespalib::string &baseDir,
       _lidSpaceCompactionHandlers(),
       _jobTrackers(),
       _calc(),
-      _metricsUpdater(_subDBs, _writeService, _jobTrackers, *_sessionManager, _writeFilter, _state)
+      _metricsUpdater(_subDBs, _writeService, _jobTrackers, *_sessionManager, _writeFilter)
 {
     assert(configSnapshot);
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
index 3a086046a27..e48a112db93 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
@@ -34,8 +34,7 @@ DocumentDBMetricsUpdater::DocumentDBMetricsUpdater(const DocumentSubDBCollection
                                                    ExecutorThreadingService &writeService,
                                                    DocumentDBJobTrackers &jobTrackers,
                                                    matching::SessionManager &sessionManager,
-                                                   const AttributeUsageFilter &writeFilter,
-                                                   [[maybe_unused]] const DDBState &state)
+                                                   const AttributeUsageFilter &writeFilter)
     : _subDBs(subDBs),
       _writeService(writeService),
       _jobTrackers(jobTrackers),
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.h b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.h
index dbf4c45007f..399918b52da 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.h
@@ -45,8 +45,7 @@ public:
                              ExecutorThreadingService &writeService,
                              DocumentDBJobTrackers &jobTrackers,
                              matching::SessionManager &sessionManager,
-                             const AttributeUsageFilter &writeFilter,
-                             const DDBState &state);
+                             const AttributeUsageFilter &writeFilter);
     ~DocumentDBMetricsUpdater();
 
     void updateMetrics(DocumentDBTaggedMetrics &metrics);
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 203b58437f3..aca002faa25 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -122,7 +122,7 @@ VESPA_THREAD_STACK_TAG(close_executor)
 
 }
 
-Proton::ProtonFileHeaderContext::ProtonFileHeaderContext([[maybe_unused]] const Proton &proton_, const vespalib::string &creator)
+Proton::ProtonFileHeaderContext::ProtonFileHeaderContext(const vespalib::string &creator)
     : _hostName(),
       _creator(creator),
       _cluster(),
@@ -189,7 +189,7 @@ Proton::Proton(const config::ConfigUri & configUri,
       _mutex(),
       _metricsHook(*this),
       _metricsEngine(std::make_unique<MetricsEngine>()),
-      _fileHeaderContext(*this, progName),
+      _fileHeaderContext(progName),
       _tls(),
       _diskMemUsageSampler(),
       _persistenceEngine(),
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h
index f88cd7bf0cd..c03839139ec 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.h
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.h
@@ -78,7 +78,7 @@ private:
         pid_t _pid;
 
     public:
-        ProtonFileHeaderContext(const Proton &proton_, const vespalib::string &creator);
+        ProtonFileHeaderContext(const vespalib::string &creator);
         ~ProtonFileHeaderContext() override;
 
         void addTags(vespalib::GenericHeader &header, const vespalib::string &name) const override;
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index 7d5d49b19c7..0bd50fc0104 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -120,7 +120,7 @@ StoreOnlyDocSubDB::StoreOnlyDocSubDB(const Config &cfg, const Context &ctx)
       _pendingLidsForCommit(std::make_shared<PendingLidTracker>()),
       _subDbId(cfg._subDbId),
       _subDbType(cfg._subDbType),
-      _fileHeaderContext(*this, ctx._fileHeaderContext, _docTypeName, _baseDir),
+      _fileHeaderContext(ctx._fileHeaderContext, _docTypeName, _baseDir),
       _gidToLidChangeHandler(std::make_shared<DummyGidToLidChangeHandler>())
 {
     vespalib::mkdir(_baseDir, false); // Assume parent is created.
@@ -497,8 +497,7 @@ StoreOnlyDocSubDB::getDocumentDBReference()
 }
 
 StoreOnlySubDBFileHeaderContext::
-StoreOnlySubDBFileHeaderContext([[maybe_unused]] StoreOnlyDocSubDB &owner,
-                                const FileHeaderContext & parentFileHeaderContext,
+StoreOnlySubDBFileHeaderContext(const FileHeaderContext & parentFileHeaderContext,
                                 const DocTypeName &docTypeName,
                                 const vespalib::string &baseDir)
     : FileHeaderContext(),
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
index 1cdd22fcc41..7c3f7c82eb0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
@@ -50,8 +50,6 @@ public:
     void close() override { }
 };
 
-class StoreOnlyDocSubDB;
-
 /**
  * File header context used by the store-only sub database.
  *
@@ -65,8 +63,7 @@ class StoreOnlySubDBFileHeaderContext : public search::common::FileHeaderContext
     vespalib::string _subDB;
 
 public:
-    StoreOnlySubDBFileHeaderContext(StoreOnlyDocSubDB &owner,
-                                    const search::common::FileHeaderContext & parentFileHeaderContext,
+    StoreOnlySubDBFileHeaderContext(const search::common::FileHeaderContext & parentFileHeaderContext,
                                     const DocTypeName &docTypeName,
                                     const vespalib::string &baseDir);
     ~StoreOnlySubDBFileHeaderContext();
diff --git a/searchlib/src/vespa/searchlib/features/termdistancefeature.cpp b/searchlib/src/vespa/searchlib/features/termdistancefeature.cpp
index e9f48421fcf..5a60f2e617f 100644
--- a/searchlib/src/vespa/searchlib/features/termdistancefeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/termdistancefeature.cpp
@@ -13,7 +13,7 @@ namespace search::features {
 
 
 TermDistanceExecutor::TermDistanceExecutor(const IQueryEnvironment & env,
-                                           [[maybe_unused]] const TermDistanceParams & params) :
+                                           const TermDistanceParams & params) :
     FeatureExecutor(),
     _termA(env.getTerm(params.termX)),
     _termB(env.getTerm(params.termY)),