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 2017/04/07 15:48:01 UTC

[24/24] lucene-solr:jira/solr-6203: Merge branch 'master' into jira/solr-6203

Merge branch 'master' into jira/solr-6203


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

Branch: refs/heads/jira/solr-6203
Commit: 3325cfa2fe9c470e5ba71a4350f6226ed07646bd
Parents: 832653a adabfdd
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Apr 7 16:34:42 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Apr 7 16:34:42 2017 +0100

----------------------------------------------------------------------
 .../BooleanPerceptronClassifier.java            |  26 +-
 .../BooleanPerceptronClassifierTest.java        |  51 +-
 .../SimpleNaiveBayesClassifierTest.java         |  11 +-
 .../lucene/document/InetAddressRange.java       |  14 +-
 .../search/TestInetAddressRangeQueries.java     | 100 ++--
 solr/CHANGES.txt                                |  33 ++
 .../apache/solr/ltr/norm/MinMaxNormalizer.java  |   4 +-
 .../solr/ltr/norm/StandardNormalizer.java       |   4 +-
 .../LTRFeatureLoggerTransformerFactory.java     |   5 -
 .../solr/ltr/search/LTRQParserPlugin.java       |   5 -
 .../solr/ltr/norm/TestMinMaxNormalizer.java     |   1 +
 .../solr/ltr/norm/TestStandardNormalizer.java   |   1 +
 .../org/apache/solr/cloud/MoveReplicaCmd.java   | 193 +++++++
 .../java/org/apache/solr/cloud/Overseer.java    |   2 +-
 .../cloud/OverseerCollectionMessageHandler.java |   1 +
 .../apache/solr/cloud/overseer/NodeMutator.java |  29 +-
 .../solr/cloud/overseer/ZkWriteCommand.java     |   5 +
 .../org/apache/solr/handler/StreamHandler.java  |  43 +-
 .../solr/handler/admin/CollectionsHandler.java  |  12 +-
 .../component/HttpShardHandlerFactory.java      |   4 -
 .../org/apache/solr/handler/sql/SolrTable.java  |   5 +
 .../org/apache/solr/parser/QueryParser.java     |   5 +-
 .../java/org/apache/solr/parser/QueryParser.jj  |   5 +-
 .../apache/solr/parser/SolrQueryParserBase.java |  23 +-
 .../analysis/ManagedSynonymFilterFactory.java   |   7 +-
 .../org/apache/solr/schema/DatePointField.java  |   5 +-
 .../apache/solr/schema/DoublePointField.java    |   5 +-
 .../java/org/apache/solr/schema/FieldType.java  |   4 +-
 .../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/schema/TextField.java  |  13 +-
 .../solr/search/ExtendedDismaxQParser.java      |   5 +-
 .../solr/search/facet/FacetFieldMerger.java     |   2 +
 .../facet/FacetFieldProcessorByArray.java       |  24 +-
 .../solr/spelling/SpellingQueryConverter.java   |   2 +-
 .../solr/collection1/conf/schema-point.xml      |  34 +-
 .../solr/collection1/conf/schema-rest.xml       |   2 +-
 .../solr/collection1/conf/schema12.xml          |  11 +-
 .../apache/solr/cloud/ClusterStateMockUtil.java | 233 ++++++++
 .../CollectionsAPIAsyncDistributedZkTest.java   |  16 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java  | 125 +++++
 .../org/apache/solr/cloud/NodeMutatorTest.java  |  95 ++++
 .../SharedFSAutoReplicaFailoverUtilsTest.java   | 263 +--------
 .../HdfsCollectionsAPIDistributedZkTest.java    | 114 ++++
 .../TestManagedSynonymFilterFactory.java        |  40 ++
 .../org/apache/solr/schema/TestPointFields.java | 541 +++++++++++++++++--
 .../solr/search/TestExtendedDismaxParser.java   |  18 +
 .../apache/solr/search/TestSolrQueryParser.java |  18 +
 .../search/facet/TestJsonFacetRefinement.java   |  17 +-
 .../spelling/SpellingQueryConverterTest.java    |  10 +
 .../client/solrj/impl/LBHttpSolrClient.java     |  11 +-
 .../client/solrj/io/stream/CloudSolrStream.java |  13 +-
 .../client/solrj/io/stream/FetchStream.java     |  20 +-
 .../client/solrj/io/stream/ShuffleStream.java   | 103 ++++
 .../solrj/request/CollectionAdminRequest.java   |  38 ++
 .../solr/common/params/CollectionParams.java    |   1 +
 .../solrj/io/stream/StreamExpressionTest.java   | 104 +++-
 .../web/js/angular/controllers/documents.js     |   2 -
 solr/webapp/web/js/scripts/documents.js         |   8 -
 solr/webapp/web/partials/documents.html         |   7 -
 solr/webapp/web/tpl/documents.html              |   7 -
 63 files changed, 2037 insertions(+), 531 deletions(-)
----------------------------------------------------------------------