Merge branch 'hotfix_1.10_4.0.x_31011' into 1.10_release_4.0.x

Author: gituser

core/src/main/java/com/dtstack/flink/sql/parser/InsertSqlParser.java

@@ -163,10 +163,21 @@ private static void rebuildSelectNode(SqlNodeList selectList, SqlSelect sqlSelec
 
         for (int index = 0; index < selectList.size(); index++) {
             if (selectList.get(index).getKind().equals(SqlKind.AS)
-                    || ((SqlIdentifier) selectList.get(index)).names.size() == 1) {
+                    || (selectList.get(index).getClass().equals(SqlIdentifier.class)
+                    && ((SqlIdentifier) selectList.get(index)).names.size() == 1)) {
                 sqlNodes.add(selectList.get(index));
                 continue;
             }
+
+            if (!selectList.get(index).getClass().equals(SqlIdentifier.class)) {
+                if (selectList.get(index).getKind().equals(SqlKind.LITERAL)) {
+                    throw new IllegalArgumentException(String.format("Constants %s in the SELECT statement must be aliased!",
+                            selectList.get(index).toString()));
+                }
+                throw new RuntimeException(String.format("Illegal statement! Please check the statement: %s",
+                        selectList.get(index).toString()));
+            }
+
             sqlNodes.add(transformToAsNode(selectList.get(index)));
         }
         sqlSelect.setSelectList(sqlNodes);

core/src/main/java/com/dtstack/flink/sql/parser/SqlParser.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
- 
+
 
 package com.dtstack.flink.sql.parser;
 
@@ -27,6 +27,8 @@
 import org.apache.commons.lang3.StringUtils;
 import com.google.common.collect.Lists;
 import com.google.common.base.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Set;
@@ -41,6 +43,7 @@
  */
 
 public class SqlParser {
+    private static final Logger LOG = LoggerFactory.getLogger(SqlParser.class);
 
     private static final char SQL_DELIMITER = ';';
 
@@ -83,13 +86,18 @@ public static SqlTree parseSql(String sql, String pluginLoadMode) throws Excepti
             }
             boolean result = false;
             for(IParser sqlParser : sqlParserList){
-                if(!sqlParser.verify(childSql)){
-                    continue;
-                }
+                try {
+                    if (!sqlParser.verify(childSql)) {
+                        continue;
+                    }
 
-                sqlParser.parseSql(childSql, sqlTree);
-                result = true;
-                break;
+                    sqlParser.parseSql(childSql, sqlTree);
+                    result = true;
+                    break;
+                } catch (Exception e) {
+                    LOG.error("'{}' parser error, detail info: {}", childSql, e.getMessage(), e);
+                    throw e;
+                }
             }
 
             if(!result){