summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-11-27 14:17:45 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-11-27 14:17:45 +0000
commit70e35f27d3761c1d5af6e37a5d0baab02f200c1b (patch)
tree4ef1a8d45c010562944c22288b58f103ff49ddea
parent030fac179605604613421c0f0488d33edb3cfa8f (diff)
Just use reference.
-rw-r--r--searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp1
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
index 4157fa221ab..480359f8382 100644
--- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
@@ -5,7 +5,6 @@
#include <vespa/vespalib/data/slime/cursor.h>
#include <vespa/vespalib/data/smart_buffer.h>
#include <vespa/vespalib/data/slime/binary_format.h>
-#include <vespa/vespalib/stllike/asciistream.h>
#include <vespa/log/log.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
index 85c30462ee3..fc21621bee3 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
@@ -93,11 +93,11 @@ createIndexManagerInitializer(const DocumentDBConfig &configSnapshot, SerialNum
const IndexConfig &indexCfg,
std::shared_ptr<searchcorespi::IIndexManager::SP> indexManager) const
{
- const Schema::SP & schema(configSnapshot.getSchemaSP());
+ const Schema & schema = *configSnapshot.getSchemaSP();
vespalib::string vespaIndexDir(_baseDir + "/index");
// Note: const_cast for reconfigurer role
return std::make_shared<IndexManagerInitializer>
- (vespaIndexDir, indexCfg, *schema, configSerialNum, const_cast<SearchableDocSubDB &>(*this),
+ (vespaIndexDir, indexCfg, schema, configSerialNum, const_cast<SearchableDocSubDB &>(*this),
_writeService, _warmupExecutor, configSnapshot.getTuneFileDocumentDBSP()->_index,
configSnapshot.getTuneFileDocumentDBSP()->_attr, _fileHeaderContext, std::move(indexManager));
}