incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1205881 - in /incubator/accumulo/branches/1.4: ./ src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java
Date Thu, 24 Nov 2011 15:29:44 GMT
Author: ecn
Date: Thu Nov 24 15:29:43 2011
New Revision: 1205881

URL: http://svn.apache.org/viewvc?rev=1205881&view=rev
Log:
ACCUMULO-178 merge to 1.4 branch

Modified:
    incubator/accumulo/branches/1.4/   (props changed)
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
    incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java

Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 24 15:29:43 2011
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880
 /incubator/accumulo/branches/1.4:1205476
 /incubator/accumulo/trunk:1205476,1205570

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java?rev=1205881&r1=1205880&r2=1205881&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
Thu Nov 24 15:29:43 2011
@@ -151,7 +151,7 @@ public class FamilyIntersectingIterator 
     if (log.isTraceEnabled())
       log.trace(zeroIndex + " " + currentDocID.getLength());
     Text colq = new Text();
-    colq.set(currentDocID.getBytes(), zeroIndex + 1, currentDocID.getLength() - zeroIndex
- 2);
+    colq.set(currentDocID.getBytes(), zeroIndex + 1, currentDocID.getLength() - zeroIndex
- 1);
     Key k = new Key(currentPartition, colf, colq);
     if (log.isTraceEnabled())
       log.trace("built doc key for seek: " + k.toString());

Modified: incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java?rev=1205881&r1=1205880&r2=1205881&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java
Thu Nov 24 15:29:43 2011
@@ -113,6 +113,7 @@ public class FamilyIntersectingIteratorT
             sb.append(cf);
           }
         }
+        sb.append(" docID=").append(doc);
         Key k = new Key(row, docColf, new Text(String.format("%010d", docid).getBytes()));
         map.put(k, new Value(sb.toString().getBytes()));
       }
@@ -182,9 +183,13 @@ public class FamilyIntersectingIteratorT
     while (iter.hasTop()) {
       hitCount++;
       Key k = iter.getTopKey();
+      Value v = iter.getTopValue();
       // System.out.println(k.toString());
       // System.out.println(iter.getDocID(k));
+      
       assertTrue(docs.contains(iter.getDocID(k)));
+      assertTrue(new String(v.get()).endsWith(" docID="+iter.getDocID(k)));
+      
       iter.next();
     }
     assertEquals(hitCount, docs.size());
@@ -214,7 +219,9 @@ public class FamilyIntersectingIteratorT
     while (iter.hasTop()) {
       hitCount++;
       Key k = iter.getTopKey();
+      Value v = iter.getTopValue();
       assertTrue(docs.contains(iter.getDocID(k)));
+      assertTrue(new String(v.get()).endsWith(" docID="+iter.getDocID(k)));
       iter.next();
     }
     assertEquals(hitCount, docs.size());
@@ -252,7 +259,9 @@ public class FamilyIntersectingIteratorT
     while (iter.hasTop()) {
       hitCount++;
       Key k = iter.getTopKey();
+      Value v = iter.getTopValue();
       assertTrue(docs.contains(iter.getDocID(k)));
+      assertTrue(new String(v.get()).endsWith(" docID="+iter.getDocID(k)));
       iter.next();
     }
     assertEquals(hitCount, docs.size());



Mime
View raw message