diff options
Diffstat (limited to 'searchcore/src/vespa/searchcore/proton/server')
20 files changed, 44 insertions, 45 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp index 1b91f9ec0c2..427f40d6116 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp @@ -340,7 +340,7 @@ DocumentDB::initFinish(DocumentDBConfig::SP configSnapshot) // Called by executor thread assert(_writeService.master().isCurrentThread()); _bucketHandler.setReadyBucketHandler(_subDBs.getReadySubDB()->getDocumentMetaStoreContext().get()); - _subDBs.initViews(*configSnapshot, _sessionManager); + _subDBs.initViews(*configSnapshot); syncFeedView(); // Check that feed view has been activated. assert(_feedView.get()); @@ -1120,4 +1120,9 @@ DocumentDB::set_attribute_usage_listener(std::unique_ptr<IAttributeUsageListener _writeFilter.set_listener(std::move(listener)); } +matching::SessionManager & +DocumentDB::session_manager() { + return *_sessionManager; +} + } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h index bec1b88c0c9..2932d21b47e 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h @@ -253,14 +253,6 @@ public: const HwInfo &hwInfo); /** - * Expose a cost view of the session manager. This is used by the - * document db explorer. - **/ - const matching::SessionManager &session_manager() const { - return *_sessionManager; - } - - /** * Frees any allocated resources. This will also stop the internal thread * and wait for it to finish. All pending tasks are deleted. */ @@ -392,6 +384,7 @@ public: document::BucketSpace getBucketSpace() const override; vespalib::string getName() const override; uint32_t getDistributionKey() const override; + matching::SessionManager &session_manager() override; /** * Implements IFeedHandlerOwner 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 3fe7fd6cfde..6b97d41e459 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "documentdb_metrics_updater.h" -#include "ddbstate.h" #include "document_meta_store_read_guards.h" #include "documentsubdbcollection.h" #include "executorthreadingservice.h" @@ -12,7 +11,6 @@ #include <vespa/searchcore/proton/attribute/i_attribute_manager.h> #include <vespa/searchcore/proton/docsummary/isummarymanager.h> #include <vespa/searchcore/proton/matching/matching_stats.h> -#include <vespa/searchcore/proton/matching/matching_stats.h> #include <vespa/searchcore/proton/metrics/documentdb_job_trackers.h> #include <vespa/searchcore/proton/metrics/executor_threading_service_stats.h> #include <vespa/searchlib/attribute/attributevector.h> diff --git a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp index e7685624f55..103234f7529 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp @@ -12,7 +12,6 @@ #include <vespa/vespalib/util/lambdatask.h> #include <vespa/vespalib/util/threadstackexecutor.h> -using proton::matching::SessionManager; using search::GrowStrategy; using search::SerialNum; using search::index::Schema; @@ -184,11 +183,10 @@ DocumentSubDBCollection::createInitializer(const DocumentDBConfig &configSnapsho void -DocumentSubDBCollection::initViews(const DocumentDBConfig &configSnapshot, - const SessionManager::SP &sessionManager) +DocumentSubDBCollection::initViews(const DocumentDBConfig &configSnapshot) { for (auto subDb : _subDBs) { - subDb->initViews(configSnapshot, sessionManager); + subDb->initViews(configSnapshot); } } diff --git a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h index 8c1e670454c..a5ab1b5971c 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h @@ -46,10 +46,7 @@ struct IBucketStateCalculator; struct IDocumentDBReferenceResolver; struct MetricsWireService; -namespace matching { - class QueryLimiter; - class SessionManager; -} +namespace matching { class QueryLimiter; } namespace initializer { class InitializerTask; } @@ -65,7 +62,6 @@ public: private: using IFeedViewSP = std::shared_ptr<IFeedView>; using IBucketStateCalculatorSP = std::shared_ptr<IBucketStateCalculator>; - using SessionManagerSP = std::shared_ptr<matching::SessionManager>; using IFlushTargetList = std::vector<std::shared_ptr<searchcorespi::IFlushTarget>>; SubDBVector _subDBs; IDocumentSubDBOwner &_owner; @@ -131,7 +127,7 @@ public: createInitializer(const DocumentDBConfig &configSnapshot, SerialNum configSerialNum, const index::IndexConfig & indexCfg); - void initViews(const DocumentDBConfig &configSnapshot, const SessionManagerSP &sessionManager); + void initViews(const DocumentDBConfig &configSnapshot); void clearViews(); void onReplayDone(); void onReprocessDone(SerialNum serialNum); diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp index 7fd54f111e1..6c684ce4c99 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp @@ -230,8 +230,7 @@ FastAccessDocSubDB::setup(const DocumentSubDbInitializerResult &initResult) } void -FastAccessDocSubDB::initViews(const DocumentDBConfig &configSnapshot, - const SessionManager::SP &) +FastAccessDocSubDB::initViews(const DocumentDBConfig &configSnapshot) { // Called by executor thread _iSearchView.set(std::make_shared<EmptySearchView>()); diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h index 94fca94c75d..2d00a2a412c 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h @@ -84,7 +84,6 @@ private: protected: using Parent = StoreOnlyDocSubDB; - using SessionManagerSP = std::shared_ptr<matching::SessionManager>; const bool _addMetrics; MetricsWireService &_metricsWireService; @@ -108,7 +107,7 @@ public: const IndexConfig &indexCfg) const override; void setup(const DocumentSubDbInitializerResult &initResult) override; - void initViews(const DocumentDBConfig &configSnapshot, const SessionManagerSP &sessionManager) override; + void initViews(const DocumentDBConfig &configSnapshot) override; IReprocessingTask::List applyConfig(const DocumentDBConfig &newConfigSnapshot, const DocumentDBConfig &oldConfigSnapshot, diff --git a/searchcore/src/vespa/searchcore/proton/server/i_document_subdb_owner.h b/searchcore/src/vespa/searchcore/proton/server/i_document_subdb_owner.h index 4bd143a077e..e170840e252 100644 --- a/searchcore/src/vespa/searchcore/proton/server/i_document_subdb_owner.h +++ b/searchcore/src/vespa/searchcore/proton/server/i_document_subdb_owner.h @@ -7,6 +7,8 @@ namespace proton { +namespace matching { class SessionManager; } + /** * Interface defining the communication needed with the owner of the * document sub db. @@ -14,10 +16,12 @@ namespace proton { class IDocumentSubDBOwner { public: + using SessionManager = matching::SessionManager; virtual ~IDocumentSubDBOwner() {} virtual document::BucketSpace getBucketSpace() const = 0; virtual vespalib::string getName() const = 0; virtual uint32_t getDistributionKey() const = 0; + virtual SessionManager & session_manager() = 0; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.h b/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.h index dc060f6a84b..36ac3427e66 100644 --- a/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.h +++ b/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.h @@ -8,14 +8,17 @@ namespace proton { class IDocumentDBReferenceRegistry; +namespace matching { class SessionManager; } class IDocumentDBOwner { public: + using SessionManager = matching::SessionManager; virtual ~IDocumentDBOwner(); virtual bool isInitializing() const = 0; virtual uint32_t getDistributionKey() const = 0; + virtual SessionManager & session_manager() = 0; virtual std::shared_ptr<IDocumentDBReferenceRegistry> getDocumentDBReferenceRegistry() const = 0; }; diff --git a/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h b/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h index b945c67660b..c6410073c09 100644 --- a/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h @@ -63,6 +63,7 @@ public: using IFlushTargetList = std::vector<std::shared_ptr<searchcorespi::IFlushTarget>>; using IndexConfig = index::IndexConfig; using OnDone = std::shared_ptr<vespalib::IDestructorCallback>; + using SessionManager = matching::SessionManager; public: IDocumentSubDB() { } virtual ~IDocumentSubDB() { } @@ -75,7 +76,7 @@ public: // Called by master thread virtual void setup(const DocumentSubDbInitializerResult &initResult) = 0; - virtual void initViews(const DocumentDBConfig &configSnapshot, const std::shared_ptr<matching::SessionManager> &sessionManager) = 0; + virtual void initViews(const DocumentDBConfig &configSnapshot) = 0; virtual IReprocessingTask::List applyConfig(const DocumentDBConfig &newConfigSnapshot, const DocumentDBConfig &oldConfigSnapshot, diff --git a/searchcore/src/vespa/searchcore/proton/server/matchview.cpp b/searchcore/src/vespa/searchcore/proton/server/matchview.cpp index bd9c927e94e..532c2e868b6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/matchview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/matchview.cpp @@ -36,13 +36,13 @@ using matching::SessionManager; MatchView::MatchView(Matchers::SP matchers, IndexSearchable::SP indexSearchable, IAttributeManager::SP attrMgr, - SessionManagerSP sessionMgr, + SessionManager & sessionMgr, IDocumentMetaStoreContext::SP metaStore, DocIdLimit &docIdLimit) : _matchers(std::move(matchers)), _indexSearchable(std::move(indexSearchable)), _attrMgr(std::move(attrMgr)), - _sessionMgr(std::move(sessionMgr)), + _sessionMgr(sessionMgr), _metaStore(std::move(metaStore)), _docIdLimit(docIdLimit) { } @@ -75,7 +75,7 @@ MatchView::match(std::shared_ptr<const ISearchHandler> searchHandler, const Sear const search::IDocumentMetaStore & dms = owned_objects.readGuard->get(); const bucketdb::BucketDBOwner & bucketDB = _metaStore->get().getBucketDB(); return matcher->match(req, threadBundle, ctx->getSearchContext(), ctx->getAttributeContext(), - *_sessionMgr, dms, bucketDB, std::move(owned_objects)); + _sessionMgr, dms, bucketDB, std::move(owned_objects)); } } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/matchview.h b/searchcore/src/vespa/searchcore/proton/server/matchview.h index f7bf0abff39..603d929b407 100644 --- a/searchcore/src/vespa/searchcore/proton/server/matchview.h +++ b/searchcore/src/vespa/searchcore/proton/server/matchview.h @@ -18,11 +18,11 @@ namespace matching { } class MatchView { - using SessionManagerSP = std::shared_ptr<matching::SessionManager>; + using SessionManager = matching::SessionManager; Matchers::SP _matchers; searchcorespi::IndexSearchable::SP _indexSearchable; IAttributeManager::SP _attrMgr; - SessionManagerSP _sessionMgr; + SessionManager & _sessionMgr; IDocumentMetaStoreContext::SP _metaStore; DocIdLimit &_docIdLimit; @@ -38,7 +38,7 @@ public: MatchView(Matchers::SP matchers, searchcorespi::IndexSearchable::SP indexSearchable, IAttributeManager::SP attrMgr, - SessionManagerSP sessionMgr, + SessionManager & sessionMgr, IDocumentMetaStoreContext::SP metaStore, DocIdLimit &docIdLimit); ~MatchView(); @@ -46,7 +46,7 @@ public: const Matchers::SP & getMatchers() const { return _matchers; } const searchcorespi::IndexSearchable::SP & getIndexSearchable() const { return _indexSearchable; } const IAttributeManager::SP & getAttributeManager() const { return _attrMgr; } - const SessionManagerSP & getSessionManager() const { return _sessionMgr; } + SessionManager & getSessionManager() const { return _sessionMgr; } const IDocumentMetaStoreContext::SP & getDocumentMetaStore() const { return _metaStore; } DocIdLimit & getDocIdLimit() const { return _docIdLimit; } diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index 3635aba9e10..3b1a88774b7 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -997,6 +997,12 @@ Proton::getDocumentDBReferenceRegistry() const return _documentDBReferenceRegistry; } +matching::SessionManager & +Proton::session_manager() { + // Temporary and will not be called used yet + abort(); +} + storage::spi::PersistenceProvider & Proton::getPersistence() { diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h index 0d4b067eea1..235bd120821 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.h +++ b/searchcore/src/vespa/searchcore/proton/server/proton.h @@ -141,6 +141,7 @@ private: uint32_t getDistributionKey() const override { return _distributionKey; } BootstrapConfig::SP getActiveConfigSnapshot() const; std::shared_ptr<IDocumentDBReferenceRegistry> getDocumentDBReferenceRegistry() const override; + SessionManager & session_manager() override; // Returns true if the node is up in _any_ bucket space bool updateNodeUp(BucketSpace bucketSpace, bool nodeUpInBucketSpace); void closeDocumentDBs(vespalib::ThreadStackExecutorBase & executor); diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp index 043e9cd5d3f..3d87e7dc7c3 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp @@ -10,7 +10,6 @@ #include <vespa/searchcore/proton/flushengine/threadedflushtarget.h> #include <vespa/searchcore/proton/index/index_manager_initializer.h> #include <vespa/searchcore/proton/index/index_writer.h> -#include <vespa/searchcore/proton/matching/sessionmanager.h> #include <vespa/searchcore/proton/reference/document_db_reference.h> #include <vespa/searchcore/proton/reference/gid_to_lid_change_handler.h> #include <vespa/searchlib/fef/indexproperties.h> @@ -19,7 +18,6 @@ using vespa::config::search::RankProfilesConfig; using proton::matching::MatchingStats; -using proton::matching::SessionManager; using search::GrowStrategy; using search::index::Schema; using search::SerialNum; @@ -187,7 +185,7 @@ SearchableDocSubDB::setBucketStateCalculator(const std::shared_ptr<IBucketStateC } void -SearchableDocSubDB::initViews(const DocumentDBConfig &configSnapshot, const SessionManager::SP &sessionManager) +SearchableDocSubDB::initViews(const DocumentDBConfig &configSnapshot) { assert(_writeService.master().isCurrentThread()); @@ -199,7 +197,7 @@ SearchableDocSubDB::initViews(const DocumentDBConfig &configSnapshot, const Sess configSnapshot.getOnnxModelsSP()); Matchers::SP matchers = _configurer.createMatchers(schema, configSnapshot.getRankProfilesConfig()); auto matchView = std::make_shared<MatchView>(std::move(matchers), indexMgr->getSearchable(), attrMgr, - sessionManager, _metaStoreCtx, _docIdLimit); + _owner.session_manager(), _metaStoreCtx, _docIdLimit); _rSearchView.set(SearchView::create( getSummaryManager()->createSummarySetup( configSnapshot.getSummaryConfig(), diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h index c628d9a96b7..dcfe0b32f4a 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h @@ -100,7 +100,7 @@ public: const IndexConfig &indexCfg) const override; void setup(const DocumentSubDbInitializerResult &initResult) override; - void initViews(const DocumentDBConfig &configSnapshot, const SessionManagerSP &sessionManager) override; + void initViews(const DocumentDBConfig &configSnapshot) override; IReprocessingTask::List applyConfig(const DocumentDBConfig &newConfigSnapshot, const DocumentDBConfig &oldConfigSnapshot, diff --git a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp index a17415db474..7a909bbebd8 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp @@ -34,7 +34,6 @@ convertGidsToLids(const DocsumRequest & request, const search::IDocumentMetaStore &metaStore, uint32_t docIdLimit) { - document::GlobalId empty; uint32_t lid = 0; for (size_t i = 0; i < request.hits.size(); ++i) { const DocsumRequest::Hit & h = request.hits[i]; @@ -128,7 +127,7 @@ SearchView::getDocsumsInternal(const DocsumRequest & req) MatchContext::UP mctx = _matchView->createContext(); auto ctx = std::make_unique<DocsumContext>(req, _summarySetup->getDocsumWriter(), *store, _matchView->getMatcher(req.ranking), mctx->getSearchContext(), mctx->getAttributeContext(), - *_summarySetup->getAttributeManager(), *getSessionManager()); + *_summarySetup->getAttributeManager(), getSessionManager()); SearchView::InternalDocsumReply reply(ctx->getDocsums(), true); uint64_t endGeneration = readGuard->get().getCurrentGeneration(); if (startGeneration != endGeneration) { diff --git a/searchcore/src/vespa/searchcore/proton/server/searchview.h b/searchcore/src/vespa/searchcore/proton/server/searchview.h index c8174c0a9a6..8c9f6cffa94 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchview.h +++ b/searchcore/src/vespa/searchcore/proton/server/searchview.h @@ -11,7 +11,7 @@ namespace proton { class SearchView : public ISearchHandler, public std::enable_shared_from_this<SearchView> { public: - using SessionManagerSP = std::shared_ptr<matching::SessionManager>; + using SessionManager = matching::SessionManager; using IndexSearchable = searchcorespi::IndexSearchable; using InternalDocsumReply = std::pair<std::unique_ptr<DocsumReply>, bool>; typedef std::shared_ptr<SearchView> SP; @@ -28,7 +28,7 @@ public: const Matchers::SP & getMatchers() const { return _matchView->getMatchers(); } const IndexSearchable::SP & getIndexSearchable() const { return _matchView->getIndexSearchable(); } const IAttributeManager::SP & getAttributeManager() const { return _matchView->getAttributeManager(); } - const SessionManagerSP & getSessionManager() const { return _matchView->getSessionManager(); } + SessionManager & getSessionManager() const { return _matchView->getSessionManager(); } const IDocumentMetaStoreContext::SP & getDocumentMetaStore() const { return _matchView->getDocumentMetaStore(); } DocIdLimit &getDocIdLimit() const { return _matchView->getDocIdLimit(); } matching::MatchingStats getMatcherStats(const vespalib::string &rankProfile) const { return _matchView->getMatcherStats(rankProfile); } diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp index 9419dfa1c90..e95c98e2740 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp @@ -356,7 +356,7 @@ StoreOnlyDocSubDB::getFeedViewPersistentParams() } void -StoreOnlyDocSubDB::initViews(const DocumentDBConfig &configSnapshot, const SessionManager::SP &sessionManager) +StoreOnlyDocSubDB::initViews(const DocumentDBConfig &configSnapshot) { assert(_writeService.master().isCurrentThread()); _iSearchView.set(std::make_shared<EmptySearchView>()); @@ -364,7 +364,6 @@ StoreOnlyDocSubDB::initViews(const DocumentDBConfig &configSnapshot, const Sessi std::lock_guard<std::mutex> guard(_configMutex); initFeedView(configSnapshot); } - (void) sessionManager; } void diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h index f694cc7298f..5a8db23e345 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h @@ -196,7 +196,7 @@ public: const IndexConfig & indexCfg) const override; void setup(const DocumentSubDbInitializerResult &initResult) override; - void initViews(const DocumentDBConfig &configSnapshot, const std::shared_ptr<matching::SessionManager> &sessionManager) override; + void initViews(const DocumentDBConfig &configSnapshot) override; void validateDocStore(FeedHandler & feedHandler, SerialNum serialNum) const override; |