From 74330ee971cc29a9ec5470a360afe279435dc32b Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@yahoo-inc.com>
Date: Tue, 21 Mar 2017 15:21:22 +0000
Subject: Rename AttributeManager member _attributeDiskLayout to _diskLayout.

---
 .../searchcore/proton/attribute/attributemanager.cpp   | 18 +++++++++---------
 .../searchcore/proton/attribute/attributemanager.h     |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
index 3c2c2f75e6c..1cd5cbe2161 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
@@ -36,7 +36,7 @@ AttributeManager::internalAddAttribute(const vespalib::string &name,
                                        uint64_t serialNum,
                                        const IAttributeFactory &factory)
 {
-    AttributeInitializer initializer(_attributeDiskLayout->getBaseDir(), _documentSubDbName, name, cfg, serialNum, factory);
+    AttributeInitializer initializer(_diskLayout->getBaseDir(), _documentSubDbName, name, cfg, serialNum, factory);
     AttributeVector::SP attr = initializer.init();
     if (attr.get() != NULL) {
         attr->setInterlock(_interlock);
@@ -54,7 +54,7 @@ AttributeManager::addAttribute(const AttributeWrap &attribute)
     if ( ! attribute.isExtra() ) {
         // Flushing of extra attributes is handled elsewhere
         _flushables[attribute->getName()] = FlushableAttribute::SP
-                (new FlushableAttribute(attribute, _attributeDiskLayout->getBaseDir(),
+                (new FlushableAttribute(attribute, _diskLayout->getBaseDir(),
                                         _tuneFileAttributes,
                                         _fileHeaderContext,
                                         _attributeFieldWriter,
@@ -128,7 +128,7 @@ AttributeManager::addNewAttributes(const Spec &newSpec,
                    aspec.getName().c_str(), newSpec.getDocIdLimit(), newSpec.getCurrentSerialNum());
 
         AttributeInitializer::UP initializer =
-                std::make_unique<AttributeInitializer>(_attributeDiskLayout->getBaseDir(), _documentSubDbName, aspec.getName(),
+                std::make_unique<AttributeInitializer>(_diskLayout->getBaseDir(), _documentSubDbName, aspec.getName(),
                         aspec.getConfig(), newSpec.getCurrentSerialNum(), *_factory);
         initializerRegistry.add(std::move(initializer));
 
@@ -167,7 +167,7 @@ AttributeManager::AttributeManager(const vespalib::string &baseDir,
       _attributes(),
       _flushables(),
       _writableAttributes(),
-      _attributeDiskLayout(std::make_shared<AttributeDiskLayout>(baseDir)),
+      _diskLayout(std::make_shared<AttributeDiskLayout>(baseDir)),
       _documentSubDbName(documentSubDbName),
       _tuneFileAttributes(tuneFileAttributes),
       _fileHeaderContext(fileHeaderContext),
@@ -177,7 +177,7 @@ AttributeManager::AttributeManager(const vespalib::string &baseDir,
       _hwInfo(hwInfo),
       _importedAttributes()
 {
-    _attributeDiskLayout->createBaseDir();
+    _diskLayout->createBaseDir();
 }
 
 
@@ -193,7 +193,7 @@ AttributeManager::AttributeManager(const vespalib::string &baseDir,
       _attributes(),
       _flushables(),
       _writableAttributes(),
-      _attributeDiskLayout(std::make_shared<AttributeDiskLayout>(baseDir)),
+      _diskLayout(std::make_shared<AttributeDiskLayout>(baseDir)),
       _documentSubDbName(documentSubDbName),
       _tuneFileAttributes(tuneFileAttributes),
       _fileHeaderContext(fileHeaderContext),
@@ -203,7 +203,7 @@ AttributeManager::AttributeManager(const vespalib::string &baseDir,
       _hwInfo(hwInfo),
       _importedAttributes()
 {
-    _attributeDiskLayout->createBaseDir();
+    _diskLayout->createBaseDir();
 }
 
 AttributeManager::AttributeManager(const AttributeManager &currMgr,
@@ -213,7 +213,7 @@ AttributeManager::AttributeManager(const AttributeManager &currMgr,
       _attributes(),
       _flushables(),
       _writableAttributes(),
-      _attributeDiskLayout(currMgr._attributeDiskLayout),
+      _diskLayout(currMgr._diskLayout),
       _documentSubDbName(currMgr._documentSubDbName),
       _tuneFileAttributes(currMgr._tuneFileAttributes),
       _fileHeaderContext(currMgr._fileHeaderContext),
@@ -441,7 +441,7 @@ AttributeManager::getAttributeListAll(std::vector<AttributeGuard> &list) const
 void
 AttributeManager::wipeHistory(search::SerialNum wipeSerial)
 {
-    const vespalib::string &baseDir = _attributeDiskLayout->getBaseDir();
+    const vespalib::string &baseDir = _diskLayout->getBaseDir();
     std::vector<vespalib::string> attributes = AttributeDiskLayout::listAttributes(baseDir);
     for (const auto &attribute : attributes) {
         auto itr = _attributes.find(attribute);
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
index 1c1b94859fa..9e91ac9e382 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
@@ -59,7 +59,7 @@ private:
     AttributeMap _attributes;
     FlushableMap _flushables;
     std::vector<search::AttributeVector *> _writableAttributes;
-    std::shared_ptr<AttributeDiskLayout> _attributeDiskLayout;
+    std::shared_ptr<AttributeDiskLayout> _diskLayout;
     vespalib::string _documentSubDbName;
     const search::TuneFileAttributes _tuneFileAttributes;
     const search::common::FileHeaderContext &_fileHeaderContext;
-- 
cgit v1.2.3