Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3A55C88D2 for ; Fri, 9 Sep 2011 03:47:48 +0000 (UTC) Received: (qmail 24719 invoked by uid 500); 9 Sep 2011 03:47:47 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 23868 invoked by uid 500); 9 Sep 2011 03:47:28 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 23860 invoked by uid 99); 9 Sep 2011 03:47:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Sep 2011 03:47:24 +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; Fri, 09 Sep 2011 03:47:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9477F2388847 for ; Fri, 9 Sep 2011 03:47:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1166982 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java Date: Fri, 09 Sep 2011 03:47:00 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110909034700.9477F2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Fri Sep 9 03:47:00 2011 New Revision: 1166982 URL: http://svn.apache.org/viewvc?rev=1166982&view=rev Log: HBASE-4350 Fix a Bloom filter bug introduced by HFile v2 and TestMultiColumnScanner that caught it Modified: hbase/trunk/CHANGES.txt hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java Modified: hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1166982&r1=1166981&r2=1166982&view=diff ============================================================================== --- hbase/trunk/CHANGES.txt (original) +++ hbase/trunk/CHANGES.txt Fri Sep 9 03:47:00 2011 @@ -251,6 +251,8 @@ Release 0.91.0 - Unreleased (Jan Lukavsky) HBASE-4015 Refactor the TimeoutMonitor to make it less racy (ramkrishna.s.vasudevan) + HBASE-4350 Fix a Bloom filter bug introduced by HFile v2 and + TestMultiColumnScanner that caught it (Mikhail Bautin) Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java?rev=1166982&r1=1166981&r2=1166982&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java Fri Sep 9 03:47:00 2011 @@ -130,7 +130,11 @@ public class ScanDeleteTracker implement // Next column case. deleteBuffer = null; } else { - //Should never happen, throw Exception + throw new IllegalStateException("isDelete failed: deleteBuffer=" + + Bytes.toStringBinary(deleteBuffer, deleteOffset, deleteLength) + + ", qualifier=" + + Bytes.toStringBinary(buffer, qualifierOffset, qualifierLength) + + ", timestamp=" + timestamp + ", comparison result: " + ret); } } Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java?rev=1166982&r1=1166981&r2=1166982&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java Fri Sep 9 03:47:00 2011 @@ -1073,6 +1073,9 @@ public class StoreFile { private boolean passesBloomFilter(Scan scan, final SortedSet columns) { + if (!scan.isGetScan()) + return true; + BloomFilter bloomFilter = this.bloomFilter; if (bloomFilter == null) { return true;