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/06/02 10:56:29 UTC
[06/38] lucene-solr:jira/solr-8668: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/97693234
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/97693234
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/97693234
Branch: refs/heads/jira/solr-8668
Commit: 97693234def7fb4fc92d8fbaab775705aaaaf565
Parents: 71411df c824b09
Author: Karl Wright <Da...@gmail.com>
Authored: Wed May 31 07:56:14 2017 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Wed May 31 07:56:14 2017 -0400
----------------------------------------------------------------------
dev-tools/scripts/checkJavaDocs.py | 2 +-
lucene/CHANGES.txt | 12 +
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 +-
.../lucene/analysis/core/StopFilterFactory.java | 2 +-
.../core/UnicodeWhitespaceTokenizer.java | 13 +
.../analysis/core/WhitespaceTokenizer.java | 13 +
.../core/WhitespaceTokenizerFactory.java | 18 +-
.../lucene/analysis/util/CharTokenizer.java | 27 +-
.../lucene/analysis/util/UnicodeProps.java | 6 +-
.../compound/hyphenation/hyphenation.dtd | 2 +-
.../lucene/analysis/compound/hyphenation.dtd | 2 +-
.../analysis/core/TestKeywordTokenizer.java | 88 +++
.../core/TestUnicodeWhitespaceTokenizer.java | 51 ++
.../analysis/util/TestCharTokenizers.java | 95 +++
.../icu/src/data/utr30/DiacriticFolding.txt | 5 +
.../icu/src/data/utr30/NativeDigitFolding.txt | 30 +
lucene/analysis/icu/src/data/utr30/nfc.txt | 22 +-
lucene/analysis/icu/src/data/utr30/nfkc.txt | 5 +-
lucene/analysis/icu/src/data/utr30/nfkc_cf.txt | 225 +++++-
.../analysis/icu/segmentation/Default.brk | Bin 35264 -> 36768 bytes
.../icu/segmentation/MyanmarSyllable.brk | Bin 19776 -> 20744 bytes
.../org/apache/lucene/analysis/icu/utr30.nrm | Bin 53840 -> 55184 bytes
.../icu/segmentation/TestICUTokenizerCJK.java | 9 +-
.../analysis/icu/GenerateUTR30DataFiles.java | 2 +-
.../uk/UkrainianMorfologikAnalyzer.java | 2 +
.../analysis/uk/TestUkrainianAnalyzer.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/ivy-versions.properties | 4 +-
lucene/licenses/icu4j-56.1.jar.sha1 | 1 -
lucene/licenses/icu4j-59.1.jar.sha1 | 1 +
.../morfologik-ukrainian-search-3.7.5.jar.sha1 | 1 -
.../morfologik-ukrainian-search-3.7.6.jar.sha1 | 1 +
lucene/spatial-extras/build.xml | 2 -
.../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 +-
.../analyzing/SuggestStopFilterFactory.java | 2 +-
solr/CHANGES.txt | 35 +-
.../solr/analytics/util/AnalyticsParsers.java | 2 +-
.../util/valuesource/DateFieldSource.java | 2 +-
.../solr/ltr/feature/FieldLengthFeature.java | 3 +-
.../apache/solr/ltr/TestLTRQParserPlugin.java | 11 +-
.../solr/ltr/TestParallelWeightCreation.java | 5 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 44 +-
.../apache/solr/cloud/CreateCollectionCmd.java | 4 +-
.../apache/solr/core/CorePropertiesLocator.java | 5 +-
.../org/apache/solr/handler/StreamHandler.java | 18 +-
.../handler/component/HttpShardHandler.java | 26 +-
.../component/HttpShardHandlerFactory.java | 28 +-
.../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 +
.../analysis/ManagedSynonymFilterFactory.java | 5 +
.../ManagedSynonymGraphFilterFactory.java | 437 ++++++++++++
.../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 +-
.../SearchGroupShardResponseProcessor.java | 4 +-
.../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 | 7 +-
.../apache/solr/update/SolrCmdDistributor.java | 4 +-
.../org/apache/solr/update/SolrIndexConfig.java | 2 +-
.../java/org/apache/solr/update/UpdateLog.java | 12 +-
.../org/apache/solr/update/VersionInfo.java | 2 +-
.../DocExpirationUpdateProcessorFactory.java | 2 +-
.../java/org/apache/solr/util/FileUtils.java | 20 +
.../src/java/org/apache/solr/util/SolrCLI.java | 2 +-
.../solr/collection1/conf/hyphenation.dtd | 2 +-
.../solr/collection1/conf/schema-rest.xml | 30 +
.../collection1/conf/schema-tokenizer-test.xml | 150 ++++
.../solr-shardhandler-loadBalancerRequests.xml | 23 +
.../AbstractCloudBackupRestoreTestCase.java | 7 +-
...aosMonkeySafeLeaderWithPullReplicasTest.java | 3 +-
.../apache/solr/cloud/TestConfigSetsAPI.java | 5 +-
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 +-
.../org/apache/solr/cloud/TestPullReplica.java | 20 +-
.../TestSolrCloudWithDelegationTokens.java | 2 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 20 +-
.../component/TestHttpShardHandlerFactory.java | 102 +++
.../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 +++++
.../org/apache/solr/rest/TestRestManager.java | 4 +-
.../TestManagedSynonymGraphFilterFactory.java | 297 ++++++++
.../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/atom/conf/atom-data-config.xml | 2 +-
solr/licenses/icu4j-56.1.jar.sha1 | 1 -
solr/licenses/icu4j-59.1.jar.sha1 | 1 +
.../conf/managed-schema | 10 +-
.../solr-ref-guide/src/filter-descriptions.adoc | 30 +-
solr/solr-ref-guide/src/language-analysis.adoc | 128 ++--
solr/solr-ref-guide/src/managed-resources.adoc | 20 +-
.../src/near-real-time-searching.adoc | 14 +-
solr/solr-ref-guide/src/other-parsers.adoc | 2 +-
.../shards-and-indexing-data-in-solrcloud.adoc | 5 -
.../solr-ref-guide/src/the-stats-component.adoc | 13 +-
solr/solr-ref-guide/src/tokenizers.adoc | 2 +-
...store-data-with-the-data-import-handler.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 | 76 +-
.../impl/SolrHttpClientContextBuilder.java | 8 -
.../org/apache/solr/client/solrj/io/Tuple.java | 4 +-
.../client/solrj/io/eval/AnovaEvaluator.java | 76 ++
.../client/solrj/io/eval/ArrayEvaluator.java | 63 ++
.../client/solrj/io/eval/ColumnEvaluator.java | 76 ++
.../solrj/io/eval/ConvolutionEvaluator.java | 80 +++
.../client/solrj/io/eval/CopyOfEvaluator.java | 82 +++
.../solrj/io/eval/CopyOfRangeEvaluator.java | 83 +++
.../solrj/io/eval/CorrelationEvaluator.java | 75 ++
.../solrj/io/eval/CovarianceEvaluator.java | 75 ++
.../client/solrj/io/eval/DescribeEvaluator.java | 90 +++
.../client/solrj/io/eval/DistanceEvaluator.java | 75 ++
.../io/eval/EmpiricalDistributionEvaluator.java | 127 ++++
.../solrj/io/eval/FindDelayEvaluator.java | 90 +++
.../solrj/io/eval/HistogramEvaluator.java | 98 +++
.../client/solrj/io/eval/LengthEvaluator.java | 58 ++
.../solrj/io/eval/MovingAverageEvaluator.java | 78 ++
.../solrj/io/eval/NormalizeEvaluator.java | 74 ++
.../solrj/io/eval/PercentileEvaluator.java | 66 ++
.../client/solrj/io/eval/PredictEvaluator.java | 66 ++
.../client/solrj/io/eval/RankEvaluator.java | 73 ++
.../solrj/io/eval/RegressionEvaluator.java | 110 +++
.../client/solrj/io/eval/ReverseEvaluator.java | 65 ++
.../client/solrj/io/eval/ScaleEvaluator.java | 76 ++
.../client/solrj/io/eval/SequenceEvaluator.java | 72 ++
.../solrj/io/graph/ShortestPathStream.java | 25 -
.../client/solrj/io/stream/CloudSolrStream.java | 21 -
.../client/solrj/io/stream/ColumnEvaluator.java | 77 --
.../solrj/io/stream/ConvolutionEvaluator.java | 82 ---
.../client/solrj/io/stream/CopyOfEvaluator.java | 84 ---
.../solrj/io/stream/CopyOfRangeEvaluator.java | 85 ---
.../solrj/io/stream/CorrelationEvaluator.java | 77 --
.../solrj/io/stream/CovarianceEvaluator.java | 77 --
.../solrj/io/stream/DescribeEvaluator.java | 92 ---
.../solrj/io/stream/DistanceEvaluator.java | 77 --
.../stream/EmpiricalDistributionEvaluator.java | 129 ----
.../client/solrj/io/stream/FacetStream.java | 16 -
.../solr/client/solrj/io/stream/KnnStream.java | 9 +
.../client/solrj/io/stream/LengthEvaluator.java | 60 --
.../solrj/io/stream/NormalizeEvaluator.java | 76 --
.../solrj/io/stream/PercentileEvaluator.java | 68 --
.../solrj/io/stream/PredictEvaluator.java | 68 --
.../client/solrj/io/stream/RandomStream.java | 4 +-
.../client/solrj/io/stream/RankEvaluator.java | 75 --
.../solrj/io/stream/RegressionEvaluator.java | 112 ---
.../solrj/io/stream/ReverseEvaluator.java | 67 --
.../client/solrj/io/stream/ScaleEvaluator.java | 78 --
.../solr/client/solrj/io/stream/SolrStream.java | 14 -
.../solr/client/solrj/io/stream/SqlStream.java | 2 -
.../client/solrj/io/stream/StatsStream.java | 10 -
.../solrj/io/stream/TimeSeriesStream.java | 38 +-
.../client/solrj/io/stream/TopicStream.java | 19 -
.../solrj/io/stream/expr/StreamFactory.java | 2 +-
.../solr/common/params/AnalysisParams.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 | 330 +++++++++
.../java/org/apache/solr/SolrTestCaseJ4.java | 108 +--
.../apache/solr/cloud/SolrCloudTestCase.java | 6 +-
247 files changed, 10742 insertions(+), 7173 deletions(-)
----------------------------------------------------------------------