summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahoo-inc.com>2017-02-23 14:34:23 +0000
committerGeir Storli <geirst@yahoo-inc.com>2017-02-23 14:34:23 +0000
commitaa048ca8f35bb2fedf41c7583646974618a702ff (patch)
treeedf29a4b413c212ba43c95072e2889e663c8e016 /searchcore
parent449af62cf2fbfb1904993484abdab7dd60ecba4b (diff)
Rename _fastUpdateFeedView -> _fastAccessFeedView.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp18
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h2
2 files changed, 10 insertions, 10 deletions
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 a79dbce2c2d..1a62b1ae00a 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
@@ -120,8 +120,8 @@ FastAccessDocSubDB::initFeedView(const IAttributeWriter::SP &writer,
getFeedViewPersistentParams(),
FastAccessFeedView::Context(writer, _docIdLimit)));
- _fastUpdateFeedView.set(FastAccessFeedView::SP(feedView.release()));
- _iFeedView.set(_fastUpdateFeedView.get());
+ _fastAccessFeedView.set(FastAccessFeedView::SP(feedView.release()));
+ _iFeedView.set(_fastAccessFeedView.get());
}
AttributeManager::SP
@@ -195,7 +195,7 @@ FastAccessDocSubDB::FastAccessDocSubDB(const Config &cfg, const Context &ctx)
_hasAttributes(cfg._hasAttributes),
_fastAccessAttributesOnly(cfg._fastAccessAttributesOnly),
_initAttrMgr(),
- _fastUpdateFeedView(),
+ _fastAccessFeedView(),
_subAttributeMetrics(ctx._subAttributeMetrics),
_totalAttributeMetrics(ctx._totalAttributeMetrics),
_addMetrics(cfg._addMetrics),
@@ -263,9 +263,9 @@ FastAccessDocSubDB::applyConfig(const DocumentDBConfig &newConfigSnapshot,
*/
if (params.shouldAttributeManagerChange() ||
newConfigSnapshot.getDocumentTypeRepoSP().get() != oldConfigSnapshot.getDocumentTypeRepoSP().get()) {
- FastAccessDocSubDBConfigurer configurer(_fastUpdateFeedView,
+ FastAccessDocSubDBConfigurer configurer(_fastAccessFeedView,
std::make_unique<AttributeWriterFactory>(), getSubDbName());
- proton::IAttributeManager::SP oldMgr = extractAttributeManager(_fastUpdateFeedView.get());
+ proton::IAttributeManager::SP oldMgr = extractAttributeManager(_fastAccessFeedView.get());
AttributeCollectionSpec::UP attrSpec =
createAttributeSpec(newConfigSnapshot.getAttributesConfig(), serialNum);
IReprocessingInitializer::UP initializer =
@@ -275,10 +275,10 @@ FastAccessDocSubDB::applyConfig(const DocumentDBConfig &newConfigSnapshot,
newConfigSnapshot.getDocumentTypeRepoSP()).release()));
}
if (_addMetrics) {
- proton::IAttributeManager::SP newMgr = extractAttributeManager(_fastUpdateFeedView.get());
+ proton::IAttributeManager::SP newMgr = extractAttributeManager(_fastAccessFeedView.get());
reconfigureAttributeMetrics(*newMgr, *oldMgr);
}
- _iFeedView.set(_fastUpdateFeedView.get());
+ _iFeedView.set(_fastAccessFeedView.get());
_owner.syncFeedView();
}
return tasks;
@@ -287,13 +287,13 @@ FastAccessDocSubDB::applyConfig(const DocumentDBConfig &newConfigSnapshot,
proton::IAttributeManager::SP
FastAccessDocSubDB::getAttributeManager() const
{
- return extractAttributeManager(_fastUpdateFeedView.get());
+ return extractAttributeManager(_fastAccessFeedView.get());
}
IDocumentRetriever::UP
FastAccessDocSubDB::getDocumentRetriever()
{
- FastAccessFeedView::SP feedView = _fastUpdateFeedView.get();
+ FastAccessFeedView::SP feedView = _fastAccessFeedView.get();
proton::IAttributeManager::SP attrMgr = extractAttributeManager(feedView);
return IDocumentRetriever::UP(new FastAccessDocumentRetriever(feedView, attrMgr));
}
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 d0ceb5a93f3..0b2764d014e 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
@@ -66,7 +66,7 @@ private:
const bool _hasAttributes;
const bool _fastAccessAttributesOnly;
AttributeManager::SP _initAttrMgr;
- Configurer::FeedViewVarHolder _fastUpdateFeedView;
+ Configurer::FeedViewVarHolder _fastAccessFeedView;
AttributeMetricsCollection _subAttributeMetrics;
LegacyAttributeMetrics *_totalAttributeMetrics;