summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java
diff options
context:
space:
mode:
authorLester Solbakken <lesters@users.noreply.github.com>2022-04-19 08:49:06 +0200
committerGitHub <noreply@github.com>2022-04-19 08:49:06 +0200
commitd8384ad07427e07c868915d3632620b7fca473d9 (patch)
tree9685b03b4a1b3eac825979793bf8afe7e1c22945 /container-search/src/main/java
parent8933192c9359795bcd704a4c60c65446be2f0277 (diff)
parent116201748d6169a822abd17cbf68f9df5034e421 (diff)
Merge pull request #22063 from vespa-engine/bratseth/serialization-test
Add serialization test
Diffstat (limited to 'container-search/src/main/java')
-rw-r--r--container-search/src/main/java/com/yahoo/search/Query.java3
-rw-r--r--container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java2
3 files changed, 4 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 7d78012bcfd..74091d9978c 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -382,7 +382,8 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
.chain(new DefaultProperties());
// Pass the values from the query profile which maps through a field in the Query object model
- // through the property chain to cause those values to be set in the Query object model
+ // through the property chain to cause those values to be set in the Query object model with
+ // the right types according to query profiles
setFieldsFrom(queryProfileProperties, requestMap);
// We need special handling for "select" because it can be both the prefix of the nested JSON select
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
index c60cf70bd59..82c570a9975 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
@@ -50,7 +50,7 @@ public class ProtobufSerialization {
}
}
- private static SearchProtocol.SearchRequest convertFromQuery(Query query, int hits, String serverId) {
+ static SearchProtocol.SearchRequest convertFromQuery(Query query, int hits, String serverId) {
var builder = SearchProtocol.SearchRequest.newBuilder().setHits(hits).setOffset(query.getOffset())
.setTimeout((int) query.getTimeLeft());
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
index b3c10a67091..d9299c07614 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
@@ -65,7 +65,7 @@ public class GroupingExecutor extends Searcher {
/**
* Constructs a new instance of this searcher with the given component id.
*
- * @param componentId The identifier to assign to this searcher.
+ * @param componentId the identifier to assign to this searcher
*/
public GroupingExecutor(ComponentId componentId) {
super(componentId);