summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-12-08 08:58:25 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-12-08 08:58:25 +0000
commit7109d95a21b1d0f2403fd8b2698bf49802316b29 (patch)
treedf0b1dd98caaf031ea31e16fa002cf8e6328fc20 /searchcore
parentb1d62841b71910ec8b43f7b35ff2c3e314053e6a (diff)
Minor cleanup while reading code.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/documentdb.cpp4
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp8
2 files changed, 3 insertions, 9 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index 334d6891cd2..1b91f9ec0c2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -475,9 +475,7 @@ DocumentDB::applyConfig(DocumentDBConfig::SP configSnapshot, SerialNum serialNum
// Save config via config manager if replay is done.
auto replay_config = DocumentDBConfig::makeReplayConfig(configSnapshot);
- bool equalReplayConfig =
- *replay_config ==
- *DocumentDBConfig::makeReplayConfig(_activeConfigSnapshot);
+ bool equalReplayConfig = (*replay_config == *DocumentDBConfig::makeReplayConfig(_activeConfigSnapshot));
bool tlsReplayDone = _feedHandler->getTransactionLogReplayDone();
FeedHandler::CommitResult commit_result;
if (!equalReplayConfig && tlsReplayDone) {
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 d5475d1f904..7fd54f111e1 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
@@ -11,7 +11,6 @@
#include <vespa/searchcore/proton/attribute/attribute_factory.h>
#include <vespa/searchcore/proton/attribute/attribute_manager_initializer.h>
#include <vespa/searchcore/proton/attribute/filter_attribute_manager.h>
-#include <vespa/searchcore/proton/attribute/sequential_attributes_initializer.h>
#include <vespa/searchcore/proton/common/alloc_config.h>
#include <vespa/searchcore/proton/matching/sessionmanager.h>
#include <vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.h>
@@ -232,10 +231,9 @@ FastAccessDocSubDB::setup(const DocumentSubDbInitializerResult &initResult)
void
FastAccessDocSubDB::initViews(const DocumentDBConfig &configSnapshot,
- const SessionManager::SP &sessionManager)
+ const SessionManager::SP &)
{
// Called by executor thread
- (void) sessionManager;
_iSearchView.set(std::make_shared<EmptySearchView>());
auto writer = std::make_shared<AttributeWriter>(getAndResetInitAttributeManager());
{
@@ -246,10 +244,8 @@ FastAccessDocSubDB::initViews(const DocumentDBConfig &configSnapshot,
IReprocessingTask::List
FastAccessDocSubDB::applyConfig(const DocumentDBConfig &newConfigSnapshot, const DocumentDBConfig &oldConfigSnapshot,
- SerialNum serialNum, const ReconfigParams &params, IDocumentDBReferenceResolver &resolver)
+ SerialNum serialNum, const ReconfigParams &params, IDocumentDBReferenceResolver &)
{
- (void) resolver;
-
AllocStrategy alloc_strategy = newConfigSnapshot.get_alloc_config().make_alloc_strategy(_subDbType);
reconfigure(newConfigSnapshot.getStoreConfig(), alloc_strategy);
IReprocessingTask::List tasks;