Send schema name down to backend as library parameter.

2 files changed, 11 insertions, 19 deletions

diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
index 658eea0b526..cd9b64da90b 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
@@ -28,6 +28,7 @@ import com.yahoo.vdslib.VisitorStatistics;
 import com.yahoo.vespa.objects.BufferSerializer;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -112,8 +113,8 @@ class StreamingVisitor extends VisitorDataHandler implements Visitor {
         return query.properties().getString(streamingSelection);
     }
 
-    private void setVisitorParameters(String searchCluster, Route route, String documentType) {
-        params.setDocumentSelection(createSelectionString(documentType, createQuerySelectionString()));
+    private void setVisitorParameters(String searchCluster, Route route, String schema) {
+        params.setDocumentSelection(createSelectionString(schema, createQuerySelectionString()));
         params.setTimeoutMs(query.getTimeout()); // Per bucket visitor timeout
         params.setSessionTimeoutMs(query.getTimeout());
         params.setVisitorLibrary("searchvisitor");
@@ -146,7 +147,8 @@ class StreamingVisitor extends VisitorDataHandler implements Visitor {
         encodeQueryData(query, 0, ed);
         params.setLibraryParameter("query", ed.getEncodedData());
         params.setLibraryParameter("querystackcount", String.valueOf(ed.getReturned()));
-        params.setLibraryParameter("searchcluster", searchCluster.getBytes());
+        params.setLibraryParameter("searchcluster", searchCluster.getBytes(StandardCharsets.UTF_8));
+        params.setLibraryParameter("schema", schema.getBytes(StandardCharsets.UTF_8));
         if (query.getPresentation().getSummary() != null) {
             params.setLibraryParameter("summaryclass", query.getPresentation().getSummary());
         } else {
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingVisitorTest.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingVisitorTest.java
index 8be60b7c3b0..afc78cf00ed 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingVisitorTest.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingVisitorTest.java
@@ -23,6 +23,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -76,7 +77,7 @@ public class StreamingVisitorTest {
         };
     }
 
-    private class QueryArguments {
+    private static class QueryArguments {
         // General query parameters
         String query = "test";
         double timeout = 0.5;
@@ -202,11 +203,7 @@ public class StreamingVisitorTest {
         }
         assertEquals(qa.from, params.getFromTimestamp());
         assertEquals(qa.to, params.getToTimestamp());
-        if (qa.priority != null) {
-            assertEquals(qa.priority, params.getPriority());
-        } else {
-            assertEquals(DocumentProtocol.Priority.VERY_HIGH, params.getPriority());
-        }
+        assertEquals(Objects.requireNonNullElse(qa.priority, DocumentProtocol.Priority.VERY_HIGH), params.getPriority());
         if (qa.maxBucketsPerVisitor != 0) {
             assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor());
         } else {
@@ -227,17 +224,10 @@ public class StreamingVisitorTest {
         //System.err.println("query="+new String(params.getLibraryParameters().get("querystackcount")));
         assertNotNull(params.getLibraryParameters().get("querystackcount")); // TODO: Check contents
         assertEquals(searchCluster, new String(params.getLibraryParameters().get("searchcluster")));
-        if (qa.summary != null) {
-            assertEquals(qa.summary, new String(params.getLibraryParameters().get("summaryclass")));
-        } else {
-            assertEquals("default", new String(params.getLibraryParameters().get("summaryclass")));
-        }
+        assertEquals(docType, new String(params.getLibraryParameters().get("schema")));
+        assertEquals(Objects.requireNonNullElse(qa.summary, "default"), new String(params.getLibraryParameters().get("summaryclass")));
         assertEquals(Integer.toString(qa.offset+qa.hits), new String(params.getLibraryParameters().get("summarycount")));
-        if (qa.profile != null) {
-            assertEquals(qa.profile, new String(params.getLibraryParameters().get("rankprofile")));
-        } else {
-            assertEquals("default", new String(params.getLibraryParameters().get("rankprofile")));
-        }
+        assertEquals(Objects.requireNonNullElse(qa.profile, "default"), new String(params.getLibraryParameters().get("rankprofile")));
         //System.err.println("queryflags="+new String(params.getLibraryParameters().get("queryflags")));
         assertNotNull(params.getLibraryParameters().get("queryflags")); // TODO: Check contents
         if (qa.location != null) {