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

gituser · gituser · commit 1557225106b0 · 2020-10-26T21:03:14.000+08:00
diff --git a/flinkx-hive/flinkx-hive-writer/src/main/java/com/dtstack/flinkx/hive/writer/HiveOutputFormat.java b/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);
                     }
                 }
             }

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