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 2017/03/14 10:09:21 UTC

[5/6] lucene-solr:jira/solr-10247: Merge branch 'master' into jira/solr-10247

Merge branch 'master' into jira/solr-10247


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

Branch: refs/heads/jira/solr-10247
Commit: 857e8919361d2137734c462c252de70c1ae7e745
Parents: 5a2c2f6 7830462
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Mar 14 10:21:03 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Mar 14 10:21:03 2017 +0100

----------------------------------------------------------------------
 dev-tools/scripts/smokeTestRelease.py           |   2 +-
 solr/CHANGES.txt                                |   4 +
 .../solr/hadoop/TreeMergeOutputFormat.java      |   3 +-
 .../org/apache/solr/cloud/ElectionContext.java  |  20 +-
 .../cloud/OverseerCollectionMessageHandler.java |   1 +
 .../org/apache/solr/cloud/RecoveryStrategy.java |  29 +-
 .../apache/solr/cloud/ReplicateFromLeader.java  | 124 ++++++
 .../org/apache/solr/cloud/ZkController.java     |  31 +-
 .../org/apache/solr/core/CoreContainer.java     |   7 +
 .../org/apache/solr/handler/IndexFetcher.java   |  34 +-
 .../apache/solr/handler/ReplicationHandler.java |  28 +-
 .../solr/handler/admin/CollectionsHandler.java  |   4 +-
 .../org/apache/solr/schema/DatePointField.java  |  11 -
 .../apache/solr/schema/DoublePointField.java    |  12 -
 .../java/org/apache/solr/schema/EnumField.java  |   9 -
 .../java/org/apache/solr/schema/FieldType.java  |  11 -
 .../org/apache/solr/schema/FloatPointField.java |  13 -
 .../org/apache/solr/schema/IntPointField.java   |  11 -
 .../org/apache/solr/schema/LongPointField.java  |  11 -
 .../schema/SpatialPointVectorFieldType.java     |   7 -
 .../java/org/apache/solr/schema/TrieField.java  |  17 -
 .../org/apache/solr/update/CommitTracker.java   |   5 +
 .../solr/update/DirectUpdateHandler2.java       |  31 +-
 .../apache/solr/update/HdfsTransactionLog.java  |  50 +++
 .../apache/solr/update/SolrIndexSplitter.java   |   3 +-
 .../org/apache/solr/update/SolrIndexWriter.java |   6 +-
 .../org/apache/solr/update/TransactionLog.java  |  50 +++
 .../org/apache/solr/update/UpdateCommand.java   |   1 +
 .../java/org/apache/solr/update/UpdateLog.java  | 171 +++++++-
 .../processor/DistributedUpdateProcessor.java   |  38 +-
 .../org/apache/solr/util/TestInjection.java     |  54 +++
 .../conf/schema.xml                             |  31 ++
 .../conf/solrconfig.xml                         |  48 ++
 .../solr/cloud/BasicDistributedZk2Test.java     |   6 +
 .../solr/cloud/BasicDistributedZkTest.java      |   9 +-
 .../cloud/ChaosMonkeyNothingIsSafeTest.java     |   7 +
 .../org/apache/solr/cloud/ForceLeaderTest.java  |   6 +
 .../apache/solr/cloud/HttpPartitionTest.java    |   7 +
 .../LeaderInitiatedRecoveryOnCommitTest.java    |   7 +
 .../solr/cloud/OnlyLeaderIndexesTest.java       | 435 +++++++++++++++++++
 .../solr/cloud/RecoveryAfterSoftCommitTest.java |   7 +-
 .../org/apache/solr/cloud/ShardSplitTest.java   |   6 +
 .../apache/solr/cloud/TestCloudRecovery.java    |  16 +-
 .../apache/solr/cloud/TestCollectionAPI.java    |   6 +-
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java  |   7 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java  |  23 +-
 .../solrj/request/CollectionAdminRequest.java   |   6 +
 .../apache/solr/common/cloud/DocCollection.java |  12 +
 .../apache/solr/common/cloud/ZkStateReader.java |   1 +
 .../cloud/AbstractFullDistribZkTestBase.java    |  14 +-
 50 files changed, 1314 insertions(+), 138 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/857e8919/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/857e8919/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/857e8919/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/857e8919/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------