Fix NOT IN with Empy Subquery (#524)

Author: datomo

core/src/main/java/org/polypheny/db/algebra/enumerable/EnumUtils.java

@@ -389,7 +389,9 @@ public static Expression makeTernary( ExpressionType ternaryType, Expression e0,
 
 
     public static Expression unwrapPoly( Expression expression ) {
-        return expression.type == PolyBoolean.class ? Expressions.convert_( Expressions.field( expression, "value" ), boolean.class ) : expression;
+        return expression.type == PolyBoolean.class
+                ? Expressions.makeTernary( ExpressionType.Conditional, Expressions.call( expression, "isNull"), Expressions.constant( false ),  Expressions.convert_( Expressions.field( expression, "value" ), boolean.class ) )
+                : expression;
     }
 
 

core/src/main/java/org/polypheny/db/algebra/enumerable/RexImpTable.java

@@ -638,7 +638,7 @@ public Expression implement( RexToLixTranslator translator, RexCall call, NullAs
                             if ( Objects.requireNonNull( nullAs ) == NullAs.NULL ) {
                                 return Expressions.call( BuiltInMethod.NOT.method, translator.translateList( call.getOperands(), nullAs ) );
                             }
-                            return Expressions.not( translator.translate( call.getOperands().get( 0 ), negate( nullAs ) ) );
+                            return EnumUtils.not( translator.translate( call.getOperands().get( 0 ), negate( nullAs ) ) );
                         }
 
 
@@ -2459,6 +2459,7 @@ public Expression implement( RexToLixTranslator translator, RexCall call, NullAs
             final ParameterExpression _list = Expressions.parameter( Types.of( List.class, PolyValue.class ), "_list" );
             final ParameterExpression par = Expressions.parameter( PolyValue.class, "_arr" );
             final ParameterExpression get_ = Expressions.parameter( PolyValue.class, "_elem$" );
+            final ParameterExpression cond_ = Expressions.parameter( boolean.class, "_cond" );
             builder.add( Expressions.declare( 0, par, translator.translate( call.getOperands().get( 0 ), NullAs.NOT_POSSIBLE, null ) ) );
             builder.add(
                     Expressions.declare( 0, predicate, Expressions.constant( false ) ) );
@@ -2467,8 +2468,9 @@ public Expression implement( RexToLixTranslator translator, RexCall call, NullAs
             );
             BlockStatement _do = Expressions.block(
                     Expressions.declare( 0, get_, Expressions.convert_( Expressions.call( _list, "get", i_ ), PolyValue.class ) ),
+                    Expressions.declare( 0, cond_, Expressions.field( translator.translateWithoutAttach( call.getOperands().get( 1 ), NullAs.NOT_POSSIBLE, null ), "value" ) ),
                     EnumUtils.ifThen(
-                            translator.translate( call.getOperands().get( 1 ), NullAs.NOT_POSSIBLE, null ),
+                            cond_,
                             Expressions.block( Expressions.return_( null, Expressions.constant( true ) ) ) )
             );
 

core/src/main/java/org/polypheny/db/algebra/enumerable/RexToLixTranslator.java

@@ -247,13 +247,21 @@ Expression translate( RexNode expr, Type storageType ) {
 
 
     Expression translate( RexNode expr, RexImpTable.NullAs nullAs, Type storageType ) {
-        Expression expression = translate0( expr, nullAs, storageType );
+        Expression expression = translatePlain( expr, nullAs, storageType );
         expression = EnumUtils.enforce( storageType, expression );
         assert expression != null;
         return list.append( "v", expression );
     }
 
 
+    Expression translateWithoutAttach( RexNode expr, RexImpTable.NullAs nullAs, Type storageType ) {
+        Expression expression = translatePlain( expr, nullAs, storageType );
+        expression = EnumUtils.enforce( storageType, expression );
+        assert expression != null;
+        return expression;
+    }
+
+
     Expression translateCast( AlgDataType sourceType, AlgDataType targetType, Expression operand ) {
         Expression convert = null;
         convert = switch ( targetType.getPolyType() ) {
@@ -436,7 +444,7 @@ public Expression handleNull( Expression input, RexImpTable.NullAs nullAs ) {
      * @param nullAs If false, if expression is definitely not null at runtime. Therefore we can optimize. For example, we can cast to int using x.intValue().
      * @return Translated expression
      */
-    private Expression translate0( RexNode expr, RexImpTable.NullAs nullAs, Type storageType ) {
+    private Expression translatePlain( RexNode expr, RexImpTable.NullAs nullAs, Type storageType ) {
         if ( nullAs == RexImpTable.NullAs.NULL && !expr.getType().isNullable() ) {
             nullAs = RexImpTable.NullAs.NOT_POSSIBLE;
         }

core/src/main/java/org/polypheny/db/plan/AlgOptUtil.java

@@ -462,13 +462,6 @@ public static Exists createExistsPlan( AlgNode seekAlg, SubQueryType subQueryTyp
             return new Exists( seekAlg, false, true );
         }
 
-        switch ( logic ) {
-            case TRUE_FALSE_UNKNOWN:
-            case UNKNOWN_AS_TRUE:
-                if ( notIn && !containsNullableFields( seekAlg ) ) {
-                    logic = Logic.TRUE_FALSE;
-                }
-        }
         AlgNode ret = seekAlg;
         final AlgCluster cluster = seekAlg.getCluster();
         final RexBuilder rexBuilder = cluster.getRexBuilder();

dbms/src/test/java/org/polypheny/db/sql/clause/SelectTest.java

@@ -18,9 +18,11 @@
 
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.ImmutableList;
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
@@ -278,4 +280,22 @@ public void insertUpdateTest() throws SQLException {
         }
     }
 
+
+    @Test
+    public void selectNotInSubqueryTest() throws SQLException {
+        try ( TestHelper.JdbcConnection polyphenyDbConnection = new TestHelper.JdbcConnection( true ) ) {
+            Connection connection = polyphenyDbConnection.getConnection();
+            try ( Statement statement = connection.createStatement() ) {
+                statement.executeUpdate( "DROP TABLE IF EXISTS partsupp" );
+                statement.executeUpdate( "DROP TABLE IF EXISTS supplier" );
+                statement.executeUpdate( "CREATE TABLE partsupp ( ps_partkey INTEGER NOT NULL, ps_suppkey INTEGER NOT NULL, PRIMARY KEY (ps_partkey, ps_suppkey) );" );
+                statement.executeUpdate( "CREATE TABLE supplier ( s_suppkey INTEGER PRIMARY KEY, s_comment VARCHAR(101) NOT NULL )" );
+                statement.executeUpdate( "INSERT INTO partsupp VALUES (1, 1)" );
+                statement.executeUpdate( "INSERT INTO supplier VALUES (1, '')" );
+                ResultSet rs = statement.executeQuery( "SELECT * FROM partsupp WHERE ps_suppkey NOT IN (SELECT s_suppkey FROM supplier WHERE s_comment <> '')" );
+                assertTrue( rs.next() );
+            }
+        }
+    }
+
 }