You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2016/12/13 20:30:12 UTC

[05/42] lucene-solr:feature/metrics: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9eaea79f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9eaea79f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9eaea79f

Branch: refs/heads/feature/metrics
Commit: 9eaea79f5c89094c08f52245b9473ca14f368f57
Parents: 44cce6b a7fa920
Author: Noble Paul <no...@apache.org>
Authored: Wed Nov 30 18:48:18 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed Nov 30 18:48:18 2016 +0530

----------------------------------------------------------------------
 solr/CHANGES.txt                                |  8 +++
 .../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 +++++++++++---------
 .../distributed/command/QueryCommand.java       |  2 +-
 .../SearchGroupShardResponseProcessor.java      |  4 +-
 .../TopGroupsShardResponseProcessor.java        |  8 +--
 .../GroupedEndResultTransformer.java            |  4 +-
 .../apache/solr/util/RecordingJSONParser.java   | 17 ++++-
 .../solr/common/util/TestJsonRecordReader.java  | 35 ++++++++--
 12 files changed, 163 insertions(+), 83 deletions(-)
----------------------------------------------------------------------