Merge branch 'hotfix_1.8_release_3.10.x_30686' into '1.8_test_3.10.x'

Hotfix 1.8 release 3.10.x 30686

See merge request dt-insight-engine/flinkx!134

Author: kanata163

flinkx-hive/flinkx-hive-writer/src/main/java/com/dtstack/flinkx/hive/writer/HiveOutputFormat.java

@@ -197,7 +197,8 @@ public void writeRecord(Row row) throws IOException {
                         event = GsonUtil.GSON.fromJson((String) tempObj, GsonUtil.gsonMapTypeToken);
                     }catch (JsonSyntaxException e){
                         // is not a json string
-                        LOG.warn("bad json string:【{}】", tempObj);
+                        //tempObj 不是map类型 则event直接往下传递
+                       // LOG.warn("bad json string:【{}】", tempObj);
                     }
                 }
             }

flinkx-postgresql/flinkx-postgresql-core/src/main/java/com/dtstack/flinkx/postgresql/PostgresqlTypeConverter.java

@@ -24,6 +24,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * The type converter for PostgreSQL database
@@ -43,6 +44,9 @@ public class PostgresqlTypeConverter implements TypeConverterInterface {
 
     private List<String> intTypes = Arrays.asList("int","int2","int4","int8");
 
+    protected static List<String> STRING_TYPES = Arrays.asList("CHAR", "VARCHAR","TINYBLOB","TINYTEXT","BLOB","TEXT", "MEDIUMBLOB", "MEDIUMTEXT", "LONGBLOB", "LONGTEXT");
+
+
     @Override
     public Object convert(Object data,String typeName) {
         if (data == null){
@@ -53,6 +57,10 @@ public Object convert(Object data,String typeName) {
             return dataValue;
         }
         if(StringUtils.isBlank(dataValue)){
+            //如果是string类型 还应该返回空字符串而不是null
+            if(STRING_TYPES.contains(typeName.toUpperCase(Locale.ENGLISH))){
+                return dataValue;
+            }
             return null;
         }
         if(doubleTypes.contains(typeName)){