summaryrefslogtreecommitdiffstats
path: root/storage/src
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2018-04-04 11:29:32 +0000
committerTor Egge <Tor.Egge@oath.com>2018-04-04 11:29:32 +0000
commit7902239839a6f34e12ed7aa0f2b7a65114f8ee68 (patch)
treedd4acdb69101c6eb844d3d09a033aa54e8b4a402 /storage/src
parent4af2908b7854cbec1ee8173cc4a821d0482a978e (diff)
Use shared pointer to const DocumentTypeRepo.
Diffstat (limited to 'storage/src')
-rw-r--r--storage/src/vespa/storage/common/storagecomponent.h2
-rw-r--r--storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp2
-rw-r--r--storage/src/vespa/storage/persistence/mergehandler.cpp2
-rw-r--r--storage/src/vespa/storage/persistence/persistenceutil.h2
-rw-r--r--storage/src/vespa/storage/storageserver/storagenode.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/storage/src/vespa/storage/common/storagecomponent.h b/storage/src/vespa/storage/common/storagecomponent.h
index e136d991ac5..168bdbe9aa6 100644
--- a/storage/src/vespa/storage/common/storagecomponent.h
+++ b/storage/src/vespa/storage/common/storagecomponent.h
@@ -60,7 +60,7 @@ class StorageComponent : public framework::Component {
public:
using UP = std::unique_ptr<StorageComponent>;
using PriorityConfig = vespa::config::content::core::internal::InternalStorPrioritymappingType;
- using DocumentTypeRepoSP = std::shared_ptr<document::DocumentTypeRepo>;
+ using DocumentTypeRepoSP = std::shared_ptr<const document::DocumentTypeRepo>;
using LoadTypeSetSP = std::shared_ptr<documentapi::LoadTypeSet>;
using DistributionSP = std::shared_ptr<lib::Distribution>;
diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp
index c7ba3d8f4cd..9fa7a319fa9 100644
--- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp
@@ -660,7 +660,7 @@ void
VisitorOperation::attemptToParseOrderingSelector()
{
std::unique_ptr<document::select::Node> docSelection;
- std::shared_ptr<document::DocumentTypeRepo> repo(_owner.getTypeRepo());
+ std::shared_ptr<const document::DocumentTypeRepo> repo(_owner.getTypeRepo());
document::select::Parser parser(
*repo, _owner.getBucketIdFactory());
docSelection = parser.parse(_msg->getDocumentSelection());
diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp
index e17be7479f0..c3dc7cba80a 100644
--- a/storage/src/vespa/storage/persistence/mergehandler.cpp
+++ b/storage/src/vespa/storage/persistence/mergehandler.cpp
@@ -616,7 +616,7 @@ MergeHandler::applyDiffLocally(
FlushGuard flushGuard(_spi, bucket, context);
- std::shared_ptr<document::DocumentTypeRepo> repo(_env._component.getTypeRepo());
+ std::shared_ptr<const document::DocumentTypeRepo> repo(_env._component.getTypeRepo());
assert(repo.get() != nullptr);
uint32_t existingCount = entries.size();
diff --git a/storage/src/vespa/storage/persistence/persistenceutil.h b/storage/src/vespa/storage/persistence/persistenceutil.h
index bf347ccb10a..0eba334c81d 100644
--- a/storage/src/vespa/storage/persistence/persistenceutil.h
+++ b/storage/src/vespa/storage/persistence/persistenceutil.h
@@ -68,7 +68,7 @@ struct PersistenceUtil {
uint16_t _nodeIndex;
FileStorThreadMetrics& _metrics;
const document::BucketIdFactory& _bucketFactory;
- const std::shared_ptr<document::DocumentTypeRepo> _repo;
+ const std::shared_ptr<const document::DocumentTypeRepo> _repo;
spi::PersistenceProvider& _spi;
PersistenceUtil(
diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h
index c8739442c13..a19fb2c0d64 100644
--- a/storage/src/vespa/storage/storageserver/storagenode.h
+++ b/storage/src/vespa/storage/storageserver/storagenode.h
@@ -82,7 +82,7 @@ public:
void updateMetrics(const MetricLockGuard & guard) override;
/** Updates the document type repo. */
- void setNewDocumentRepo(const std::shared_ptr<document::DocumentTypeRepo>& repo);
+ void setNewDocumentRepo(const std::shared_ptr<const document::DocumentTypeRepo>& repo);
/**
* Pauses the persistence processing. While the returned ResumeGuard