DRILL-671: Select against hbase table with filter against row_key fails
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/6d4dc8fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/6d4dc8fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/6d4dc8fe
Branch: refs/heads/master
Commit: 6d4dc8fe00d4aea7f7e6a8e67ea404933d326bcf
Parents: 7388150
Author: Aditya Kishore <aditya@maprtech.com>
Authored: Fri May 16 18:18:47 2014 -0700
Committer: Jacques Nadeau <jacques@apache.org>
Committed: Mon May 19 18:06:28 2014 -0700
----------------------------------------------------------------------
.../org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java | 3 ++-
.../src/test/java/org/apache/drill/hbase/BaseHBaseTest.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6d4dc8fe/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java
b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java
index 0e0ccf5..924cd6e 100644
--- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java
+++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java
@@ -53,7 +53,8 @@ public class HBaseFilterBuilder extends AbstractExprVisitor<HBaseScanSpec,
Void,
}
public HBaseScanSpec parseTree() {
- return mergeScanSpecs("booleanAnd", this.groupScan.getHBaseScanSpec(), le.accept(this,
null));
+ HBaseScanSpec parsedSpec = le.accept(this, null);
+ return parsedSpec != null ? mergeScanSpecs("booleanAnd", this.groupScan.getHBaseScanSpec(),
parsedSpec ) : null;
}
public boolean isAllExpressionsConverted() {
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6d4dc8fe/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
index 48193eb..9e07d9f 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
@@ -55,7 +55,7 @@ public class BaseHBaseTest extends BaseTestQuery {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
/*
- * Change the following to HBaseTestsSuite.configure(false, false)
+ * Change the following to HBaseTestsSuite.configure(false, true)
* if you want to test against an externally running HBase cluster.
*/
HBaseTestsSuite.configure(true, true);
|