summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-02-21 11:20:50 +0100
committerArne H Juul <arnej@yahoo-inc.com>2017-02-21 11:20:50 +0100
commit0f73e375ee010b4ac7ab56239ec7ac11898a5f0f (patch)
treed816274cbf3fcdb59da6f60220f989ebc49eeb41 /container-search
parenta25e78ba171f9f65a1208be15b5ccf936c02e417 (diff)
ask for and expect slime docsums
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java1
-rw-r--r--container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java
index 3b414e288da..07d5136c816 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java
@@ -74,6 +74,7 @@ public final class DocsumDefinitionSet {
buffer.order(ByteOrder.LITTLE_ENDIAN);
long docsumClassId = buffer.getInt();
if (docsumClassId != SLIME_MAGIC_ID) {
+ log.warning("Only expecting SchemaLess docsums");
// TODO: Not used, remove - bratseth 2017-01-016
DocsumDefinition docsumDefinition = lookupDocsum(docsumClassId);
Docsum docsum = new Docsum(docsumDefinition, data);
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 ca2bd9c4b05..9fe64e6977d 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,6 +181,7 @@ 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);