Remove the PerDocTypeFeedMetrics

4 files changed, 40 insertions, 110 deletions

diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index 315fb7e86eb..87efd74659d 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -9,7 +9,6 @@
 #include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
 #include <vespa/searchcore/proton/documentmetastore/lidreusedelayer.h>
 #include <vespa/searchcore/proton/matching/error_constant_value.h>
-#include <vespa/searchcore/proton/metrics/feed_metrics.h>
 #include <vespa/searchcore/proton/index/index_writer.h>
 #include <vespa/searchcore/proton/index/indexmanager.h>
 #include <vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.h>
@@ -47,7 +46,7 @@ using proton::matching::SessionManager;
 using searchcorespi::IndexSearchable;
 using searchcorespi::index::IThreadingService;
 using proton::test::MockGidToLidChangeHandler;
-
+using std::make_shared;
 
 using CCR = DocumentDBConfig::ComparisonResult;
 using Configurer = SearchableDocSubDBConfigurer;
@@ -178,14 +177,8 @@ Fixture::Fixture()
     vespalib::rmdir(BASE_DIR, true);
     vespalib::mkdir(BASE_DIR);
     initViewSet(_views);
-    _configurer.reset(new Configurer(_views._summaryMgr,
-                                     _views.searchView,
-                                     _views.feedView,
-                                     _queryLimiter,
-                                     _constantValueRepo,
-                                     _clock,
-                                     "test",
-                                     0));
+    _configurer.reset(new Configurer(_views._summaryMgr, _views.searchView, _views.feedView, _queryLimiter,
+                                     _constantValueRepo, _clock, "test", 0));
 }
 Fixture::~Fixture() {}
 
@@ -193,53 +186,33 @@ void
 Fixture::initViewSet(ViewSet &views)
 {
     Matchers::SP matchers(new Matchers(_clock, _queryLimiter, _constantValueRepo));
-    IndexManager::SP indexMgr(new IndexManager(BASE_DIR, searchcorespi::index::WarmupConfig(),
-                                      2, 0, Schema(), 1, views._reconfigurer,
-                                      views._writeService, _summaryExecutor, TuneFileIndexManager(),
-                                      TuneFileAttributes(), views._fileHeaderContext));
-    AttributeManager::SP attrMgr(new AttributeManager(BASE_DIR,
-                                                      "test.subdb",
-                                                      TuneFileAttributes(),
-                                                      views._fileHeaderContext,
-                                                      views._writeService.
-                                                      attributeFieldWriter(),
-                                                      views._hwInfo));
+    auto indexMgr = make_shared<IndexManager>(BASE_DIR, searchcorespi::index::WarmupConfig(), 2, 0, Schema(), 1,
+                                              views._reconfigurer, views._writeService, _summaryExecutor,
+                                              TuneFileIndexManager(), TuneFileAttributes(), views._fileHeaderContext);
+    auto attrMgr = make_shared<AttributeManager>(BASE_DIR, "test.subdb", TuneFileAttributes(), views._fileHeaderContext,
+                                                 views._writeService.attributeFieldWriter(),views._hwInfo);
     ProtonConfig protonCfg;
-    SummaryManager::SP summaryMgr(
-            new SummaryManager(_summaryExecutor, search::LogDocumentStore::Config(),
-                               GrowStrategy(), BASE_DIR, views._docTypeName,
-                               TuneFileSummary(), views._fileHeaderContext,
-                               views._noTlSyncer, search::IBucketizer::SP()));
-    SessionManager::SP sesMgr(
-            new SessionManager(protonCfg.grouping.sessionmanager.maxentries));
-    DocumentMetaStoreContext::SP metaStore(
-            new DocumentMetaStoreContext(std::make_shared<BucketDBOwner>()));
+    auto summaryMgr = make_shared<SummaryManager>
+            (_summaryExecutor, search::LogDocumentStore::Config(), GrowStrategy(), BASE_DIR, views._docTypeName,
+             TuneFileSummary(), views._fileHeaderContext,views._noTlSyncer, search::IBucketizer::SP());
+    auto sesMgr = make_shared<SessionManager>(protonCfg.grouping.sessionmanager.maxentries);
+    auto metaStore = make_shared<DocumentMetaStoreContext>(make_shared<BucketDBOwner>());
     IIndexWriter::SP indexWriter(new IndexWriter(indexMgr));
     AttributeWriter::SP attrWriter(new AttributeWriter(attrMgr));
     ISummaryAdapter::SP summaryAdapter(new SummaryAdapter(summaryMgr));
-    views._gidToLidChangeHandler = std::make_shared<MockGidToLidChangeHandler>();
+    views._gidToLidChangeHandler = make_shared<MockGidToLidChangeHandler>();
     Schema::SP schema(new Schema());
     views._summaryMgr = summaryMgr;
     views._dmsc = metaStore;
-    views._lidReuseDelayer.reset(
-            new documentmetastore::LidReuseDelayer(views._writeService,
-                                                   metaStore->get()));
+    views._lidReuseDelayer.reset(new documentmetastore::LidReuseDelayer(views._writeService, metaStore->get()));
     IndexSearchable::SP indexSearchable;
-    MatchView::SP matchView(new MatchView(matchers, indexSearchable, attrMgr,
-                                          sesMgr, metaStore, views._docIdLimit));
-    views.searchView.set(
-            SearchView::SP(
-                    new SearchView(
-                            summaryMgr->createSummarySetup(SummaryConfig(),
-                                    SummarymapConfig(),
-                                    JuniperrcConfig(),
-                                    views.repo,
-                                    attrMgr),
-                            matchView)));
-    PerDocTypeFeedMetrics metrics(0);
+    MatchView::SP matchView(new MatchView(matchers, indexSearchable, attrMgr, sesMgr, metaStore, views._docIdLimit));
+    views.searchView.set(make_shared<SearchView>
+                                 (summaryMgr->createSummarySetup(SummaryConfig(), SummarymapConfig(),
+                                                                 JuniperrcConfig(), views.repo, attrMgr),
+                                  matchView));
     views.feedView.set(
-            SearchableFeedView::SP(
-                    new SearchableFeedView(StoreOnlyFeedView::Context(summaryAdapter,
+            make_shared<SearchableFeedView>(StoreOnlyFeedView::Context(summaryAdapter,
                             schema,
                             views.searchView.get()->getDocumentMetaStore(),
                             *views._gidToLidChangeHandler,
@@ -251,11 +224,10 @@ Fixture::initViewSet(ViewSet &views)
                                     views.serialNum,
                                     views.serialNum,
                                     views._docTypeName,
-                                    metrics,
                                     0u /* subDbId */,
                                     SubDbType::READY),
                             FastAccessFeedView::Context(attrWriter, views._docIdLimit),
-                            SearchableFeedView::Context(indexWriter))));
+                            SearchableFeedView::Context(indexWriter)));
 }
 
 
@@ -263,7 +235,6 @@ using MySummaryAdapter = test::MockSummaryAdapter;
 
 struct MyFastAccessFeedView
 {
-    PerDocTypeFeedMetrics _metrics;
     DummyFileHeaderContext _fileHeaderContext;
     DocIdLimit _docIdLimit;
     IThreadingService &_writeService;
@@ -276,13 +247,12 @@ struct MyFastAccessFeedView
     VarHolder<FastAccessFeedView::SP> _feedView;
 
     MyFastAccessFeedView(IThreadingService &writeService)
-        : _metrics(0),
-          _fileHeaderContext(),
+        : _fileHeaderContext(),
           _docIdLimit(0),
           _writeService(writeService),
           _hwInfo(),
           _dmsc(),
-          _gidToLidChangeHandler(std::make_shared<DummyGidToLidChangeHandler>()),
+          _gidToLidChangeHandler(make_shared<DummyGidToLidChangeHandler>()),
           _lidReuseDelayer(),
           _commitTimeTracker(TimeStamp()),
           _feedView()
@@ -295,30 +265,21 @@ struct MyFastAccessFeedView
     void init() {
         ISummaryAdapter::SP summaryAdapter(new MySummaryAdapter());
         Schema::SP schema(new Schema());
-        DocumentMetaStoreContext::SP docMetaCtx(
-                new DocumentMetaStoreContext(std::make_shared<BucketDBOwner>()));
-        _dmsc = docMetaCtx;
-        _lidReuseDelayer.reset(
-                new documentmetastore::LidReuseDelayer(_writeService,
-                                                       docMetaCtx->get()));
+        _dmsc = make_shared<DocumentMetaStoreContext>(std::make_shared<BucketDBOwner>());
+        _lidReuseDelayer.reset(new documentmetastore::LidReuseDelayer(_writeService, _dmsc->get()));
         DocumentTypeRepo::SP repo = createRepo();
-        StoreOnlyFeedView::Context storeOnlyCtx(summaryAdapter, schema, docMetaCtx, *_gidToLidChangeHandler, repo, _writeService, *_lidReuseDelayer, _commitTimeTracker);
-        StoreOnlyFeedView::PersistentParams params(1, 1, DocTypeName(DOC_TYPE), _metrics, 0, SubDbType::NOTREADY);
-        AttributeManager::SP mgr(new AttributeManager(BASE_DIR, "test.subdb",
-                                                      TuneFileAttributes(),
-                                                      _fileHeaderContext,
-                                                      _writeService.
-                                                      attributeFieldWriter(),
-                                                      _hwInfo));
+        StoreOnlyFeedView::Context storeOnlyCtx(summaryAdapter, schema, _dmsc, *_gidToLidChangeHandler, repo,
+                                                _writeService, *_lidReuseDelayer, _commitTimeTracker);
+        StoreOnlyFeedView::PersistentParams params(1, 1, DocTypeName(DOC_TYPE), 0, SubDbType::NOTREADY);
+        auto mgr = make_shared<AttributeManager>(BASE_DIR, "test.subdb", TuneFileAttributes(), _fileHeaderContext,
+                                                 _writeService.attributeFieldWriter(), _hwInfo);
         IAttributeWriter::SP writer(new AttributeWriter(mgr));
         FastAccessFeedView::Context fastUpdateCtx(writer, _docIdLimit);
-        _feedView.set(FastAccessFeedView::SP(new FastAccessFeedView(storeOnlyCtx,
-                params, fastUpdateCtx)));;
+        _feedView.set(FastAccessFeedView::SP(new FastAccessFeedView(storeOnlyCtx, params, fastUpdateCtx)));;
     }
 };
 
-MyFastAccessFeedView::~MyFastAccessFeedView() {
-}
+MyFastAccessFeedView::~MyFastAccessFeedView() = default;
 
 struct FastAccessFixture
 {
@@ -328,8 +289,7 @@ struct FastAccessFixture
     FastAccessFixture()
         : _writeService(),
           _view(_writeService),
-          _configurer(_view._feedView,
-                  IAttributeWriterFactory::UP(new AttributeWriterFactory), "test")
+          _configurer(_view._feedView, IAttributeWriterFactory::UP(new AttributeWriterFactory), "test")
     {
         vespalib::rmdir(BASE_DIR, true);
         vespalib::mkdir(BASE_DIR);
@@ -339,11 +299,10 @@ struct FastAccessFixture
     }
 };
 
-
 DocumentDBConfig::SP
 createConfig()
 {
-    return test::DocumentDBConfigBuilder(0, std::make_shared<Schema>(), "client", DOC_TYPE).
+    return test::DocumentDBConfigBuilder(0, make_shared<Schema>(), "client", DOC_TYPE).
             repo(createRepo()).build();
 }
 
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index cccbbededd1..29f043e7caa 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -14,7 +14,6 @@
 #include <vespa/searchcore/proton/feedoperation/removeoperation.h>
 #include <vespa/searchcore/proton/feedoperation/updateoperation.h>
 #include <vespa/searchcore/proton/feedoperation/wipehistoryoperation.h>
-#include <vespa/searchcore/proton/metrics/feed_metrics.h>
 #include <vespa/searchcore/proton/persistenceengine/i_resource_write_filter.h>
 #include <vespa/searchcore/proton/server/configstore.h>
 #include <vespa/searchcore/proton/server/ddbstate.h>
@@ -393,18 +392,6 @@ struct PutHandler {
 };
 
 
-struct MyFeedMetrics : public metrics::MetricSet
-{
-    PerDocTypeFeedMetrics       _feed;
-
-    MyFeedMetrics()
-        : metrics::MetricSet("myfeedmetrics", "", "My feed metrics", NULL),
-          _feed(this)
-    {
-    }
-};
-
-
 struct MyTlsWriter : TlsWriter {
     int store_count;
     int erase_count;
@@ -419,7 +406,6 @@ struct MyTlsWriter : TlsWriter {
     } 
 };
 
-
 struct FeedHandlerFixture
 {
     DummyFileHeaderContext       _fileHeaderContext;
@@ -432,7 +418,6 @@ struct FeedHandlerFixture
     DDBState                     _state;
     MyReplayConfig               replayConfig;
     MyFeedView                   feedView;
-    MyFeedMetrics                feedMetrics;
     MyTlsWriter                  tls_writer;
     BucketDBOwner                _bucketDB;
     bucketdb::BucketDBHandler    _bucketDBHandler;
@@ -449,8 +434,8 @@ struct FeedHandlerFixture
           feedView(schema.getRepo()),
           _bucketDB(),
           _bucketDBHandler(_bucketDB),
-          handler(writeService, tlsSpec, schema.getDocType(),
-                  feedMetrics._feed, _state, owner, writeFilter, replayConfig, tls, &tls_writer)
+          handler(writeService, tlsSpec, schema.getDocType(), _state, owner,
+                  writeFilter, replayConfig, tls, &tls_writer)
     {
         _state.enterLoadState();
         _state.enterReplayTransactionLogState();
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index c820a9f392c..6d4e5ae2478 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -10,7 +10,6 @@
 #include <vespa/searchcore/proton/common/feedtoken.h>
 #include <vespa/searchcore/proton/documentmetastore/lidreusedelayer.h>
 #include <vespa/searchcore/proton/index/i_index_writer.h>
-#include <vespa/searchcore/proton/metrics/feed_metrics.h>
 #include <vespa/searchcore/proton/server/executorthreadingservice.h>
 #include <vespa/searchcore/proton/server/ifrozenbuckethandler.h>
 #include <vespa/searchcore/proton/server/isummaryadapter.h>
@@ -30,9 +29,6 @@
 #include <vespa/searchlib/docstore/cachestats.h>
 #include <vespa/searchlib/docstore/idocumentstore.h>
 #include <vespa/searchlib/index/docbuilder.h>
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/vespalib/util/blockingthreadstackexecutor.h>
-#include <mutex>
 
 #include <vespa/log/log.h>
 LOG_SETUP("feedview_test");
@@ -132,8 +128,6 @@ struct MyTracer
 struct ParamsContext
 {
     DocTypeName                          _docTypeName;
-    FeedMetrics                          _feedMetrics;
-    PerDocTypeFeedMetrics                _metrics;
     SearchableFeedView::PersistentParams _params;
 
     ParamsContext(const vespalib::string &docType, const vespalib::string &baseDir);
@@ -143,9 +137,7 @@ struct ParamsContext
 
 ParamsContext::ParamsContext(const vespalib::string &docType, const vespalib::string &baseDir)
     : _docTypeName(docType),
-      _feedMetrics(),
-      _metrics(&_feedMetrics),
-      _params(0, 0, _docTypeName, _metrics, subdb_id, SubDbType::READY)
+      _params(0, 0, _docTypeName, subdb_id, SubDbType::READY)
 {
     (void) baseDir;
 }
@@ -636,7 +628,7 @@ struct FixtureBase
             getFeedView().handleRemove(token, op);
         } else {
             if (token != NULL) {
-                token->ack(op.getType(), pc._metrics);
+                token->ack();
             }
         }
     }
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
index 1ec201fdbd2..bbdabe2d0ef 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
@@ -1,13 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/document/base/documentid.h>
-#include <vespa/document/base/globalid.h>
-#include <vespa/document/bucket/bucketid.h>
 #include <vespa/document/datatype/datatype.h>
 #include <vespa/searchcommon/common/schema.h>
 #include <vespa/searchcore/proton/common/commit_time_tracker.h>
 #include <vespa/searchcore/proton/documentmetastore/lidreusedelayer.h>
-#include <vespa/searchcore/proton/metrics/feed_metrics.h>
 #include <vespa/searchcore/proton/server/executorthreadingservice.h>
 #include <vespa/searchcore/proton/server/putdonecontext.h>
 #include <vespa/searchcore/proton/server/removedonecontext.h>
@@ -15,8 +12,6 @@
 #include <vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h>
 #include <vespa/searchcore/proton/test/mock_summary_adapter.h>
 #include <vespa/searchcore/proton/test/thread_utils.h>
-#include <vespa/searchlib/common/idestructorcallback.h>
-#include <vespa/searchlib/common/serialnum.h>
 #include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
@@ -225,8 +220,7 @@ struct FixtureBase {
           commitTimeTracker(fastos::TimeStamp()),
           feedview()
     {
-        PerDocTypeFeedMetrics metrics(0);
-        StoreOnlyFeedView::PersistentParams params(0, 0, DocTypeName("foo"), metrics, subdb_id, subDbType);
+        StoreOnlyFeedView::PersistentParams params(0, 0, DocTypeName("foo"), subdb_id, subDbType);
         metaStore->constructFreeList();
         ISummaryAdapter::SP adapter = std::make_unique<MySummaryAdapter>(removeCount, putCount, heartbeatCount);
         feedview = std::make_unique<FeedViewType>(adapter, metaStore, writeService, lidReuseDelayer,