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

Author: gituser

core/src/main/java/com/dtstack/flink/sql/table/AbstractTableParser.java

@@ -26,8 +26,6 @@
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.java.tuple.Tuple2;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.List;
@@ -46,8 +44,6 @@
 
 public abstract class AbstractTableParser {
 
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractTableParser.class);
-
     private static final String PRIMARY_KEY = "primaryKey";
     private static final String NEST_JSON_FIELD_KEY = "nestFieldKey";
     private static final String CHAR_TYPE_NO_LENGTH = "CHAR";
@@ -119,14 +115,8 @@ public void parseFieldsInfo(String fieldsInfo, AbstractTableInfo tableInfo) {
          */
         if (tableInfo instanceof AbstractSideTableInfo) {
             tableInfo.getPrimaryKeys().stream()
-                    .filter(pk -> !tableInfo.getFieldList().contains(pk))
-                    .forEach(pk -> {
-                        try {
-                            handleKeyNotHaveAlias(String.format("%s varchar", pk), tableInfo);
-                        } catch (Exception e) {
-                            LOG.error(String.format("Handle primary key failed. Reason: %s", e.getMessage()));
-                        }
-                    });
+                    .filter(pk -> (!tableInfo.getFieldList().contains(pk) && pk.equals("rowkey")))
+                    .forEach(pk -> handleKeyNotHaveAlias(String.format("%s varchar", pk), tableInfo));
         }
 
         tableInfo.finish();