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 2017/02/19 09:54:18 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/54f90d9f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/54f90d9f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/54f90d9f
Branch: refs/heads/branch_6x
Commit: 54f90d9f4333b6aade8fdb5bbd5b1a4863ba5d9f
Parents: 31211d0 7ae5bab
Author: Cao Manh Dat <da...@apache.org>
Authored: Sun Feb 19 16:54:04 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sun Feb 19 16:54:04 2017 +0700
----------------------------------------------------------------------
solr/CHANGES.txt | 9 +
.../client/solrj/embedded/JettySolrRunner.java | 58 +
.../handler/component/RealTimeGetComponent.java | 369 +++++-
.../apache/solr/update/AddUpdateCommand.java | 39 +-
.../solr/update/DeleteByQueryWrapper.java | 1 +
.../solr/update/DirectUpdateHandler2.java | 77 +-
.../org/apache/solr/update/DocumentBuilder.java | 151 ++-
.../java/org/apache/solr/update/PeerSync.java | 10 +
.../apache/solr/update/SolrCmdDistributor.java | 4 +
.../org/apache/solr/update/TransactionLog.java | 43 +-
.../java/org/apache/solr/update/UpdateLog.java | 242 +++-
.../org/apache/solr/update/VersionInfo.java | 7 +
.../processor/AtomicUpdateDocumentMerger.java | 182 ++-
.../processor/DistributedUpdateProcessor.java | 269 +++-
...BasedVersionConstraintsProcessorFactory.java | 2 +-
.../SkipExistingDocumentsProcessorFactory.java | 5 +-
.../collection1/conf/schema-inplace-updates.xml | 67 +
.../test-files/solr/collection1/conf/schema.xml | 10 +-
.../solr/collection1/conf/schema15.xml | 7 +-
.../solrconfig-sortingmergepolicyfactory.xml | 3 +-
.../cloud/SegmentTerminateEarlyTestState.java | 14 +-
.../apache/solr/cloud/TestSegmentSorting.java | 166 ++-
.../solr/cloud/TestStressInPlaceUpdates.java | 612 ++++++++++
.../solr/handler/admin/TestCoreAdminApis.java | 2 -
.../org/apache/solr/search/TestRecovery.java | 246 +++-
.../org/apache/solr/update/PeerSyncTest.java | 171 ++-
.../apache/solr/update/SolrIndexConfigTest.java | 4 +-
.../solr/update/TestInPlaceUpdatesDistrib.java | 1150 ++++++++++++++++++
.../update/TestInPlaceUpdatesStandalone.java | 1100 +++++++++++++++++
.../test/org/apache/solr/update/TestUpdate.java | 2 +-
.../org/apache/solr/update/UpdateLogTest.java | 271 +++++
.../update/processor/AtomicUpdatesTest.java | 147 +++
.../java/org/apache/solr/SolrTestCaseJ4.java | 19 +
33 files changed, 5220 insertions(+), 239 deletions(-)
----------------------------------------------------------------------