Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@minotaur.apache.org Received: (qmail 48188 invoked from network); 15 May 2009 02:06:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 May 2009 02:06:18 -0000 Received: (qmail 20496 invoked by uid 500); 15 May 2009 02:06:18 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 20455 invoked by uid 500); 15 May 2009 02:06:18 -0000 Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hbase-dev@hadoop.apache.org Delivered-To: mailing list hbase-commits@hadoop.apache.org Received: (qmail 20423 invoked by uid 99); 15 May 2009 02:06:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 May 2009 02:06:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 15 May 2009 02:06:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7EFF92388895; Fri, 15 May 2009 02:05:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r774982 - in /hadoop/hbase/trunk_on_hadoop-0.18.3: CHANGES.txt src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java Date: Fri, 15 May 2009 02:05:49 -0000 To: hbase-commits@hadoop.apache.org From: apurtell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090515020549.7EFF92388895@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apurtell Date: Fri May 15 02:05:48 2009 New Revision: 774982 URL: http://svn.apache.org/viewvc?rev=774982&view=rev Log: HBASE-1425 ColumnValueFilter and WhileMatchFilter fixes on trunk (Clint Morgan via Stack) Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt?rev=774982&r1=774981&r2=774982&view=diff ============================================================================== --- hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt (original) +++ hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt Fri May 15 02:05:48 2009 @@ -129,6 +129,8 @@ HBASE-1391 NPE in TableInputFormatBase$TableRecordReader.restart if zoo.cfg is wrong or missing on task trackers HBASE-1323 hbase-1234 broke TestThriftServer; fix and reenable + HBASE-1425 ColumnValueFilter and WhileMatchFilter fixes on trunk + (Clint Morgan via Stack) IMPROVEMENTS HBASE-1089 Add count of regions on filesystem to master UI; add percentage Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java?rev=774982&r1=774981&r2=774982&view=diff ============================================================================== --- hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java (original) +++ hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/ColumnValueFilter.java Fri May 15 02:05:48 2009 @@ -161,9 +161,9 @@ final int length) { int compareResult; if (comparator != null) { - compareResult = comparator.compareTo(data); + compareResult = comparator.compareTo(Arrays.copyOfRange(data, offset, offset+length)); } else { - compareResult = compare(value, data); + compareResult = Bytes.compareTo(value, 0, value.length, data, offset, length); } switch (compareOp) { @@ -228,21 +228,10 @@ if (found == null) { return false; } - return this.filterColumnValue(found.getValue(), found.getValueOffset(), + return this.filterColumnValue(found.getBuffer(), found.getValueOffset(), found.getValueLength()); } - private int compare(final byte[] b1, final byte[] b2) { - int len = Math.min(b1.length, b2.length); - - for (int i = 0; i < len; i++) { - if (b1[i] != b2[i]) { - return b1[i] - b2[i]; - } - } - return b1.length - b2.length; - } - public boolean processAlways() { return false; } Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java?rev=774982&r1=774981&r2=774982&view=diff ============================================================================== --- hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java (original) +++ hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java Fri May 15 02:05:48 2009 @@ -159,7 +159,7 @@ public boolean filterColumn(byte[] rowKey, int roffset, int rlength, byte[] colunmName, int coffset, int clength, byte[] columnValue, int voffset, int vlength) { - // TODO Auto-generated method stub - return false; + changeFAR(this.filter.filterColumn(rowKey, roffset, rlength, colunmName, coffset, clength, columnValue, voffset, vlength)); + return filterAllRemaining(); } }