You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/10/16 01:28:18 UTC
lucene-solr:branch_6x: SOLR-6203: in QueryComponent rename
groupSortStr to sortWithinGroupStr (so that name and meaning match)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x c620fc295 -> e87072bc5
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/e87072bc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e87072bc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e87072bc
Branch: refs/heads/branch_6x
Commit: e87072bc5abb6b7c6f7a6e494d9360814689dffd
Parents: c620fc2
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 21:13:44 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/e87072bc/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 fe4bceb..7d8c873 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
@@ -258,9 +258,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;
}