aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/dispatch/GroupingResultAggregator.java
diff options
context:
space:
mode:
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/dispatch/GroupingResultAggregator.java')
-rw-r--r--container-search/src/main/java/com/yahoo/search/dispatch/GroupingResultAggregator.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/GroupingResultAggregator.java b/container-search/src/main/java/com/yahoo/search/dispatch/GroupingResultAggregator.java
index 8db0ec46f95..8311c84930e 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/GroupingResultAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/GroupingResultAggregator.java
@@ -1,7 +1,7 @@
// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.search.dispatch;
-import com.yahoo.prelude.fastsearch.DocsumDefinitionSet;
+import com.yahoo.prelude.fastsearch.DocumentDatabase;
import com.yahoo.prelude.fastsearch.GroupingListHit;
import com.yahoo.search.Query;
import com.yahoo.searchlib.aggregation.Grouping;
@@ -23,13 +23,13 @@ class GroupingResultAggregator {
private static final Logger log = Logger.getLogger(GroupingResultAggregator.class.getName());
private final Map<Integer, Grouping> groupings = new LinkedHashMap<>();
- private DocsumDefinitionSet docsumDefinitions = null;
+ private DocumentDatabase documentDatabase = null;
private Query query = null;
private int groupingHitsMerged = 0;
void mergeWith(GroupingListHit result) {
++groupingHitsMerged;
- if (docsumDefinitions == null) docsumDefinitions = result.getDocsumDefinitionSet();
+ if (documentDatabase == null) documentDatabase = result.getDocumentDatBase();
if (query == null) query = result.getQuery();
log.log(Level.FINE, () ->
String.format("Merging hit #%d having %d groupings",
@@ -46,8 +46,8 @@ class GroupingResultAggregator {
if (groupingHitsMerged == 0) return Optional.empty();
log.log(Level.FINE, () ->
String.format("Creating aggregated hit containing %d groupings from %d hits with docsums '%s' and %s",
- groupings.size(), groupingHitsMerged, docsumDefinitions, query));
- GroupingListHit groupingHit = new GroupingListHit(List.copyOf(groupings.values()), docsumDefinitions);
+ groupings.size(), groupingHitsMerged, documentDatabase.getDocsumDefinitionSet(), query));
+ GroupingListHit groupingHit = new GroupingListHit(List.copyOf(groupings.values()), documentDatabase, query);
groupingHit.setQuery(query);
groupingHit.getGroupingList().forEach(g -> {
g.select(o -> o instanceof Hit, o -> ((Hit)o).setContext(groupingHit));