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 74F0A1886D for ; Tue, 11 Aug 2015 17:02:03 +0000 (UTC) Received: (qmail 82267 invoked by uid 500); 11 Aug 2015 17:02:03 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 82224 invoked by uid 500); 11 Aug 2015 17:02:03 -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 82214 invoked by uid 99); 11 Aug 2015 17:02:03 -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, 11 Aug 2015 17:02:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 05DC8E045F; Tue, 11 Aug 2015 17:02:03 +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-14206 MultiRowRangeFilter returns records whose rowKeys are out of allowed ranges (Anton Nazaruk) Date: Tue, 11 Aug 2015 17:02:03 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 c07eb21e4 -> 90b8cc89b HBASE-14206 MultiRowRangeFilter returns records whose rowKeys are out of allowed ranges (Anton Nazaruk) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/90b8cc89 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/90b8cc89 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/90b8cc89 Branch: refs/heads/branch-1 Commit: 90b8cc89bdd0e67bdbaab97f24f6d2a3887a651a Parents: c07eb21 Author: tedyu Authored: Tue Aug 11 10:01:55 2015 -0700 Committer: tedyu Committed: Tue Aug 11 10:01:55 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/filter/MultiRowRangeFilter.java | 3 +++ .../hbase/filter/TestMultiRowRangeFilter.java | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/90b8cc89/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java index ca4f9b0..7efda86 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java @@ -233,6 +233,9 @@ public class MultiRowRangeFilter extends FilterBase { if (insertionPosition == 0 && !rangeList.get(insertionPosition).contains(rowKey)) { return ROW_BEFORE_FIRST_RANGE; } + if (!initialized) { + initialized = true; + } return insertionPosition; } // the row key equals one of the start keys, and the the range exclude the start key http://git-wip-us.apache.org/repos/asf/hbase/blob/90b8cc89/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java index 0c596aa..dfa8bfa 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java @@ -70,6 +70,24 @@ public class TestMultiRowRangeFilter { } @Test + public void testRanges() throws IOException { + byte[] key1Start = new byte[] {-3}; + byte[] key1End = new byte[] {-2}; + + byte[] key2Start = new byte[] {5}; + byte[] key2End = new byte[] {6}; + + byte[] badKey = new byte[] {-10}; + + MultiRowRangeFilter filter = new MultiRowRangeFilter(Arrays.asList( + new MultiRowRangeFilter.RowRange(key1Start, true, key1End, false), + new MultiRowRangeFilter.RowRange(key2Start, true, key2End, false) + )); + filter.filterRowKey(badKey, 0, 1); + assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, filter.filterKeyValue(null)); + } + + @Test public void testOutOfOrderScannerNextException() throws Exception { MultiRowRangeFilter filter = new MultiRowRangeFilter(Arrays.asList( new MultiRowRangeFilter.RowRange(Bytes.toBytes("b"), true, Bytes.toBytes("c"), true),