Merge branch 'rickyhuo.fix.date'

RickyHuo · Jan 11, 2019 · ef62932 · ef62932
2 parents b2fbd6b + 6e69f92
commit ef62932
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 * Author: rickyHuo
 * Homepage: https://github.com/RickyHuo/hangout-output-clickhouse
-* Version: 0.0.7
+* Version: 0.0.8
 
 ### Description
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>sina</groupId>
     <artifactId>hangout-output-plugins-clickhouse</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
     <packaging>jar</packaging>
 
     <name>hangout-output-plugins-clickhouse</name>

diff --git a/src/main/java/com/sina/bip/hangout/outputs/Clickhouse.java b/src/main/java/com/sina/bip/hangout/outputs/Clickhouse.java
@@ -72,9 +72,8 @@ private void eventInsert(Map event, int eventSize) throws Exception {
 
         // 重试3次
         if (this.events.size() >= eventSize + 3) {
-            this.events.clear();
-            log.error("Retry 3 times failed, drop this bulk, number: " + this.bulkNum);
-            this.bulkNum += 1;
+            log.error("Retry failed 3 times, system exit");
+            System.exit(1);
         }
         if (this.events.size() >= eventSize) {
 

diff --git a/src/main/java/com/sina/bip/hangout/outputs/TabSeparated.java b/src/main/java/com/sina/bip/hangout/outputs/TabSeparated.java
@@ -204,7 +204,11 @@ public void bulkInsert(List<Map> events) throws Exception {
                         break;
                     case "DateTime":
                         if (fieldValue != null) {
-                            statement.setString(i + 1, fieldValue.toString());
+                            if (fieldValue.equals(0) || fieldValue.equals("0")) {
+                                statement.setString(i + 1, "0000-00-00 00:00:00");
+                            } else {
+                                statement.setString(i + 1, fieldValue.toString());
+                            }
                         } else {
                             statement.setString(i + 1, this.datetimeFormat.format(System.currentTimeMillis()));
                         }