You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/12/06 23:13:28 UTC
[33/50] [abbrv] lucene-solr:apiv2: SOLR-9660: in
GroupingSpecification factor [group](sort|offset|limit) into
[group](sortSpec) (Judith Silverman, Christine Poerschke)
SOLR-9660: in GroupingSpecification factor [group](sort|offset|limit) into [group](sortSpec) (Judith Silverman, Christine Poerschke)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a7fa920b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a7fa920b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a7fa920b
Branch: refs/heads/apiv2
Commit: a7fa920b52febb80be70210caad7db1eeaf0f97a
Parents: 590d31f
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Nov 29 19:54:47 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Nov 29 22:15:30 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +
.../solr/handler/component/QueryComponent.java | 34 +++++-----
.../component/QueryElevationComponent.java | 28 +++-----
.../apache/solr/search/SolrIndexSearcher.java | 26 ++++++++
.../java/org/apache/solr/search/SortSpec.java | 10 +++
.../search/grouping/GroupingSpecification.java | 70 +++++++++++---------
.../TopGroupsShardResponseProcessor.java | 4 +-
.../GroupedEndResultTransformer.java | 4 +-
8 files changed, 112 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7fa920b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 448f2d7..1584647 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -250,6 +250,9 @@ Other Changes
* SOLR-9783: (Search|Top)Group[s]ShardResponseProcessor.process: turned sortWithinGroup null check into assert.
(Christine Poerschke)
+* SOLR-9660: in GroupingSpecification factor [group](sort|offset|limit) into [group](sortSpec)
+ (Judith Silverman, Christine Poerschke)
+
================== 6.3.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7fa920b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index fb6fec9..84ade43 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -252,21 +252,27 @@ public class QueryComponent extends SearchComponent
final SortSpec sortSpec = rb.getSortSpec();
//TODO: move weighting of sort
- Sort groupSort = searcher.weightSort(sortSpec.getSort());
- if (groupSort == null) {
- groupSort = Sort.RELEVANCE;
- }
+ final SortSpec groupSortSpec = searcher.weightSortSpec(sortSpec, Sort.RELEVANCE);
// groupSort defaults to sort
String sortWithinGroupStr = params.get(GroupParams.GROUP_SORT);
//TODO: move weighting of sort
- Sort sortWithinGroup = sortWithinGroupStr == null ? groupSort : searcher.weightSort(SortSpecParsing.parseSortSpec(sortWithinGroupStr, req).getSort());
- if (sortWithinGroup == null) {
- sortWithinGroup = Sort.RELEVANCE;
+ final SortSpec sortSpecWithinGroup;
+ if (sortWithinGroupStr != null) {
+ SortSpec parsedSortSpecWithinGroup = SortSpecParsing.parseSortSpec(sortWithinGroupStr, req);
+ sortSpecWithinGroup = searcher.weightSortSpec(parsedSortSpecWithinGroup, Sort.RELEVANCE);
+ } else {
+ sortSpecWithinGroup = new SortSpec(
+ groupSortSpec.getSort(),
+ groupSortSpec.getSchemaFields(),
+ groupSortSpec.getCount(),
+ groupSortSpec.getOffset());
}
+ sortSpecWithinGroup.setOffset(params.getInt(GroupParams.GROUP_OFFSET, 0));
+ sortSpecWithinGroup.setCount(params.getInt(GroupParams.GROUP_LIMIT, 1));
- groupingSpec.setSortWithinGroup(sortWithinGroup);
- groupingSpec.setGroupSort(groupSort);
+ groupingSpec.setSortSpecWithinGroup(sortSpecWithinGroup);
+ groupingSpec.setGroupSortSpec(groupSortSpec);
String formatStr = params.get(GroupParams.GROUP_FORMAT, Grouping.Format.grouped.name());
Grouping.Format responseFormat;
@@ -280,10 +286,6 @@ public class QueryComponent extends SearchComponent
groupingSpec.setFields(params.getParams(GroupParams.GROUP_FIELD));
groupingSpec.setQueries(params.getParams(GroupParams.GROUP_QUERY));
groupingSpec.setFunctions(params.getParams(GroupParams.GROUP_FUNC));
- groupingSpec.setGroupOffset(params.getInt(GroupParams.GROUP_OFFSET, 0));
- groupingSpec.setGroupLimit(params.getInt(GroupParams.GROUP_LIMIT, 1));
- groupingSpec.setOffset(sortSpec.getOffset());
- groupingSpec.setLimit(sortSpec.getCount());
groupingSpec.setIncludeGroupCount(params.getBool(GroupParams.GROUP_TOTAL_COUNT, false));
groupingSpec.setMain(params.getBool(GroupParams.GROUP_MAIN, false));
groupingSpec.setNeedScore((rb.getFieldFlags() & SolrIndexSearcher.GET_SCORES) != 0);
@@ -415,7 +417,7 @@ public class QueryComponent extends SearchComponent
.setTruncateGroups(groupingSpec.isTruncateGroups() && groupingSpec.getFields().length > 0)
.setSearcher(searcher);
- int docsToCollect = Grouping.getMax(groupingSpec.getGroupOffset(), groupingSpec.getGroupLimit(), searcher.maxDoc());
+ int docsToCollect = Grouping.getMax(groupingSpec.getWithinGroupOffset(), groupingSpec.getWithinGroupLimit(), searcher.maxDoc());
docsToCollect = Math.max(docsToCollect, 1);
for (String field : groupingSpec.getFields()) {
@@ -477,8 +479,8 @@ public class QueryComponent extends SearchComponent
.setDefaultFormat(groupingSpec.getResponseFormat())
.setLimitDefault(limitDefault)
.setDefaultTotalCount(defaultTotalCount)
- .setDocsPerGroupDefault(groupingSpec.getGroupLimit())
- .setGroupOffsetDefault(groupingSpec.getGroupOffset())
+ .setDocsPerGroupDefault(groupingSpec.getWithinGroupLimit())
+ .setGroupOffsetDefault(groupingSpec.getWithinGroupOffset())
.setGetGroupedDocSet(groupingSpec.isTruncateGroups());
if (groupingSpec.getFields() != null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7fa920b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
index 4dde8ef..f72fc89 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
@@ -460,15 +460,15 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
// alter the sorting in the grouping specification if there is one
GroupingSpecification groupingSpec = rb.getGroupingSpec();
if(groupingSpec != null) {
- SortField[] groupSort = groupingSpec.getGroupSort().getSort();
- Sort modGroupSort = this.modifySort(groupSort, force, comparator);
- if(modGroupSort != null) {
- groupingSpec.setGroupSort(modGroupSort);
+ SortSpec groupSortSpec = groupingSpec.getGroupSortSpec();
+ SortSpec modGroupSortSpec = this.modifySortSpec(groupSortSpec, force, comparator);
+ if (modGroupSortSpec != null) {
+ groupingSpec.setGroupSortSpec(modGroupSortSpec);
}
- SortField[] withinGroupSort = groupingSpec.getSortWithinGroup().getSort();
- Sort modWithinGroupSort = this.modifySort(withinGroupSort, force, comparator);
- if(modWithinGroupSort != null) {
- groupingSpec.setSortWithinGroup(modWithinGroupSort);
+ SortSpec withinGroupSortSpec = groupingSpec.getSortSpecWithinGroup();
+ SortSpec modWithinGroupSortSpec = this.modifySortSpec(withinGroupSortSpec, force, comparator);
+ if (modWithinGroupSortSpec != null) {
+ groupingSpec.setSortSpecWithinGroup(modWithinGroupSortSpec);
}
}
}
@@ -494,12 +494,6 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
}
}
- private Sort modifySort(SortField[] current, boolean force, ElevationComparatorSource comparator) {
- SortSpec tmp = new SortSpec(new Sort(current), Arrays.asList(new SchemaField[current.length]));
- tmp = modifySortSpec(tmp, force, comparator);
- return null == tmp ? null : tmp.getSort();
- }
-
private SortSpec modifySortSpec(SortSpec current, boolean force, ElevationComparatorSource comparator) {
boolean modify = false;
SortField[] currentSorts = current.getSort().getSort();
@@ -526,9 +520,9 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
}
if (modify) {
SortSpec newSpec = new SortSpec(new Sort(sorts.toArray(new SortField[sorts.size()])),
- fields);
- newSpec.setOffset(current.getOffset());
- newSpec.setCount(current.getCount());
+ fields,
+ current.getCount(),
+ current.getOffset());
return newSpec;
}
return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7fa920b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index bf381f4..6d13b51 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -924,6 +924,32 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
return (sort != null) ? sort.rewrite(this) : null;
}
+ /** Returns a weighted sort spec according to this searcher */
+ public SortSpec weightSortSpec(SortSpec originalSortSpec, Sort nullEquivalent) throws IOException {
+ return implWeightSortSpec(
+ originalSortSpec.getSort(),
+ originalSortSpec.getCount(),
+ originalSortSpec.getOffset(),
+ nullEquivalent);
+ }
+
+ /** Returns a weighted sort spec according to this searcher */
+ private SortSpec implWeightSortSpec(Sort originalSort, int num, int offset, Sort nullEquivalent) throws IOException {
+ Sort rewrittenSort = weightSort(originalSort);
+ if (rewrittenSort == null) {
+ rewrittenSort = nullEquivalent;
+ }
+
+ final SortField[] rewrittenSortFields = rewrittenSort.getSort();
+ final SchemaField[] rewrittenSchemaFields = new SchemaField[rewrittenSortFields.length];
+ for (int ii = 0; ii < rewrittenSortFields.length; ++ii) {
+ final String fieldName = rewrittenSortFields[ii].getField();
+ rewrittenSchemaFields[ii] = (fieldName == null ? null : schema.getFieldOrNull(fieldName));
+ }
+
+ return new SortSpec(rewrittenSort, rewrittenSchemaFields, num, offset);
+ }
+
/**
* Returns the first document number containing the term <code>t</code> Returns -1 if no document was found. This
* method is primarily intended for clients that want to fetch documents using a unique identifier."
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7fa920b/solr/core/src/java/org/apache/solr/search/SortSpec.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SortSpec.java b/solr/core/src/java/org/apache/solr/search/SortSpec.java
index 8cd954c..b79ed0a 100644
--- a/solr/core/src/java/org/apache/solr/search/SortSpec.java
+++ b/solr/core/src/java/org/apache/solr/search/SortSpec.java
@@ -34,9 +34,19 @@ public class SortSpec
private int num = 10;
private int offset = 0;
+ public SortSpec(Sort sort, List<SchemaField> fields, int num, int offset) {
+ setSortAndFields(sort, fields);
+ this.num = num;
+ this.offset = offset;
+ }
public SortSpec(Sort sort, List<SchemaField> fields) {
setSortAndFields(sort, fields);
}
+ public SortSpec(Sort sort, SchemaField[] fields, int num, int offset) {
+ setSortAndFields(sort, Arrays.asList(fields));
+ this.num = num;
+ this.offset = offset;
+ }
public SortSpec(Sort sort, SchemaField[] fields) {
setSortAndFields(sort, Arrays.asList(fields));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7fa920b/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java b/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java
index fbe0ace..4194dd0 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java
@@ -18,6 +18,7 @@ package org.apache.solr.search.grouping;
import org.apache.lucene.search.Sort;
import org.apache.solr.search.Grouping;
+import org.apache.solr.search.SortSpec;
/**
* Encapsulates the grouping options like fields group sort and more specified by clients.
@@ -29,12 +30,8 @@ public class GroupingSpecification {
private String[] fields = new String[]{};
private String[] queries = new String[]{};
private String[] functions = new String[]{};
- private int offset;
- private int limit;
- private int groupOffset;
- private int groupLimit;
- private Sort groupSort;
- private Sort sortWithinGroup;
+ private SortSpec groupSortSpec;
+ private SortSpec sortSpecWithinGroup;
private boolean includeGroupCount;
private boolean main;
private Grouping.Format responseFormat;
@@ -77,53 +74,49 @@ public class GroupingSpecification {
this.functions = functions;
}
+ @Deprecated
+ public int getWithinGroupOffset() {
+ return sortSpecWithinGroup.getOffset();
+ }
+ @Deprecated
public int getGroupOffset() {
- return groupOffset;
+ return getWithinGroupOffset();
}
- public void setGroupOffset(int groupOffset) {
- this.groupOffset = groupOffset;
- }
+ @Deprecated
+ public int getWithinGroupLimit() {
+ return sortSpecWithinGroup.getCount();
+ }
+ @Deprecated
public int getGroupLimit() {
- return groupLimit;
+ return getWithinGroupLimit();
}
- public void setGroupLimit(int groupLimit) {
- this.groupLimit = groupLimit;
- }
+ @Deprecated
public int getOffset() {
- return offset;
+ return groupSortSpec.getOffset();
}
- public void setOffset(int offset) {
- this.offset = offset;
- }
+ @Deprecated
public int getLimit() {
- return limit;
+ return groupSortSpec.getCount();
}
- public void setLimit(int limit) {
- this.limit = limit;
- }
+ @Deprecated
public Sort getGroupSort() {
- return groupSort;
+ return groupSortSpec.getSort();
}
- public void setGroupSort(Sort groupSort) {
- this.groupSort = groupSort;
- }
+ @Deprecated
public Sort getSortWithinGroup() {
- return sortWithinGroup;
+ return sortSpecWithinGroup.getSort();
}
- public void setSortWithinGroup(Sort sortWithinGroup) {
- this.sortWithinGroup = sortWithinGroup;
- }
public boolean isIncludeGroupCount() {
return includeGroupCount;
@@ -164,4 +157,21 @@ public class GroupingSpecification {
public void setTruncateGroups(boolean truncateGroups) {
this.truncateGroups = truncateGroups;
}
+
+ public SortSpec getGroupSortSpec() {
+ return groupSortSpec;
+ }
+
+ public void setGroupSortSpec(SortSpec groupSortSpec) {
+ this.groupSortSpec = groupSortSpec;
+ }
+
+ public SortSpec getSortSpecWithinGroup() {
+ return sortSpecWithinGroup;
+ }
+
+ public void setSortSpecWithinGroup(SortSpec sortSpecWithinGroup) {
+ this.sortSpecWithinGroup = sortSpecWithinGroup;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7fa920b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
index 3610a38..7e38e5d 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
@@ -68,9 +68,9 @@ public class TopGroupsShardResponseProcessor implements ShardResponseProcessor {
if (rb.getGroupingSpec().getResponseFormat() == Grouping.Format.simple || rb.getGroupingSpec().isMain()) {
groupOffsetDefault = 0;
} else {
- groupOffsetDefault = rb.getGroupingSpec().getGroupOffset();
+ groupOffsetDefault = rb.getGroupingSpec().getWithinGroupOffset();
}
- int docsPerGroupDefault = rb.getGroupingSpec().getGroupLimit();
+ int docsPerGroupDefault = rb.getGroupingSpec().getWithinGroupLimit();
Map<String, List<TopGroups<BytesRef>>> commandTopGroups = new HashMap<>();
for (String field : fields) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7fa920b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
index f8c9872..47b5276 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
@@ -79,7 +79,7 @@ public class GroupedEndResultTransformer implements EndResultTransformer {
if (!Float.isNaN(group.maxScore)) {
docList.setMaxScore(group.maxScore);
}
- docList.setStart(rb.getGroupingSpec().getGroupOffset());
+ docList.setStart(rb.getGroupingSpec().getWithinGroupOffset());
for (ScoreDoc scoreDoc : group.scoreDocs) {
docList.add(solrDocumentSource.retrieve(scoreDoc));
}
@@ -97,7 +97,7 @@ public class GroupedEndResultTransformer implements EndResultTransformer {
if (!Float.isNaN(queryCommandResult.getTopDocs().getMaxScore())) {
docList.setMaxScore(queryCommandResult.getTopDocs().getMaxScore());
}
- docList.setStart(rb.getGroupingSpec().getGroupOffset());
+ docList.setStart(rb.getGroupingSpec().getWithinGroupOffset());
for (ScoreDoc scoreDoc :queryCommandResult.getTopDocs().scoreDocs){
docList.add(solrDocumentSource.retrieve(scoreDoc));
}