You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/06/12 04:26:34 UTC
[1/4] hbase git commit: HBASE-13892 NPE in ClientScanner on null
results array
Repository: hbase
Updated Branches:
refs/heads/0.98 8f54f8daf -> 3f3132713
refs/heads/branch-1.0 904ec1e4c -> 71baa89ec
refs/heads/branch-1.1 7125dd4f9 -> 05cef0bbd
refs/heads/master 9d3422ed1 -> 8cef99e50
HBASE-13892 NPE in ClientScanner on null results array
Test only
Signed-off-by: Andrew Purtell <ap...@apache.org>
Amending-Author: Andrew Purtell <ap...@apache.org>
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3f313271
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3f313271
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3f313271
Branch: refs/heads/0.98
Commit: 3f31327135b784eceeafb4d417a19d441cfbd712
Parents: 8f54f8d
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 11 20:33:19 2015 -0400
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jun 11 18:10:50 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/client/TestFromClientSide.java | 22 ++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3f313271/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 73afdb4..7eec037 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -74,6 +74,8 @@ import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.filter.FilterList;
+import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
+import org.apache.hadoop.hbase.filter.InclusiveStopFilter;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.filter.LongComparator;
import org.apache.hadoop.hbase.filter.PrefixFilter;
@@ -6326,4 +6328,24 @@ public class TestFromClientSide {
}
assertEquals(4, count); // 003 004 005 006
}
+
+ @Test
+ public void testFilterAllRecords() throws IOException {
+ Scan scan = new Scan();
+ scan.setBatch(1);
+ scan.setCaching(1);
+ // Filter out any records
+ scan.setFilter(new FilterList(new FirstKeyOnlyFilter(), new InclusiveStopFilter(new byte[0])));
+ HTable table = new HTable(TEST_UTIL.getConfiguration(), TableName.NAMESPACE_TABLE_NAME);
+ try {
+ ResultScanner s = table.getScanner(scan);
+ try {
+ assertNull(s.next());
+ } finally {
+ s.close();
+ }
+ } finally {
+ table.close();
+ }
+ }
}
[4/4] hbase git commit: HBASE-13892 NPE in ClientScanner on null
results array
Posted by ap...@apache.org.
HBASE-13892 NPE in ClientScanner on null results array
Signed-off-by: Andrew Purtell <ap...@apache.org>
Amending-Author: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8cef99e5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8cef99e5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8cef99e5
Branch: refs/heads/master
Commit: 8cef99e5062d889a748c8442595a0e0644e11458
Parents: 9d3422e
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 11 20:33:19 2015 -0400
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jun 11 19:03:59 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/client/ClientScanner.java | 3 ++-
.../hadoop/hbase/client/TestFromClientSide.java | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cef99e5/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
index 566bf4b..c013a4d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
@@ -586,7 +586,8 @@ public abstract class ClientScanner extends AbstractClientScanner {
// the caller will receive a result back where the number of cells in the result is less than
// the batch size even though it may not be the last group of cells for that row.
if (allowPartials || isBatchSet) {
- addResultsToList(resultsToAddToCache, resultsFromServer, 0, resultsFromServer.length);
+ addResultsToList(resultsToAddToCache, resultsFromServer, 0,
+ (null == resultsFromServer ? 0 : resultsFromServer.length));
return resultsToAddToCache;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8cef99e5/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 5ca2b92..027a348 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -73,6 +73,8 @@ import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.filter.FilterList;
+import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
+import org.apache.hadoop.hbase.filter.InclusiveStopFilter;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.filter.LongComparator;
import org.apache.hadoop.hbase.filter.PrefixFilter;
@@ -6320,4 +6322,18 @@ public class TestFromClientSide {
}
}
}
+
+ @Test
+ public void testFilterAllRecords() throws IOException {
+ Scan scan = new Scan();
+ scan.setBatch(1);
+ scan.setCaching(1);
+ // Filter out any records
+ scan.setFilter(new FilterList(new FirstKeyOnlyFilter(), new InclusiveStopFilter(new byte[0])));
+ try (Table table = TEST_UTIL.getConnection().getTable(TableName.NAMESPACE_TABLE_NAME)) {
+ try (ResultScanner s = table.getScanner(scan)) {
+ assertNull(s.next());
+ }
+ }
+ }
}
[3/4] hbase git commit: HBASE-13892 NPE in ClientScanner on null
results array
Posted by ap...@apache.org.
HBASE-13892 NPE in ClientScanner on null results array
Signed-off-by: Andrew Purtell <ap...@apache.org>
Amending-Author: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/05cef0bb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/05cef0bb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/05cef0bb
Branch: refs/heads/branch-1.1
Commit: 05cef0bbdd87822b0862726c2d946588fe6e1698
Parents: 7125dd4
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 11 20:33:19 2015 -0400
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jun 11 18:17:59 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/client/ClientScanner.java | 3 ++-
.../hadoop/hbase/client/TestFromClientSide.java | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/05cef0bb/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
index 947eb69..d674534 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
@@ -573,7 +573,8 @@ public class ClientScanner extends AbstractClientScanner {
// the caller will receive a result back where the number of cells in the result is less than
// the batch size even though it may not be the last group of cells for that row.
if (allowPartials || isBatchSet) {
- addResultsToList(resultsToAddToCache, resultsFromServer, 0, resultsFromServer.length);
+ addResultsToList(resultsToAddToCache, resultsFromServer, 0,
+ (null == resultsFromServer ? 0 : resultsFromServer.length));
return resultsToAddToCache;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/05cef0bb/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 6381862..7a62873 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -72,6 +72,8 @@ import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.filter.FilterList;
+import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
+import org.apache.hadoop.hbase.filter.InclusiveStopFilter;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.filter.LongComparator;
import org.apache.hadoop.hbase.filter.PrefixFilter;
@@ -6415,4 +6417,18 @@ public class TestFromClientSide {
}
}
}
+
+ @Test
+ public void testFilterAllRecords() throws IOException {
+ Scan scan = new Scan();
+ scan.setBatch(1);
+ scan.setCaching(1);
+ // Filter out any records
+ scan.setFilter(new FilterList(new FirstKeyOnlyFilter(), new InclusiveStopFilter(new byte[0])));
+ try (Table table = TEST_UTIL.getConnection().getTable(TableName.NAMESPACE_TABLE_NAME)) {
+ try (ResultScanner s = table.getScanner(scan)) {
+ assertNull(s.next());
+ }
+ }
+ }
}
[2/4] hbase git commit: HBASE-13892 NPE in ClientScanner on null
results array
Posted by ap...@apache.org.
HBASE-13892 NPE in ClientScanner on null results array
Test only
Signed-off-by: Andrew Purtell <ap...@apache.org>
Amending-Author: Andrew Purtell <ap...@apache.org>
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/71baa89e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/71baa89e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/71baa89e
Branch: refs/heads/branch-1.0
Commit: 71baa89ec45393ff5459567b069be6085ea16b8e
Parents: 904ec1e
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 11 20:33:19 2015 -0400
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jun 11 18:14:39 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/client/TestFromClientSide.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/71baa89e/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 85c0475..891f92a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -74,6 +74,8 @@ import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.filter.FilterList;
+import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
+import org.apache.hadoop.hbase.filter.InclusiveStopFilter;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.filter.LongComparator;
import org.apache.hadoop.hbase.filter.PrefixFilter;
@@ -6375,4 +6377,17 @@ public class TestFromClientSide {
}
}
+ @Test
+ public void testFilterAllRecords() throws IOException {
+ Scan scan = new Scan();
+ scan.setBatch(1);
+ scan.setCaching(1);
+ // Filter out any records
+ scan.setFilter(new FilterList(new FirstKeyOnlyFilter(), new InclusiveStopFilter(new byte[0])));
+ try (Table table = TEST_UTIL.getConnection().getTable(TableName.NAMESPACE_TABLE_NAME)) {
+ try (ResultScanner s = table.getScanner(scan)) {
+ assertNull(s.next());
+ }
+ }
+ }
}