deal where is not null

Author: todd5167

core/src/main/java/com/dtstack/flink/sql/side/SidePredicatesParser.java

@@ -120,22 +120,35 @@ private void extractPredicateInfo(SqlNode whereNode, List<PredicateInfo> predica
             SqlOperator operator = ((SqlBasicCall) whereNode).getOperator();
             String operatorName = operator.getName();
             SqlKind operatorKind = operator.getKind();
-            // 跳过函数
-            if ((((SqlBasicCall) whereNode).getOperands()[0] instanceof SqlIdentifier)) {
-                SqlIdentifier fieldFullPath = (SqlIdentifier) ((SqlBasicCall) whereNode).getOperands()[0];
-                if (fieldFullPath.names.size() == 2) {
-                    String ownerTable = fieldFullPath.names.get(0);
-                    String fieldName = fieldFullPath.names.get(1);
-                    String content = (operatorKind == SqlKind.BETWEEN) ? ((SqlBasicCall) whereNode).getOperands()[1].toString() + " AND " +
-                            ((SqlBasicCall) whereNode).getOperands()[2].toString() : ((SqlBasicCall) whereNode).getOperands()[1].toString();
 
-                    PredicateInfo predicateInfo = PredicateInfo.builder().setOperatorName(operatorName).setOperatorKind(operatorKind.toString())
-                            .setOwnerTable(ownerTable).setFieldName(fieldName).setCondition(content).build();
+            if (operatorKind == SqlKind.IS_NOT_NULL || operatorKind == SqlKind.IS_NULL) {
+                fillPredicateInfoToList((SqlBasicCall) whereNode, predicatesInfoList, operatorName, operatorKind, 0, 0);
+                return;
+            }
 
-                    predicatesInfoList.add(predicateInfo);
-                }
+            // 跳过函数
+            if ((((SqlBasicCall) whereNode).getOperands()[0] instanceof SqlIdentifier)
+                    && (((SqlBasicCall) whereNode).getOperands()[1].getKind() != SqlKind.OTHER_FUNCTION)) {
+                fillPredicateInfoToList((SqlBasicCall) whereNode, predicatesInfoList, operatorName, operatorKind, 0, 1);
+            } else if ((((SqlBasicCall) whereNode).getOperands()[1] instanceof SqlIdentifier)
+                    && (((SqlBasicCall) whereNode).getOperands()[0].getKind() != SqlKind.OTHER_FUNCTION)) {
+                fillPredicateInfoToList((SqlBasicCall) whereNode, predicatesInfoList, operatorName, operatorKind, 1, 0);
             }
+        }
+    }
+
+    private void fillPredicateInfoToList(SqlBasicCall whereNode, List<PredicateInfo> predicatesInfoList, String operatorName, SqlKind operatorKind,
+                                         int fieldIndex, int conditionIndex) {
+        SqlIdentifier fieldFullPath = (SqlIdentifier) whereNode.getOperands()[fieldIndex];
+        if (fieldFullPath.names.size() == 2) {
+            String ownerTable = fieldFullPath.names.get(0);
+            String fieldName = fieldFullPath.names.get(1);
+            String content = (operatorKind == SqlKind.BETWEEN) ? whereNode.getOperands()[conditionIndex].toString() + " AND " +
+                    whereNode.getOperands()[2].toString() : whereNode.getOperands()[conditionIndex].toString();
 
+            PredicateInfo predicateInfo = PredicateInfo.builder().setOperatorName(operatorName).setOperatorKind(operatorKind.toString())
+                    .setOwnerTable(ownerTable).setFieldName(fieldName).setCondition(content).build();
+            predicatesInfoList.add(predicateInfo);
         }
     }
 

rdb/rdb-side/src/main/java/com/dtstack/flink/sql/side/rdb/async/RdbAsyncSideInfo.java

@@ -150,6 +150,9 @@ public String buildFilterCondition(PredicateInfo info) {
                 return quoteIdentifier(info.getFieldName()) + " != " + info.getCondition();
             case "BETWEEN":
                 return quoteIdentifier(info.getFieldName()) + " BETWEEN  " + info.getCondition();
+            case "IS_NOT_NULL":
+            case "IS_NULL":
+                return quoteIdentifier(info.getFieldName()) + " " + info.getOperatorName();
             default:
                 return quoteIdentifier(info.getFieldName()) + " " + info.getOperatorName() + " " + info.getCondition();
         }