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 E297E1756D for ; Tue, 22 Sep 2015 17:00:30 +0000 (UTC) Received: (qmail 67710 invoked by uid 500); 22 Sep 2015 17:00:21 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 67672 invoked by uid 500); 22 Sep 2015 17:00:21 -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 67663 invoked by uid 99); 22 Sep 2015 17:00:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2015 17:00:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 280A1E03FA; Tue, 22 Sep 2015 17:00:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-14397 Revert pending review comments Date: Tue, 22 Sep 2015 17:00:21 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 cb1c44df6 -> 992856c11 HBASE-14397 Revert pending review comments Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/992856c1 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/992856c1 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/992856c1 Branch: refs/heads/branch-1 Commit: 992856c11dbe6551807931c6a5a31efacb9ec80b Parents: cb1c44d Author: tedyu Authored: Tue Sep 22 10:00:11 2015 -0700 Committer: tedyu Committed: Tue Sep 22 10:00:11 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/filter/PrefixFilter.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/992856c1/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java index 8afe9c9..8030ff6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java @@ -38,11 +38,9 @@ import java.util.ArrayList; @InterfaceAudience.Public @InterfaceStability.Stable public class PrefixFilter extends FilterBase { - public static final int MAX_SKIPPED_COMPARE_ROW_NUM = 100; protected byte [] prefix = null; protected boolean passedPrefix = false; protected boolean filterRow = true; - protected int skippedCompareRows = 0; public PrefixFilter(final byte [] prefix) { this.prefix = prefix; @@ -55,12 +53,8 @@ public class PrefixFilter extends FilterBase { public boolean filterRowKey(byte[] buffer, int offset, int length) { if (buffer == null || this.prefix == null) return true; - if (length < prefix.length && skippedCompareRows < MAX_SKIPPED_COMPARE_ROW_NUM) { - ++skippedCompareRows; + if (length < prefix.length) return true; - } - skippedCompareRows = 0; - // if they are equal, return false => pass row // else return true, filter row // if we are passed the prefix, set flag