summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-08-30 14:50:33 +0200
committerGitHub <noreply@github.com>2023-08-30 14:50:33 +0200
commitfcb04a4d2b58f048336027a1ad9a198351a094fc (patch)
tree5a0e15afc74812a47008de14568863e21a2d0546 /searchcore
parent5b9fadac979ca1aacaa653409e29cea2cea876d1 (diff)
parentc11112e3110af4477a95b0790b18c45939bce0d3 (diff)
Merge pull request #28257 from vespa-engine/balder/unify-code
Balder/unify code
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
index 9d86b2d28e1..7df116a5f0c 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
@@ -30,7 +30,6 @@
#include <vespa/searchlib/index/dummyfileheadercontext.h>
#include <vespa/searchlib/transactionlog/translogserver.h>
#include <vespa/searchsummary/config/config-juniperrc.h>
-#include <vespa/storage/bucketdb/config-stor-bucket-init.h>
#include <vespa/storage/common/i_storage_chain_builder.h>
#include <vespa/storage/config/config-stor-bouncer.h>
#include <vespa/storage/config/config-stor-communicationmanager.h>
@@ -103,7 +102,6 @@ using vespa::config::content::UpgradingConfigBuilder;
using vespa::config::content::core::BucketspacesConfig;
using vespa::config::content::core::BucketspacesConfigBuilder;
using vespa::config::content::core::StorBouncerConfigBuilder;
-using vespa::config::content::core::StorBucketInitConfigBuilder;
using vespa::config::content::core::StorCommunicationmanagerConfigBuilder;
using vespa::config::content::core::StorDistributormanagerConfigBuilder;
using vespa::config::content::core::StorOpsloggerConfigBuilder;
@@ -355,7 +353,6 @@ struct ServiceLayerConfigSet : public StorageConfigSet
{
PersistenceConfigBuilder persistence;
StorFilestorConfigBuilder stor_filestor;
- StorBucketInitConfigBuilder stor_bucket_init;
StorVisitorConfigBuilder stor_visitor;
ServiceLayerConfigSet(const vespalib::string& base_dir, uint32_t node_idx, const vespalib::string& config_id_in, const IBmDistribution& distribution, const DocumenttypesConfig& documenttypes_in,
@@ -363,7 +360,6 @@ struct ServiceLayerConfigSet : public StorageConfigSet
: StorageConfigSet(base_dir, node_idx, false, config_id_in, distribution, documenttypes_in, slobrok_port, mbus_port, rpc_port, status_port, params),
persistence(),
stor_filestor(),
- stor_bucket_init(),
stor_visitor()
{
stor_filestor.numResponseThreads = params.get_response_threads();
@@ -377,7 +373,6 @@ struct ServiceLayerConfigSet : public StorageConfigSet
StorageConfigSet::add_builders(set);
set.addBuilder(config_id, &persistence);
set.addBuilder(config_id, &stor_filestor);
- set.addBuilder(config_id, &stor_bucket_init);
set.addBuilder(config_id, &stor_visitor);
}
};