diff options
9 files changed, 13 insertions, 28 deletions
diff --git a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java index b5476ed6ba3..5ee775a7ed3 100644 --- a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java +++ b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java @@ -69,7 +69,7 @@ public class GetDocSumsPacket extends Packet { * definition of enum getdocsums_flags */ public static final int GDFLAG_IGNORE_ROW = 0x00000001; - public static final int GDFLAG_ALLOW_SLIME = 0x00000002; + public static final int GDFLAG_ALLOW_SLIME = 0x00000002; // now always assumed true; remove in Vespa 7 public void encodeBody(ByteBuffer buffer) { setFieldsFromHits(); @@ -80,9 +80,6 @@ public class GetDocSumsPacket extends Packet { query.getRanking().getProperties().put(sessionIdKey, query.getSessionId(false).asUtf8String().toString()); } - // always allow slime docsums - flags |= GDFLAG_ALLOW_SLIME; - // set the default features long features = GDF_MLD; if (sendQuery) diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java index 9fe64e6977d..ca2bd9c4b05 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java @@ -181,7 +181,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor { } params.setLibraryParameter("summarycount", String.valueOf(query.getOffset() + query.getHits())); params.setLibraryParameter("rankprofile", query.getRanking().getProfile()); - params.setLibraryParameter("allowslimedocsums", "true"); params.setLibraryParameter("queryflags", String.valueOf(getQueryFlags(query))); ByteBuffer buf = ByteBuffer.allocate(1024); diff --git a/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java index 76323b7139d..a5c538d235a 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java @@ -37,13 +37,13 @@ public class GetDocSumsPacketTestCase { hit.setIgnoreRowBits(true); assertPacket(true, hit, new byte[] { 0, 0, 0, 57, 0, 0, 0, -37, 0, 0, 40, 21, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE, IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0x01, 0, 0, 0, 7, - 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1, 0, 0, 0, 6, 4, 0, 3, 102, 111, 111, 0, 0, 0, 3 }); + 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1, 0, 0, 0, 6, 4, 0, 3, 102, 111, 111, 0, 0, 0, 1 }); hit = new FastHit(); hit.setIgnoreRowBits(false); - assertPacket(true, hit, new byte[] {0, 0, 0, 57, 0, 0, 0, -37, 0, 0, 40, 21, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE, + assertPacket(true, hit, new byte[] {0, 0, 0, 53, 0, 0, 0, -37, 0, 0, 8, 21, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE, IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0x01, 0, 0, 0, 7, - 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1, 0, 0, 0, 6, 4, 0, 3, 102, 111, 111, 0, 0, 0, 2}); + 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1, 0, 0, 0, 6, 4, 0, 3, 102, 111, 111}); } @Test @@ -52,13 +52,13 @@ public class GetDocSumsPacketTestCase { hit.setIgnoreRowBits(true); assertPacket(false, hit, new byte[] { 0, 0, 0, 43, 0, 0, 0, -37, 0, 0, 40, 17, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE, IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0x01, 0, 0, 0, 7, - 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 3 + 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1 }); hit = new FastHit(); hit.setIgnoreRowBits(false); - assertPacket(false, hit, new byte[] { 0, 0, 0, 43, 0, 0, 0, -37, 0, 0, 40, 17, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE, - IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0x01, 0, 0, 0, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 2 + assertPacket(false, hit, new byte[] { 0, 0, 0, 39, 0, 0, 0, -37, 0, 0, 8, 17, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE, + IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0x01, 0, 0, 0, 7, 100, 101, 102, 97, 117, 108, 116 }); } @@ -68,6 +68,7 @@ public class GetDocSumsPacketTestCase { result.getQuery().getSessionId(true); // create session id. result.getQuery().getRanking().setQueryCache(true); FastHit hit = new FastHit(); + hit.setIgnoreRowBits(true); result.hits().add(hit); assertPacket(false, result, new byte[] { 0, 0, 0, -123, 0, 0, 0, -37, 0, 0, 56, 17, 0, 0, 0, 0, // query timeout @@ -84,7 +85,7 @@ public class GetDocSumsPacketTestCase { // caches: features => true 0, 0, 0, 6, 'c', 'a', 'c', 'h', 'e', 's', 0, 0, 0, 1, 0, 0, 0, 5, 'q', 'u', 'e', 'r', 'y', 0, 0, 0, 4, 't', 'r', 'u', 'e', // flags - 0, 0, 0, 2 + 0, 0, 0, 1 }); } diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java index 9787cf2838f..194de116baf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java @@ -262,7 +262,7 @@ public class FastSearcherTestCase { buf.get(actual); byte IGNORE = 69; - byte[] expected = new byte[] { 0, 0, 0, -85, 0, 0, 0, -37, 0, 0, 48, 17, 0, 0, 0, 0, + byte[] expected = new byte[] { 0, 0, 0, -89, 0, 0, 0, -37, 0, 0, 16, 17, 0, 0, 0, 0, // query timeout IGNORE, IGNORE, IGNORE, IGNORE, // "default" - rank profile @@ -275,9 +275,8 @@ public class FastSearcherTestCase { // match: documentdb.searchdoctype => test 0, 0, 0, 5, 'm', 'a', 't', 'c', 'h', 0, 0, 0, 1, 0, 0, 0, 24, 'd', 'o', 'c', 'u', 'm', 'e', 'n', 't', 'd', 'b', '.', 's', 'e', 'a', 'r', 'c', 'h', 'd', 'o', 'c', 't', 'y', 'p', 'e', 0, 0, 0, 4, 't', 'e', 's', 't', // sessionId => qrserver.0.XXXXXXXXXXXXX.0 - 0, 0, 0, 6, 'c', 'a', 'c', 'h', 'e', 's', 0, 0, 0, 1, 0, 0, 0, 5, 'q', 'u', 'e', 'r', 'y', 0, 0, 0, 4, 't', 'r', 'u', 'e', - // flags - 0, 0, 0, 2 + 0, 0, 0, 6, 'c', 'a', 'c', 'h', 'e', 's', 0, 0, 0, 1, 0, 0, 0, 5, 'q', 'u', 'e', 'r', 'y', 0, 0, 0, 4, 't', 'r', 'u', 'e' + // no flags }; assertEquals(expected.length, actual.length); for (int i = 0; i < expected.length; ++i) { diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index bffc9f9b772..c5ba2b3b04e 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -654,7 +654,6 @@ Test::requireThatDocsumRequestIsProcessed() DocsumRequest req; req.resultClassName = "class1"; - req._flags = ::search::fs4transport::GDFLAG_ALLOW_SLIME; req.hits.push_back(DocsumRequest::Hit(gid2)); req.hits.push_back(DocsumRequest::Hit(gid4)); req.hits.push_back(DocsumRequest::Hit(gid9)); @@ -694,7 +693,6 @@ Test::requireThatRewritersAreUsed() DocsumRequest req; req.resultClassName = "class2"; - req._flags = ::search::fs4transport::GDFLAG_ALLOW_SLIME; req.hits.push_back(DocsumRequest::Hit(gid1)); DocsumReply::UP rep = dc._ddb->getDocsums(req); EXPECT_EQUAL(1u, rep->docsums.size()); @@ -802,7 +800,6 @@ Test::requireThatAttributesAreUsed() DocsumRequest req; req.resultClassName = "class3"; - req._flags = ::search::fs4transport::GDFLAG_ALLOW_SLIME; req.hits.push_back(DocsumRequest::Hit(gid2)); req.hits.push_back(DocsumRequest::Hit(gid3)); DocsumReply::UP rep = dc._ddb->getDocsums(req); @@ -853,7 +850,6 @@ Test::requireThatAttributesAreUsed() DocsumRequest req3; req3.resultClassName = "class3"; - req3._flags = ::search::fs4transport::GDFLAG_ALLOW_SLIME; req3.hits.push_back(DocsumRequest::Hit(gid3)); DocsumReply::UP rep3 = dc._ddb->getDocsums(req3); @@ -1158,7 +1154,6 @@ Test::requireThatPositionsAreUsed() DocsumRequest req; req.resultClassName = "class5"; - req._flags = ::search::fs4transport::GDFLAG_ALLOW_SLIME; req.hits.push_back(DocsumRequest::Hit(gid1)); DocsumReply::UP rep = dc._ddb->getDocsums(req); // uint32_t rclass = 5; 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 132856ef755..06abf5e65bc 100644 --- a/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp +++ b/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp @@ -60,7 +60,6 @@ DocsumBySlime::slimeToRequest(const Inspector & request) { DocsumRequest::UP docsumRequest(std::make_unique<DocsumRequest>(true)); - docsumRequest->_flags = search::fs4transport::GDFLAG_ALLOW_SLIME; docsumRequest->resultClassName = request[SUMMARYCLASS].asString().make_string(); Inspector & gids = request[GIDS]; docsumRequest->hits.reserve(gids.entries()); diff --git a/searchlib/src/vespa/searchlib/common/transport.h b/searchlib/src/vespa/searchlib/common/transport.h index 2625b3f0635..92816a96f94 100644 --- a/searchlib/src/vespa/searchlib/common/transport.h +++ b/searchlib/src/vespa/searchlib/common/transport.h @@ -104,7 +104,7 @@ enum getdocsums_features { enum getdocsums_flags { GDFLAG_IGNORE_ROW = 0x00000001, - GDFLAG_ALLOW_SLIME = 0x00000002 + GDFLAG_ALLOW_SLIME = 0x00000002 // now always assumed true; remove in Vespa 7 }; // docsum class for slime tunneling diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp index 91420dad7ac..7a17e803ea8 100644 --- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp +++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp @@ -56,7 +56,6 @@ struct DocsumFixture : IDocsumStore, GetDocsumsStateCallback { config->CreateEnumMaps(); writer.reset(new DynamicDocsumWriter(config, 0)); packer.reset(new ResultPacker(writer->GetResultConfig())); - state._args.setFlags(search::fs4transport::GDFLAG_ALLOW_SLIME); } void getDocsum(Slime &slime) { uint32_t classId; diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index cf39afff088..40c1d1f46db 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -198,10 +198,6 @@ void SearchVisitor::init(const Parameters & params) static_cast<unsigned>(valueRef.size())); LOG(debug, "Received summary class: %s", _summaryClass.c_str()); } - if (params.get("allowslimedocsums", valueRef)) { - _summaryGenerator.getDocsumState()._args.setFlags(search::fs4transport::GDFLAG_ALLOW_SLIME); - LOG(debug, "Set flag: GDFLAG_ALLOW_SLIME"); - } size_t wantedSummaryCount(10); if (params.get("summarycount", valueRef) ) { |