You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/06/15 16:16:09 UTC
[2/7] lucene-solr:jira/SOLR-10834: Merge branch 'master' into
jira/SOLR-10834
Merge branch 'master' into jira/SOLR-10834
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8f104384
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8f104384
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8f104384
Branch: refs/heads/jira/SOLR-10834
Commit: 8f1043840f38533864b2c713daf066b6c3509147
Parents: 7b95773 abc393d
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Jun 15 09:02:00 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Jun 15 09:02:00 2017 -0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 5 ++
.../org/apache/lucene/index/CodecReader.java | 11 ++--
.../lucene/index/ExitableDirectoryReader.java | 40 ++----------
.../java/org/apache/lucene/index/Fields.java | 10 ++-
.../apache/lucene/index/FilterLeafReader.java | 6 +-
.../org/apache/lucene/index/LeafReader.java | 15 +----
.../apache/lucene/index/MergeReaderWrapper.java | 7 +-
.../org/apache/lucene/index/MultiFields.java | 69 ++++++++++++++++++--
.../apache/lucene/index/ParallelLeafReader.java | 33 +++++-----
.../lucene/index/SlowCodecReaderWrapper.java | 16 +++--
.../apache/lucene/index/SortingLeafReader.java | 6 +-
.../index/TestExitableDirectoryReader.java | 16 +----
.../lucene/index/TestFilterLeafReader.java | 17 +----
.../lucene/index/TestParallelTermEnum.java | 20 ++----
.../lucene/search/TermInSetQueryTest.java | 24 +++----
.../org/apache/lucene/search/TestTermQuery.java | 43 ++++++------
.../search/highlight/TermVectorLeafReader.java | 8 +--
.../highlight/WeightedSpanTermExtractor.java | 25 ++-----
.../lucene/search/uhighlight/PhraseHelper.java | 29 +++-----
.../TermVectorFilteredLeafReader.java | 22 +------
.../apache/lucene/index/memory/MemoryIndex.java | 8 +--
.../lucene/index/AssertingLeafReader.java | 7 +-
.../index/BaseIndexFileFormatTestCase.java | 2 +-
.../index/BasePostingsFormatTestCase.java | 15 ++---
.../lucene/index/FieldFilterLeafReader.java | 9 ++-
.../org/apache/lucene/search/QueryUtils.java | 26 ++------
.../solr/index/SlowCompositeReaderWrapper.java | 4 +-
.../test/org/apache/solr/search/TestDocSet.java | 5 +-
28 files changed, 214 insertions(+), 284 deletions(-)
----------------------------------------------------------------------