You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pa...@apache.org on 2018/06/03 00:42:16 UTC

[drill] branch master updated: Revert "DRILL-4020: The not-equal operator returns incorrect results when used on the HBase row key"

This is an automated email from the ASF dual-hosted git repository.

parthc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new 9dceecf  Revert "DRILL-4020: The not-equal operator returns incorrect results when used on the HBase row key"
9dceecf is described below

commit 9dceecff3957be6fed409ef10cb52e05e4cdb0fd
Author: Parth Chandra <pa...@apache.org>
AuthorDate: Sat Jun 2 17:41:45 2018 -0700

    Revert "DRILL-4020: The not-equal operator returns incorrect results when used on the HBase row key"
    
    This reverts commit 0d5eda83fe34928ff60629e6a4903d43a1d82582.
---
 .../drill/exec/store/hbase/HBaseFilterBuilder.java     |  1 -
 .../apache/drill/hbase/TestHBaseFilterPushDown.java    | 18 ------------------
 2 files changed, 19 deletions(-)

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 6e1efe5..8d2e8ff 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
@@ -61,7 +61,6 @@ public class HBaseFilterBuilder extends AbstractExprVisitor<HBaseScanSpec, Void,
        * remove it since its effect is also achieved through startRow and stopRow.
        */
       if (parsedSpec.filter instanceof RowFilter &&
-          ((RowFilter)parsedSpec.filter).getOperator() != CompareOp.NOT_EQUAL &&
           ((RowFilter)parsedSpec.filter).getComparator() instanceof BinaryComparator) {
         parsedSpec.filter = null;
       }
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java
index e70cf08..0e14cb1 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java
@@ -45,24 +45,6 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
   }
 
   @Test
-  public void testFilterPushDownRowKeyNotEqual() throws Exception {
-    setColumnWidths(new int[] {8, 38, 38});
-    final String sql = "SELECT\n"
-        + "  *\n"
-        + "FROM\n"
-        + "  hbase.`[TABLE_NAME]` tableName\n"
-        + "WHERE\n"
-        + "  row_key <> 'b4'";
-
-    runHBaseSQLVerifyCount(sql, 6);
-
-    final String[] expectedPlan = {".*startRow=, stopRow=, filter=RowFilter \\(NOT_EQUAL, b4\\).*"};
-    final String[] excludedPlan ={};
-    final String sqlHBase = canonizeHBaseSQL(sql);
-    PlanTestBase.testPlanMatchingPatterns(sqlHBase, expectedPlan, excludedPlan);
-  }
-
-  @Test
   public void testFilterPushDownRowKeyEqualWithItem() throws Exception {
     setColumnWidths(new int[] {20, 30});
     final String sql = "SELECT\n"

-- 
To stop receiving notification emails like this one, please contact
parthc@apache.org.