From f77b2641cea9d51ceb2f4cfa13eb3dd8571b2161 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 14 Jul 2022 12:09:09 +0200 Subject: Carry over parameters when grouping from YQL --- .../main/java/com/yahoo/search/yql/MinimalQueryInserter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'container-search/src/main/java/com/yahoo/search/yql') diff --git a/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java b/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java index 48c48748563..e844bac21e8 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java +++ b/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java @@ -10,7 +10,7 @@ import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; import com.yahoo.processing.request.CompoundName; -import com.yahoo.search.grouping.GroupingRequest; +import com.yahoo.search.grouping.GroupingQueryParser; import com.yahoo.search.query.QueryTree; import com.yahoo.search.query.parser.Parsable; import com.yahoo.search.query.parser.ParserEnvironment; @@ -116,11 +116,11 @@ public class MinimalQueryInserter extends Searcher { } query.getModel().getQueryTree().setRoot(newTree.getRoot()); query.getPresentation().getSummaryFields().addAll(parser.getYqlSummaryFields()); - for (VespaGroupingStep step : parser.getGroupingSteps()) { - GroupingRequest.newInstance(query) - .setRootOperation(step.getOperation()) - .continuations().addAll(step.continuations()); - } + + GroupingQueryParser.validate(query); + for (VespaGroupingStep step : parser.getGroupingSteps()) + GroupingQueryParser.createGroupingRequestIn(query, step.getOperation(), step.continuations()); + if (parser.getYqlSources().size() == 0) { query.getModel().getSources().clear(); } else { -- cgit v1.2.3