Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A658597A4 for ; Thu, 24 Nov 2011 15:30:23 +0000 (UTC) Received: (qmail 87305 invoked by uid 500); 24 Nov 2011 15:30:23 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 87279 invoked by uid 500); 24 Nov 2011 15:30:23 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 87272 invoked by uid 99); 24 Nov 2011 15:30:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Nov 2011 15:30:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Nov 2011 15:30:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 440C023888EA; Thu, 24 Nov 2011 15:29:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1205882 - in /incubator/accumulo/trunk: ./ 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:59 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111124152959.440C023888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Thu Nov 24 15:29:58 2011 New Revision: 1205882 URL: http://svn.apache.org/viewvc?rev=1205882&view=rev Log: ACCUMULO-178 merge to trunk Modified: incubator/accumulo/trunk/ (props changed) incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 24 15:29:58 2011 @@ -1,2 +1,2 @@ -/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:1201902-1205055 Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java?rev=1205882&r1=1205881&r2=1205882&view=diff ============================================================================== --- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java (original) +++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java Thu Nov 24 15:29:58 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/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java?rev=1205882&r1=1205881&r2=1205882&view=diff ============================================================================== --- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java (original) +++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java Thu Nov 24 15:29:58 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());