You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2011/11/25 14:36:44 UTC

svn commit: r1206163 - /incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java

Author: ecn
Date: Fri Nov 25 13:36:43 2011
New Revision: 1206163

URL: http://svn.apache.org/viewvc?rev=1206163&view=rev
Log:
ACCUMULO-178: back-port additional FamilyIntersectingIterator fixes from 1.4 branch to 1.3

Modified:
    incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java?rev=1206163&r1=1206162&r2=1206163&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java Fri Nov 25 13:36:43 2011
@@ -51,6 +51,7 @@ public class FamilyIntersectingIterator 
     Text colq = new Text(term);
     colq.append(nullByte, 0, 1);
     colq.append(docID.getBytes(), 0, docID.getLength());
+    colq.append(nullByte, 0, 1);
     return new Key(partition, indexColf, colq);
   }
   
@@ -77,7 +78,7 @@ public class FamilyIntersectingIterator 
     }
     Text docID = new Text();
     try {
-      docID.set(colq.getBytes(), firstZeroIndex + 1, thirdZeroIndex - 1);
+      docID.set(colq.getBytes(), firstZeroIndex + 1, thirdZeroIndex - 1 - firstZeroIndex);
     } catch (ArrayIndexOutOfBoundsException e) {
       throw new IllegalArgumentException("bad indices for docid: " + key.toString() + " " + firstZeroIndex + " " + secondZeroIndex + " " + thirdZeroIndex);
     }