diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-17 22:48:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-17 22:48:12 +0200 |
commit | ba3d1e4de167511767b70e63a91ef6c740b76add (patch) | |
tree | fd9cec2ae699630d24ee27980a40347e0d53b25e /searchlib | |
parent | 2e60b8217b93fc9222ec00422de9ff909b775b42 (diff) |
Revert "Introduce async write interface in the TLS."
Diffstat (limited to 'searchlib')
7 files changed, 6 insertions, 45 deletions
diff --git a/searchlib/src/vespa/searchlib/common/CMakeLists.txt b/searchlib/src/vespa/searchlib/common/CMakeLists.txt index f9db738528c..b1f71303449 100644 --- a/searchlib/src/vespa/searchlib/common/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/common/CMakeLists.txt @@ -13,7 +13,6 @@ vespa_add_library(searchlib_common OBJECT featureset.cpp fileheadercontext.cpp foregroundtaskexecutor.cpp - gatecallback.cpp growablebitvector.cpp indexmetainfo.cpp location.cpp diff --git a/searchlib/src/vespa/searchlib/common/gatecallback.cpp b/searchlib/src/vespa/searchlib/common/gatecallback.cpp deleted file mode 100644 index a853909be71..00000000000 --- a/searchlib/src/vespa/searchlib/common/gatecallback.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include "gatecallback.h" -#include <vespa/vespalib/util/sync.h> - -namespace search { - -GateCallback::~GateCallback() { - _gate.countDown(); -} - -} diff --git a/searchlib/src/vespa/searchlib/common/gatecallback.h b/searchlib/src/vespa/searchlib/common/gatecallback.h deleted file mode 100644 index 1e85d796089..00000000000 --- a/searchlib/src/vespa/searchlib/common/gatecallback.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once - -#include "idestructorcallback.h" - -namespace vespalib { class Gate; } - -namespace search { - -class GateCallback : public IDestructorCallback { -public: - GateCallback(vespalib::Gate & gate) : _gate(gate) {} - ~GateCallback() override; -private: - vespalib::Gate & _gate; -}; - -class IgnoreCallback : public IDestructorCallback { -public: - IgnoreCallback() { } - ~IgnoreCallback() override = default; -}; - -} // namespace search diff --git a/searchlib/src/vespa/searchlib/common/idestructorcallback.h b/searchlib/src/vespa/searchlib/common/idestructorcallback.h index 77adba7a4cc..4c42f68f0e4 100644 --- a/searchlib/src/vespa/searchlib/common/idestructorcallback.h +++ b/searchlib/src/vespa/searchlib/common/idestructorcallback.h @@ -3,7 +3,8 @@ #include <memory> -namespace search { +namespace search +{ /** * Interface for class that performs a callback when instance is @@ -16,7 +17,7 @@ class IDestructorCallback { public: using SP = std::shared_ptr<IDestructorCallback>; - virtual ~IDestructorCallback() = default; + virtual ~IDestructorCallback() { } }; } // namespace search diff --git a/searchlib/src/vespa/searchlib/transactionlog/common.h b/searchlib/src/vespa/searchlib/transactionlog/common.h index db8b9727daa..65ef8f363c0 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/common.h +++ b/searchlib/src/vespa/searchlib/transactionlog/common.h @@ -2,7 +2,6 @@ #pragma once #include <vespa/searchlib/common/serialnum.h> -#include <vespa/searchlib/common/idestructorcallback.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/buffer.h> @@ -91,9 +90,8 @@ int makeDirectory(const char * dir); class Writer { public: - using DoneCallback = std::shared_ptr<IDestructorCallback>; virtual ~Writer() { } - virtual void commit(const vespalib::string & domainName, const Packet & packet, DoneCallback done) = 0; + virtual void commit(const vespalib::string & domainName, const Packet & packet) = 0; }; } diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp index e793aafd38f..ca17457bdb9 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp @@ -453,9 +453,8 @@ void TransLogServer::domainStatus(FRT_RPCRequest *req) } } -void TransLogServer::commit(const vespalib::string & domainName, const Packet & packet, DoneCallback done) +void TransLogServer::commit(const vespalib::string & domainName, const Packet & packet) { - (void) done; Domain::SP domain(findDomain(domainName)); if (domain) { domain->commit(packet); diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h index c12e37dd1c8..92832786059 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h +++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h @@ -31,7 +31,7 @@ public: virtual ~TransLogServer(); DomainStats getDomainStats() const; - void commit(const vespalib::string & domainName, const Packet & packet, DoneCallback done) override; + void commit(const vespalib::string & domainName, const Packet & packet) override; class Session |