github/DataX
5
0
Fork 0
mirror of https://github.com/alibaba/DataX.git synced 2025-05-03 03:59:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from alibaba/master

Browse Source 
rebase
This commit is contained in:
Jing Xu 2021-09-18 19:23:35 +08:00 committed by GitHub
commit 59f1825016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -152,3 +152,6 @@ This software is free to use under the Apache License [Apache license](https://g
- DataX开源用户交流群5 - DataX开源用户交流群5
- <img src="https://github.com/alibaba/DataX/blob/master/images/DataX%E5%BC%80%E6%BA%90%E7%94%A8%E6%88%B7%E4%BA%A4%E6%B5%81%E7%BE%A45.jpg" width="20%" height="20%"> - <img src="https://github.com/alibaba/DataX/blob/master/images/DataX%E5%BC%80%E6%BA%90%E7%94%A8%E6%88%B7%E4%BA%A4%E6%B5%81%E7%BE%A45.jpg" width="20%" height="20%">
- DataX开源用户交流群6
- <img src="https://user-images.githubusercontent.com/1905000/124073771-139cbd00-da75-11eb-9a3f-598cba145a76.png" width="20%" height="20%">

3
oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/InsertTask.java
View File

@ -65,6 +65,7 @@ public class InsertTask implements Runnable {
this.writeRecordSql = writeRecordSql; this.writeRecordSql = writeRecordSql;
this.isStop = false; this.isStop = false;
this.deleteMeta = deleteMeta; this.deleteMeta = deleteMeta;
connHolder.initConnection();
} }
void setWriterTask(ConcurrentTableWriterTask writerTask) { void setWriterTask(ConcurrentTableWriterTask writerTask) {
@ -151,7 +152,6 @@ public class InsertTask implements Runnable {
public void doMultiInsert(final List<Record> buffer, final boolean printCost, final long restrict) { public void doMultiInsert(final List<Record> buffer, final boolean printCost, final long restrict) {
checkMemstore(); checkMemstore();
connHolder.initConnection();
Connection conn = connHolder.getConn(); Connection conn = connHolder.getConn();
boolean success = false; boolean success = false;
long cost = 0; long cost = 0;
@ -165,7 +165,6 @@ public class InsertTask implements Runnable {
} catch (InterruptedException e) { } catch (InterruptedException e) {
LOG.info("thread interrupted ..., ignore"); LOG.info("thread interrupted ..., ignore");
} }
connHolder.initConnection();
conn = connHolder.getConn(); conn = connHolder.getConn();
LOG.info("retry {}, start do batch insert, size={}", i, buffer.size()); LOG.info("retry {}, start do batch insert, size={}", i, buffer.size());
checkMemstore(); checkMemstore();

2
odpsreader/src/main/java/com/alibaba/datax/plugin/reader/odpsreader/util/DESCipher.java
View File

@ -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"; private final static String DES = "DES";

2
odpswriter/src/main/java/com/alibaba/datax/plugin/writer/odpswriter/util/DESCipher.java
View File

@ -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"; private final static String DES = "DES";