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 2017/04/11 09:19:44 UTC

[23/23] lucene-solr:jira/solr-9959: Merge branch 'master' into jira/solr-9959

Merge branch 'master' into jira/solr-9959


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

Branch: refs/heads/jira/solr-9959
Commit: d4692f2c8f0f76afdcfc28867d6b0f74eab56263
Parents: 7591eaa e02a1f1
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Apr 10 22:08:58 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Apr 10 22:08:58 2017 +0200

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   3 +
 lucene/MIGRATE.txt                              |  13 +
 .../BooleanPerceptronClassifier.java            |  26 +-
 .../BooleanPerceptronClassifierTest.java        |  51 +-
 .../SimpleNaiveBayesClassifierTest.java         |  11 +-
 .../apache/lucene/search/TopFieldCollector.java |   4 +-
 .../java/org/apache/lucene/util/Version.java    |   7 +
 .../search/grouping/AllGroupHeadsCollector.java | 239 +++++-
 .../search/grouping/AllGroupsCollector.java     |  42 +-
 .../search/grouping/BlockGroupingCollector.java |   2 +-
 .../grouping/DistinctValuesCollector.java       |  92 ++-
 .../grouping/FirstPassGroupingCollector.java    |  63 +-
 .../lucene/search/grouping/GroupReducer.java    | 112 +++
 .../lucene/search/grouping/GroupSelector.java   |  73 ++
 .../apache/lucene/search/grouping/Grouper.java  |  56 --
 .../lucene/search/grouping/GroupingSearch.java  |  24 +-
 .../grouping/SecondPassGroupingCollector.java   | 144 +---
 .../grouping/TermGroupFacetCollector.java       | 414 ++++++++++
 .../search/grouping/TermGroupSelector.java      | 114 +++
 .../search/grouping/TopGroupsCollector.java     | 116 +++
 .../grouping/ValueSourceGroupSelector.java      |  86 +++
 .../FunctionAllGroupHeadsCollector.java         | 159 ----
 .../function/FunctionAllGroupsCollector.java    |  82 --
 .../FunctionDistinctValuesCollector.java        |  85 --
 .../FunctionFirstPassGroupingCollector.java     |  86 ---
 .../grouping/function/FunctionGrouper.java      |  69 --
 .../FunctionSecondPassGroupingCollector.java    |  80 --
 .../search/grouping/function/package-info.java  |  21 -
 .../lucene/search/grouping/package-info.java    |  34 +-
 .../term/TermAllGroupHeadsCollector.java        | 767 -------------------
 .../grouping/term/TermAllGroupsCollector.java   | 128 ----
 .../term/TermDistinctValuesCollector.java       | 162 ----
 .../term/TermFirstPassGroupingCollector.java    |  96 ---
 .../grouping/term/TermGroupFacetCollector.java  | 415 ----------
 .../search/grouping/term/TermGrouper.java       |  81 --
 .../term/TermSecondPassGroupingCollector.java   |  91 ---
 .../search/grouping/term/package-info.java      |  21 -
 .../grouping/AllGroupHeadsCollectorTest.java    |  13 +-
 .../search/grouping/AllGroupsCollectorTest.java |  20 +-
 .../grouping/DistinctValuesCollectorTest.java   |  86 +--
 .../grouping/GroupFacetCollectorTest.java       |   1 -
 .../lucene/search/grouping/TestGrouping.java    |  89 +--
 solr/CHANGES.txt                                |  22 +
 .../response/SolrVelocityResourceLoader.java    |  12 +-
 .../org/apache/solr/handler/StreamHandler.java  |   4 +
 .../component/HttpShardHandlerFactory.java      |   4 -
 .../org/apache/solr/handler/sql/SolrTable.java  |   5 +
 .../org/apache/solr/request/SimpleFacets.java   |   7 +-
 .../analysis/ManagedSynonymFilterFactory.java   |   7 +-
 .../org/apache/solr/schema/DatePointField.java  |   5 +-
 .../apache/solr/schema/DoublePointField.java    |   5 +-
 .../org/apache/solr/schema/FloatPointField.java |   5 +-
 .../org/apache/solr/schema/IntPointField.java   |   5 +-
 .../org/apache/solr/schema/LongPointField.java  |   5 +-
 .../java/org/apache/solr/schema/PointField.java |  53 +-
 .../java/org/apache/solr/search/Grouping.java   |  57 +-
 .../solr/search/facet/FacetFieldMerger.java     |   2 +
 .../facet/FacetFieldProcessorByArray.java       |  24 +-
 .../solr/search/grouping/CommandHandler.java    |  10 +-
 .../command/SearchGroupsFieldCommand.java       |  26 +-
 .../command/TopGroupsFieldCommand.java          |  30 +-
 .../solr/spelling/SpellCheckCollator.java       |  17 +-
 .../solr/spelling/SpellingQueryConverter.java   |   2 +-
 .../solr/collection1/conf/schema-point.xml      |  39 +-
 .../solr/collection1/conf/schema-rest.xml       |   2 +-
 .../conf/solrconfig-collapseqparser.xml         | 111 +--
 .../org/apache/solr/TestGroupingSearch.java     |   4 +-
 .../TestManagedSynonymFilterFactory.java        |  40 +
 .../org/apache/solr/schema/TestPointFields.java | 612 +++++++++++++--
 .../solr/schema/TestUseDocValuesAsStored.java   |  34 +-
 .../search/facet/TestJsonFacetRefinement.java   |  17 +-
 .../SpellCheckCollatorWithCollapseTest.java     |  67 ++
 .../spelling/SpellingQueryConverterTest.java    |  10 +
 .../client/solrj/impl/LBHttpSolrClient.java     |  11 +-
 .../client/solrj/request/UpdateRequest.java     |   3 +-
 75 files changed, 2474 insertions(+), 3061 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d4692f2c/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------