You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/11/15 20:40:34 UTC

svn commit: r1035420 - in /lucene/dev/trunk: lucene/src/java/org/apache/lucene/search/FieldComparator.java solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java

Author: yonik
Date: Mon Nov 15 19:40:33 2010
New Revision: 1035420

URL: http://svn.apache.org/viewvc?rev=1035420&view=rev
Log:
LUCENE-2631: avoid redundant checks/sets of readerGen

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldComparator.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldComparator.java?rev=1035420&r1=1035419&r2=1035420&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldComparator.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldComparator.java Mon Nov 15 19:40:33 2010
@@ -1129,13 +1129,11 @@ public abstract class FieldComparator {
             bottomOrd = index;
             // exact value match
             bottomSameReader = true;
+            readerGen[bottomSlot] = currentReaderGen;            
           }
           ords[bottomSlot] = bottomOrd;
         }
       }
-      if (bottomSameReader) {
-        readerGen[bottomSlot] = currentReaderGen;
-      }
     }
 
     @Override

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java?rev=1035420&r1=1035419&r2=1035420&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java Mon Nov 15 19:40:33 2010
@@ -189,13 +189,11 @@ class TermOrdValComparator_SML extends F
             bottomOrd = index;
             // exact value match
             bottomSameReader = true;
+            readerGen[bottomSlot] = currentReaderGen;
           }
           ords[bottomSlot] = bottomOrd;
         }
       }
-      if (bottomSameReader) {
-        readerGen[bottomSlot] = currentReaderGen;
-      }
     }
 
     @Override