You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/01/26 07:34:37 UTC

[12/12] lucene-solr:apiv2: Merge branch 'master' into apiv2

Merge branch 'master' into apiv2


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

Branch: refs/heads/apiv2
Commit: e80f31bcd2775f2a80ae4461437278686cf6becc
Parents: 5a8dfd9 5375410
Author: Noble Paul <no...@apache.org>
Authored: Thu Jan 26 18:03:35 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Thu Jan 26 18:03:35 2017 +1030

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   16 +
 .../CompressingStoredFieldsWriter.java          |    5 +-
 .../codecs/compressing/CompressionMode.java     |   49 +-
 .../lucene/codecs/compressing/Compressor.java   |    3 +-
 .../org/apache/lucene/index/FieldInfos.java     |    6 +
 .../apache/lucene/index/IndexReaderContext.java |    7 +-
 .../org/apache/lucene/index/IndexWriter.java    |   16 +
 .../org/apache/lucene/index/TermContext.java    |   21 +-
 .../apache/lucene/search/BlendedTermQuery.java  |   12 +-
 .../org/apache/lucene/search/TermQuery.java     |    6 +-
 .../lucene/search/spans/SpanTermQuery.java      |    4 +-
 .../java/org/apache/lucene/util/Version.java    |    7 +
 .../lucene/search/TermAutomatonQuery.java       |    2 +-
 lucene/site/changes/changes2html.pl             |    7 +-
 .../dummy/DummyCompressingCodec.java            |    3 +
 solr/CHANGES.txt                                |   21 +
 .../client/solrj/embedded/JettySolrRunner.java  |   58 +
 .../handler/component/RealTimeGetComponent.java |  369 +++++-
 .../apache/solr/search/SolrIndexSearcher.java   |    6 +-
 .../apache/solr/update/AddUpdateCommand.java    |   36 +-
 .../solr/update/DirectUpdateHandler2.java       |   52 +-
 .../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   |  258 +++-
 ...BasedVersionConstraintsProcessorFactory.java |    2 +-
 .../SkipExistingDocumentsProcessorFactory.java  |    5 +-
 .../collection1/conf/schema-inplace-updates.xml |   67 ++
 .../test-files/solr/collection1/conf/schema.xml |   14 +-
 .../solr/collection1/conf/schema15.xml          |    7 +-
 .../solrconfig-sortingmergepolicyfactory.xml    |    3 +-
 .../cloud/SegmentTerminateEarlyTestState.java   |   14 +-
 .../apache/solr/cloud/TestSegmentSorting.java   |  165 ++-
 .../solr/cloud/TestStressInPlaceUpdates.java    |  612 ++++++++++
 .../org/apache/solr/search/TestRecovery.java    |  149 ++-
 .../org/apache/solr/update/PeerSyncTest.java    |  152 ++-
 .../apache/solr/update/SolrIndexConfigTest.java |    4 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java  | 1101 ++++++++++++++++++
 .../update/TestInPlaceUpdatesStandalone.java    | 1100 +++++++++++++++++
 .../test/org/apache/solr/update/TestUpdate.java |    2 +-
 .../org/apache/solr/update/UpdateLogTest.java   |  271 +++++
 .../update/processor/AtomicUpdatesTest.java     |  147 +++
 .../apache/solr/common/util/JavaBinCodec.java   |   10 +-
 .../web/js/angular/controllers/plugins.js       |    1 +
 48 files changed, 5158 insertions(+), 271 deletions(-)
----------------------------------------------------------------------