diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-12 14:20:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-12 14:20:40 +0100 |
commit | 776f0ec4a9ddc44e492a7eeb9f82f914bbdf4709 (patch) | |
tree | 3aa10ffdf2755cb60fdebe19a9cc713339356475 | |
parent | e8202e9ab83df0453f67ab2d7bdaddd8dfaf5064 (diff) | |
parent | 4f420eafb82812f17c46f64b18311b56e2e18de4 (diff) |
Merge pull request #19993 from vespa-engine/geirst/fix-class-name-typo
Fix typo in AsyncTransportContext class name.
3 files changed, 12 insertions, 12 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp index 2e1fc74037c..04d91b9c028 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp @@ -364,7 +364,7 @@ PersistenceEngine::putAsync(const Bucket &bucket, Timestamp ts, storage::spi::Do return onComplete->onComplete(std::make_unique<Result>(Result::ErrorType::PERMANENT_ERROR, make_string("No handler for document type '%s'", docType.toString().c_str()))); } - auto transportContext = std::make_shared<AsyncTranportContext>(1, std::move(onComplete)); + auto transportContext = std::make_shared<AsyncTransportContext>(1, std::move(onComplete)); handler->handlePut(feedtoken::make(std::move(transportContext)), bucket, ts, std::move(doc)); } @@ -384,7 +384,7 @@ PersistenceEngine::removeAsync(const Bucket& b, Timestamp t, const DocumentId& d return onComplete->onComplete(std::make_unique<RemoveResult>(Result::ErrorType::PERMANENT_ERROR, make_string("No handler for document type '%s'", docType.toString().c_str()))); } - auto transportContext = std::make_shared<AsyncTranportContext>(1, std::move(onComplete)); + auto transportContext = std::make_shared<AsyncTransportContext>(1, std::move(onComplete)); handler->handleRemove(feedtoken::make(std::move(transportContext)), b, t, did); } @@ -436,7 +436,7 @@ PersistenceEngine::updateAsync(const Bucket& b, Timestamp t, DocumentUpdate::SP if (handler == nullptr) { return onComplete->onComplete(std::make_unique<UpdateResult>(Result::ErrorType::PERMANENT_ERROR, make_string("No handler for document type '%s'", docType.toString().c_str()))); } - auto transportContext = std::make_shared<AsyncTranportContext>(1, std::move(onComplete)); + auto transportContext = std::make_shared<AsyncTransportContext>(1, std::move(onComplete)); handler->handleUpdate(feedtoken::make(std::move(transportContext)), b, t, std::move(upd)); } @@ -555,7 +555,7 @@ PersistenceEngine::createBucketAsync(const Bucket &b, Context &, OperationComple LOG(spam, "createBucket(%s)", b.toString().c_str()); HandlerSnapshot snap = getHandlerSnapshot(rguard, b.getBucketSpace()); - auto transportContext = std::make_shared<AsyncTranportContext>(snap.size(), std::move(onComplete)); + auto transportContext = std::make_shared<AsyncTransportContext>(snap.size(), std::move(onComplete)); while (snap.handlers().valid()) { IPersistenceHandler *handler = snap.handlers().get(); snap.handlers().next(); @@ -575,7 +575,7 @@ PersistenceEngine::deleteBucketAsync(const Bucket& b, Context&, OperationComplet LOG(spam, "deleteBucket(%s)", b.toString().c_str()); HandlerSnapshot snap = getHandlerSnapshot(rguard, b.getBucketSpace()); - auto transportContext = std::make_shared<AsyncTranportContext>(snap.size(), std::move(onComplete)); + auto transportContext = std::make_shared<AsyncTransportContext>(snap.size(), std::move(onComplete)); while (snap.handlers().valid()) { IPersistenceHandler *handler = snap.handlers().get(); snap.handlers().next(); diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp index 61c240f0d6a..8a0955b3147 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp @@ -67,7 +67,7 @@ TransportLatch::send(ResultUP result, bool documentWasFound) _latch.countDown(); } -AsyncTranportContext::AsyncTranportContext(uint32_t cnt, OperationComplete::UP onComplete) +AsyncTransportContext::AsyncTransportContext(uint32_t cnt, OperationComplete::UP onComplete) : TransportMerger(cnt > 1), _countDown(cnt), _onComplete(std::move(onComplete)) @@ -78,17 +78,17 @@ AsyncTranportContext::AsyncTranportContext(uint32_t cnt, OperationComplete::UP o } void -AsyncTranportContext::completeIfDone() { +AsyncTransportContext::completeIfDone() { _countDown--; if (_countDown == 0) { _onComplete->onComplete(std::move(_result)); } } -AsyncTranportContext::~AsyncTranportContext() = default; +AsyncTransportContext::~AsyncTransportContext() = default; void -AsyncTranportContext::send(ResultUP result, bool documentWasFound) +AsyncTransportContext::send(ResultUP result, bool documentWasFound) { mergeResult(std::move(result), documentWasFound); } diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h index 084ad0e8d10..91cadfedcd5 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h @@ -63,7 +63,7 @@ public: * Implementation of FeedToken::ITransport for async handling of the async reply for an operation. * Uses an internal count to keep track the number of the outstanding replies. */ -class AsyncTranportContext : public TransportMerger { +class AsyncTransportContext : public TransportMerger { private: using Result = storage::spi::Result; using OperationComplete = storage::spi::OperationComplete; @@ -72,8 +72,8 @@ private: OperationComplete::UP _onComplete; void completeIfDone() override; public: - AsyncTranportContext(uint32_t cnt, OperationComplete::UP); - ~AsyncTranportContext() override; + AsyncTransportContext(uint32_t cnt, OperationComplete::UP); + ~AsyncTransportContext() override; void send(ResultUP result, bool documentWasFound) override; }; |