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/05/30 11:28:34 UTC
[25/25] lucene-solr:jira/solr-8668: Merge branch 'master' into
jira/solr-8668
Merge branch 'master' into jira/solr-8668
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/36faceaf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/36faceaf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/36faceaf
Branch: refs/heads/jira/solr-8668
Commit: 36faceaf5bf7c900215aa33c40c2b7b9a3d8a9e6
Parents: 8143752 759fa42
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue May 30 12:13:32 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue May 30 12:13:32 2017 +0100
----------------------------------------------------------------------
dev-tools/scripts/checkJavaDocs.py | 2 +-
lucene/CHANGES.txt | 6 +
lucene/MIGRATE.txt | 6 +
.../lucene/analysis/core/KeywordTokenizer.java | 10 +-
.../analysis/core/KeywordTokenizerFactory.java | 19 +-
.../lucene/analysis/core/LetterTokenizer.java | 14 +
.../analysis/core/LetterTokenizerFactory.java | 19 +-
.../analysis/core/LowerCaseTokenizer.java | 13 +
.../core/LowerCaseTokenizerFactory.java | 37 +-
.../core/UnicodeWhitespaceTokenizer.java | 13 +
.../analysis/core/WhitespaceTokenizer.java | 13 +
.../core/WhitespaceTokenizerFactory.java | 18 +-
.../lucene/analysis/util/CharTokenizer.java | 27 +-
.../analysis/core/TestKeywordTokenizer.java | 88 +++
.../core/TestUnicodeWhitespaceTokenizer.java | 51 ++
.../analysis/util/TestCharTokenizers.java | 95 +++
.../icu/segmentation/TestICUTokenizerCJK.java | 9 +-
.../apache/lucene/legacy/LegacyDoubleField.java | 174 -----
.../org/apache/lucene/legacy/LegacyField.java | 90 ---
.../apache/lucene/legacy/LegacyFieldType.java | 149 ----
.../apache/lucene/legacy/LegacyFloatField.java | 174 -----
.../apache/lucene/legacy/LegacyIntField.java | 175 -----
.../apache/lucene/legacy/LegacyLongField.java | 184 -----
.../lucene/legacy/LegacyNumericRangeQuery.java | 537 --------------
.../lucene/legacy/LegacyNumericTokenStream.java | 357 ----------
.../apache/lucene/legacy/LegacyNumericType.java | 34 -
.../lucene/legacy/LegacyNumericUtils.java | 510 --------------
.../lucene/legacy/doc-files/nrq-formula-1.png | Bin 3171 -> 0 bytes
.../lucene/legacy/doc-files/nrq-formula-2.png | Bin 3694 -> 0 bytes
.../org/apache/lucene/legacy/package-info.java | 21 -
.../index/TestBackwardsCompatibility.java | 52 --
.../apache/lucene/legacy/TestLegacyField.java | 186 -----
.../lucene/legacy/TestLegacyFieldReuse.java | 81 ---
.../lucene/legacy/TestLegacyNumericUtils.java | 571 ---------------
.../apache/lucene/legacy/TestLegacyTerms.java | 164 -----
.../TestMultiValuedNumericRangeQuery.java | 84 ---
.../lucene/legacy/TestNumericRangeQuery32.java | 461 ------------
.../lucene/legacy/TestNumericRangeQuery64.java | 490 -------------
.../lucene/legacy/TestNumericTokenStream.java | 188 -----
.../lucene/spatial/bbox/BBoxStrategy.java | 59 +-
.../prefix/BytesRefIteratorTokenStream.java | 2 -
.../prefix/NumberRangePrefixTreeStrategy.java | 24 +-
.../spatial/prefix/PrefixTreeStrategy.java | 20 +-
.../prefix/RecursivePrefixTreeStrategy.java | 41 +-
.../spatial/vector/PointVectorStrategy.java | 52 --
.../lucene/spatial/DistanceStrategyTest.java | 3 -
.../lucene/spatial/QueryEqualsHashCodeTest.java | 2 -
.../lucene/spatial/bbox/TestBBoxStrategy.java | 33 +-
.../spatial/prefix/DateNRStrategyTest.java | 43 +-
.../spatial/vector/TestPointVectorStrategy.java | 7 +-
solr/CHANGES.txt | 20 +-
.../solr/analytics/util/AnalyticsParsers.java | 2 +-
.../util/valuesource/DateFieldSource.java | 2 +-
.../apache/solr/core/CorePropertiesLocator.java | 5 +-
.../org/apache/solr/handler/StreamHandler.java | 5 +-
.../handler/component/HttpShardHandler.java | 26 +-
.../solr/highlight/DefaultSolrHighlighter.java | 8 +-
.../org/apache/solr/legacy/BBoxStrategy.java | 706 +++++++++++++++++++
.../org/apache/solr/legacy/BBoxValueSource.java | 135 ++++
.../apache/solr/legacy/DistanceValueSource.java | 133 ++++
.../apache/solr/legacy/LegacyDoubleField.java | 174 +++++
.../org/apache/solr/legacy/LegacyField.java | 90 +++
.../org/apache/solr/legacy/LegacyFieldType.java | 149 ++++
.../apache/solr/legacy/LegacyFloatField.java | 174 +++++
.../org/apache/solr/legacy/LegacyIntField.java | 175 +++++
.../org/apache/solr/legacy/LegacyLongField.java | 184 +++++
.../solr/legacy/LegacyNumericRangeQuery.java | 537 ++++++++++++++
.../solr/legacy/LegacyNumericTokenStream.java | 357 ++++++++++
.../apache/solr/legacy/LegacyNumericType.java | 34 +
.../apache/solr/legacy/LegacyNumericUtils.java | 510 ++++++++++++++
.../apache/solr/legacy/PointVectorStrategy.java | 292 ++++++++
.../solr/legacy/doc-files/nrq-formula-1.png | Bin 0 -> 3171 bytes
.../solr/legacy/doc-files/nrq-formula-2.png | Bin 0 -> 3694 bytes
.../org/apache/solr/legacy/package-info.java | 21 +
.../java/org/apache/solr/schema/BBoxField.java | 4 +-
.../java/org/apache/solr/schema/EnumField.java | 10 +-
.../org/apache/solr/schema/IndexSchema.java | 2 +-
.../schema/SpatialPointVectorFieldType.java | 4 +-
.../org/apache/solr/schema/TrieDoubleField.java | 2 +-
.../java/org/apache/solr/schema/TrieField.java | 24 +-
.../org/apache/solr/schema/TrieFloatField.java | 2 +-
.../org/apache/solr/schema/TrieIntField.java | 2 +-
.../org/apache/solr/schema/TrieLongField.java | 2 +-
.../search/LegacyNumericRangeQueryBuilder.java | 8 +-
.../org/apache/solr/search/QueryParsing.java | 2 +-
.../apache/solr/search/QueryWrapperFilter.java | 2 +-
.../apache/solr/search/mlt/CloudMLTQParser.java | 2 +-
.../solr/search/mlt/SimpleMLTQParser.java | 2 +-
.../org/apache/solr/uninverting/FieldCache.java | 20 +-
.../solr/uninverting/UninvertingReader.java | 16 +-
.../java/org/apache/solr/update/PeerSync.java | 3 +-
.../java/org/apache/solr/update/UpdateLog.java | 3 +-
.../org/apache/solr/update/VersionInfo.java | 2 +-
.../java/org/apache/solr/util/FileUtils.java | 20 +
.../src/java/org/apache/solr/util/SolrCLI.java | 2 +-
.../collection1/conf/schema-tokenizer-test.xml | 150 ++++
.../AbstractCloudBackupRestoreTestCase.java | 7 +-
.../apache/solr/cloud/TestConfigSetsAPI.java | 5 +-
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 +-
.../TestSolrCloudWithDelegationTokens.java | 2 +-
.../org/apache/solr/legacy/TestLegacyField.java | 186 +++++
.../solr/legacy/TestLegacyFieldReuse.java | 81 +++
.../solr/legacy/TestLegacyNumericUtils.java | 571 +++++++++++++++
.../org/apache/solr/legacy/TestLegacyTerms.java | 164 +++++
.../TestMultiValuedNumericRangeQuery.java | 84 +++
.../solr/legacy/TestNumericRangeQuery32.java | 461 ++++++++++++
.../solr/legacy/TestNumericRangeQuery64.java | 490 +++++++++++++
.../solr/legacy/TestNumericTokenStream.java | 188 +++++
.../TestLegacyNumericRangeQueryBuilder.java | 2 +-
.../solr/search/TestMaxScoreQueryParser.java | 2 +-
.../apache/solr/search/TestSolr4Spatial.java | 2 +-
.../solr/search/function/TestOrdValues.java | 4 +-
.../hadoop/TestDelegationWithHadoopAuth.java | 2 +-
.../solr/uninverting/TestDocTermOrds.java | 6 +-
.../solr/uninverting/TestFieldCacheSort.java | 8 +-
.../solr/uninverting/TestLegacyFieldCache.java | 8 +-
.../solr/uninverting/TestNumericTerms32.java | 6 +-
.../solr/uninverting/TestNumericTerms64.java | 6 +-
.../solr/uninverting/TestUninvertingReader.java | 8 +-
.../solr/util/TestMaxTokenLenTokenizer.java | 135 ++++
solr/solr-ref-guide/src/language-analysis.adoc | 121 +++-
solr/solr-ref-guide/src/tokenizers.adoc | 2 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 271 +------
.../solrj/impl/ConcurrentUpdateSolrClient.java | 51 +-
.../impl/DelegationTokenHttpSolrClient.java | 24 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 43 +-
.../client/solrj/impl/LBHttpSolrClient.java | 26 +-
.../impl/SolrHttpClientContextBuilder.java | 8 -
.../client/solrj/io/eval/AnovaEvaluator.java | 76 ++
.../client/solrj/io/eval/ArrayEvaluator.java | 63 ++
.../solrj/io/eval/HistogramEvaluator.java | 98 +++
.../solrj/io/graph/ShortestPathStream.java | 25 -
.../client/solrj/io/stream/CloudSolrStream.java | 21 -
.../client/solrj/io/stream/FacetStream.java | 16 -
.../client/solrj/io/stream/RandomStream.java | 4 +-
.../solr/client/solrj/io/stream/SolrStream.java | 14 -
.../solr/client/solrj/io/stream/SqlStream.java | 2 -
.../client/solrj/io/stream/StatsStream.java | 10 -
.../client/solrj/io/stream/TopicStream.java | 19 -
.../solrj/io/stream/expr/StreamFactory.java | 2 +-
.../solr/common/params/HighlightParams.java | 2 -
.../apache/solr/common/util/ExecutorUtil.java | 41 --
.../org/apache/solr/common/util/NamedList.java | 23 +-
.../solr/common/util/SimpleOrderedMap.java | 9 +-
.../embedded/SolrExampleStreamingTest.java | 2 +-
.../solrj/impl/BasicHttpSolrClientTest.java | 2 +-
.../CloudSolrClientMultiConstructorTest.java | 4 +-
.../impl/ConcurrentUpdateSolrClientTest.java | 23 +-
.../solrj/io/graph/GraphExpressionTest.java | 2 +-
.../solrj/io/stream/StreamExpressionTest.java | 107 ++-
.../java/org/apache/solr/SolrTestCaseJ4.java | 108 +--
151 files changed, 7429 insertions(+), 5651 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/36faceaf/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------