You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2016/04/09 02:35:42 UTC
[2/2] lucene-solr:branch_6x: Merge branch 'branch_6x' of
https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1e695d83
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1e695d83
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1e695d83
Branch: refs/heads/branch_6x
Commit: 1e695d835e50085aad7514d87c783cce09c11e5f
Parents: a8f9073 f479f16
Author: Karl Wright <Da...@gmail.com>
Authored: Fri Apr 8 20:35:29 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Fri Apr 8 20:35:29 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +
.../handler/dataimport/SolrEntityProcessor.java | 10 +-
.../dataimport/TestContentStreamDataSource.java | 4 +-
.../TestSolrEntityProcessorEndToEnd.java | 2 +-
.../src/java/org/apache/solr/hadoop/GoLive.java | 6 +-
.../solr/hadoop/MorphlineGoLiveMiniMRTest.java | 4 +-
.../solr/SafeConcurrentUpdateSolrClient.java | 2 +-
.../solr/morphlines/solr/SolrLocator.java | 5 +-
.../solr/AbstractSolrMorphlineTestBase.java | 34 +--
.../cloud/LeaderInitiatedRecoveryThread.java | 2 +-
.../OverseerAutoReplicaFailoverThread.java | 32 ++-
.../cloud/OverseerCollectionMessageHandler.java | 2 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 5 +-
.../org/apache/solr/cloud/SyncStrategy.java | 2 +-
.../org/apache/solr/cloud/ZkController.java | 3 +-
.../apache/solr/cloud/rule/SnitchContext.java | 3 +-
.../solr/handler/CdcrReplicatorManager.java | 18 +-
.../apache/solr/handler/CdcrRequestHandler.java | 2 +-
.../solr/handler/CdcrUpdateLogSynchronizer.java | 2 +-
.../org/apache/solr/handler/IndexFetcher.java | 12 +-
.../apache/solr/handler/SolrConfigHandler.java | 3 +-
.../solr/handler/admin/CollectionsHandler.java | 3 +-
.../handler/component/HttpShardHandler.java | 5 +-
.../component/HttpShardHandlerFactory.java | 6 +-
.../component/IterativeMergeStrategy.java | 7 +-
.../apache/solr/schema/ManagedIndexSchema.java | 2 +-
.../apache/solr/update/SolrCmdDistributor.java | 3 +-
.../solr/update/StreamingSolrClients.java | 66 +++---
.../src/java/org/apache/solr/util/SolrCLI.java | 21 +-
.../org/apache/solr/TestTolerantSearch.java | 6 +-
.../solr/client/solrj/ConnectionReuseTest.java | 6 +-
.../solrj/embedded/TestJettySolrRunner.java | 3 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 28 ++-
.../solr/cloud/AsyncMigrateRouteKeyTest.java | 6 +-
.../solr/cloud/BaseCdcrDistributedZkTest.java | 5 +-
.../solr/cloud/BasicDistributedZk2Test.java | 6 +-
.../solr/cloud/BasicDistributedZkTest.java | 15 +-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 49 ++--
.../apache/solr/cloud/CollectionReloadTest.java | 2 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 12 +-
.../solr/cloud/CollectionsAPISolrJTest.java | 2 +-
...ConcurrentDeleteAndCreateCollectionTest.java | 6 +-
.../apache/solr/cloud/CustomCollectionTest.java | 12 +-
.../solr/cloud/DeleteInactiveReplicaTest.java | 2 +-
.../apache/solr/cloud/DeleteReplicaTest.java | 4 +-
.../org/apache/solr/cloud/DeleteShardTest.java | 6 +-
.../solr/cloud/DistributedVersionInfoTest.java | 8 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 2 +-
.../cloud/FullSolrCloudDistribCmdsTest.java | 2 +-
.../apache/solr/cloud/HttpPartitionTest.java | 2 +-
.../LeaderInitiatedRecoveryOnCommitTest.java | 2 +-
...aderInitiatedRecoveryOnShardRestartTest.java | 2 +-
.../apache/solr/cloud/MigrateRouteKeyTest.java | 4 +-
.../solr/cloud/ReplicationFactorTest.java | 2 +-
.../org/apache/solr/cloud/SSLMigrationTest.java | 2 +-
.../org/apache/solr/cloud/ShardSplitTest.java | 32 +--
.../org/apache/solr/cloud/SyncSliceTest.java | 2 +-
.../solr/cloud/TestCloudDeleteByQuery.java | 10 +-
.../apache/solr/cloud/TestConfigSetsAPI.java | 20 +-
.../cloud/TestConfigSetsAPIExclusivity.java | 4 +-
.../solr/cloud/TestConfigSetsAPIZkFailure.java | 4 +-
.../org/apache/solr/cloud/TestCryptoKeys.java | 2 +-
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 +-
.../cloud/TestRandomRequestDistribution.java | 4 +-
.../cloud/TestRequestStatusCollectionAPI.java | 2 +-
.../cloud/TestTolerantUpdateProcessorCloud.java | 10 +-
.../TestTolerantUpdateProcessorRandomCloud.java | 2 +-
.../solr/cloud/UnloadDistributedZkTest.java | 30 +--
.../HdfsWriteToMultipleCollectionsTest.java | 2 +-
.../apache/solr/cloud/hdfs/StressHdfsTest.java | 2 +-
.../solr/core/OpenCloseCoreStressTest.java | 4 +-
.../apache/solr/core/TestDynamicLoading.java | 2 +-
.../solr/handler/TestReplicationHandler.java | 5 +-
.../handler/TestReplicationHandlerBackup.java | 3 +-
.../apache/solr/handler/TestRestoreCore.java | 3 +-
.../handler/admin/CoreAdminHandlerTest.java | 4 +-
.../DistributedDebugComponentTest.java | 6 +-
.../DistributedQueryElevationComponentTest.java | 3 +-
.../test/org/apache/solr/search/TestSolrJ.java | 4 +-
.../solr/search/stats/TestDistribIDF.java | 8 +-
.../solr/security/BasicAuthIntegrationTest.java | 3 +-
.../processor/TestNamedUpdateProcessors.java | 3 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 4 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 229 ++++++++++++++++---
.../solrj/impl/ConcurrentUpdateSolrClient.java | 146 ++++++++++--
.../solr/client/solrj/impl/HttpSolrClient.java | 112 +++++++--
.../client/solrj/impl/LBHttpSolrClient.java | 126 ++++++++--
.../solr/client/solrj/io/SolrClientCache.java | 9 +-
.../solrj/io/sql/DatabaseMetaDataImpl.java | 4 +-
.../client/solrj/io/stream/CloudSolrStream.java | 7 +-
.../client/solrj/io/stream/FacetStream.java | 8 +-
.../solr/client/solrj/io/stream/SolrStream.java | 4 +-
.../client/solrj/io/stream/StatsStream.java | 7 +-
.../client/solrj/io/stream/TopicStream.java | 8 +-
.../client/solrj/io/stream/UpdateStream.java | 5 +-
.../client/solrj/SolrExampleBinaryTest.java | 2 +-
.../solr/client/solrj/SolrExampleTests.java | 2 +-
.../solr/client/solrj/SolrExampleXMLTest.java | 2 +-
.../solr/client/solrj/SolrExceptionTest.java | 4 +-
.../client/solrj/SolrSchemalessExampleTest.java | 2 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 30 +--
.../solrj/embedded/SolrExampleJettyTest.java | 2 +-
.../embedded/SolrExampleStreamingTest.java | 23 +-
.../solrj/impl/BasicHttpSolrClientTest.java | 37 +--
.../solrj/impl/CloudSolrClientBuilderTest.java | 90 ++++++++
.../client/solrj/impl/CloudSolrClientTest.java | 21 +-
.../ConcurrentUpdateSolrClientBuilderTest.java | 33 +++
.../impl/ConcurrentUpdateSolrClientTest.java | 37 ++-
.../solrj/impl/HttpSolrClientBuilderTest.java | 76 ++++++
.../solrj/impl/LBHttpSolrClientBuilderTest.java | 65 ++++++
.../solr/BaseDistributedSearchTestCase.java | 2 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 2 +-
.../java/org/apache/solr/SolrTestCaseHS.java | 40 ++--
.../java/org/apache/solr/SolrTestCaseJ4.java | 142 ++++++++++++
.../cloud/AbstractFullDistribZkTestBase.java | 18 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 5 +-
116 files changed, 1442 insertions(+), 503 deletions(-)
----------------------------------------------------------------------