diff options
4 files changed, 4 insertions, 8 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp b/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp index 7999bcf85d6..bd6a09c1387 100644 --- a/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp +++ b/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp @@ -63,7 +63,7 @@ getCompressionConfig() DocsumRequest::UP DocsumBySlime::slimeToRequest(const Inspector & request) { - DocsumRequest::UP docsumRequest(std::make_unique<DocsumRequest>(true)); + DocsumRequest::UP docsumRequest(std::make_unique<DocsumRequest>()); docsumRequest->resultClassName = request[SUMMARYCLASS].asString().make_string(); diff --git a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp index 5efe3f9fe8c..973d2bcc15c 100644 --- a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp +++ b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp @@ -321,14 +321,10 @@ TEST_F(SearchReplyTest, require_that_issues_are_converted_to_errors) { struct DocsumRequestTest : ::testing::Test { Converter::ProtoDocsumRequest proto; DocsumRequest request; - DocsumRequestTest() : proto(), request(true) {} // <- use root slime + DocsumRequestTest() : proto(), request() {} void convert() { Converter::docsum_request_from_proto(proto, request); } }; -TEST_F(DocsumRequestTest, require_that_root_slime_is_used) { - EXPECT_TRUE(request.useRootSlime()); -} - TEST_F(DocsumRequestTest, require_that_timeout_is_converted) { proto.set_timeout(500); convert(); diff --git a/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp b/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp index 304e33900a6..41f471f0a7a 100644 --- a/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp +++ b/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp @@ -52,7 +52,7 @@ struct MyDocsumServer : DocsumServer { auto reply = std::make_unique<DocsumReply>(); reply->_root = std::make_unique<Slime>(); auto &list = reply->_root->setArray(); - list.addObject().setBool("use_root_slime", req->useRootSlime()); + list.addObject().setBool("use_root_slime", true); list.addObject().setString("ranking", req->ranking); reply->request = std::move(req); std::this_thread::sleep_for(std::chrono::milliseconds(5)); diff --git a/searchlib/src/vespa/searchlib/engine/proto_rpc_adapter.cpp b/searchlib/src/vespa/searchlib/engine/proto_rpc_adapter.cpp index b1bc8ec37b4..5a3bfe42515 100644 --- a/searchlib/src/vespa/searchlib/engine/proto_rpc_adapter.cpp +++ b/searchlib/src/vespa/searchlib/engine/proto_rpc_adapter.cpp @@ -138,7 +138,7 @@ struct DocsumRequestDecoder : DocsumRequest::Source::Decoder { return std::unique_ptr<DocsumRequest>(nullptr); } stats.requested_documents = msg.global_ids_size(); - auto req = std::make_unique<DocsumRequest>(std::move(relative_time), true); + auto req = std::make_unique<DocsumRequest>(std::move(relative_time)); ProtoConverter::docsum_request_from_proto(msg, *req); return req; } |