You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/06/11 15:49:26 UTC
[10/21] lucene-solr:branch_6x: LUCENE-6766: don't throw exc from
MultiXXX if there is an index sort
LUCENE-6766: don't throw exc from MultiXXX if there is an index sort
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f4022dc6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f4022dc6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f4022dc6
Branch: refs/heads/branch_6x
Commit: f4022dc68a3a83024b87fbc1dffb4cb4dfee0ccf
Parents: 1530c5a
Author: Mike McCandless <mi...@apache.org>
Authored: Sat May 7 11:45:59 2016 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Sat Jun 11 11:48:40 2016 -0400
----------------------------------------------------------------------
lucene/core/src/java/org/apache/lucene/index/MultiSorter.java | 2 +-
lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f4022dc6/lucene/core/src/java/org/apache/lucene/index/MultiSorter.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiSorter.java b/lucene/core/src/java/org/apache/lucene/index/MultiSorter.java
index 062dde9..7f71eb5 100644
--- a/lucene/core/src/java/org/apache/lucene/index/MultiSorter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/MultiSorter.java
@@ -123,7 +123,7 @@ final class MultiSorter {
private static CrossReaderComparator getComparator(List<CodecReader> readers, SortField sortField) throws IOException {
switch(sortField.getType()) {
- // TODO: use global ords for string sort
+ // ncommit: use segment-local ords for string sort
case INT:
{
List<NumericDocValues> values = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f4022dc6/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
index 3ac64c8..b81b807 100644
--- a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
+++ b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
@@ -819,6 +819,7 @@ public class IndexSearcher {
sumTotalTermFreq = terms.getSumTotalTermFreq();
sumDocFreq = terms.getSumDocFreq();
}
+
return new CollectionStatistics(field, reader.maxDoc(), docCount, sumTotalTermFreq, sumDocFreq);
}
}