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 2018/01/23 13:28:22 UTC
[50/51] lucene-solr:jira/solr-11714: Merge branch 'master' into
jira/solr-11714
Merge branch 'master' into jira/solr-11714
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bf6ac14a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bf6ac14a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bf6ac14a
Branch: refs/heads/jira/solr-11714
Commit: bf6ac14a89cc1aea26b88d9919aa12ec53111ff4
Parents: ed7b497 f72a5db
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Jan 22 13:01:50 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Jan 22 13:01:50 2018 +0100
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/idea/solr/contrib/langid/langid.iml | 1 +
lucene/CHANGES.txt | 30 +-
.../compound/hyphenation/HyphenationTree.java | 4 +-
.../lucene/analysis/util/UnicodeProps.java | 116 +-
.../compound/TestCompoundWordTokenFilter.java | 15 +
.../compound/hyphenation-LUCENE-8124.xml | 61 ++
.../lucene/analysis/icu/ICUFoldingFilter.java | 28 +-
.../analysis/icu/ICUFoldingFilterFactory.java | 20 +-
.../icu/segmentation/BreakIteratorWrapper.java | 190 ++--
.../segmentation/CompositeBreakIterator.java | 2 +-
.../segmentation/DefaultICUTokenizerConfig.java | 18 +-
.../icu/segmentation/ICUTokenizerConfig.java | 9 +-
.../icu/segmentation/ICUTokenizerFactory.java | 4 +-
.../icu/TestICUFoldingFilterFactory.java | 21 +-
.../icu/segmentation/TestICUTokenizer.java | 99 +-
.../icu/segmentation/TestICUTokenizerCJK.java | 9 +
.../index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.7.2.1-cfs.zip | Bin 0 -> 15605 bytes
.../apache/lucene/index/index.7.2.1-nocfs.zip | Bin 0 -> 15606 bytes
.../org/apache/lucene/index/sorted.7.2.1.zip | Bin 0 -> 93388 bytes
lucene/common-build.xml | 3 +-
.../analysis/standard/StandardTokenizer.java | 5 +-
.../org/apache/lucene/index/TermStates.java | 2 +-
.../search/similarities/BM25Similarity.java | 7 +-
.../search/similarities/BooleanSimilarity.java | 6 +-
.../search/similarities/MultiSimilarity.java | 5 +-
.../lucene/search/similarities/Similarity.java | 5 +-
.../search/similarities/SimilarityBase.java | 7 +-
.../search/similarities/TFIDFSimilarity.java | 7 +-
.../lucene/index/TestMaxTermFrequency.java | 3 +-
.../org/apache/lucene/index/TestTermStates.java | 36 +
.../search/TestBooleanQueryVisitSubscorers.java | 2 +-
.../lucene/search/TestSimilarityProvider.java | 6 +-
.../lucene/search/TestSubScorerFreqs.java | 2 +-
.../search/uhighlight/FieldHighlighter.java | 14 +-
.../search/uhighlight/FieldOffsetStrategy.java | 80 +-
.../lucene/search/uhighlight/OffsetsEnum.java | 132 ++-
.../lucene/search/uhighlight/Passage.java | 18 +
.../lucene/search/uhighlight/PhraseHelper.java | 584 +++-------
.../uhighlight/TokenStreamOffsetStrategy.java | 56 +-
.../uhighlight/TestUnifiedHighlighter.java | 87 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 55 +-
.../TestUnifiedHighlighterStrictPhrases.java | 88 ++
.../TestUnifiedHighlighterExtensibility.java | 4 +-
lucene/ivy-versions.properties | 2 +-
...jetty-continuation-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-continuation-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-http-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-http-9.4.8.v20171121.jar.sha1 | 1 +
.../licenses/jetty-io-9.3.20.v20170531.jar.sha1 | 1 -
.../licenses/jetty-io-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-server-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-server-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-servlet-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-servlet-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-util-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-util-9.4.8.v20171121.jar.sha1 | 1 +
.../lucene/replicator/ReplicatorTestCase.java | 4 +-
.../lucene/document/LatLonBoundingBox.java | 21 +-
.../search/TestLatLonBoundingBoxQueries.java | 6 +
.../similarities/AssertingSimilarity.java | 6 +-
solr/CHANGES.txt | 45 +-
solr/bin/solr | 64 +-
solr/contrib/langid/README.txt | 3 +-
solr/contrib/langid/build.xml | 60 ++
solr/contrib/langid/ivy.xml | 1 +
.../LanguageIdentifierUpdateProcessor.java | 64 ++
.../OpenNLPLangDetectUpdateProcessor.java | 80 ++
...OpenNLPLangDetectUpdateProcessorFactory.java | 130 +++
.../TikaLanguageIdentifierUpdateProcessor.java | 65 --
.../opennlp-langdetect.eng-swe-spa-rus-deu.bin | Bin 0 -> 17702 bytes
.../conf/solrconfig-languageidentifier.xml | 25 +-
.../opennlp.langdetect.trainer.params.txt | 17 +
...dentifierUpdateProcessorFactoryTestCase.java | 6 +-
...NLPLangDetectUpdateProcessorFactoryTest.java | 66 ++
.../client/solrj/embedded/JettySolrRunner.java | 8 +-
.../org/apache/solr/cloud/AddReplicaCmd.java | 279 -----
.../src/java/org/apache/solr/cloud/Assign.java | 483 ---------
.../java/org/apache/solr/cloud/BackupCmd.java | 225 ----
.../solr/cloud/CloudConfigSetService.java | 1 +
.../java/org/apache/solr/cloud/CloudUtil.java | 2 +-
.../org/apache/solr/cloud/CreateAliasCmd.java | 101 --
.../apache/solr/cloud/CreateCollectionCmd.java | 533 ---------
.../org/apache/solr/cloud/CreateShardCmd.java | 191 ----
.../apache/solr/cloud/CreateSnapshotCmd.java | 179 ---
.../org/apache/solr/cloud/DeleteAliasCmd.java | 43 -
.../apache/solr/cloud/DeleteCollectionCmd.java | 141 ---
.../org/apache/solr/cloud/DeleteNodeCmd.java | 137 ---
.../org/apache/solr/cloud/DeleteReplicaCmd.java | 281 -----
.../org/apache/solr/cloud/DeleteShardCmd.java | 178 ---
.../apache/solr/cloud/DeleteSnapshotCmd.java | 160 ---
.../solr/cloud/ExclusiveSliceProperty.java | 5 +-
.../solr/cloud/LeaderRecoveryWatcher.java | 88 --
.../java/org/apache/solr/cloud/MigrateCmd.java | 337 ------
.../org/apache/solr/cloud/MoveReplicaCmd.java | 302 ------
.../java/org/apache/solr/cloud/Overseer.java | 1 +
.../OverseerCollectionConfigSetProcessor.java | 1 +
.../cloud/OverseerCollectionMessageHandler.java | 1003 -----------------
.../org/apache/solr/cloud/OverseerRoleCmd.java | 102 --
.../apache/solr/cloud/OverseerStatusCmd.java | 112 --
.../org/apache/solr/cloud/ReplaceNodeCmd.java | 226 ----
.../java/org/apache/solr/cloud/RestoreCmd.java | 363 -------
.../cloud/RoutedAliasCreateCollectionCmd.java | 182 ----
.../org/apache/solr/cloud/SplitShardCmd.java | 542 ----------
.../org/apache/solr/cloud/UtilizeNodeCmd.java | 120 ---
.../cloud/api/collections/AddReplicaCmd.java | 282 +++++
.../solr/cloud/api/collections/Assign.java | 483 +++++++++
.../solr/cloud/api/collections/BackupCmd.java | 224 ++++
.../cloud/api/collections/CreateAliasCmd.java | 100 ++
.../api/collections/CreateCollectionCmd.java | 531 +++++++++
.../cloud/api/collections/CreateShardCmd.java | 190 ++++
.../api/collections/CreateSnapshotCmd.java | 179 +++
.../cloud/api/collections/DeleteAliasCmd.java | 43 +
.../api/collections/DeleteCollectionCmd.java | 142 +++
.../cloud/api/collections/DeleteNodeCmd.java | 137 +++
.../cloud/api/collections/DeleteReplicaCmd.java | 280 +++++
.../cloud/api/collections/DeleteShardCmd.java | 178 +++
.../api/collections/DeleteSnapshotCmd.java | 160 +++
.../api/collections/LeaderRecoveryWatcher.java | 88 ++
.../solr/cloud/api/collections/MigrateCmd.java | 334 ++++++
.../cloud/api/collections/MoveReplicaCmd.java | 303 ++++++
.../OverseerCollectionMessageHandler.java | 1011 +++++++++++++++++
.../cloud/api/collections/OverseerRoleCmd.java | 102 ++
.../api/collections/OverseerStatusCmd.java | 113 ++
.../cloud/api/collections/ReplaceNodeCmd.java | 227 ++++
.../solr/cloud/api/collections/RestoreCmd.java | 357 ++++++
.../RoutedAliasCreateCollectionCmd.java | 184 ++++
.../cloud/api/collections/SplitShardCmd.java | 540 ++++++++++
.../cloud/api/collections/UtilizeNodeCmd.java | 120 +++
.../cloud/api/collections/package-info.java | 23 +
.../cloud/autoscaling/ScheduledTriggers.java | 36 +-
.../cloud/overseer/ClusterStateMutator.java | 2 +-
.../solr/cloud/overseer/ReplicaMutator.java | 12 +-
.../solr/cloud/overseer/SliceMutator.java | 13 +-
.../org/apache/solr/core/CoreContainer.java | 3 +
.../org/apache/solr/handler/StreamHandler.java | 16 +-
.../solr/handler/admin/CollectionsHandler.java | 24 +-
.../handler/component/RangeFacetRequest.java | 73 +-
.../apache/solr/schema/AbstractEnumField.java | 24 +-
.../apache/solr/schema/CurrencyFieldType.java | 165 +--
.../org/apache/solr/schema/CurrencyValue.java | 231 ++++
.../org/apache/solr/schema/DatePointField.java | 6 -
.../apache/solr/schema/DoublePointField.java | 6 -
.../org/apache/solr/schema/EnumFieldType.java | 11 +
.../java/org/apache/solr/schema/FieldType.java | 80 +-
.../org/apache/solr/schema/FloatPointField.java | 6 -
.../org/apache/solr/schema/IntPointField.java | 6 -
.../org/apache/solr/schema/LongPointField.java | 6 -
.../java/org/apache/solr/schema/NumberType.java | 34 +-
.../java/org/apache/solr/schema/PointField.java | 6 +
.../apache/solr/schema/PrimitiveFieldType.java | 5 +
.../org/apache/solr/schema/SchemaField.java | 8 +-
.../java/org/apache/solr/schema/StrField.java | 28 +
.../java/org/apache/solr/schema/TrieField.java | 39 +-
.../apache/solr/search/facet/FacetRange.java | 115 +-
.../TimeRoutedAliasUpdateProcessor.java | 2 +-
.../solr/collection1/conf/schema11.xml | 25 +
.../AbstractCloudBackupRestoreTestCase.java | 346 ------
.../test/org/apache/solr/cloud/AssignTest.java | 155 ---
.../solr/cloud/BasicDistributedZkTest.java | 1 +
.../solr/cloud/ChaosMonkeyShardSplitTest.java | 5 +
.../apache/solr/cloud/CollectionReloadTest.java | 84 --
.../cloud/CollectionTooManyReplicasTest.java | 221 ----
.../CollectionsAPIAsyncDistributedZkTest.java | 177 ---
.../cloud/CollectionsAPIDistributedZkTest.java | 684 ------------
...ConcurrentDeleteAndCreateCollectionTest.java | 226 ----
.../apache/solr/cloud/CustomCollectionTest.java | 198 ----
...verseerCollectionConfigSetProcessorTest.java | 28 +-
.../solr/cloud/OverseerTaskQueueTest.java | 1 +
.../solr/cloud/ReplicaPropertiesBase.java | 177 ---
.../org/apache/solr/cloud/ShardSplitTest.java | 1015 -----------------
.../cloud/SimpleCollectionCreateDeleteTest.java | 64 --
.../apache/solr/cloud/TestCollectionAPI.java | 797 --------------
.../TestCollectionsAPIViaSolrCloudCluster.java | 295 -----
.../solr/cloud/TestHdfsCloudBackupRestore.java | 203 ----
.../cloud/TestLocalFSCloudBackupRestore.java | 57 -
.../org/apache/solr/cloud/TestPullReplica.java | 78 +-
.../solr/cloud/TestReplicaProperties.java | 236 ----
.../cloud/TestRequestStatusCollectionAPI.java | 197 ----
.../AbstractCloudBackupRestoreTestCase.java | 348 ++++++
.../solr/cloud/api/collections/AssignTest.java | 156 +++
.../api/collections/CollectionReloadTest.java | 85 ++
.../CollectionTooManyReplicasTest.java | 222 ++++
.../CollectionsAPIAsyncDistributedZkTest.java | 178 +++
.../CollectionsAPIDistributedZkTest.java | 686 ++++++++++++
...ConcurrentDeleteAndCreateCollectionTest.java | 227 ++++
.../api/collections/CustomCollectionTest.java | 199 ++++
.../HdfsCollectionsAPIDistributedZkTest.java | 176 +++
.../api/collections/ReplicaPropertiesBase.java | 178 +++
.../cloud/api/collections/ShardSplitTest.java | 1017 ++++++++++++++++++
.../SimpleCollectionCreateDeleteTest.java | 66 ++
.../api/collections/TestCollectionAPI.java | 795 ++++++++++++++
.../TestCollectionsAPIViaSolrCloudCluster.java | 297 +++++
.../collections/TestHdfsCloudBackupRestore.java | 207 ++++
.../TestLocalFSCloudBackupRestore.java | 57 +
.../api/collections/TestReplicaProperties.java | 236 ++++
.../TestRequestStatusCollectionAPI.java | 198 ++++
.../autoscaling/TriggerIntegrationTest.java | 19 +-
.../cloud/autoscaling/sim/SimCloudManager.java | 2 +-
.../sim/SimClusterStateProvider.java | 14 +-
.../cloud/autoscaling/sim/TestLargeCluster.java | 16 +-
.../autoscaling/sim/TestTriggerIntegration.java | 9 +-
.../cloud/cdcr/BaseCdcrDistributedZkTest.java | 11 +-
.../HdfsCollectionsAPIDistributedZkTest.java | 176 ---
.../solr/schema/CurrencyFieldTypeTest.java | 235 ++++
.../org/apache/solr/schema/TestPointFields.java | 164 ++-
.../search/CurrencyRangeFacetCloudTest.java | 483 +++++++++
.../function/TestMinMaxOnMultiValuedField.java | 409 ++++++-
.../solr/uninverting/TestFieldCacheSort.java | 3 +
.../TimeRoutedAliasUpdateProcessorTest.java | 20 +-
...jetty-continuation-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-continuation-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-deploy-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-deploy-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-http-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-http-9.4.8.v20171121.jar.sha1 | 1 +
.../licenses/jetty-io-9.3.20.v20170531.jar.sha1 | 1 -
solr/licenses/jetty-io-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-jmx-9.3.20.v20170531.jar.sha1 | 1 -
.../licenses/jetty-jmx-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-rewrite-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-rewrite-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-security-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-security-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-server-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-server-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-servlet-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-servlet-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-servlets-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-servlets-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-util-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-util-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-webapp-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-webapp-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-xml-9.3.20.v20170531.jar.sha1 | 1 -
.../licenses/jetty-xml-9.4.8.v20171121.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
solr/server/etc/jetty-http.xml | 1 -
solr/server/etc/jetty-https.xml | 1 -
.../conf/velocity/VM_global_library.vm | 6 +-
.../src/common-query-parameters.adoc | 22 +-
.../detecting-languages-during-indexing.adoc | 29 +-
.../src/distributed-requests.adoc | 2 +-
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 2 +-
solr/solr-ref-guide/src/suggester.adoc | 12 +-
.../src/transforming-result-documents.adoc | 8 +-
...king-with-currencies-and-exchange-rates.adoc | 1 +
.../DelegatingClusterStateProvider.java | 7 +
.../cloud/autoscaling/MoveReplicaSuggester.java | 3 +-
.../client/solrj/cloud/autoscaling/Policy.java | 12 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 33 +
.../solrj/cloud/autoscaling/Suggester.java | 32 +-
.../solrj/cloud/autoscaling/Suggestion.java | 1 +
.../client/solrj/impl/ClusterStateProvider.java | 7 +-
.../client/solrj/io/eval/ColumnAtEvaluator.java | 55 +
.../solrj/io/eval/ColumnCountEvaluator.java | 42 +
.../solrj/io/eval/FeatureSelectEvaluator.java | 93 ++
.../solrj/io/eval/GetAttributesEvaluator.java | 42 +
.../solrj/io/eval/GetCentroidsEvaluator.java | 55 +
.../solrj/io/eval/GetClusterEvaluator.java | 64 ++
.../client/solrj/io/eval/IndexOfEvaluator.java | 51 +
.../client/solrj/io/eval/KmeansEvaluator.java | 135 +++
.../solr/client/solrj/io/eval/KnnEvaluator.java | 170 +++
.../solr/client/solrj/io/eval/Matrix.java | 8 +
.../client/solrj/io/eval/RowAtEvaluator.java | 56 +
.../client/solrj/io/eval/RowCountEvaluator.java | 42 +
.../solrj/io/eval/SetColumnLabelsEvaluator.java | 47 +
.../solrj/io/eval/SetRowLabelsEvaluator.java | 47 +
.../solrj/io/eval/TermVectorsEvaluator.java | 13 +-
.../solrj/io/eval/TopFeaturesEvaluator.java | 112 ++
.../client/solrj/io/eval/UnitEvaluator.java | 5 +-
.../solr/client/solrj/io/stream/LetStream.java | 28 +-
.../client/solrj/response/QueryResponse.java | 14 +-
.../solr/client/solrj/response/RangeFacet.java | 6 +
.../solrj/cloud/autoscaling/TestPolicy.java | 125 +++
.../client/solrj/embedded/JettyWebappTest.java | 4 +-
.../solrj/io/stream/StreamExpressionTest.java | 268 ++++-
.../cloud/AbstractFullDistribZkTestBase.java | 40 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../org/apache/solr/util/SSLTestConfig.java | 11 +-
.../solr/cloud/MiniSolrCloudClusterTest.java | 2 +-
solr/webapp/web/img/ZeroClipboard.swf | Bin 1071 -> 0 bytes
284 files changed, 16918 insertions(+), 13138 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bf6ac14a/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bf6ac14a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bf6ac14a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java
----------------------------------------------------------------------