You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/06/24 22:45:07 UTC

svn commit: r1139433 - in /lucene/dev/branches/lucene_solr_3_3: ./ lucene/ lucene/backwards/ lucene/backwards/src/test-framework/ lucene/backwards/src/test/ lucene/src/java/org/apache/lucene/util/ lucene/src/test/org/apache/lucene/util/ solr/

Author: uschindler
Date: Fri Jun 24 20:45:06 2011
New Revision: 1139433

URL: http://svn.apache.org/viewvc?rev=1139433&view=rev
Log:
LUCENE-3179: Fix bug in handling of indexes >= size in OpenBitSet.prevSetBit()

Modified:
    lucene/dev/branches/lucene_solr_3_3/   (props changed)
    lucene/dev/branches/lucene_solr_3_3/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_3_3/lucene/backwards/   (props changed)
    lucene/dev/branches/lucene_solr_3_3/lucene/backwards/src/test/   (props changed)
    lucene/dev/branches/lucene_solr_3_3/lucene/backwards/src/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_3_3/lucene/src/java/org/apache/lucene/util/OpenBitSet.java
    lucene/dev/branches/lucene_solr_3_3/lucene/src/test/org/apache/lucene/util/TestOpenBitSet.java
    lucene/dev/branches/lucene_solr_3_3/solr/   (props changed)

Modified: lucene/dev/branches/lucene_solr_3_3/lucene/src/java/org/apache/lucene/util/OpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_3/lucene/src/java/org/apache/lucene/util/OpenBitSet.java?rev=1139433&r1=1139432&r2=1139433&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_3/lucene/src/java/org/apache/lucene/util/OpenBitSet.java (original)
+++ lucene/dev/branches/lucene_solr_3_3/lucene/src/java/org/apache/lucene/util/OpenBitSet.java Fri Jun 24 20:45:06 2011
@@ -660,15 +660,19 @@ public class OpenBitSet extends DocIdSet
    *  -1 is returned if there are no more set bits.
    */
   public int prevSetBit(int index) {
-    if (index < 0) {
-      return -1;
-    }
-    int i = index>>6;
+    int i = index >> 6;
+    final int subIndex;
+    long word;
     if (i >= wlen) {
       i = wlen - 1;
+      if (i < 0) return -1;
+      subIndex = 63;  // last possible bit
+      word = bits[i];
+    } else {
+      if (i < 0) return -1;
+      subIndex = index & 0x3f;  // index within the word
+      word = (bits[i] << (63-subIndex));  // skip all the bits to the left of index
     }
-    final int subIndex = index & 0x3f;      // index within the word
-    long word = (bits[i] << (63-subIndex));  // skip all the bits to the left of index
 
     if (word != 0) {
       return (i << 6) + subIndex - Long.numberOfLeadingZeros(word); // See LUCENE-3197

Modified: lucene/dev/branches/lucene_solr_3_3/lucene/src/test/org/apache/lucene/util/TestOpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_3/lucene/src/test/org/apache/lucene/util/TestOpenBitSet.java?rev=1139433&r1=1139432&r2=1139433&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_3/lucene/src/test/org/apache/lucene/util/TestOpenBitSet.java (original)
+++ lucene/dev/branches/lucene_solr_3_3/lucene/src/test/org/apache/lucene/util/TestOpenBitSet.java Fri Jun 24 20:45:06 2011
@@ -42,8 +42,8 @@ public class TestOpenBitSet extends Luce
   }
 
   void doPrevSetBit(BitSet a, OpenBitSet b) {
-    int aa=a.length();
-    int bb=aa;
+    int aa = a.size() + random.nextInt(100);
+    int bb = aa;
     do {
       // aa = a.prevSetBit(aa-1);
       aa--;