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 2018/08/21 01:31:17 UTC

[50/50] [abbrv] lucene-solr:jira/http2: Merge branch 'master' into jira/http1

Merge branch 'master' into jira/http1


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

Branch: refs/heads/jira/http2
Commit: 49d9b4988bada543c83e85340f2ed9f834ef62e7
Parents: af9b7a8 5eab1c3
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Aug 21 08:30:06 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Tue Aug 21 08:30:06 2018 +0700

----------------------------------------------------------------------
 dev-tools/idea/solr/core/src/java/solr-core.iml |   1 +
 lucene/CHANGES.txt                              |  13 +
 .../ko/KoreanPartOfSpeechStopFilterFactory.java |  17 +-
 .../ko/KoreanReadingFormFilterFactory.java      |   8 +
 .../analysis/ko/KoreanTokenizerFactory.java     |  22 +
 lucene/common-build.xml                         |   2 +-
 .../search/BlockMaxConjunctionScorer.java       |   1 +
 .../apache/lucene/search/ConjunctionScorer.java |   2 -
 .../lucene/search/MaxScoreSumPropagator.java    | 102 ++-
 .../apache/lucene/search/ReqOptSumScorer.java   |   8 +
 .../org/apache/lucene/search/WANDScorer.java    |   1 +
 .../search/TestMaxScoreSumPropagator.java       | 200 ++++++
 .../uhighlight/DefaultPassageFormatter.java     |  25 +-
 .../lucene/search/uhighlight/OffsetsEnum.java   |   4 +
 .../search/vectorhighlight/FieldTermStack.java  |  11 +-
 lucene/ivy-versions.properties                  |   2 +-
 .../licenses/commons-compress-1.16.1.jar.sha1   |   1 -
 lucene/licenses/commons-compress-1.18.jar.sha1  |   1 +
 .../spatial3d/geom/GeoLongitudeSlice.java       |  17 +-
 .../spatial3d/geom/GeoNorthRectangle.java       |  18 +-
 .../spatial3d/geom/GeoPolygonFactory.java       |  33 +-
 .../lucene/spatial3d/geom/GeoRectangle.java     |  12 +-
 .../spatial3d/geom/GeoSouthRectangle.java       |  16 +-
 .../lucene/spatial3d/geom/SidedPlane.java       |  16 +
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |   2 +-
 .../lucene/spatial3d/geom/XYZSolidTest.java     |  19 +
 solr/CHANGES.txt                                |  54 +-
 solr/common-build.xml                           |   6 +-
 .../org/apache/solr/cloud/ActionThrottle.java   |   2 +-
 .../java/org/apache/solr/cloud/Overseer.java    |   5 +
 .../solr/cloud/OverseerTaskProcessor.java       |   5 +
 .../org/apache/solr/cloud/RecoveryStrategy.java |   8 +-
 .../solr/cloud/api/collections/Assign.java      |   6 +-
 .../solr/cloud/api/collections/BackupCmd.java   |   2 +-
 .../api/collections/CreateCollectionCmd.java    |   9 +
 .../cloud/autoscaling/IndexSizeTrigger.java     |   3 +
 .../cloud/autoscaling/ScheduledTriggers.java    |   7 +-
 .../cloud/autoscaling/SearchRateTrigger.java    | 173 +++--
 .../autoscaling/TriggerActionException.java     |  33 +
 .../apache/solr/handler/admin/BackupCoreOp.java |   4 +-
 .../handler/component/TermVectorComponent.java  |  41 +-
 .../org/apache/solr/response/DocsStreamer.java  |  26 +-
 .../solr/response/RetrieveFieldsOptimizer.java  | 130 ----
 .../apache/solr/search/HashQParserPlugin.java   |  23 +-
 .../apache/solr/search/SolrDocumentFetcher.java | 198 +++++-
 .../apache/solr/search/SolrReturnFields.java    |  31 +
 .../org/apache/solr/update/CommitTracker.java   |  13 +-
 .../ParseDateFieldUpdateProcessorFactory.java   |  20 +-
 ...lrconfig-parsing-update-processor-chains.xml |  15 +
 .../configsets/_default/conf/managed-schema     |  34 +
 .../org/apache/solr/TestDistributedSearch.java  |   2 -
 .../apache/solr/cloud/ActionThrottleTest.java   |   2 +-
 .../solr/cloud/BasicDistributedZkTest.java      |   5 +-
 .../org/apache/solr/cloud/CloudTestUtils.java   |  29 +-
 .../apache/solr/cloud/DeleteReplicaTest.java    |   1 +
 .../org/apache/solr/cloud/DeleteShardTest.java  |   1 +
 .../solr/cloud/LIRRollingUpdatesTest.java       |   3 +
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |  11 +-
 .../solr/cloud/LegacyCloudClusterPropTest.java  |   1 +
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |   3 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java  |   3 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java |   1 +
 .../solr/cloud/SaslZkACLProviderTest.java       |   2 +-
 .../TestLeaderInitiatedRecoveryThread.java      |   2 +-
 .../cloud/TestPullReplicaErrorHandling.java     |   2 +-
 .../org/apache/solr/cloud/TestTlogReplica.java  |   1 +
 .../apache/solr/cloud/TestWithCollection.java   |   9 +-
 .../CollectionsAPIAsyncDistributedZkTest.java   |   2 +-
 .../CollectionsAPIDistributedZkTest.java        |   1 +
 .../api/collections/CustomCollectionTest.java   |   1 +
 .../cloud/api/collections/ShardSplitTest.java   | 375 ++++------
 .../TestCollectionsAPIViaSolrCloudCluster.java  |   2 +-
 .../collections/TestHdfsCloudBackupRestore.java |   9 +-
 .../TestLocalFSCloudBackupRestore.java          |  13 +-
 .../autoscaling/AutoScalingHandlerTest.java     |   1 +
 .../cloud/autoscaling/IndexSizeTriggerTest.java |  46 +-
 .../ScheduledMaintenanceTriggerTest.java        |   2 +-
 .../SearchRateTriggerIntegrationTest.java       |  43 +-
 .../autoscaling/SearchRateTriggerTest.java      |  11 +-
 .../solr/cloud/autoscaling/TestPolicyCloud.java |  22 +
 .../autoscaling/TriggerIntegrationTest.java     |  40 +-
 .../sim/SimClusterStateProvider.java            | 158 +++--
 .../autoscaling/sim/SimNodeStateProvider.java   |  14 +-
 .../autoscaling/sim/TestComputePlanAction.java  |   7 +-
 .../autoscaling/sim/TestExecutePlanAction.java  |  10 +-
 .../sim/TestGenericDistributedQueue.java        |   5 +
 .../cloud/autoscaling/sim/TestLargeCluster.java |  89 ++-
 .../cloud/autoscaling/sim/TestPolicyCloud.java  |  10 +-
 .../autoscaling/sim/TestTriggerIntegration.java |  74 +-
 .../cloud/cdcr/CdcrOpsAndBoundariesTest.java    | 321 +++++++++
 .../cdcr/CdcrReplicationDistributedZkTest.java  | 681 -------------------
 .../apache/solr/cloud/cdcr/CdcrTestsUtil.java   | 132 +++-
 .../cloud/cdcr/CdcrWithNodesRestartsTest.java   | 343 ++++++++++
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java |   2 +
 .../apache/solr/core/TestDynamicLoading.java    |   2 +-
 .../solr/handler/TestReplicationHandler.java    |   3 +-
 .../TestSolrConfigHandlerConcurrent.java        |  38 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java  |   2 +-
 .../response/TestRetrieveFieldsOptimizer.java   | 642 ++++++++++++++++-
 .../solr/search/TestHashQParserPlugin.java      |  35 +-
 .../solr/security/BasicAuthIntegrationTest.java |   2 +-
 .../solr/update/MaxSizeAutoCommitTest.java      | 268 ++------
 .../ParsingFieldUpdateProcessorsTest.java       | 126 +++-
 .../processor/TestNamedUpdateProcessors.java    |   2 +-
 .../example-DIH/solr/db/conf/managed-schema     |  34 +
 .../example-DIH/solr/mail/conf/managed-schema   |  34 +
 .../example-DIH/solr/solr/conf/managed-schema   |  34 +
 solr/example/files/conf/managed-schema          |   9 +
 solr/licenses/commons-compress-1.16.1.jar.sha1  |   1 -
 solr/licenses/commons-compress-1.18.jar.sha1    |   1 +
 .../configsets/_default/conf/managed-schema     |  34 +
 .../conf/managed-schema                         |  34 +
 solr/solr-ref-guide/src/_layouts/page.html      |   2 +-
 solr/solr-ref-guide/src/cloud-screens.adoc      |  10 +-
 .../src/colocating-collections.adoc             |  26 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc      |   8 +-
 solr/solr-ref-guide/src/css/theme-solr.css      |  21 +-
 solr/solr-ref-guide/src/docvalues.adoc          |  20 +-
 solr/solr-ref-guide/src/dsp.adoc                |   8 +-
 solr/solr-ref-guide/src/index.adoc              |  19 +-
 solr/solr-ref-guide/src/json-facet-api.adoc     | 123 ++--
 .../src/making-and-restoring-backups.adoc       |   2 +
 solr/solr-ref-guide/src/math-expressions.adoc   |  30 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc  |   6 +-
 solr/solr-ref-guide/src/searching.adoc          |   2 -
 ...olrcloud-autoscaling-policy-preferences.adoc |  44 +-
 .../src/solrcloud-autoscaling-triggers.adoc     |  49 +-
 ...rcloud-query-routing-and-read-tolerance.adoc |  60 +-
 .../src/update-request-processors.adoc          |   2 +-
 .../cloud/autoscaling/AutoScalingConfig.java    |  40 +-
 .../client/solrj/cloud/autoscaling/Clause.java  |  20 +-
 .../solrj/cloud/autoscaling/CoresVariable.java  |   3 +-
 .../client/solrj/cloud/autoscaling/Policy.java  |  18 +-
 .../solrj/cloud/autoscaling/PolicyHelper.java   |  44 +-
 .../solrj/cloud/autoscaling/ReplicaInfo.java    |  28 +-
 .../cloud/autoscaling/ReplicaVariable.java      |  19 +-
 .../solr/client/solrj/impl/CloudSolrClient.java |   5 +-
 .../org/apache/solr/client/solrj/io/Lang.java   |   3 +
 .../client/solrj/io/eval/GaussFitEvaluator.java |  91 +++
 .../solr/client/solrj/io/eval/KnnEvaluator.java |   4 +
 .../solrj/io/eval/KnnRegressionEvaluator.java   |  65 +-
 .../client/solrj/io/eval/OutliersEvaluator.java | 138 ++++
 .../client/solrj/io/eval/PredictEvaluator.java  |   8 +-
 .../solr/client/solrj/io/stream/SolrStream.java |   6 +-
 .../solr/client/solrj/request/V2Request.java    |   2 +-
 .../solrj/request/schema/SchemaRequest.java     |   2 +-
 .../solr/common/ConditionalMapWriter.java       |   7 +
 .../java/org/apache/solr/common/MapWriter.java  |   6 +-
 .../java/org/apache/solr/common/util/Utils.java |  34 +-
 .../solrj/cloud/autoscaling/TestPolicy.java     |  29 +-
 .../solrj/impl/CloudSolrClientRetryTest.java    |  79 +++
 .../apache/solr/client/solrj/io/TestLang.java   |   3 +-
 .../solrj/io/stream/MathExpressionTest.java     | 131 +++-
 .../solrj/io/stream/StreamDecoratorTest.java    |  25 +
 .../client/solrj/io/stream/StreamingTest.java   |  57 ++
 .../cloud/TestCloudCollectionsListeners.java    |   2 +
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   9 +-
 .../apache/solr/cloud/SolrCloudTestCase.java    |  29 +
 solr/webapp/web/WEB-INF/web.xml                 | 101 +--
 solr/webapp/web/js/angular/controllers/cloud.js |   9 +-
 160 files changed, 4565 insertions(+), 2079 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/49d9b498/lucene/ivy-versions.properties
----------------------------------------------------------------------