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

SOLR-236: simplify by using groupSort in base class 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@998326 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-09-17 21:10:50 +00:00
parent 34cc899c7d
commit bdb729a137
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solr/src/java/org/apache/solr/handler/component/QueryComponent.java
View File

@ -217,14 +217,8 @@ public class QueryComponent extends SearchComponent
for (String groupByStr : funcs) {
QParser parser = QParser.getParser(groupByStr, "func", rb.req);
Query q = parser.getQuery();
SolrIndexSearcher.GroupCommandFunc gc;
if (groupSort != null) {
SolrIndexSearcher.GroupSortCommand gcSort = new SolrIndexSearcher.GroupSortCommand();
gcSort.sort = groupSort;
gc = gcSort;
} else {
gc = new SolrIndexSearcher.GroupCommandFunc();
}
SolrIndexSearcher.GroupCommandFunc gc = new SolrIndexSearcher.GroupCommandFunc();
gc.groupSort = groupSort;
if (q instanceof FunctionQuery) {
gc.groupBy = ((FunctionQuery)q).getValueSource();

20
solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
View File

@ -930,9 +930,8 @@ public class SolrIndexSearcher extends IndexSearcher implements SolrInfoMBean {
Map context = ValueSource.newContext();
gc.groupBy.createWeight(context, this);
TopGroupCollector collector;
if (gc instanceof GroupSortCommand) {
GroupSortCommand sortGc = (GroupSortCommand) gc;
collector = new TopGroupSortCollector(gc.groupBy, context, sort, sortGc.sort, last);
if (gc.groupSort != null && gc.groupSort != sort) {
collector = new TopGroupSortCollector(gc.groupBy, context, sort, gc.groupSort, last);
} else {
collector = new TopGroupCollector(gc.groupBy, context, sort, last);
}
@ -963,13 +962,7 @@ public class SolrIndexSearcher extends IndexSearcher implements SolrInfoMBean {
for (GroupCommand groupCommand : cmd.groupCommands) {
if (groupCommand instanceof GroupCommandFunc) {
GroupCommandFunc gc = (GroupCommandFunc)groupCommand;
Sort collectorSort;
if (gc instanceof GroupSortCommand) {
collectorSort = ((GroupSortCommand) gc).sort;
} else {
collectorSort = sort;
}
Sort collectorSort = gc.groupSort == null ? sort : gc.groupSort;
Phase2GroupCollector collector = new Phase2GroupCollector((TopGroupCollector)gc.collector, gc.groupBy, gc.context, collectorSort, gc.docsPerGroup, needScores);
phase2Collectors.add(collector);
}
@ -1985,9 +1978,6 @@ public class SolrIndexSearcher extends IndexSearcher implements SolrInfoMBean {
public Sort groupSort; // the sort of the documents *within* a single group.
public int groupLimit; // how many groups - defaults to the "rows" parameter
public int docsPerGroup; // how many docs in each group - from "group.limit" param, default=1
}
public static class GroupCommandFunc extends GroupCommand {
@ -1999,10 +1989,6 @@ public class SolrIndexSearcher extends IndexSearcher implements SolrInfoMBean {
transient Collector collector;
}
public static class GroupSortCommand extends GroupCommandFunc {
public Sort sort;
}
/**
* The result of a search.
*/