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/04/23 17:35:44 UTC
[40/40] lucene-solr:jira/solr-11833: Merge branch 'master' into
jira/solr-11833
Merge branch 'master' into jira/solr-11833
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/880ce3f9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/880ce3f9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/880ce3f9
Branch: refs/heads/jira/solr-11833
Commit: 880ce3f903e3d94ca0e078a99c6c0659cb067a8b
Parents: 14824ca 1409ab8
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Apr 23 19:34:54 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Apr 23 19:34:54 2018 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 9 +-
.../lucene/index/BufferedUpdatesStream.java | 134 +---
.../apache/lucene/index/DocumentsWriter.java | 224 +++---
.../index/DocumentsWriterFlushControl.java | 4 +-
.../lucene/index/DocumentsWriterFlushQueue.java | 5 +-
.../lucene/index/DocumentsWriterPerThread.java | 32 +-
.../apache/lucene/index/FilterMergePolicy.java | 4 +-
.../lucene/index/FrozenBufferedUpdates.java | 77 +-
.../org/apache/lucene/index/IndexWriter.java | 699 +++++++-----------
.../org/apache/lucene/index/MergePolicy.java | 2 +-
.../org/apache/lucene/index/NoMergePolicy.java | 4 +-
.../org/apache/lucene/index/PendingDeletes.java | 2 +-
.../apache/lucene/index/PendingSoftDeletes.java | 12 +-
.../org/apache/lucene/index/ReaderPool.java | 390 ++++++++++
.../apache/lucene/index/ReadersAndUpdates.java | 43 +-
.../index/SoftDeletesRetentionMergePolicy.java | 5 +-
.../lucene/index/StandardDirectoryReader.java | 6 +-
.../search/DisjunctionMatchesIterator.java | 10 +-
.../apache/lucene/search/MatchesIterator.java | 8 -
.../lucene/search/TermMatchesIterator.java | 9 +-
.../org/apache/lucene/search/TermQuery.java | 2 +-
.../apache/lucene/index/TestIndexWriter.java | 3 +-
.../lucene/index/TestIndexWriterDelete.java | 24 +
.../lucene/index/TestIndexWriterExceptions.java | 9 +-
.../lucene/index/TestIndexWriterOnDiskFull.java | 3 +-
.../org/apache/lucene/index/TestInfoStream.java | 8 +-
.../apache/lucene/index/TestMultiFields.java | 3 +-
.../apache/lucene/index/TestPendingDeletes.java | 4 +-
.../lucene/index/TestPendingSoftDeletes.java | 5 +-
.../org/apache/lucene/index/TestReaderPool.java | 223 ++++++
.../TestSoftDeletesDirectoryReaderWrapper.java | 32 -
.../TestSoftDeletesRetentionMergePolicy.java | 101 ++-
.../lucene/search/TestMatchesIterator.java | 73 +-
lucene/ivy-versions.properties | 2 +-
.../search/TestInetAddressRangeQueries.java | 2 +
.../spatial3d/geom/GeoComplexPolygon.java | 347 +++++----
.../spatial3d/geom/GeoPolygonFactory.java | 20 +-
.../lucene/spatial3d/geom/GeoPolygonTest.java | 81 ++-
.../apache/lucene/index/RandomIndexWriter.java | 8 +-
.../lucene/search/AssertingMatchesIterator.java | 7 -
solr/CHANGES.txt | 51 +-
solr/bin/solr | 4 +
solr/bin/solr.cmd | 3 +
solr/bin/solr.in.cmd | 12 +-
solr/bin/solr.in.sh | 16 +-
...ractNamedEntitiesUpdateProcessorFactory.java | 6 +
.../carrot2/CarrotClusteringEngine.java | 2 +-
...anguageIdentifierUpdateProcessorFactory.java | 8 +-
...OpenNLPLangDetectUpdateProcessorFactory.java | 8 +-
...anguageIdentifierUpdateProcessorFactory.java | 8 +-
.../solrj/embedded/EmbeddedSolrServer.java | 24 +-
.../org/apache/solr/cloud/ZkController.java | 136 +++-
.../cloud/api/collections/SetAliasPropCmd.java | 45 +-
.../apache/solr/core/HdfsDirectoryFactory.java | 13 +-
.../apache/solr/core/MMapDirectoryFactory.java | 2 +-
.../solr/core/NRTCachingDirectoryFactory.java | 2 +-
.../src/java/org/apache/solr/core/SolrCore.java | 24 +-
.../java/org/apache/solr/core/ZkContainer.java | 16 -
.../apache/solr/handler/CdcrRequestHandler.java | 8 +-
.../apache/solr/handler/RequestHandlerBase.java | 4 +-
.../solr/handler/UpdateRequestHandler.java | 2 +-
.../solr/handler/admin/CollectionsHandler.java | 183 +++--
.../solr/handler/admin/ConfigSetsHandler.java | 18 +-
.../handler/admin/MetricsCollectorHandler.java | 2 +-
.../component/QueryElevationComponent.java | 2 +-
.../solr/highlight/HighlightingPluginBase.java | 2 +-
.../solr/request/LocalSolrQueryRequest.java | 10 +-
.../solr/response/XSLTResponseWriter.java | 2 +-
.../org/apache/solr/schema/IndexSchema.java | 2 +-
.../solr/schema/ManagedIndexSchemaFactory.java | 2 +-
.../solr/spelling/DirectSolrSpellChecker.java | 2 +-
.../org/apache/solr/update/SolrIndexConfig.java | 4 +
.../org/apache/solr/update/TransactionLog.java | 3 +-
.../ClassificationUpdateProcessorFactory.java | 2 +-
...oreCommitOptimizeUpdateProcessorFactory.java | 2 +-
.../processor/LogUpdateProcessorFactory.java | 2 +-
.../processor/RegexpBoostProcessorFactory.java | 2 +-
.../SignatureUpdateProcessorFactory.java | 2 +-
.../processor/URLClassifyProcessorFactory.java | 2 +-
.../solrconfig-concurrentmergescheduler.xml | 37 +
.../org/apache/solr/BasicFunctionalityTest.java | 2 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 33 +-
.../solr/cloud/CreateRoutedAliasTest.java | 10 +-
.../apache/solr/cloud/DeleteReplicaTest.java | 83 ++-
.../org/apache/solr/cloud/ForceLeaderTest.java | 81 ---
.../org/apache/solr/cloud/MoveReplicaTest.java | 20 -
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 59 ++
.../cloud/autoscaling/NodeLostTriggerTest.java | 1 +
.../autoscaling/sim/TestTriggerIntegration.java | 1 +
.../solr/handler/TestReplicationHandler.java | 36 +-
.../solr/handler/admin/TestCollectionAPIs.java | 23 +
.../request/TestUnInvertedFieldException.java | 8 +-
.../apache/solr/update/SolrIndexConfigTest.java | 24 +
.../apache/solr/update/TransactionLogTest.java | 47 ++
.../TimeRoutedAliasUpdateProcessorTest.java | 31 +-
solr/licenses/commons-fileupload-1.3.2.jar.sha1 | 1 -
solr/licenses/commons-fileupload-1.3.3.jar.sha1 | 1 +
solr/solr-ref-guide/src/about-this-guide.adoc | 2 +
solr/solr-ref-guide/src/blob-store-api.adoc | 96 ++-
solr/solr-ref-guide/src/config-api.adoc | 720 ++++++++++++++-----
solr/solr-ref-guide/src/config-sets.adoc | 36 +-
solr/solr-ref-guide/src/configsets-api.adoc | 244 ++++---
.../src/configuring-solrconfig-xml.adoc | 42 +-
solr/solr-ref-guide/src/css/customstyles.css | 2 +-
solr/solr-ref-guide/src/enabling-ssl.adoc | 21 +-
.../src/implicit-requesthandlers.adoc | 374 ++++++++--
solr/solr-ref-guide/src/learning-to-rank.adoc | 2 +
.../src/requestdispatcher-in-solrconfig.adoc | 2 +-
solr/solr-ref-guide/src/schema-api.adoc | 2 +-
...tting-up-an-external-zookeeper-ensemble.adoc | 403 ++++++++---
.../src/update-request-processors.adoc | 2 +-
.../client/solrj/cloud/autoscaling/Clause.java | 21 +-
.../autoscaling/DelegatingCloudManager.java | 2 +-
.../client/solrj/cloud/autoscaling/Operand.java | 2 +-
.../client/solrj/cloud/autoscaling/Policy.java | 38 +-
.../solrj/cloud/autoscaling/ReplicaCount.java | 6 +
.../solrj/cloud/autoscaling/Suggestion.java | 4 +-
.../solrj/cloud/autoscaling/Violation.java | 2 +-
.../solr/client/solrj/impl/HttpClientUtil.java | 59 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 4 +-
.../org/apache/solr/client/solrj/io/Lang.java | 1 +
.../client/solrj/io/eval/MemsetEvaluator.java | 167 +++++
.../solrj/io/graph/GatherNodesStream.java | 20 +-
.../client/solrj/io/stream/FacetStream.java | 6 +-
.../solr/client/solrj/io/stream/LetStream.java | 11 +-
.../solr/client/solrj/io/stream/SqlStream.java | 3 +-
.../solrj/io/stream/TimeSeriesStream.java | 4 +-
.../request/JavaBinUpdateRequestCodec.java | 6 +-
.../java/org/apache/solr/common/MapWriter.java | 9 +-
.../common/cloud/CloudCollectionsListener.java | 40 ++
.../apache/solr/common/cloud/ZkStateReader.java | 82 ++-
.../apache/solr/common/params/SolrParams.java | 22 +-
.../org/apache/solr/common/util/NamedList.java | 30 +
.../apispec/cluster.configs.Commands.json | 12 +-
.../apispec/cluster.configs.delete.json | 2 +-
.../src/resources/apispec/cluster.configs.json | 2 +-
.../solrj/cloud/autoscaling/TestPolicy.java | 22 +-
.../client/solrj/impl/HttpClientUtilTest.java | 108 +++
.../apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/stream/MathExpressionTest.java | 106 +++
.../cloud/TestCloudCollectionsListeners.java | 307 ++++++++
.../solr/common/params/SolrParamTest.java | 38 +-
.../org/apache/solr/util/SSLTestConfig.java | 89 ++-
...estConfig.hostname-and-ip-missmatch.keystore | Bin 0 -> 2246 bytes
.../resources/SSLTestConfig.testing.keystore | Bin 2208 -> 2207 bytes
.../src/resources/create-keystores.sh | 37 +
solr/webapp/web/css/angular/collections.css | 4 -
solr/webapp/web/css/angular/cores.css | 8 -
solr/webapp/web/partials/cores.html | 2 -
149 files changed, 4890 insertions(+), 2108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/880ce3f9/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/880ce3f9/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
index 048050a,cbdb2a7..05c9c20
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
@@@ -465,13 -467,11 +467,13 @@@ public class Policy implements MapWrite
private static final Map<CollectionAction, Supplier<Suggester>> ops = new HashMap<>();
static {
- ops.put(CollectionAction.ADDREPLICA, () -> new AddReplicaSuggester());
- ops.put(CollectionAction.DELETEREPLICA, () -> new DeleteReplicaSuggester());
- ops.put(CollectionAction.DELETENODE, () -> new DeleteNodeSuggester());
- ops.put(CollectionAction.MOVEREPLICA, () -> new MoveReplicaSuggester());
- ops.put(CollectionAction.SPLITSHARD, () -> new SplitShardSuggester());
+ ops.put(CollectionAction.ADDREPLICA, AddReplicaSuggester::new);
- ops.put(CollectionAction.DELETEREPLICA, () -> new UnsupportedSuggester(CollectionAction.DELETEREPLICA));
++ ops.put(CollectionAction.DELETEREPLICA, DeleteReplicaSuggester::new);
++ ops.put(CollectionAction.DELETENODE, DeleteNodeSuggester::new);
+ ops.put(CollectionAction.MOVEREPLICA, MoveReplicaSuggester::new);
+ ops.put(CollectionAction.SPLITSHARD, SplitShardSuggester::new);
ops.put(CollectionAction.MERGESHARDS, () -> new UnsupportedSuggester(CollectionAction.MERGESHARDS));
+ ops.put(CollectionAction.NONE, () -> new UnsupportedSuggester(CollectionAction.NONE));
}
public Map<String, List<Clause>> getPolicies() {