Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-10394: Rename getSortWithinGroup to getWithinGroupSort in search.grouping.Command class. 

(Judith Silverman, Christine Poerschke)
This commit is contained in:
Christine Poerschke 2017-04-04 12:52:09 +01:00
parent ee98cdc790
commit 05749d0694
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -190,6 +190,9 @@ Other Changes
* SOLR-9745: print errors from solr.cmd (Gopikannan Venugopalsamy via Mikhail Khludnev)
* SOLR-10394: Rename getSortWithinGroup to getWithinGroupSort in search.grouping.Command class.
(Judith Silverman, Christine Poerschke)
================== 6.5.1 ==================
Bug Fixes

2
solr/core/src/java/org/apache/solr/search/grouping/Command.java
View File

@ -60,6 +60,6 @@ public interface Command<T> {
/**
* @return The sort inside a group
*/
Sort getSortWithinGroup();
Sort getWithinGroupSort();
}

4
solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
View File

@ -174,9 +174,9 @@ public class CommandHandler {
final AllGroupHeadsCollector allGroupHeadsCollector;
if (fieldType.getNumberType() != null) {
ValueSource vs = fieldType.getValueSource(sf, null);
allGroupHeadsCollector = new FunctionAllGroupHeadsCollector(vs, new HashMap(), firstCommand.getSortWithinGroup());
allGroupHeadsCollector = new FunctionAllGroupHeadsCollector(vs, new HashMap(), firstCommand.getWithinGroupSort());
} else {
allGroupHeadsCollector = TermAllGroupHeadsCollector.create(firstCommand.getKey(), firstCommand.getSortWithinGroup());
allGroupHeadsCollector = TermAllGroupHeadsCollector.create(firstCommand.getKey(), firstCommand.getWithinGroupSort());
}
if (collectors.isEmpty()) {
searchWithTimeLimiter(query, filter, allGroupHeadsCollector);

2
solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
View File

@ -149,7 +149,7 @@ public class QueryCommand implements Command<QueryCommandResult> {
}
@Override
public Sort getSortWithinGroup() {
public Sort getWithinGroupSort() {
return null;
}
}

2
solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java
View File

@ -138,7 +138,7 @@ public class SearchGroupsFieldCommand implements Command<SearchGroupsFieldComman
}
@Override
public Sort getSortWithinGroup() {
public Sort getWithinGroupSort() {
return null;
}

2
solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java
View File

@ -173,7 +173,7 @@ public class TopGroupsFieldCommand implements Command<TopGroups<BytesRef>> {
}
@Override
public Sort getSortWithinGroup() {
public Sort getWithinGroupSort() {
return sortWithinGroup;
}
}