[hotfix-32959][core] opt join dim table double group retract

Author: simenliuxing

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

@@ -133,6 +133,8 @@ public void exec(String sql,
         sideSQLParser.setLocalTableCache(localTableCache);
         Queue<Object> exeQueue = sideSQLParser.getExeQueue(sql, sideTableMap.keySet(), scope);
         Object pollObj = null;
+        // create view中是否包含维表
+        boolean includeDimTable = false;
 
         while ((pollObj = exeQueue.poll()) != null) {
 
@@ -175,9 +177,13 @@ public void exec(String sql,
                     }
 
                     localTableCache.put(createView.getTableName(), table);
+                    if(includeDimTable){
+                        dimTableNewTable.put(createView.getTableName(), table);
+                    }
                 }
-
+                includeDimTable = false;
             } else if (pollObj instanceof JoinInfo) {
+                includeDimTable = true;
                 LOG.info("----------exec join info----------\n{}", pollObj.toString());
                 joinFun(pollObj, localTableCache, dimTableNewTable,sideTableMap, tableEnv);
             }

core/src/main/java/com/dtstack/flink/sql/util/TableUtils.java

@@ -850,31 +850,29 @@ public static boolean checkIsDimTableGroupBy(SqlNode sqlNode, Collection<String>
                 // 2.(sub query) as alias group by
                 // 3.tableName group by
                 // 4.tableName as alias group by
-                // 5.tableName no group by
-                // 6.tableName as alias no group by
-
-                // 没有group by：5.no group by
-                if (fromNode.getKind() == IDENTIFIER
-                        && (groupNodeList == null || groupNodeList.size() == 0)) {
-                    return false;
-                }
+                // 5.others return false
 
                 // (子查询) group by：1.(sub query) group by
                 if (fromNode.getKind() == SELECT) {
                     return checkIsDimTableGroupBy(fromNode, newRegisterTableList);
                 }
 
                 // 表名 as 别名 group by、(子查询) as 别名 group by、表名 group by
-                if (fromNode.getKind() == AS) {
-                    // 表名 as 别名 group by：4.tableName as alias group by
-                    SqlNode operand = ((SqlBasicCall) fromNode).getOperands()[0];
-                    // (子查询) as 别名 group by：2.(sub query) as alias group by
-                    if (operand.getKind() != IDENTIFIER) {
-                        return checkIsDimTableGroupBy(fromNode, newRegisterTableList);
+                if (fromNode.getKind() == AS || fromNode.getKind() == IDENTIFIER) {
+                    SqlNode operand;
+                    // 表名 group by：3.tableName group by
+                    if (fromNode.getKind() == IDENTIFIER) {
+                        operand = fromNode;
+                    } else {
+                        // 表名 as 别名 group by：4.tableName as alias group by
+                        operand = ((SqlBasicCall) fromNode).getOperands()[0];
+                        // (子查询) as 别名 group by：2.(sub query) as alias group by
+                        if (operand.getKind() != IDENTIFIER) {
+                            return checkIsDimTableGroupBy(fromNode, newRegisterTableList);
+                        }
                     }
 
                     // 最里层是表名 group by，且group by字段不为空，且表名包含在维表中
-                    // 6.tableName as alias no group by，会在这一层过滤掉
                     if (operand.getKind() == IDENTIFIER
                             && groupNodeList != null
                             && groupNodeList.size() != 0