You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2017/12/27 15:04:46 UTC
[53/54] [abbrv] lucene-solr:jira/solr-11702: merge with master
merge with master
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/23524499
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/23524499
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/23524499
Branch: refs/heads/jira/solr-11702
Commit: 23524499a7576ff87458193ec827a8d34515e153
Parents: 81efe52 137675a
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Dec 27 20:16:28 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Dec 27 20:16:28 2017 +0700
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/idea/.idea/ant.xml | 1 +
dev-tools/idea/.idea/modules.xml | 1 +
dev-tools/idea/.idea/workspace.xml | 83 +-
.../idea/lucene/analysis/opennlp/opennlp.iml | 30 +
dev-tools/idea/lucene/facet/facet.iml | 2 +-
dev-tools/idea/lucene/queries/queries.iml | 1 +
.../contrib/analysis-extras/analysis-extras.iml | 1 +
.../dataimporthandler-extras.iml | 1 +
.../idea/solr/contrib/extraction/extraction.iml | 1 +
.../lucene/analysis/opennlp/pom.xml.template | 78 +
.../maven/lucene/analysis/pom.xml.template | 1 +
lucene/CHANGES.txt | 28 +
lucene/MIGRATE.txt | 13 +
lucene/analysis/README.txt | 5 +
lucene/analysis/build.xml | 6 +-
.../miscellaneous/TrimFilterFactory.java | 12 +-
.../miscellaneous/TypeAsSynonymFilter.java | 80 +
.../TypeAsSynonymFilterFactory.java | 55 +
.../analysis/util/MultiTermAwareComponent.java | 5 +
...ache.lucene.analysis.util.TokenFilterFactory | 1 +
.../analysis/minhash/MinHashFilterTest.java | 6 +-
.../TestPerFieldAnalyzerWrapper.java | 2 +
.../TestTypeAsSynonymFilterFactory.java | 50 +
lucene/analysis/opennlp/build.xml | 118 +
lucene/analysis/opennlp/ivy.xml | 29 +
.../analysis/opennlp/OpenNLPChunkerFilter.java | 108 +
.../opennlp/OpenNLPChunkerFilterFactory.java | 81 +
.../opennlp/OpenNLPLemmatizerFilter.java | 123 +
.../opennlp/OpenNLPLemmatizerFilterFactory.java | 89 +
.../analysis/opennlp/OpenNLPPOSFilter.java | 97 +
.../opennlp/OpenNLPPOSFilterFactory.java | 71 +
.../opennlp/OpenNLPSentenceBreakIterator.java | 224 ++
.../analysis/opennlp/OpenNLPTokenizer.java | 98 +
.../opennlp/OpenNLPTokenizerFactory.java | 79 +
.../lucene/analysis/opennlp/package-info.java | 21 +
.../analysis/opennlp/tools/NLPChunkerOp.java | 41 +
.../analysis/opennlp/tools/NLPLemmatizerOp.java | 80 +
.../analysis/opennlp/tools/NLPNERTaggerOp.java | 56 +
.../analysis/opennlp/tools/NLPPOSTaggerOp.java | 41 +
.../opennlp/tools/NLPSentenceDetectorOp.java | 50 +
.../analysis/opennlp/tools/NLPTokenizerOp.java | 48 +
.../opennlp/tools/OpenNLPOpsFactory.java | 176 +
.../analysis/opennlp/tools/package-info.java | 21 +
lucene/analysis/opennlp/src/java/overview.html | 61 +
...ache.lucene.analysis.util.TokenFilterFactory | 18 +
...apache.lucene.analysis.util.TokenizerFactory | 16 +
.../lucene/analysis/opennlp/en-test-chunker.bin | Bin 0 -> 89915 bytes
.../lucene/analysis/opennlp/en-test-lemmas.dict | 12 +
.../analysis/opennlp/en-test-lemmatizer.bin | Bin 0 -> 7370 bytes
.../analysis/opennlp/en-test-ner-person.bin | Bin 0 -> 1700 bytes
.../analysis/opennlp/en-test-pos-maxent.bin | Bin 0 -> 18424 bytes
.../lucene/analysis/opennlp/en-test-sent.bin | Bin 0 -> 1050 bytes
.../analysis/opennlp/en-test-tokenizer.bin | Bin 0 -> 15096 bytes
.../TestOpenNLPChunkerFilterFactory.java | 74 +
.../TestOpenNLPLemmatizerFilterFactory.java | 169 +
.../opennlp/TestOpenNLPPOSFilterFactory.java | 92 +
.../TestOpenNLPSentenceBreakIterator.java | 201 +
.../opennlp/TestOpenNLPTokenizerFactory.java | 96 +
.../src/tools/test-model-data/README.txt | 6 +
.../src/tools/test-model-data/chunks.txt | 3566 ++++++++++++++++++
.../src/tools/test-model-data/lemmas.txt | 875 +++++
.../tools/test-model-data/ner_TrainerParams.txt | 21 +
.../src/tools/test-model-data/ner_flashman.txt | 143 +
.../opennlp/src/tools/test-model-data/pos.txt | 30 +
.../src/tools/test-model-data/sentences.txt | 144 +
.../src/tools/test-model-data/tokenizer.txt | 69 +
.../index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.7.2.0-cfs.zip | Bin 0 -> 15641 bytes
.../apache/lucene/index/index.7.2.0-nocfs.zip | Bin 0 -> 15629 bytes
.../org/apache/lucene/index/sorted.7.2.0.zip | Bin 0 -> 87935 bytes
.../org/apache/lucene/index/CheckIndex.java | 2 +-
.../org/apache/lucene/search/BoostQuery.java | 3 +
.../lucene/search/DisjunctionMaxQuery.java | 18 +-
.../lucene/search/DisjunctionMaxScorer.java | 46 +-
.../lucene/search/DisjunctionSumScorer.java | 20 +-
.../apache/lucene/search/ReqOptSumScorer.java | 159 +-
.../apache/lucene/search/TermInSetQuery.java | 8 +-
.../org/apache/lucene/search/WANDScorer.java | 14 +-
.../java/org/apache/lucene/util/MathUtil.java | 15 +
.../apache/lucene/analysis/TestStopFilter.java | 9 +-
.../lucene/search/TermInSetQueryTest.java | 4 +-
.../lucene/search/TestReqOptSumScorer.java | 190 +
.../expressions/ExpressionValueSource.java | 6 +-
lucene/facet/build.xml | 15 +-
.../lucene/facet/LongValueFacetCounts.java | 13 +-
.../facet/range/LongRangeFacetCounts.java | 5 +-
.../taxonomy/TaxonomyFacetSumValueSource.java | 3 +-
.../highlight/WeightedSpanTermExtractor.java | 6 +-
.../uhighlight/MultiTermHighlighting.java | 6 +-
.../search/vectorhighlight/FieldQuery.java | 8 +-
.../search/highlight/HighlighterTest.java | 7 +-
.../FastVectorHighlighterTest.java | 7 +-
lucene/ivy-versions.properties | 31 +-
lucene/licenses/opennlp-maxent-3.0.3.jar.sha1 | 1 +
lucene/licenses/opennlp-maxent-LICENSE-ASL.txt | 202 +
lucene/licenses/opennlp-maxent-NOTICE.txt | 6 +
lucene/licenses/opennlp-tools-1.8.3.jar.sha1 | 1 +
lucene/licenses/opennlp-tools-LICENSE-ASL.txt | 202 +
lucene/licenses/opennlp-tools-NOTICE.txt | 6 +
lucene/licenses/slf4j-api-1.7.24.jar.sha1 | 1 +
lucene/licenses/slf4j-api-1.7.7.jar.sha1 | 1 -
lucene/module-build.xml | 22 +
lucene/queries/build.xml | 8 +
.../apache/lucene/queries/BoostingQuery.java | 186 -
.../lucene/queries/CustomScoreProvider.java | 162 -
.../apache/lucene/queries/CustomScoreQuery.java | 322 --
.../lucene/queries/function/BoostedQuery.java | 184 -
.../queries/function/FunctionScoreQuery.java | 7 +
.../lucene/queries/BoostingQueryTest.java | 56 -
.../queries/TestCustomScoreExplanations.java | 91 -
.../lucene/queries/TestCustomScoreQuery.java | 361 --
.../queries/function/TestBoostedQuery.java | 98 -
.../function/TestFunctionScoreQuery.java | 145 +-
.../queryparser/xml/CorePlusQueriesParser.java | 2 -
.../xml/builders/BoostingQueryBuilder.java | 58 -
.../queryparser/xml/DisjunctionMaxQuery.xml | 4 +-
.../lucene/queryparser/xml/TestCoreParser.java | 2 +-
.../xml/TestCorePlusQueriesParser.java | 5 -
.../analysis/BaseTokenStreamTestCase.java | 32 +-
solr/CHANGES.txt | 29 +
solr/bin/solr | 34 +
solr/bin/solr.in.sh | 11 +
solr/contrib/analysis-extras/README.txt | 10 +-
solr/contrib/analysis-extras/build.xml | 20 +-
solr/contrib/analysis-extras/ivy.xml | 3 +
...ractNamedEntitiesUpdateProcessorFactory.java | 571 +++
.../apache/solr/update/processor/package.html | 24 +
.../collection1/conf/en-test-ner-person.bin | Bin 0 -> 1700 bytes
.../solr/collection1/conf/en-test-sent.bin | Bin 0 -> 1050 bytes
.../solr/collection1/conf/en-test-tokenizer.bin | Bin 0 -> 15096 bytes
.../collection1/conf/schema-opennlp-extract.xml | 49 +
.../conf/solrconfig-opennlp-extract.xml | 206 +
.../solrconfig.snippet.randomindexconfig.xml | 48 +
...ractNamedEntitiesUpdateProcessorFactory.java | 192 +
.../handler/dataimport/TikaEntityProcessor.java | 4 +-
.../src/resources/solr-default-tika-config.xml | 20 +
solr/contrib/extraction/ivy.xml | 9 +-
.../extraction/ExtractingRequestHandler.java | 14 +-
.../handler/extraction/XLSXResponseWriter.java | 5 +-
.../src/resources/solr-default-tika-config.xml | 20 +
solr/core/ivy.xml | 2 +-
.../org/apache/solr/cloud/ActionThrottle.java | 16 +-
.../org/apache/solr/cloud/AddReplicaCmd.java | 149 +-
.../src/java/org/apache/solr/cloud/Assign.java | 24 +-
.../solr/cloud/CloudConfigSetService.java | 2 +-
.../java/org/apache/solr/cloud/CloudUtil.java | 7 +
.../apache/solr/cloud/CreateCollectionCmd.java | 244 +-
.../org/apache/solr/cloud/CreateShardCmd.java | 102 +-
.../apache/solr/cloud/DeleteCollectionCmd.java | 9 +-
.../org/apache/solr/cloud/DeleteShardCmd.java | 9 +-
.../java/org/apache/solr/cloud/MigrateCmd.java | 9 +-
.../org/apache/solr/cloud/MoveReplicaCmd.java | 9 +-
.../java/org/apache/solr/cloud/Overseer.java | 16 +-
.../cloud/OverseerCollectionMessageHandler.java | 43 +-
.../java/org/apache/solr/cloud/RestoreCmd.java | 2 +-
.../org/apache/solr/cloud/SplitShardCmd.java | 248 +-
.../solr/cloud/autoscaling/AutoScaling.java | 16 +-
.../cloud/autoscaling/AutoScalingHandler.java | 70 +-
.../cloud/autoscaling/ComputePlanAction.java | 50 +-
.../cloud/autoscaling/ExecutePlanAction.java | 42 +-
.../cloud/autoscaling/HttpTriggerListener.java | 6 +-
.../solr/cloud/autoscaling/MetricTrigger.java | 190 +
.../cloud/autoscaling/NodeAddedTrigger.java | 15 +-
.../solr/cloud/autoscaling/NodeLostTrigger.java | 16 +-
.../autoscaling/OverseerTriggerThread.java | 20 +-
.../cloud/autoscaling/ScheduledTriggers.java | 53 +-
.../cloud/autoscaling/SearchRateTrigger.java | 10 +-
.../cloud/autoscaling/SystemLogListener.java | 6 +-
.../cloud/autoscaling/TriggerEventQueue.java | 4 +-
.../cloud/autoscaling/TriggerListenerBase.java | 6 +-
.../solr/cloud/overseer/CollectionMutator.java | 8 +-
.../solr/cloud/overseer/ReplicaMutator.java | 2 +-
.../solr/cloud/overseer/SliceMutator.java | 2 +-
.../org/apache/solr/core/CoreContainer.java | 6 +-
.../apache/solr/core/CorePropertiesLocator.java | 6 +
.../solr/handler/CdcrReplicatorManager.java | 11 +-
.../org/apache/solr/handler/StreamHandler.java | 8 +-
.../solr/handler/admin/CollectionsHandler.java | 2 +-
.../org/apache/solr/schema/SchemaManager.java | 3 +-
.../apache/solr/search/BoostQParserPlugin.java | 23 +-
.../solr/search/ExtendedDismaxQParser.java | 5 +-
.../apache/solr/search/ValueSourceParser.java | 4 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 5 +-
.../processor/DistributedUpdateProcessor.java | 3 +-
.../src/java/org/apache/solr/util/IdUtils.java | 1 +
.../src/java/org/apache/solr/util/TimeOut.java | 18 +-
.../java/org/apache/solr/util/TimeSource.java | 57 -
.../solr/util/xslt/TransformerProvider.java | 3 +-
.../org/apache/solr/BasicFunctionalityTest.java | 2 +-
.../apache/solr/cloud/ActionThrottleTest.java | 12 +-
.../org/apache/solr/cloud/AddReplicaTest.java | 2 +-
.../test/org/apache/solr/cloud/AssignTest.java | 10 +-
...MonkeyNothingIsSafeWithPullReplicasTest.java | 3 +-
...aosMonkeySafeLeaderWithPullReplicasTest.java | 3 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 5 +-
...ConcurrentDeleteAndCreateCollectionTest.java | 3 +-
...DistribDocExpirationUpdateProcessorTest.java | 3 +-
.../cloud/LeaderFailureAfterFreshStartTest.java | 3 +-
.../apache/solr/cloud/MigrateRouteKeyTest.java | 3 +-
...verseerCollectionConfigSetProcessorTest.java | 9 +-
.../apache/solr/cloud/OverseerRolesTest.java | 3 +-
.../solr/cloud/PeerSyncReplicationTest.java | 3 +-
.../cloud/SharedFSAutoReplicaFailoverTest.java | 3 +-
.../org/apache/solr/cloud/TestPullReplica.java | 7 +-
.../cloud/TestPullReplicaErrorHandling.java | 9 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 5 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 11 +-
.../solr/cloud/UnloadDistributedZkTest.java | 3 +-
.../org/apache/solr/cloud/ZkSolrClientTest.java | 4 +-
.../AutoAddReplicasIntegrationTest.java | 3 +-
.../AutoAddReplicasPlanActionTest.java | 4 +-
.../autoscaling/AutoScalingHandlerTest.java | 3 +-
.../solr/cloud/autoscaling/CapturedEvent.java | 63 +
.../autoscaling/ComputePlanActionTest.java | 16 +
.../autoscaling/ExecutePlanActionTest.java | 2 +-
.../cloud/autoscaling/MetricTriggerTest.java | 133 +
.../cloud/autoscaling/NodeAddedTriggerTest.java | 2 +-
.../cloud/autoscaling/NodeLostTriggerTest.java | 2 +-
.../autoscaling/TriggerIntegrationTest.java | 285 +-
.../solr/cloud/autoscaling/sim/ActionError.java | 24 +
.../sim/GenericDistributedQueue.java | 599 +++
.../sim/GenericDistributedQueueFactory.java | 45 +
.../cloud/autoscaling/sim/LiveNodesSet.java | 103 +
.../cloud/autoscaling/sim/SimCloudManager.java | 620 +++
.../sim/SimClusterStateProvider.java | 1278 +++++++
.../autoscaling/sim/SimDistribStateManager.java | 579 +++
.../sim/SimDistributedQueueFactory.java | 284 ++
.../autoscaling/sim/SimNodeStateProvider.java | 298 ++
.../autoscaling/sim/SimSolrCloudTestCase.java | 343 ++
.../sim/TestClusterStateProvider.java | 221 ++
.../autoscaling/sim/TestComputePlanAction.java | 348 ++
.../sim/TestDistribStateManager.java | 284 ++
.../autoscaling/sim/TestExecutePlanAction.java | 202 +
.../sim/TestGenericDistributedQueue.java | 32 +
.../cloud/autoscaling/sim/TestLargeCluster.java | 463 +++
.../autoscaling/sim/TestNodeAddedTrigger.java | 306 ++
.../autoscaling/sim/TestNodeLostTrigger.java | 331 ++
.../cloud/autoscaling/sim/TestPolicyCloud.java | 357 ++
.../sim/TestSimDistributedQueue.java | 220 ++
.../autoscaling/sim/TestTriggerIntegration.java | 1217 ++++++
.../cloud/autoscaling/sim/package-info.java | 21 +
.../cloud/cdcr/BaseCdcrDistributedZkTest.java | 3 +-
.../apache/solr/cloud/hdfs/StressHdfsTest.java | 3 +-
.../solr/cloud/overseer/ZkStateReaderTest.java | 3 +-
.../solr/cloud/rule/ImplicitSnitchTest.java | 2 +
.../apache/solr/cloud/rule/RuleEngineTest.java | 3 +
.../solr/core/OpenCloseCoreStressTest.java | 7 +-
.../org/apache/solr/core/PluginInfoTest.java | 10 +-
.../apache/solr/core/TestJmxIntegration.java | 4 +-
.../org/apache/solr/core/TestLazyCores.java | 2 +
.../apache/solr/core/TestXIncludeConfig.java | 4 +-
.../apache/solr/handler/SearchHandlerTest.java | 4 +-
.../handler/admin/CoreAdminHandlerTest.java | 35 +
.../handler/admin/LukeRequestHandlerTest.java | 4 +-
.../admin/SegmentsInfoRequestHandlerTest.java | 4 +-
.../handler/component/StatsComponentTest.java | 4 +-
.../solr/highlight/HighlighterConfigTest.java | 4 +-
.../org/apache/solr/request/TestWriterPerf.java | 4 +-
.../solr/response/TestBinaryResponseWriter.java | 4 +-
.../org/apache/solr/schema/IndexSchemaTest.java | 14 +
.../search/TestComplexPhraseQParserPlugin.java | 4 +-
.../solr/search/TestMaxScoreQueryParser.java | 4 +-
.../org/apache/solr/search/TestQueryTypes.java | 4 +-
.../org/apache/solr/search/TestQueryUtils.java | 4 +-
.../org/apache/solr/search/TestSearchPerf.java | 4 +-
.../solr/search/TestSurroundQueryParser.java | 4 +-
.../search/function/SortByFunctionTest.java | 4 +-
.../solr/search/function/TestFunctionQuery.java | 2 +-
.../solr/security/BasicAuthStandaloneTest.java | 6 +-
.../solr/servlet/DirectSolrConnectionTest.java | 4 +-
.../update/DirectUpdateHandlerOptimizeTest.java | 4 +-
.../apache/solr/update/SoftAutoCommitTest.java | 14 +-
.../solr/update/TestIndexingPerformance.java | 4 +-
.../apache/solr/update/UpdateParamsTest.java | 4 +-
.../processor/UpdateProcessorTestBase.java | 168 -
.../UpdateRequestProcessorFactoryTest.java | 4 +-
solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 | 1 -
solr/licenses/apache-mime4j-core-0.8.1.jar.sha1 | 1 +
solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 | 1 -
solr/licenses/apache-mime4j-dom-0.8.1.jar.sha1 | 1 +
solr/licenses/bcmail-jdk15-1.45.jar.sha1 | 1 -
solr/licenses/bcmail-jdk15on-1.54.jar.sha1 | 1 +
solr/licenses/bcpkix-jdk15on-1.54.jar.sha1 | 1 +
.../bcpkix-jdk15on-LICENSE-BSD_LIKE.txt | 15 +
solr/licenses/bcpkix-jdk15on-NOTICE.txt | 2 +
solr/licenses/bcprov-jdk15-1.45.jar.sha1 | 1 -
solr/licenses/bcprov-jdk15on-1.54.jar.sha1 | 1 +
solr/licenses/fontbox-2.0.6.jar.sha1 | 1 -
solr/licenses/fontbox-2.0.8.jar.sha1 | 1 +
solr/licenses/jackcess-encrypt-2.1.4.jar.sha1 | 1 +
solr/licenses/jackcess-encrypt-LICENSE-ASL.txt | 507 +++
solr/licenses/jackcess-encrypt-NOTICE.txt | 2 +
solr/licenses/jcl-over-slf4j-1.7.24.jar.sha1 | 1 +
solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1 | 1 -
solr/licenses/jdom-1.0.jar.sha1 | 1 -
solr/licenses/jdom-2.0.2.jar.sha1 | 1 +
solr/licenses/jul-to-slf4j-1.7.24.jar.sha1 | 1 +
solr/licenses/jul-to-slf4j-1.7.7.jar.sha1 | 1 -
.../licenses/metadata-extractor-2.10.1.jar.sha1 | 1 +
solr/licenses/metadata-extractor-2.9.1.jar.sha1 | 1 -
solr/licenses/opennlp-maxent-3.0.3.jar.sha1 | 1 +
solr/licenses/opennlp-maxent-LICENSE-ASL.txt | 202 +
solr/licenses/opennlp-maxent-NOTICE.txt | 6 +
solr/licenses/opennlp-tools-1.8.3.jar.sha1 | 1 +
solr/licenses/opennlp-tools-LICENSE-ASL.txt | 202 +
solr/licenses/opennlp-tools-NOTICE.txt | 6 +
solr/licenses/pdfbox-2.0.6.jar.sha1 | 1 -
solr/licenses/pdfbox-2.0.8.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-2.0.6.jar.sha1 | 1 -
solr/licenses/pdfbox-tools-2.0.8.jar.sha1 | 1 +
solr/licenses/poi-3.17-beta1.jar.sha1 | 1 -
solr/licenses/poi-3.17.jar.sha1 | 1 +
solr/licenses/poi-ooxml-3.17-beta1.jar.sha1 | 1 -
solr/licenses/poi-ooxml-3.17.jar.sha1 | 1 +
.../poi-ooxml-schemas-3.17-beta1.jar.sha1 | 1 -
solr/licenses/poi-ooxml-schemas-3.17.jar.sha1 | 1 +
.../licenses/poi-scratchpad-3.17-beta1.jar.sha1 | 1 -
solr/licenses/poi-scratchpad-3.17.jar.sha1 | 1 +
solr/licenses/rome-utils-1.5.1.jar.sha1 | 1 +
solr/licenses/rome-utils-LICENSE-ASL.txt | 14 +
solr/licenses/rome-utils-NOTICE.txt | 1 +
solr/licenses/slf4j-api-1.7.24.jar.sha1 | 1 +
solr/licenses/slf4j-api-1.7.7.jar.sha1 | 1 -
solr/licenses/slf4j-log4j12-1.7.24.jar.sha1 | 1 +
solr/licenses/slf4j-log4j12-1.7.7.jar.sha1 | 1 -
solr/licenses/slf4j-simple-1.7.24.jar.sha1 | 1 +
solr/licenses/slf4j-simple-1.7.7.jar.sha1 | 1 -
solr/licenses/tika-core-1.16.jar.sha1 | 1 -
solr/licenses/tika-core-1.17.jar.sha1 | 1 +
solr/licenses/tika-java7-1.16.jar.sha1 | 1 -
solr/licenses/tika-java7-1.17.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.16.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.17.jar.sha1 | 1 +
solr/licenses/tika-xmp-1.16.jar.sha1 | 1 -
solr/licenses/tika-xmp-1.17.jar.sha1 | 1 +
solr/licenses/xmpcore-5.1.2.jar.sha1 | 1 -
solr/licenses/xmpcore-5.1.3.jar.sha1 | 1 +
.../solr-ref-guide/src/filter-descriptions.adoc | 32 +
solr/solr-ref-guide/src/language-analysis.adoc | 208 +
.../src/solrcloud-autoscaling-triggers.adoc | 32 +-
.../src/statistical-programming.adoc | 6 +-
.../src/stream-evaluator-reference.adoc | 689 +++-
solr/solr-ref-guide/src/tokenizers.adoc | 4 +
.../src/update-request-processors.adoc | 6 +
.../cloud/autoscaling/AutoScalingConfig.java | 9 +
.../autoscaling/DelegatingCloudManager.java | 17 +
.../DelegatingDistribStateManager.java | 17 +-
.../DelegatingNodeStateProvider.java | 11 +
.../cloud/autoscaling/DistribStateManager.java | 23 +-
.../cloud/autoscaling/NodeStateProvider.java | 4 +-
.../client/solrj/cloud/autoscaling/Policy.java | 21 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 35 +-
.../solrj/cloud/autoscaling/ReplicaInfo.java | 33 +-
.../cloud/autoscaling/SolrCloudManager.java | 10 +-
.../solrj/cloud/autoscaling/Suggestion.java | 2 +-
.../cloud/autoscaling/TriggerEventType.java | 3 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 5 +-
.../client/solrj/impl/ClusterStateProvider.java | 4 +-
.../solrj/impl/HttpClusterStateProvider.java | 21 +-
.../solrj/impl/SolrClientCloudManager.java | 6 +
.../solrj/impl/SolrClientNodeStateProvider.java | 6 +
.../solrj/impl/ZkDistribStateManager.java | 32 +-
.../client/solrj/io/eval/DensityEvaluator.java | 55 +
.../solrj/io/eval/IntegrateEvaluator.java | 70 +
...MultiVariateNormalDistributionEvaluator.java | 54 +
.../solrj/io/eval/PairedTTestEvaluator.java | 75 +
.../client/solrj/io/eval/SampleEvaluator.java | 27 +-
.../client/solrj/io/eval/TTestEvaluator.java | 95 +
.../org/apache/solr/common/SolrException.java | 8 +-
.../apache/solr/common/cloud/ClusterState.java | 10 +
.../org/apache/solr/common/cloud/Replica.java | 11 +
.../apache/solr/common/cloud/ZkStateReader.java | 19 +-
.../solr/common/params/AutoScalingParams.java | 4 +
.../org/apache/solr/common/util/TimeSource.java | 161 +
.../java/org/apache/solr/common/util/Utils.java | 23 +-
.../solrj/MergeIndexesExampleTestBase.java | 21 +-
.../solr/client/solrj/SolrExampleTestBase.java | 64 -
.../solr/client/solrj/SolrExampleTestsBase.java | 3 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 3 +-
.../solrj/cloud/autoscaling/TestPolicy.java | 12 +
.../solrj/io/stream/StreamExpressionTest.java | 120 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 31 +-
.../cloud/AbstractFullDistribZkTestBase.java | 7 +-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 3 +-
.../org/apache/solr/cloud/ZkTestServer.java | 3 +-
.../processor/UpdateProcessorTestBase.java | 168 +
.../apache/solr/util/AbstractSolrTestCase.java | 135 -
389 files changed, 22555 insertions(+), 3340 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23524499/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
index 60ad61a,2171c60..543f1e2
--- a/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
@@@ -375,19 -394,12 +394,19 @@@ public class CreateCollectionCmd implem
}
}
- public static void createCollectionZkNode(SolrZkClient zkClient, String collection, Map<String,String> params) {
+ public static void createCollectionZkNode(DistribStateManager stateManager, String collection, Map<String,String> params) {
log.debug("Check for collection zkNode:" + collection);
String collectionPath = ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection;
-
+ String termsPath = ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection + "/terms";
+ try {
+ if (zkClient.exists(termsPath, true)) {
+ zkClient.clean(termsPath);
+ }
+ } catch (KeeperException | InterruptedException e) {
+ throw new SolrException(ErrorCode.SERVER_ERROR, "Error deleting old term nodes for collection from Zookeeper", e);
+ }
try {
- if (!zkClient.exists(collectionPath, true)) {
+ if (!stateManager.hasData(collectionPath)) {
log.debug("Creating collection in ZooKeeper:" + collection);
try {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23524499/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23524499/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23524499/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23524499/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23524499/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
----------------------------------------------------------------------