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/01/23 15:29:42 UTC

[21/21] lucene-solr:jira/solr-9857: Merge branch 'master' into jira/solr-9857

Merge branch 'master' into jira/solr-9857


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

Branch: refs/heads/jira/solr-9857
Commit: 11b3f9431a73ce86d60ba952007bbc53dc9d05dc
Parents: 3219de0 ca50e5b
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Jan 23 16:29:12 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Jan 23 16:29:12 2017 +0100

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                       |   7 +-
 dev-tools/doap/solr.rdf                         |   9 +-
 lucene/CHANGES.txt                              |  16 +
 .../index/TestBackwardsCompatibility.java       |   4 +-
 .../org/apache/lucene/index/index.6.4.0-cfs.zip | Bin 0 -> 15829 bytes
 .../apache/lucene/index/index.6.4.0-nocfs.zip   | Bin 0 -> 15831 bytes
 lucene/common-build.xml                         |  25 +-
 .../lucene/document/NumericDocValuesField.java  |  48 +++
 .../lucene/document/SortedDocValuesField.java   |  42 +++
 .../document/SortedNumericDocValuesField.java   |  54 ++++
 .../SortedNumericDocValuesRangeQuery.java       | 144 +++++++++
 .../document/SortedSetDocValuesField.java       |  43 +++
 .../document/SortedSetDocValuesRangeQuery.java  | 188 ++++++++++++
 .../lucene/search/IndexOrDocValuesQuery.java    | 166 ++++++++++
 .../lucene60/TestLucene60PointsFormat.java      |  37 ++-
 .../lucene/search/TestDocValuesQueries.java     | 271 ++++++++++++++++
 .../search/TestIndexOrDocValuesQuery.java       |  89 ++++++
 .../org/apache/lucene/util/bkd/TestBKD.java     |  37 ++-
 lucene/ivy-versions.properties                  |   2 +-
 .../randomizedtesting-runner-2.4.0.jar.sha1     |   1 -
 .../randomizedtesting-runner-2.5.0.jar.sha1     |   1 +
 .../lucene/search/DocValuesRangeQuery.java      | 276 -----------------
 .../lucene/search/IndexOrDocValuesQuery.java    | 116 -------
 .../lucene/search/TestDocValuesRangeQuery.java  | 307 -------------------
 .../search/TestIndexOrDocValuesQuery.java       |  89 ------
 lucene/tools/prettify/inject-javadocs.js        |  27 ++
 lucene/tools/prettify/lang-apollo.js            |  18 --
 lucene/tools/prettify/lang-css.js               |  18 --
 lucene/tools/prettify/lang-hs.js                |  18 --
 lucene/tools/prettify/lang-lisp.js              |  19 --
 lucene/tools/prettify/lang-lua.js               |  18 --
 lucene/tools/prettify/lang-ml.js                |  18 --
 lucene/tools/prettify/lang-proto.js             |  17 -
 lucene/tools/prettify/lang-sql.js               |  18 --
 lucene/tools/prettify/lang-vb.js                |  18 --
 lucene/tools/prettify/lang-wiki.js              |  18 --
 lucene/tools/prettify/prettify.css              |  30 +-
 lucene/tools/prettify/prettify.js               |  90 +++---
 solr/CHANGES.txt                                |   9 +
 .../apache/solr/schema/ICUCollationField.java   |  10 +-
 .../component/MoreLikeThisComponent.java        |  12 +-
 .../handler/component/TermVectorComponent.java  |   9 +
 .../org/apache/solr/schema/CollationField.java  |   3 +-
 .../apache/solr/schema/DoublePointField.java    |  11 +-
 .../java/org/apache/solr/schema/EnumField.java  |  20 +-
 .../java/org/apache/solr/schema/FieldType.java  |  16 +-
 .../org/apache/solr/schema/FloatPointField.java |  11 +-
 .../org/apache/solr/schema/IntPointField.java   |  12 +-
 .../org/apache/solr/schema/LongPointField.java  |  11 +-
 .../apache/solr/schema/NumericFieldType.java    | 151 +++++++++
 .../java/org/apache/solr/schema/PointField.java |  28 +-
 .../org/apache/solr/schema/TrieDateField.java   |   2 +-
 .../org/apache/solr/schema/TrieDoubleField.java |   2 +-
 .../java/org/apache/solr/schema/TrieField.java  | 150 ++-------
 .../org/apache/solr/schema/TrieFloatField.java  |   2 +-
 .../org/apache/solr/schema/TrieIntField.java    |   2 +-
 .../org/apache/solr/schema/TrieLongField.java   |   2 +-
 .../apache/solr/search/SolrIndexSearcher.java   |   3 +-
 .../distributed/command/GroupConverter.java     |   2 +-
 .../solr/collection1/conf/schema-point.xml      |   4 +
 .../configsets/cloud-hdfs/conf/solrconfig.xml   |   2 +
 .../solr/cloud/CollectionsAPISolrJTest.java     |  34 --
 .../apache/solr/cloud/OverseerRolesTest.java    | 173 +++++------
 .../HdfsCollectionsAPIDistributedZkTest.java    |   1 +
 .../component/DistributedMLTComponentTest.java  |  23 ++
 .../TermVectorComponentDistributedTest.java     |  18 ++
 .../org/apache/solr/schema/TestPointFields.java |  23 ++
 solr/licenses/junit4-ant-2.4.0.jar.sha1         |   1 -
 solr/licenses/junit4-ant-2.5.0.jar.sha1         |   1 +
 .../randomizedtesting-runner-2.4.0.jar.sha1     |   1 -
 .../randomizedtesting-runner-2.5.0.jar.sha1     |   1 +
 71 files changed, 1643 insertions(+), 1406 deletions(-)
----------------------------------------------------------------------