From 65f6e95ccede9564a987a1cfa6ab0b7ecd64a37c Mon Sep 17 00:00:00 2001 From: Trafalgar Date: Thu, 1 Jul 2021 14:03:57 +0800 Subject: [PATCH 1/5] Update README.md add a new ding ding group --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 23dfb2d0..681de048 100644 --- a/README.md +++ b/README.md @@ -152,3 +152,6 @@ This software is free to use under the Apache License [Apache license](https://g - DataX开源用户交流群5 - +- DataX开源用户交流群6 + - + From 73a42021c5154336e340df6ebb12d9aa7d731ab9 Mon Sep 17 00:00:00 2001 From: Trafalgar Date: Tue, 20 Jul 2021 17:11:18 +0800 Subject: [PATCH 2/5] Update DESCipher.java --- .../alibaba/datax/plugin/reader/odpsreader/util/DESCipher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odpsreader/src/main/java/com/alibaba/datax/plugin/reader/odpsreader/util/DESCipher.java b/odpsreader/src/main/java/com/alibaba/datax/plugin/reader/odpsreader/util/DESCipher.java index dad82d50..82e97191 100644 --- a/odpsreader/src/main/java/com/alibaba/datax/plugin/reader/odpsreader/util/DESCipher.java +++ b/odpsreader/src/main/java/com/alibaba/datax/plugin/reader/odpsreader/util/DESCipher.java @@ -40,7 +40,7 @@ public class DESCipher { * 　　 */ - public static final String KEY = "u4Gqu4Z8"; + public static final String KEY = "DESDES"; private final static String DES = "DES"; From 3225f02bf98d058c12d3acdc1ce933636a1c2180 Mon Sep 17 00:00:00 2001 From: Trafalgar Date: Tue, 20 Jul 2021 17:12:03 +0800 Subject: [PATCH 3/5] Update DESCipher.java --- .../alibaba/datax/plugin/writer/odpswriter/util/DESCipher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odpswriter/src/main/java/com/alibaba/datax/plugin/writer/odpswriter/util/DESCipher.java b/odpswriter/src/main/java/com/alibaba/datax/plugin/writer/odpswriter/util/DESCipher.java index bf7f5a88..4afead52 100755 --- a/odpswriter/src/main/java/com/alibaba/datax/plugin/writer/odpswriter/util/DESCipher.java +++ b/odpswriter/src/main/java/com/alibaba/datax/plugin/writer/odpswriter/util/DESCipher.java @@ -40,7 +40,7 @@ public class DESCipher { * 　　 */ - public static final String KEY = "u4Gqu4Z8"; + public static final String KEY = "DESDES"; private final static String DES = "DES"; From 38b4dc8946178eb013f002f93de99a748950cd9f Mon Sep 17 00:00:00 2001 From: wang Date: Thu, 9 Sep 2021 16:31:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=20bug:=20=E8=A7=A3=E5=86=B3ob=20writer?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=95=B0=E9=9A=8F=E7=9D=80=E5=86=99=E5=85=A5?= =?UTF-8?q?=E4=B8=8D=E6=96=AD=E4=B8=8A=E6=B6=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datax/plugin/writer/oceanbasev10writer/task/InsertTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java index 522d91a5..36fc726b 100644 --- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java +++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java @@ -65,6 +65,7 @@ public class InsertTask implements Runnable { this.writeRecordSql = writeRecordSql; this.isStop = false; this.deleteMeta = deleteMeta; + connHolder.initConnection(); } void setWriterTask(ConcurrentTableWriterTask writerTask) { @@ -151,7 +152,6 @@ public class InsertTask implements Runnable { public void doMultiInsert(final List buffer, final boolean printCost, final long restrict) { checkMemstore(); - connHolder.initConnection(); Connection conn = connHolder.getConn(); boolean success = false; long cost = 0; From 5b975c55a775e0a1075d1076987939d1e326030e Mon Sep 17 00:00:00 2001 From: wang Date: Thu, 16 Sep 2021 19:27:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=20bug=EF=BC=9A=E5=9C=A8=E5=87=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E8=B0=83=E4=B8=80=E6=AC=A1reconnect=EF=BC=8C=E8=BF=99=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E9=87=8A=E6=94=BE=E6=97=A7=E8=BF=9E=E6=8E=A5=EF=BC=8C?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=96=B0=E8=BF=9E=E6=8E=A5=EF=BC=9B=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E4=B8=8B=E4=B8=80=E6=AC=A1=E5=BE=AA=E7=8E=AF=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E5=8F=88=E5=88=9B=E5=BB=BA=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E8=BF=9E=E6=8E=A5=EF=BC=8C=E6=89=80=E4=BB=A5=E5=9C=A8?= =?UTF-8?q?reconnect=E9=87=8C=E9=9D=A2=E5=88=9B=E5=BB=BA=E7=9A=84=E9=82=A3?= =?UTF-8?q?=E4=B8=AA=E6=96=B0=E8=BF=9E=E6=8E=A5=E5=B0=B1=E6=B3=84=E9=9C=B2?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datax/plugin/writer/oceanbasev10writer/task/InsertTask.java | 1 - 1 file changed, 1 deletion(-) diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java index 36fc726b..968908ca 100644 --- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java +++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java @@ -165,7 +165,6 @@ public class InsertTask implements Runnable { } catch (InterruptedException e) { LOG.info("thread interrupted ..., ignore"); } - connHolder.initConnection(); conn = connHolder.getConn(); LOG.info("retry {}, start do batch insert, size={}", i, buffer.size()); checkMemstore();