You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/10/20 19:31:16 UTC
[07/50] [abbrv] lucene-solr:jira/solr-8593: SOLR-6203: in
QueryComponent rename groupSortStr to sortWithinGroupStr (so that name and
meaning match)
SOLR-6203: in QueryComponent rename groupSortStr to sortWithinGroupStr (so that name and meaning match)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a4a314d1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a4a314d1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a4a314d1
Branch: refs/heads/jira/solr-8593
Commit: a4a314d1602458cd7427b337d32eca60049c72da
Parents: 5261eb0
Author: Christine Poerschke <cp...@apache.org>
Authored: Sat Oct 15 20:56:05 2016 -0400
Committer: Christine Poerschke <cp...@apache.org>
Committed: Sat Oct 15 20:56:05 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/solr/handler/component/QueryComponent.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a4a314d1/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 ba6a68d..8e0f0ee 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
@@ -257,9 +257,9 @@ public class QueryComponent extends SearchComponent
}
// groupSort defaults to sort
- String groupSortStr = params.get(GroupParams.GROUP_SORT);
+ String sortWithinGroupStr = params.get(GroupParams.GROUP_SORT);
//TODO: move weighting of sort
- Sort sortWithinGroup = groupSortStr == null ? groupSort : searcher.weightSort(SortSpecParsing.parseSortSpec(groupSortStr, req).getSort());
+ Sort sortWithinGroup = sortWithinGroupStr == null ? groupSort : searcher.weightSort(SortSpecParsing.parseSortSpec(sortWithinGroupStr, req).getSort());
if (sortWithinGroup == null) {
sortWithinGroup = Sort.RELEVANCE;
}