diff options
6 files changed, 5 insertions, 11 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index 15328f1c627..4706338a953 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -185,7 +185,6 @@ SearchVisitor::SearchVisitor(StorageComponent& component, _groupingList(), _attributeFields(), _sortList(), - _docsumWriter(nullptr), _searchBuffer(new vsm::SearcherBuf()), _tmpSortBuffer(256), _documentIdAttributeBacking(new search::SingleStringExtAttribute("[docid]") ), diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h index ceadd8a9c79..abe66f555a1 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h @@ -439,7 +439,6 @@ private: std::vector<AttrInfo> _attributeFields; search::common::SortSpec _sortSpec; std::vector<size_t> _sortList; - IDocsumWriter * _docsumWriter; vsm::SharedSearcherBuf _searchBuffer; std::vector<char> _tmpSortBuffer; search::AttributeVector::SP _documentIdAttributeBacking; diff --git a/vbench/src/tests/request_dumper/request_dumper_test.cpp b/vbench/src/tests/request_dumper/request_dumper_test.cpp index 648b68a31d3..70a89576f5f 100644 --- a/vbench/src/tests/request_dumper/request_dumper_test.cpp +++ b/vbench/src/tests/request_dumper/request_dumper_test.cpp @@ -4,8 +4,8 @@ using namespace vbench; -TEST_FF("dump request", RequestSink(), RequestDumper(f1)) { - f2.handle(Request::UP(new Request())); +TEST_F("dump request", RequestDumper()) { + f1.handle(Request::UP(new Request())); } TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/vbench/src/vbench/vbench/native_factory.cpp b/vbench/src/vbench/vbench/native_factory.cpp index 5d2b55733a8..b418e644af2 100644 --- a/vbench/src/vbench/vbench/native_factory.cpp +++ b/vbench/src/vbench/vbench/native_factory.cpp @@ -50,7 +50,7 @@ NativeFactory::createAnalyzer(const vespalib::slime::Inspector &spec, return Analyzer::UP(new QpsAnalyzer(next)); } if (type == "RequestDumper") { - return Analyzer::UP(new RequestDumper(next)); + return Analyzer::UP(new RequestDumper()); } if (type == "IgnoreBefore") { return Analyzer::UP(new IgnoreBefore(spec["time"].asDouble(), next)); diff --git a/vbench/src/vbench/vbench/request_dumper.cpp b/vbench/src/vbench/vbench/request_dumper.cpp index 7474eafa283..81928bbe14b 100644 --- a/vbench/src/vbench/vbench/request_dumper.cpp +++ b/vbench/src/vbench/vbench/request_dumper.cpp @@ -5,8 +5,7 @@ namespace vbench { -RequestDumper::RequestDumper(Handler<Request> &next) - : _next(next) +RequestDumper::RequestDumper() { } diff --git a/vbench/src/vbench/vbench/request_dumper.h b/vbench/src/vbench/vbench/request_dumper.h index 980f8b798b3..7943519fd19 100644 --- a/vbench/src/vbench/vbench/request_dumper.h +++ b/vbench/src/vbench/vbench/request_dumper.h @@ -12,11 +12,8 @@ namespace vbench { **/ class RequestDumper : public Analyzer { -private: - Handler<Request> &_next; - public: - RequestDumper(Handler<Request> &_next); + RequestDumper(); void handle(Request::UP request) override; void report() override; }; |