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/09/17 09:44:31 UTC

[45/47] lucene-solr:jira/solr-12709: Merge branch 'master' into jira/solr-12709

Merge branch 'master' into jira/solr-12709


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

Branch: refs/heads/jira/solr-12709
Commit: c4eb2f05f0cd71050dcf1c355bf4db52431944f2
Parents: 4a9176b 3b62f23
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Sat Sep 8 10:47:09 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Sat Sep 8 10:47:09 2018 +0200

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |    7 +
 lucene/MIGRATE.txt                              |    5 +
 .../apache/lucene/collation/package-info.java   |   21 +-
 lucene/analysis/icu/src/java/overview.html      |   21 +-
 .../lucene/analysis/ko/dict/UserDictionary.java |    6 +-
 lucene/common-build.xml                         |    3 +-
 .../lucene/index/FilterDirectoryReader.java     |   14 +-
 .../SoftDeletesDirectoryReaderWrapper.java      |   14 +
 .../java/org/apache/lucene/index/Sorter.java    |   27 -
 .../lucene/search/Boolean2ScorerSupplier.java   |    4 +-
 .../org/apache/lucene/search/BooleanScorer.java |   14 +-
 .../org/apache/lucene/search/BooleanWeight.java |    2 +-
 .../apache/lucene/search/CachingCollector.java  |   16 +-
 .../org/apache/lucene/search/FakeScorer.java    |   62 -
 .../apache/lucene/search/MatchAllDocsQuery.java |    2 +-
 .../org/apache/lucene/search/ScoreAndDoc.java   |   35 +
 .../java/org/apache/lucene/search/Scorer.java   |    7 +-
 .../org/apache/lucene/search/SortRescorer.java  |   10 +-
 .../org/apache/lucene/search/TermQuery.java     |    2 +-
 .../lucene/store/ByteBuffersIndexInput.java     |    2 +-
 lucene/core/src/java/overview.html              |   23 +-
 .../src/test/org/apache/lucene/TestDemo.java    |   69 +-
 .../TestSoftDeletesDirectoryReaderWrapper.java  |   51 +
 .../lucene/search/MultiCollectorTest.java       |   20 +-
 .../search/TestBoolean2ScorerSupplier.java      |   80 +-
 .../org/apache/lucene/search/TestBooleanOr.java |    2 +-
 .../apache/lucene/search/TestBooleanScorer.java |    2 +-
 .../lucene/search/TestCachingCollector.java     |   23 +-
 .../lucene/search/TestConjunctionDISI.java      |   50 +-
 .../lucene/search/TestConstantScoreQuery.java   |    4 +-
 .../search/TestMaxScoreSumPropagator.java       |   34 +-
 .../lucene/search/TestMultiCollector.java       |   16 +-
 .../apache/lucene/search/TestQueryRescorer.java |    2 +-
 .../lucene/search/TestTopDocsCollector.java     |   22 +-
 .../lucene/search/TestTopFieldCollector.java    |    2 +-
 .../apache/lucene/expressions/FakeScorer.java   |   53 -
 .../lucene/facet/DrillSidewaysScorer.java       |   24 +-
 .../search/grouping/BlockGroupingCollector.java |   19 +-
 .../lucene/search/grouping/FakeScorer.java      |   52 -
 lucene/ivy-versions.properties                  |    2 +-
 .../apache/lucene/search/join/FakeScorer.java   |   52 -
 .../randomizedtesting-runner-2.6.0.jar.sha1     |    1 -
 .../randomizedtesting-runner-2.6.4.jar.sha1     |    1 +
 .../queries/function/FunctionRangeQuery.java    |    4 +-
 .../lucene/queries/function/FunctionValues.java |   15 +-
 .../lucene/queries/function/ValueSource.java    |   26 +-
 .../queries/function/ValueSourceScorer.java     |    8 +-
 .../docvalues/DocTermsIndexDocValues.java       |    5 +-
 .../function/docvalues/DoubleDocValues.java     |   11 +-
 .../function/docvalues/IntDocValues.java        |    5 +-
 .../function/docvalues/LongDocValues.java       |    5 +-
 .../function/valuesource/EnumFieldSource.java   |    5 +-
 .../document/TestLatLonPolygonShapeQueries.java |    2 +
 .../Geo3dShapeWGS84ModelRectRelationTest.java   |    2 +-
 solr/CHANGES.txt                                |   35 +-
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java |    3 +-
 solr/core/ivy.xml                               |    2 +-
 .../cloud/OverseerConfigSetMessageHandler.java  |   30 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |    8 +-
 .../cloud/api/collections/DeleteNodeCmd.java    |    4 -
 .../api/collections/MaintainRoutedAliasCmd.java |    7 +-
 .../cloud/api/collections/TimeRoutedAlias.java  |   19 +
 .../cloud/autoscaling/ComputePlanAction.java    |   38 +-
 .../solr/cloud/autoscaling/NodeLostTrigger.java |   31 +-
 .../src/java/org/apache/solr/core/SolrCore.java |    4 +-
 .../solr/handler/HaversineMetersEvaluator.java  |   59 +
 .../org/apache/solr/handler/IndexFetcher.java   |    2 +-
 .../solr/handler/SolrDefaultStreamFactory.java  |    1 +
 .../solr/handler/admin/ConfigSetsHandler.java   |   20 +-
 .../PhrasesIdentificationComponent.java         | 1129 ++++++++++++++++++
 .../solr/handler/component/QueryComponent.java  |   31 +-
 .../response/transform/ChildDocTransformer.java |   18 +-
 .../transform/ChildDocTransformerFactory.java   |   30 +-
 .../solr/response/transform/DocTransformer.java |   23 +
 .../transform/RawValueTransformerFactory.java   |   20 +-
 .../solr/search/CollapsingQParserPlugin.java    |   38 +-
 .../src/java/org/apache/solr/search/Filter.java |    2 +-
 .../apache/solr/search/FunctionRangeQuery.java  |   12 +-
 .../search/function/ValueSourceRangeFilter.java |    9 +-
 .../java/org/apache/solr/update/PeerSync.java   |    2 +-
 .../apache/solr/update/PeerSyncWithLeader.java  |    6 +-
 .../DistributedUpdateProcessorFactory.java      |    2 +-
 .../TimeRoutedAliasUpdateProcessor.java         |  355 ++++--
 solr/core/src/test-files/log4j2.xml             |   12 +-
 .../conf/schema-phrases-identification.xml      |   97 ++
 .../conf/solrconfig-phrases-identification.xml  |   53 +
 .../cloud/AssignBackwardCompatibilityTest.java  |    1 +
 .../org/apache/solr/cloud/DeleteShardTest.java  |    2 +-
 .../cloud/LeaderElectionIntegrationTest.java    |    3 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |    2 +
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |    3 +-
 .../apache/solr/cloud/OverseerRolesTest.java    |    1 +
 .../apache/solr/cloud/TestCloudConsistency.java |    1 +
 ...TestCloudPhrasesIdentificationComponent.java |  200 ++++
 .../apache/solr/cloud/TestCloudRecovery.java    |    2 +-
 .../solr/cloud/TestClusterProperties.java       |   25 +-
 .../apache/solr/cloud/TestConfigSetsAPI.java    |   14 +-
 .../TestStressCloudBlindAtomicUpdates.java      |    2 +-
 .../apache/solr/cloud/TestWithCollection.java   |    1 +
 .../CollectionsAPIAsyncDistributedZkTest.java   |    3 +-
 .../AutoAddReplicasPlanActionTest.java          |    2 +-
 .../autoscaling/ComputePlanActionTest.java      |   65 +-
 .../autoscaling/ExecutePlanActionTest.java      |    2 +-
 .../MetricTriggerIntegrationTest.java           |    3 +-
 .../autoscaling/SearchRateTriggerTest.java      |    3 +-
 .../sim/TestSimExecutePlanAction.java           |    2 +-
 .../sim/TestSimGenericDistributedQueue.java     |    6 +-
 .../autoscaling/sim/TestSimLargeCluster.java    |    2 +-
 .../sim/TestSimTriggerIntegration.java          |    8 +-
 .../solr/cloud/cdcr/CdcrBootstrapTest.java      |    4 +-
 .../apache/solr/cloud/hdfs/StressHdfsTest.java  |    1 +
 .../apache/solr/handler/RequestLoggingTest.java |   27 +-
 .../admin/ZookeeperStatusHandlerTest.java       |    1 +
 .../component/DistributedMLTComponentTest.java  |    3 +-
 .../PhrasesIdentificationComponentTest.java     |  796 ++++++++++++
 .../org/apache/solr/logging/TestLogWatcher.java |   79 +-
 .../solr/metrics/SolrMetricReporterTest.java    |    4 +-
 .../reporters/solr/SolrCloudReportersTest.java  |    2 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java  |    1 +
 .../transform/TestChildDocTransformer.java      |   51 +-
 .../solr/rest/TestManagedResourceStorage.java   |    3 +-
 .../solr/schema/SchemaApiFailureTest.java       |    2 +-
 .../apache/solr/search/TestRankQueryPlugin.java |   32 +-
 .../apache/solr/search/TestStressRecovery.java  |    3 +
 .../solr/search/stats/TestDistribIDF.java       |    3 +-
 .../hadoop/TestDelegationWithHadoopAuth.java    |    3 +-
 .../solr/servlet/HttpSolrCallGetCoreTest.java   |    3 +-
 .../solr/store/hdfs/HdfsDirectoryTest.java      |    7 +-
 .../TestDocTermOrdsUninvertLimit.java           |    2 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java  |    3 +-
 .../TimeRoutedAliasUpdateProcessorTest.java     |  237 +++-
 .../TrackingUpdateProcessorFactory.java         |  136 +--
 .../apache/solr/util/DateMathParserTest.java    |    4 +-
 solr/licenses/junit4-ant-2.6.0.jar.sha1         |    1 -
 solr/licenses/junit4-ant-2.6.4.jar.sha1         |    1 +
 .../randomizedtesting-runner-2.6.0.jar.sha1     |    1 -
 .../randomizedtesting-runner-2.6.4.jar.sha1     |    1 +
 solr/server/resources/log4j2-console.xml        |    8 +-
 solr/server/resources/log4j2.xml                |   30 +-
 .../src/basic-authentication-plugin.adoc        |    4 +-
 solr/solr-ref-guide/src/cloud-screens.adoc      |    2 +-
 solr/solr-ref-guide/src/collections-api.adoc    |   24 +-
 solr/solr-ref-guide/src/configsets-api.adoc     |    2 +-
 .../src/distributed-requests.adoc               |    4 +-
 solr/solr-ref-guide/src/docvalues.adoc          |   10 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc |    4 +-
 solr/solr-ref-guide/src/machine-learning.adoc   |  242 +++-
 .../src/solrcloud-autoscaling-triggers.adoc     |  354 +++---
 .../src/stream-decorator-reference.adoc         |   23 +-
 .../src/stream-source-reference.adoc            |   32 +-
 .../src/transforming-result-documents.adoc      |   60 +-
 ...store-data-with-the-data-import-handler.adoc |   25 +-
 .../org/apache/solr/client/solrj/io/Lang.java   |    1 +
 .../solrj/io/eval/KnnRegressionEvaluator.java   |    3 +
 .../solrj/io/eval/LatLonVectorsEvaluator.java   |  115 ++
 .../solrj/io/stream/TimeSeriesStream.java       |    2 +
 .../solrj/request/CollectionAdminRequest.java   |   10 +
 .../solrj/request/ConfigSetAdminRequest.java    |    5 +-
 .../solr/common/cloud/ClusterProperties.java    |   23 +-
 .../apispec/cluster.configs.Commands.json       |    2 +-
 .../resources/apispec/collections.Commands.json |    4 +
 .../solr/client/solrj/SolrExampleTests.java     |    4 +-
 .../solrj/embedded/LargeVolumeJettyTest.java    |    3 +-
 .../client/solrj/impl/CloudSolrClientTest.java  |    2 +-
 .../apache/solr/client/solrj/io/TestLang.java   |    2 +-
 .../solrj/io/graph/GraphExpressionTest.java     |    2 +-
 .../solrj/io/stream/MathExpressionTest.java     |   46 +
 .../solrj/io/stream/StreamExpressionTest.java   |   18 +-
 .../client/solrj/io/stream/StreamingTest.java   |    2 +
 .../request/TestConfigSetAdminRequest.java      |    2 -
 170 files changed, 4563 insertions(+), 1339 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c4eb2f05/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c4eb2f05/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimExecutePlanAction.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c4eb2f05/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java
----------------------------------------------------------------------