Merge pull request #14302 from vespa-engine/balder/remove-unused

GC unused members.

3 files changed, 7 insertions, 13 deletions

diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
index 804a558789e..6b47393336a 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
@@ -37,12 +37,10 @@ DomainConfig::DomainConfig()
       _chunkAgeLimit(10ms)
 { }
 
-Domain::Domain(const string &domainName, const string & baseDir, FastOS_ThreadPool & threadPool,
-               Executor & commitExecutor, Executor & sessionExecutor, const DomainConfig & cfg,
-               const FileHeaderContext &fileHeaderContext)
+Domain::Domain(const string &domainName, const string & baseDir, Executor & commitExecutor,
+               Executor & sessionExecutor, const DomainConfig & cfg, const FileHeaderContext &fileHeaderContext)
     : _config(cfg),
       _lastSerial(0),
-      _threadPool(threadPool),
       _singleCommiter(std::make_unique<vespalib::ThreadStackExecutor>(1, 128*1024)),
       _commitExecutor(commitExecutor),
       _sessionExecutor(sessionExecutor),
@@ -58,8 +56,7 @@ Domain::Domain(const string &domainName, const string & baseDir, FastOS_ThreadPo
       _maxSessionRunTime(),
       _baseDir(baseDir),
       _fileHeaderContext(fileHeaderContext),
-      _markedDeleted(false),
-      _self(nullptr)
+      _markedDeleted(false)
 {
     int retval(0);
     if ((retval = makeDirectory(_baseDir.c_str())) != 0) {
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.h b/searchlib/src/vespa/searchlib/transactionlog/domain.h
index cc7f4ac5e4b..a6c6dad5fe8 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.h
@@ -65,9 +65,8 @@ class Domain
 public:
     using SP = std::shared_ptr<Domain>;
     using Executor = vespalib::SyncableThreadExecutor;
-    Domain(const vespalib::string &name, const vespalib::string &baseDir, FastOS_ThreadPool & threadPool,
-           Executor & commitExecutor, Executor & sessionExecutor, const DomainConfig & cfg,
-           const common::FileHeaderContext &fileHeaderContext);
+    Domain(const vespalib::string &name, const vespalib::string &baseDir, Executor & commitExecutor,
+           Executor & sessionExecutor, const DomainConfig & cfg, const common::FileHeaderContext &fileHeaderContext);
 
     ~Domain();
 
@@ -122,7 +121,6 @@ private:
 
     DomainConfig           _config;
     SerialNum              _lastSerial;
-    FastOS_ThreadPool    & _threadPool;
     std::unique_ptr<Executor> _singleCommiter;
     Executor             & _commitExecutor;
     Executor             & _sessionExecutor;
@@ -139,7 +137,6 @@ private:
     vespalib::string       _baseDir;
     const common::FileHeaderContext &_fileHeaderContext;
     bool                   _markedDeleted;
-    FastOS_ThreadInterface  * _self;
 };
 
 }
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index b98453a7648..edfbf846688 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -113,7 +113,7 @@ TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, con
                 domainDir >> domainName;
                 if ( ! domainName.empty()) {
                     try {
-                        auto domain = make_shared<Domain>(domainName, dir(), *_threadPool, _commitExecutor,
+                        auto domain = make_shared<Domain>(domainName, dir(), _commitExecutor,
                                                           _sessionExecutor, cfg, _fileHeaderContext);
                         _domains[domain->name()] = domain;
                     } catch (const std::exception & e) {
@@ -446,7 +446,7 @@ TransLogServer::createDomain(FRT_RPCRequest *req)
     Domain::SP domain(findDomain(domainName));
     if ( !domain ) {
         try {
-            domain = std::make_shared<Domain>(domainName, dir(), *_threadPool, _commitExecutor,
+            domain = std::make_shared<Domain>(domainName, dir(), _commitExecutor,
                                               _sessionExecutor, _domainConfig, _fileHeaderContext);
             Guard domainGuard(_lock);
             _domains[domain->name()] = domain;