Merge branch 'rikcyhuo.replace'

RickyHuo · Dec 4, 2017 · 36ced58 · 36ced58
2 parents da46cca + 62cda41
commit 36ced58
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/main/java/com/sina/bip/hangout/outputs/Clickhouse.java b/src/main/java/com/sina/bip/hangout/outputs/Clickhouse.java
@@ -97,16 +97,24 @@ protected void bulkInsert(Map event) throws Exception{
                 for (int j =0; j < fields.size(); j++) {
                     String field = fields.get(j);
                     // 判断元数据中是否有对应的key
+
                     if (e.containsKey(field)) {
                         if (e.get(field) instanceof String) {
                             String fieldValue = e.get(field).toString();
                             if (!(fieldValue.indexOf("'") > 0)){
                                 value += "'" + e.get(field) + "'";
                             } else {
-                                value += "''";
+                                if (fieldValue.indexOf("\\'") > 0)
+                                    value += "'" + fieldValue.replace("'", "\\'").replace("\\\\'", "\\\\\\'") + "'";
+                                else
+                                    value += "'" + fieldValue.replace("'", "\\'") + "'";
                             }
                         } else {
-                            value += e.get(field);
+                            if (e.get(field) == null){
+                                value += "''";
+                            } else {
+                                value += e.get(field);
+                            }
                         }
                     } else {
                         value += ClickhouseUtils.renderDefault(this.schema.get(field));
@@ -126,9 +134,14 @@ protected void bulkInsert(Map event) throws Exception{
             try {
                 conn.createStatement().execute(sqls.toString());
             } catch (SQLException e){
+                System.out.println(sqls.toString());
                 System.out.println(e.toString());
+                for (int i = 0; i < this.events.size(); i++) {
+                    System.out.println(events.get(i));
+                }
                 // System.out.println("insert error");
             } catch (Exception e) {
+                System.out.println(e.toString());
                 System.out.println("error");
             }
             conn.close();
@@ -140,6 +153,7 @@ protected void emit(Map event) {
         try {
             bulkInsert(event);
         } catch (Exception e) {
+            System.out.println(e.toString());
             System.out.println("insert error");
         }
     }

diff --git a/src/test/java/TestMain.java b/src/test/java/TestMain.java
@@ -1,3 +1,4 @@
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -6,8 +7,10 @@
  */
 public class TestMain {
     public static void main(String args[]) {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("a", "b");
-        System.out.println(map.get("h"));
+
+        String src = "a='b+\\'+c'";
+        System.out.println(src);
+        System.out.println(src.replace("'", "\\'"));
+        System.out.println(src.replace("'", "\\'").replace("\\\\'", "\\\\\\'"));
     }
 }