From f98953cb178a3c023e476b05475a4ec5de0077c7 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sat, 2 May 2020 23:04:15 +0000 Subject: Actually propagate result. --- .../proton/attribute/attribute_usage_filter.cpp | 16 +++++----------- .../searchcore/proton/attribute/attribute_usage_filter.h | 14 +++++++------- .../src/vespa/searchcore/proton/common/feedtoken.cpp | 2 +- .../proton/persistenceengine/transport_latch.cpp | 3 ++- .../searchcore/proton/server/disk_mem_usage_filter.cpp | 3 +-- .../searchcore/proton/server/disk_mem_usage_filter.h | 2 +- .../src/vespa/searchcore/proton/server/feedhandler.cpp | 2 +- .../searchcore/proton/server/persistencehandlerproxy.cpp | 14 +++++++------- 8 files changed, 25 insertions(+), 31 deletions(-) diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.cpp index dd5e120b4b1..2852497cf3f 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.cpp @@ -56,24 +56,20 @@ AttributeUsageFilter::recalcState(const Guard &guard) (void) guard; bool hasMessage = false; std::ostringstream message; - const AddressSpaceUsageStats &enumStoreUsage = - _attributeStats.enumStoreUsage(); + const AddressSpaceUsageStats &enumStoreUsage = _attributeStats.enumStoreUsage(); double enumStoreUsed = enumStoreUsage.getUsage().usage(); if (enumStoreUsed > _config._enumStoreLimit) { hasMessage = true; - makeEnumStoreMessage(message, enumStoreUsed, _config._enumStoreLimit, - enumStoreUsage); + makeEnumStoreMessage(message, enumStoreUsed, _config._enumStoreLimit, enumStoreUsage); } - const AddressSpaceUsageStats &multiValueUsage = - _attributeStats.multiValueUsage(); + const AddressSpaceUsageStats &multiValueUsage = _attributeStats.multiValueUsage(); double multiValueUsed = multiValueUsage.getUsage().usage(); if (multiValueUsed > _config._multiValueLimit) { if (hasMessage) { message << ", "; } hasMessage = true; - makeMultiValueMessage(message, multiValueUsed, _config._multiValueLimit, - multiValueUsage); + makeMultiValueMessage(message, multiValueUsed, _config._multiValueLimit, multiValueUsage); } if (hasMessage) { _state = State(false, message.str()); @@ -93,9 +89,7 @@ AttributeUsageFilter::AttributeUsageFilter() { } -AttributeUsageFilter::~AttributeUsageFilter() -{ -} +AttributeUsageFilter::~AttributeUsageFilter() = default; void AttributeUsageFilter::setAttributeStats(AttributeUsageStats attributeStats_in) diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h index 634d1ae5437..ecc95d4ee02 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h @@ -24,23 +24,23 @@ public: using Config = AttributeUsageFilterConfig; private: - mutable Mutex _lock; // protect _attributeStats, _config, _state + mutable Mutex _lock; // protect _attributeStats, _config, _state AttributeUsageStats _attributeStats; - Config _config; - State _state; - std::atomic _acceptWrite; + Config _config; + State _state; + std::atomic _acceptWrite; void recalcState(const Guard &guard); // called with _lock held public: AttributeUsageFilter(); - ~AttributeUsageFilter(); + ~AttributeUsageFilter() override; void setAttributeStats(AttributeUsageStats attributeStats_in); AttributeUsageStats getAttributeUsageStats() const; void setConfig(Config config); double getEnumStoreUsedRatio() const; double getMultiValueUsedRatio() const; - virtual bool acceptWriteOperation() const override; - virtual State getAcceptState() const override; + bool acceptWriteOperation() const override; + State getAcceptState() const override; }; diff --git a/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp b/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp index e0bc7cb551f..d61eaa2c6ab 100644 --- a/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp @@ -6,7 +6,7 @@ namespace proton::feedtoken { State::State(ITransport & transport) : _transport(transport), - _result(new storage::spi::Result()), + _result(std::make_unique()), _documentWasFound(false), _alreadySent(false) { diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp index 64159841efe..e44d2213462 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp @@ -81,8 +81,9 @@ void AsyncTranportContext::completeIfDone() { _countDown--; if (_countDown == 0) { - _onComplete->onComplete(std::make_unique()); + _onComplete->onComplete(std::move(_result)); } + } AsyncTranportContext::~AsyncTranportContext() = default; diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.cpp index 1a6fc6cdbfd..3191d82bf11 100644 --- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.cpp @@ -252,8 +252,7 @@ DiskMemUsageFilter::removeDiskMemUsageListener(IDiskMemUsageListener *listener) } void -DiskMemUsageFilter::notifyDiskMemUsage(const Guard &guard, - DiskMemUsageState state) +DiskMemUsageFilter::notifyDiskMemUsage(const Guard &guard, DiskMemUsageState state) { (void) guard; if (_dmstate == state) { diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.h b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.h index b9047d47793..afb8c3d2c7a 100644 --- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.h +++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_filter.h @@ -56,7 +56,7 @@ private: public: DiskMemUsageFilter(const HwInfo &hwInfo); - ~DiskMemUsageFilter(); + ~DiskMemUsageFilter() override; void setMemoryStats(vespalib::ProcessMemoryStats memoryStats_in); void setDiskUsedSize(uint64_t diskUsedSizeBytes); void setConfig(Config config); diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp index 4a87ee0009c..3d21a080ae1 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp @@ -393,7 +393,7 @@ FeedHandler::replayTransactionLog(SerialNum flushedIndexMgrSerial, SerialNum flu (void) newestFlushedSerial; assert(_activeFeedView); assert(_bucketDBHandler); - FeedState::SP state = make_shared + auto state = make_shared (getDocTypeName(), _activeFeedView, *_bucketDBHandler, _replayConfig, config_store); changeFeedState(state); // Resurrected attribute vector might cause oldestFlushedSerial to diff --git a/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp index ba0db2bb77d..af4af7f64fe 100644 --- a/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp @@ -42,21 +42,21 @@ void PersistenceHandlerProxy::handlePut(FeedToken token, const Bucket &bucket, Timestamp timestamp, DocumentSP doc) { auto op = std::make_unique(bucket.getBucketId().stripUnused(), timestamp, std::move(doc)); - _feedHandler.handleOperation(token, std::move(op)); + _feedHandler.handleOperation(std::move(token), std::move(op)); } void PersistenceHandlerProxy::handleUpdate(FeedToken token, const Bucket &bucket, Timestamp timestamp, const DocumentUpdateSP &upd) { auto op = std::make_unique(bucket.getBucketId().stripUnused(), timestamp, upd); - _feedHandler.handleOperation(token, std::move(op)); + _feedHandler.handleOperation(std::move(token), std::move(op)); } void PersistenceHandlerProxy::handleRemove(FeedToken token, const Bucket &bucket, Timestamp timestamp, const document::DocumentId &id) { auto op = std::make_unique(bucket.getBucketId().stripUnused(), timestamp, id); - _feedHandler.handleOperation(token, std::move(op)); + _feedHandler.handleOperation(std::move(token), std::move(op)); } void @@ -89,14 +89,14 @@ void PersistenceHandlerProxy::handleCreateBucket(FeedToken token, const Bucket &bucket) { auto op = std::make_unique(bucket.getBucketId().stripUnused()); - _feedHandler.handleOperation(token, std::move(op)); + _feedHandler.handleOperation(std::move(token), std::move(op)); } void PersistenceHandlerProxy::handleDeleteBucket(FeedToken token, const Bucket &bucket) { auto op = std::make_unique(bucket.getBucketId().stripUnused()); - _feedHandler.handleOperation(token, std::move(op)); + _feedHandler.handleOperation(std::move(token), std::move(op)); } void @@ -111,7 +111,7 @@ PersistenceHandlerProxy::handleSplit(FeedToken token, const Bucket &source, cons auto op = std::make_unique(source.getBucketId().stripUnused(), target1.getBucketId().stripUnused(), target2.getBucketId().stripUnused()); - _feedHandler.handleOperation(token, std::move(op)); + _feedHandler.handleOperation(std::move(token), std::move(op)); } void @@ -120,7 +120,7 @@ PersistenceHandlerProxy::handleJoin(FeedToken token, const Bucket &source1, cons auto op = std::make_unique(source1.getBucketId().stripUnused(), source2.getBucketId().stripUnused(), target.getBucketId().stripUnused()); - _feedHandler.handleOperation(token, std::move(op)); + _feedHandler.handleOperation(std::move(token), std::move(op)); } IPersistenceHandler::RetrieversSP -- cgit v1.2.3