Merge branch '1.8_release_4.0.x' into 1.10_release_4.0.x

Author: gituser

flinkx-hdfs/flinkx-hdfs-core/src/main/java/com/dtstack/flinkx/hdfs/HdfsUtil.java

@@ -23,11 +23,14 @@
 import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe;
 import org.apache.hadoop.hive.serde2.io.DateWritable;
 import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
+import org.apache.hadoop.hive.serde2.io.TimestampWritable;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
+import org.apache.hadoop.io.BooleanWritable;
 import org.apache.hadoop.io.ByteWritable;
 import org.apache.hadoop.io.BytesWritable;
 import org.apache.hadoop.io.DoubleWritable;
+import org.apache.hadoop.io.FloatWritable;
 import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
@@ -68,10 +71,17 @@ public static Object getWritableValue(Object writable) {
             ret = ((DateWritable) writable).get();
         } else if(writable instanceof DoubleWritable){
             ret = ((DoubleWritable) writable).get();
-        } else {
+        } else if(writable instanceof TimestampWritable){
+            ret = ((TimestampWritable) writable).getTimestamp();
+        }else if (writable instanceof DateWritable){
+            ret = ((DateWritable) writable).get();
+        }else if (writable instanceof FloatWritable){
+            ret = ((FloatWritable) writable).get();
+        }else if (writable instanceof BooleanWritable){
+            ret = ((BooleanWritable) writable).get();
+        }else  {
             ret = writable.toString();
         }
-
         return ret;
     }