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/17 10:05:33 UTC

[9/9] 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/2e4ac772
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2e4ac772
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2e4ac772

Branch: refs/heads/jira/solr-11833
Commit: 2e4ac772edec9274cc910e4c9bac2e382031c289
Parents: 96c2edb 4ee92c2
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Apr 17 12:05:17 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Apr 17 12:05:17 2018 +0200

----------------------------------------------------------------------
 .../codecs/lucene50/Lucene50CompoundFormat.java |   4 -
 .../org/apache/lucene/index/IndexWriter.java    |  28 ++---
 .../org/apache/lucene/index/PendingDeletes.java |  21 +++-
 .../apache/lucene/index/PendingSoftDeletes.java |  75 +++++++++---
 .../apache/lucene/index/ReadersAndUpdates.java  |  10 +-
 .../index/SoftDeletesRetentionMergePolicy.java  |  22 ++--
 .../apache/lucene/index/TestIndexSorting.java   |   1 -
 .../lucene/index/TestPendingSoftDeletes.java    |  19 ++-
 .../TestSoftDeletesDirectoryReaderWrapper.java  |  32 +++++
 .../apache/lucene/search/TestLRUQueryCache.java |  46 ++++++++
 .../spatial3d/geom/GeoComplexPolygon.java       |  19 ++-
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |  20 ++++
 .../org/apache/lucene/util/LuceneTestCase.java  |   6 +-
 solr/CHANGES.txt                                |   6 +-
 solr/bin/solr                                   |   8 +-
 solr/bin/solr.cmd                               | 118 +++++++++++--------
 .../org/apache/solr/handler/IndexFetcher.java   |   5 +-
 .../java/org/apache/solr/update/PeerSync.java   |  10 +-
 .../solr/uninverting/TestDocTermOrds.java       |  57 ---------
 .../TestDocTermOrdsUninvertLimit.java           |  88 ++++++++++++++
 20 files changed, 418 insertions(+), 177 deletions(-)
----------------------------------------------------------------------