diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 0ddf6c077ca..f6f54819d43 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -256,6 +256,9 @@ Other Changes * SOLR-10438: Assign explicit useDocValuesAsStored values to all points field types in schema-point.xml/TestPointFields. (hossman, Steve Rowe) +* SOLR-10659: Remove ResponseBuilder.getSortSpec use in SearchGroupShardResponseProcessor. + (Judith Silverman via Christine Poerschke) + ================== 6.6.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java index ab13f7244b5..18896e08cff 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java @@ -52,7 +52,7 @@ public class SearchGroupShardResponseProcessor implements ShardResponseProcessor */ @Override public void process(ResponseBuilder rb, ShardRequest shardRequest) { - SortSpec ss = rb.getSortSpec(); + SortSpec groupSortSpec = rb.getGroupingSpec().getGroupSortSpec(); Sort groupSort = rb.getGroupingSpec().getGroupSort(); final String[] fields = rb.getGroupingSpec().getFields(); Sort withinGroupSort = rb.getGroupingSpec().getSortWithinGroup(); @@ -144,7 +144,7 @@ public class SearchGroupShardResponseProcessor implements ShardResponseProcessor rb.firstPhaseElapsedTime = maxElapsedTime; for (String groupField : commandSearchGroups.keySet()) { List>> topGroups = commandSearchGroups.get(groupField); - Collection> mergedTopGroups = SearchGroup.merge(topGroups, ss.getOffset(), ss.getCount(), groupSort); + Collection> mergedTopGroups = SearchGroup.merge(topGroups, groupSortSpec.getOffset(), groupSortSpec.getCount(), groupSort); if (mergedTopGroups == null) { continue; }