Merge branch '1.8_release_3.9.x' into 1.8_release_3.10.x

Author: gituser

core/src/main/java/com/dtstack/flink/sql/Main.java

@@ -240,7 +240,8 @@ private static Set<URL> registerTable(SqlTree sqlTree, StreamExecutionEnvironmen
 
                 RowTypeInfo typeInfo = new RowTypeInfo(adaptTable.getSchema().getTypes(), adaptTable.getSchema().getColumnNames());
                 DataStream adaptStream = tableEnv.toRetractStream(adaptTable, typeInfo)
-                        .map((Tuple2<Boolean, Row> f0) -> { return f0.f1; })
+                        .filter((Tuple2<Boolean, Row> f0) -> f0.f0)
+                        .map((Tuple2<Boolean, Row> f0) -> f0.f1)
                         .returns(typeInfo);
 
                 String fields = String.join(",", typeInfo.getFieldNames());

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

@@ -774,9 +774,9 @@ private void joinFun(Object pollObj, Map<String, Table> localTableCache,
         RowTypeInfo typeInfo = new RowTypeInfo(targetTable.getSchema().getTypes(), targetTable.getSchema().getColumnNames());
 
         DataStream adaptStream = tableEnv.toRetractStream(targetTable, org.apache.flink.types.Row.class)
-                                .map((Tuple2<Boolean, Row> f0) -> { return f0.f1; })
-                                .returns(Row.class);
-
+                .filter((Tuple2<Boolean, Row> f0) -> f0.f0)
+                .map((Tuple2<Boolean, Row> f0) -> f0.f1)
+                .returns(Row.class);
 
         //join side table before keyby ===> Reducing the size of each dimension table cache of async
         if(sideTableInfo.isPartitionedJoin()){