PHOENIX-2141 ComparisonExpression should return Boolean null if eithe…

…r operand is null (bug fix)
apache · Aug 25, 2015 · 8a98324 · 8a98324
1 parent db137dc
commit 8a98324
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 13 deletions.
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -251,9 +251,6 @@ private Expression orExpression(List<Expression> children) throws SQLException {
             if (child.getDataType() != PBoolean.INSTANCE) {
                 throw TypeMismatchException.newException(PBoolean.INSTANCE, child.getDataType(), child.toString());
             }
-            if (LiteralExpression.isBooleanNull(child)) {
-                return child;
-            }
             if (LiteralExpression.isFalse(child)) {
                 iterator.remove();
             }

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/AndExpression.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/AndExpression.java
@@ -44,9 +44,6 @@ public static Expression create(List<Expression> children) throws SQLException {
             if (child.getDataType() != PBoolean.INSTANCE) {
                 throw TypeMismatchException.newException(PBoolean.INSTANCE, child.getDataType(), child.toString());
             }
-            if (LiteralExpression.isBooleanNull(child)) {
-                return child;
-            }
             if (LiteralExpression.isFalse(child)) {
                 return child;
             }

diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
@@ -218,8 +218,7 @@ public void testMultiColumnEqualFilter() throws SQLException {
 
     @Test
     public void testCollapseFunctionToNull() throws SQLException {
-        String tenantId = "000000000000001";
+        String query = "select * from atable where substr(entity_id,null) = 'foo'";
-        String query = "select * from atable where organization_id='" + tenantId + "' and substr(entity_id,null) = 'foo'";
         PhoenixConnection pconn = DriverManager.getConnection(getUrl(), PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
         PhoenixPreparedStatement pstmt = newPreparedStatement(pconn, query);
         QueryPlan plan = pstmt.optimizeQuery();

diff --git a/phoenix-core/src/test/java/org/apache/phoenix/expression/NullValueTest.java b/phoenix-core/src/test/java/org/apache/phoenix/expression/NullValueTest.java
@@ -38,22 +38,57 @@ public void testComparisonExpressionWithNullOperands() throws Exception {
     }
 
     @Test
-    public void testAndOrExpressionWithNullOperands() throws Exception {
+    public void testAndExpressionWithNullOperands() throws Exception {
-        String[] query = {"SELECT 'a' >= '' or '' < 'a'", 
+        String[] query = {"SELECT 'b' >= 'a' and '' < 'b'", 
+                          "SELECT 'b' >= '' and 'a' < 'b'",
+                          "SELECT 'a' >= 'b' and 'a' < ''",
+                          "SELECT '' >= 'a' and 'b' < 'a'",
                           "SELECT 'a' >= '' and '' < 'a'"};
+        Boolean[] result = {null,
+                            null,
+                            Boolean.FALSE,
+                            Boolean.FALSE,
+                            null};
         Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
-            for (String q : query) {
+            for (int i = 0; i < query.length; i++) {
-                ResultSet rs = conn.createStatement().executeQuery(q);
+                ResultSet rs = conn.createStatement().executeQuery(query[i]);
                 assertTrue(rs.next());
-                assertNull(rs.getObject(1));
+                assertEquals(result[i], rs.getObject(1));
                 assertEquals(false, rs.getBoolean(1));
                 assertFalse(rs.next());
             }
         } finally {
             conn.close();
         }       
     }
+
+    @Test
+    public void testOrExpressionWithNullOperands() throws Exception {
+        String[] query = {"SELECT 'b' >= 'a' or '' < 'b'", 
+                          "SELECT 'b' >= '' or 'a' < 'b'",
+                          "SELECT 'a' >= 'b' or 'a' < ''",
+                          "SELECT '' >= 'a' or 'b' < 'a'",
+                          "SELECT 'a' >= '' or '' < 'a'"};
+        Boolean[] result = {Boolean.TRUE,
+                            Boolean.TRUE,
+                            null,
+                            null,
+                            null};
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+        Connection conn = DriverManager.getConnection(getUrl(), props);
+        try {
+            for (int i = 0; i < query.length; i++) {
+                ResultSet rs = conn.createStatement().executeQuery(query[i]);
+                assertTrue(rs.next());
+                assertEquals(result[i], rs.getObject(1));
+                assertEquals(Boolean.TRUE.equals(result[i]) ? true : false, rs.getBoolean(1));
+                assertFalse(rs.next());
+            }
+        } finally {
+            conn.close();
+        }       
+    }
 
 }