lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1411411 - /lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SortedDocValuesConsumer.java
Date Mon, 19 Nov 2012 21:05:02 GMT
Author: rmuir
Date: Mon Nov 19 21:05:01 2012
New Revision: 1411411

URL: http://svn.apache.org/viewvc?rev=1411411&view=rev
Log:
fix sortedbytes merge bugs

Modified:
    lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SortedDocValuesConsumer.java

Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SortedDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SortedDocValuesConsumer.java?rev=1411411&r1=1411410&r2=1411411&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SortedDocValuesConsumer.java
(original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SortedDocValuesConsumer.java
Mon Nov 19 21:05:01 2012
@@ -139,7 +139,6 @@ public abstract class SortedDocValuesCon
       }
 
       BytesRef lastTerm = null;
-      boolean first = true;
       int ord = 0;
       while (q.size() != 0) {
         SegmentState top = q.top();
@@ -148,10 +147,10 @@ public abstract class SortedDocValuesCon
           // nocommit we could spill this to disk instead of
           // RAM, and replay on finish...
           mergedTerms.add(lastTerm);
-          if (lastTerm == null) {
+          ord++;
+          if (fixedLength == -2) {
             fixedLength = lastTerm.length;
           } else {
-            ord++;
             if (lastTerm.length != fixedLength) {
               fixedLength = -1;
             }



Mime
View raw message