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/06 04:16:21 UTC

[48/48] lucene-solr:jira/http2: Merge branch 'master' into jira/http2

Merge branch 'master' into jira/http2


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

Branch: refs/heads/jira/http2
Commit: d6d6fbdbeecaf6109f59d5309fea2dd8e24d83c7
Parents: 8b20877 3b15be3
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Aug 6 11:13:13 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Aug 6 11:13:13 2018 +0700

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  14 +
 lucene/MIGRATE.txt                              |   8 +-
 .../src/java/org/apache/lucene/geo/Polygon.java |  30 +
 .../java/org/apache/lucene/geo/Polygon2D.java   | 147 +++-
 .../org/apache/lucene/index/CheckIndex.java     |  39 -
 .../lucene/index/DefaultIndexingChain.java      |  49 ++
 .../index/SortingStoredFieldsConsumer.java      |   6 +-
 .../index/SortingTermVectorsConsumer.java       |   6 +-
 .../org/apache/lucene/search/IndexSearcher.java |  23 +-
 .../apache/lucene/search/ReqOptSumScorer.java   |   4 +-
 .../org/apache/lucene/search/TermQuery.java     |   2 +-
 .../org/apache/lucene/geo/TestPolygon2D.java    |  43 ++
 .../apache/lucene/index/TestIndexSorting.java   |  40 +
 .../lucene/index/TestIndexWriterReader.java     |  15 +-
 .../lucene/index/TestTieredMergePolicy.java     |   2 +-
 .../index/TestUpgradeIndexMergePolicy.java      |   8 +-
 .../org/apache/lucene/search/TestBoolean2.java  |   5 +-
 .../apache/lucene/search/TestBooleanScorer.java |   2 +-
 .../apache/lucene/search/TestLRUQueryCache.java |   8 +-
 .../apache/lucene/search/TestNeedsScores.java   |   2 +-
 .../lucene/search/TestShardSearching.java       |   2 +-
 .../apache/lucene/search/TestTopDocsMerge.java  |   2 +-
 lucene/ivy-versions.properties                  |   1 -
 .../search/join/ToChildBlockJoinQuery.java      |   2 +-
 .../search/join/ToParentBlockJoinQuery.java     |   8 +-
 .../org/apache/lucene/document/LatLonShape.java |  71 +-
 .../document/LatLonShapeBoundingBoxQuery.java   |   4 +-
 .../document/LatLonShapePolygonQuery.java       | 341 +++++++++
 .../src/java/org/apache/lucene/geo/Line.java    | 139 ++++
 .../document/BaseLatLonShapeTestCase.java       | 473 ++++++++++++
 .../document/TestLatLonLineShapeQueries.java    |  94 +++
 .../document/TestLatLonPointShapeQueries.java   |  70 ++
 .../document/TestLatLonPolygonShapeQueries.java |  82 ++
 .../apache/lucene/document/TestLatLonShape.java |  31 +-
 .../lucene/document/TestLatLonShapeQueries.java | 276 -------
 .../org/apache/lucene/util/LuceneTestCase.java  |  54 +-
 .../java/org/apache/lucene/util/TestUtil.java   |  18 +-
 .../src/groovy/check-source-patterns.groovy     |   3 +
 solr/CHANGES.txt                                |  34 +
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java |   2 +
 solr/contrib/velocity/ivy.xml                   |   1 -
 .../cloud/api/collections/AddReplicaCmd.java    |   2 +-
 .../cloud/api/collections/SplitShardCmd.java    | 154 ++--
 .../solr/cloud/overseer/ReplicaMutator.java     |  47 +-
 .../org/apache/solr/core/ConfigSetService.java  |   8 +-
 .../org/apache/solr/core/CoreContainer.java     |   4 +-
 .../apache/solr/core/CorePropertiesLocator.java |  22 +-
 .../org/apache/solr/handler/GraphHandler.java   |   4 +-
 .../org/apache/solr/handler/SQLHandler.java     |   4 +-
 .../solr/handler/SolrDefaultStreamFactory.java  |  53 ++
 .../org/apache/solr/handler/StreamHandler.java  |  15 +-
 .../solr/handler/admin/AdminHandlersProxy.java  | 128 ++++
 .../solr/handler/admin/CollectionsHandler.java  |   6 +-
 .../solr/handler/admin/MetricsHandler.java      |  13 +-
 .../handler/admin/MetricsHistoryHandler.java    |  11 +-
 .../org/apache/solr/handler/admin/SplitOp.java  |  24 +-
 .../solr/handler/admin/SystemInfoHandler.java   |  11 +-
 .../apache/solr/handler/sql/SolrEnumerator.java |   4 +-
 .../apache/solr/metrics/SolrMetricManager.java  |  14 +
 .../metrics/reporters/SolrSlf4jReporter.java    |  63 +-
 .../reporters/solr/SolrClusterReporter.java     |  11 +-
 .../solr/metrics/rrd/SolrRrdBackendFactory.java |   9 +-
 .../java/org/apache/solr/search/Grouping.java   |   8 +-
 .../apache/solr/search/HashQParserPlugin.java   |   4 +-
 .../solr/search/grouping/CommandHandler.java    |   4 +-
 .../solr/store/hdfs/HdfsLocalityReporter.java   |   8 +-
 .../solr/update/DirectUpdateHandler2.java       |   5 +-
 .../apache/solr/update/SolrIndexSplitter.java   | 469 +++++++++++-
 .../apache/solr/update/SplitIndexCommand.java   |  22 +-
 .../java/org/apache/solr/update/UpdateLog.java  |   6 +
 .../processor/DistributedUpdateProcessor.java   |  12 +-
 .../src/test-files/solr/solr-slf4jreporter.xml  |   7 +
 .../org/apache/solr/TestDistributedSearch.java  |   1 +
 .../org/apache/solr/cloud/AddReplicaTest.java   |   2 +-
 .../cloud/ChaosMonkeyNothingIsSafeTest.java     |   2 +
 .../solr/cloud/ChaosMonkeyShardSplitTest.java   |  11 +-
 .../apache/solr/cloud/DeleteReplicaTest.java    |   2 +-
 .../solr/cloud/DocValuesNotIndexedTest.java     |   2 +
 .../cloud/FullSolrCloudDistribCmdsTest.java     |   2 +
 .../cloud/LeaderElectionIntegrationTest.java    |   2 +
 .../solr/cloud/LeaderTragicEventTest.java       |  10 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |   2 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java  |   2 +
 .../apache/solr/cloud/OverseerRolesTest.java    |   2 +-
 .../solr/cloud/PeerSyncReplicationTest.java     |   2 +-
 .../org/apache/solr/cloud/RecoveryZkTest.java   |   2 +-
 .../apache/solr/cloud/RollingRestartTest.java   |   3 +-
 .../apache/solr/cloud/TestCloudConsistency.java |   3 +-
 .../apache/solr/cloud/TestCloudPivotFacet.java  |   2 +-
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java |   4 +-
 .../AbstractCloudBackupRestoreTestCase.java     |  18 +-
 .../CollectionsAPIAsyncDistributedZkTest.java   |   3 +-
 .../cloud/api/collections/ShardSplitTest.java   | 157 ++--
 .../collections/TestHdfsCloudBackupRestore.java |   2 +
 .../TestLocalFSCloudBackupRestore.java          |   2 +
 .../AutoAddReplicasIntegrationTest.java         |   2 +
 .../autoscaling/AutoScalingHandlerTest.java     |   2 +-
 .../autoscaling/ComputePlanActionTest.java      |   3 +
 .../MetricTriggerIntegrationTest.java           |   2 +
 .../ScheduledTriggerIntegrationTest.java        |   2 +
 .../solr/cloud/autoscaling/TestPolicyCloud.java |   6 +-
 .../sim/SimClusterStateProvider.java            |  41 +-
 .../sim/TestGenericDistributedQueue.java        |   1 +
 .../cloud/autoscaling/sim/TestLargeCluster.java |   2 +-
 .../cloud/autoscaling/sim/TestPolicyCloud.java  |   4 +-
 .../solr/cloud/cdcr/CdcrBootstrapTest.java      |   2 +
 .../hdfs/HdfsChaosMonkeySafeLeaderTest.java     |   2 +
 .../org/apache/solr/handler/TestSQLHandler.java |   2 +
 .../handler/admin/AdminHandlersProxyTest.java   | 119 +++
 .../solr/handler/admin/MetricsHandlerTest.java  |   8 +-
 .../admin/MetricsHistoryHandlerTest.java        |   4 +-
 .../component/DistributedMLTComponentTest.java  |   2 +
 .../handler/component/InfixSuggestersTest.java  |  33 +-
 .../reporters/SolrJmxReporterCloudTest.java     |   2 +
 .../reporters/SolrSlf4jReporterTest.java        |   5 +-
 .../reporters/solr/SolrCloudReportersTest.java  |   3 +
 .../solr/search/TestHashQParserPlugin.java      |  30 +-
 .../solr/search/stats/TestDistribIDF.java       |   2 +
 .../hadoop/TestDelegationWithHadoopAuth.java    |   2 +
 .../solr/servlet/HttpSolrCallGetCoreTest.java   |   2 +
 .../solr/update/MaxSizeAutoCommitTest.java      |   7 +-
 .../solr/update/SolrIndexSplitterTest.java      | 122 ++-
 .../solr/update/TestInPlaceUpdatesDistrib.java  |   2 +
 solr/licenses/commons-beanutils-1.8.3.jar.sha1  |   1 -
 solr/licenses/commons-beanutils-LICENSE-ASL.txt | 202 -----
 solr/licenses/commons-beanutils-NOTICE.txt      |   2 -
 solr/solr-ref-guide/src/cloud-screens.adoc      |  25 +-
 solr/solr-ref-guide/src/collections-api.adoc    |  28 +-
 .../solr-ref-guide/src/filter-descriptions.adoc |  50 +-
 .../src/images/cloud-screens/cloud-nodes.png    | Bin 0 -> 185805 bytes
 solr/solr-ref-guide/src/metrics-reporting.adoc  |  83 ++-
 .../src/running-solr-on-hdfs.adoc               |   2 +-
 ...olrcloud-autoscaling-policy-preferences.adoc |   7 +-
 .../client/solrj/cloud/autoscaling/Cell.java    |   5 +-
 .../client/solrj/cloud/autoscaling/Clause.java  | 235 +-----
 .../solrj/cloud/autoscaling/ComputedType.java   |  99 +++
 .../solrj/cloud/autoscaling/Condition.java      | 122 +++
 .../solrj/cloud/autoscaling/CoresVariable.java  | 115 +++
 .../cloud/autoscaling/FreeDiskVariable.java     | 135 ++++
 .../solrj/cloud/autoscaling/NodeVariable.java   |  45 ++
 .../client/solrj/cloud/autoscaling/Operand.java |  16 +-
 .../client/solrj/cloud/autoscaling/Policy.java  |  31 +-
 .../solrj/cloud/autoscaling/PolicyHelper.java   |  11 +-
 .../solrj/cloud/autoscaling/RangeVal.java       |  54 ++
 .../cloud/autoscaling/ReplicaVariable.java      | 135 ++++
 .../client/solrj/cloud/autoscaling/Row.java     |   4 +-
 .../solrj/cloud/autoscaling/SealedClause.java   |   2 +-
 .../solrj/cloud/autoscaling/Suggester.java      |   2 +-
 .../solrj/cloud/autoscaling/Suggestion.java     | 740 +------------------
 .../client/solrj/cloud/autoscaling/VarType.java |  43 --
 .../solrj/cloud/autoscaling/Variable.java       | 366 +++++++++
 .../solrj/cloud/autoscaling/VariableBase.java   | 205 +++++
 .../solrj/cloud/autoscaling/Violation.java      |  49 ++
 .../autoscaling/WithCollectionVarType.java      | 160 ----
 .../autoscaling/WithCollectionVariable.java     | 165 +++++
 .../solrj/impl/SolrClientNodeStateProvider.java |  13 +-
 .../solrj/io/stream/SignificantTermsStream.java |  16 +-
 .../solrj/request/CollectionAdminRequest.java   |  11 +
 .../solr/common/params/CommonAdminParams.java   |   2 +
 .../apache/solr/common/params/CommonParams.java |   2 +
 .../solr/common/params/CoreAdminParams.java     |   2 +-
 .../resources/apispec/collections.Commands.json |   3 +-
 .../collections.collection.Commands.modify.json |   4 +-
 .../solrj/cloud/autoscaling/TestPolicy.java     | 125 +++-
 .../solrj/cloud/autoscaling/TestPolicy2.java    |  76 +-
 .../solrj/embedded/LargeVolumeJettyTest.java    |   2 +
 .../client/solrj/impl/CloudSolrClientTest.java  |   5 +-
 .../solrj/io/graph/GraphExpressionTest.java     |   1 +
 .../solr/client/solrj/io/graph/GraphTest.java   |   1 +
 .../solrj/io/stream/MathExpressionTest.java     |   4 +-
 .../solrj/io/stream/StreamDecoratorTest.java    |  11 +
 .../solrj/io/stream/StreamExpressionTest.java   |   1 +
 solr/webapp/web/css/angular/cloud.css           | 193 +++++
 solr/webapp/web/css/angular/menu.css            |   2 +-
 solr/webapp/web/index.html                      |   4 +-
 solr/webapp/web/js/angular/controllers/cloud.js | 486 +++++++++++-
 solr/webapp/web/js/angular/services.js          |   7 +-
 solr/webapp/web/partials/cloud.html             | 132 ++++
 178 files changed, 5936 insertions(+), 2271 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d6d6fbdb/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------