Merge branch '1.8_release_3.10.x' into 1.8_release_4.0.x

Author: gituser

hbase/hbase-sink/src/main/java/com/dtstack/flink/sql/sink/hbase/HbaseOutputFormat.java

@@ -213,10 +213,10 @@ private Put getPutByRow(Row record) {
         Put put = new Put(rowKey.getBytes());
         for (int i = 0; i < record.getArity(); ++i) {
             Object fieldVal = record.getField(i);
-            if (fieldVal == null) {
-                continue;
+            byte[] val = null;
+            if (fieldVal != null) {
+                val = fieldVal.toString().getBytes();
             }
-            byte[] val = fieldVal.toString().getBytes();
             byte[] cf = families[i].getBytes();
             byte[] qualifier = qualifiers[i].getBytes();
 

hbase/hbase-sink/src/main/java/com/dtstack/flink/sql/sink/hbase/table/HbaseSinkParser.java

@@ -129,7 +129,7 @@ public void parseFieldsInfo(String fieldsInfo, HbaseTableInfo tableInfo){
     }
 
     private Map<String, String> parseColumnFamily(Map<String, String> physicalFieldMap){
-        Map<String, String> columnFamiles = Maps.newHashMap();
+        Map<String, String> columnFamiles = new LinkedHashMap<>();
         physicalFieldMap.values().forEach(x -> {
             String[] columnFamily = StringUtils.split(x.trim(), ":");
             columnFamiles.put(x, columnFamily[1]);