From ca39f422d0f78f44afd2178ceb17930098661d45 Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Wed, 22 Dec 2021 16:14:41 +0800
Subject: [PATCH 01/15] sd

---
 .../oceanbasev10reader/OceanBaseReader.java   | 19 ++++-
 .../oceanbasev10reader/ext/ReaderJob.java     | 31 ++++++++-
 .../util/DatabaseKeywordTransformer.java      | 69 +++++++++++++++++++
 .../util/ObReaderUtils.java                   | 10 +++
 4 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
index 0a4934a1..db9d34e0 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
@@ -1,8 +1,12 @@
 package com.alibaba.datax.plugin.reader.oceanbasev10reader;
 
+import java.sql.Array;
 import java.sql.Connection;
+import java.util.ArrayList;
 import java.util.List;
 
+import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.DatabaseKeywordTransformer;
+import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,6 +26,7 @@ public class OceanBaseReader extends Reader {
     public static class Job extends Reader.Job {
         private Configuration originalConfig = null;
         private ReaderJob readerJob;
+        private DataBaseType DATABASE_TYPE;
         private static final Logger LOG = LoggerFactory.getLogger(Task.class);
 
         @Override
@@ -37,10 +42,15 @@ public class OceanBaseReader extends Reader {
 
             setDatabaseType(originalConfig);
 
-            this.readerJob = new ReaderJob();
-            this.readerJob.init(this.originalConfig);
-        }
 
+
+            this.readerJob = new ReaderJob();
+            this.readerJob.init(this.originalConfig,DATABASE_TYPE);
+        }
+        @Override
+        public  void prepare(){
+            //ObReaderUtils.DATABASE_TYPE获取当前数据库的语法模式
+        }
         @Override
         public void preCheck() {
             init();
@@ -90,6 +100,9 @@ public class OceanBaseReader extends Reader {
             } catch (Exception e){
                 LOG.warn("error in get compatible mode, using mysql as default: " + e.getMessage());
             }
+            finally {
+                DATABASE_TYPE=ObReaderUtils.DATABASE_TYPE;
+            }
         }
     }
 
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
index c56155f6..efeec2e9 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
@@ -6,15 +6,44 @@ import com.alibaba.datax.common.constant.CommonConstant;
 import com.alibaba.datax.common.util.Configuration;
 import com.alibaba.datax.plugin.rdbms.reader.CommonRdbmsReader;
 import com.alibaba.datax.plugin.rdbms.reader.Key;
+import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 import com.alibaba.datax.plugin.rdbms.writer.Constant;
+import com.alibaba.datax.plugin.reader.oceanbasev10reader.OceanBaseReader;
+import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.DatabaseKeywordTransformer;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.ObReaderUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class ReaderJob extends CommonRdbmsReader.Job {
 
     public ReaderJob() {
         super(ObReaderUtils.DATABASE_TYPE);
-    }
 
+    }
+    public void init(Configuration originalConfig,DataBaseType databaseType){
+        //将config中的column和table中的关键字进行转义
+        final Logger LOG = LoggerFactory.getLogger(OceanBaseReader.Task.class);
+        try {
+            DatabaseKeywordTransformer.setDatabaseType(databaseType);
+        }catch (Exception e){
+            LOG.warn("database type is "+databaseType+e.getMessage());
+        }
+        List<String> columns=originalConfig.getList(Key.COLUMN,String.class);
+        DatabaseKeywordTransformer.transferDatabaseKeywords(columns);
+        originalConfig.set(Key.COLUMN, columns);
+
+        List<JSONObject> conns=originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK,JSONObject.class);
+        for(int i=0;i<conns.size();i++){
+            JSONObject conn=conns.get(i);
+            Configuration connConfig=Configuration.from(conn.toString());
+            List<String> tables=connConfig.getList(Key.TABLE,String.class);
+            DatabaseKeywordTransformer.transferDatabaseKeywords(tables);
+            originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK,i,Key.TABLE),tables);
+        }
+        super.init(originalConfig);
+    }
     @Override
     public List<Configuration> split(Configuration originalConfig, int adviceNumber) {
         List<Configuration> list = super.split(originalConfig, adviceNumber);
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
new file mode 100644
index 00000000..ccbbfb25
--- /dev/null
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
@@ -0,0 +1,69 @@
+package com.alibaba.datax.plugin.reader.oceanbasev10reader.util;
+
+//java api
+import java.util.HashSet;
+import java.util.List;
+
+//dataX api
+import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
+
+//该类用于转义数据库中的关键字
+public  class DatabaseKeywordTransformer {
+    private static DataBaseType databaseType;
+    static HashSet<String> databaseKeywords;
+    private static HashSet<String> keywordsFromString2HashSet(final String Keywords){
+        String[] keywordArray =Keywords.split(",");
+        HashSet<String> res=new HashSet<String>();
+        for(String keyword: keywordArray){
+            res.add(keyword);
+        }
+        return res;
+    }
+    public static void setDatabaseType(final DataBaseType databaseType) throws Exception {
+        if(databaseType==DatabaseKeywordTransformer.databaseType){
+            return ;
+        }
+        DatabaseKeywordTransformer.databaseType = databaseType;
+        if(databaseType==DataBaseType.MySql){
+            databaseKeywords=keywordsFromString2HashSet(DatabaseKeywords.MYSQL_KEYWORDS);
+        }
+        else if(databaseType==DataBaseType.Oracle){
+            databaseKeywords=keywordsFromString2HashSet(DatabaseKeywords.ORACLE_KEYWORDS);
+        }
+        else if(databaseType==DataBaseType.SQLServer){
+            databaseKeywords=keywordsFromString2HashSet(DatabaseKeywords.SQLSERVER_KEYWORDS);
+        }
+        else{
+            throw new Exception("sorry,unknown database tpye...");
+        }
+    }
+
+    public static void transferDatabaseKeywords(List<String> keywords){
+        for(int i=0;i<keywords.size();i++){
+            String keyword=keywords.get(i).toUpperCase();
+            if(databaseKeywords.contains(keyword)){
+                if(databaseType==DataBaseType.MySql){
+                    keyword='`'+keyword+'`';
+                }
+                else if(databaseType==DataBaseType.Oracle){
+                    keyword='"'+keyword+'"';
+                }
+                else if(databaseType==DataBaseType.SQLServer){
+                    keyword='['+keyword+']';
+                }
+            }
+            keyword=keyword.toLowerCase();
+            keywords.set(i,keyword);
+        }
+    }
+}
+
+
+final class DatabaseKeywords{
+
+    public static final String MYSQL_KEYWORDS = "ACCESSIBLE,ACCOUNT,ACTION,ADD,AFTER,AGAINST,AGGREGATE,ALGORITHM,ALL,ALTER,ALWAYS,ANALYSE,AND,ANY,AS,ASC,ASCII,ASENSITIVE,AT,AUTO_INCREMENT,AUTOEXTEND_SIZE,AVG,AVG_ROW_LENGTH,BACKUP,BEFORE,BEGIN,BETWEEN,BIGINT,BINARY,BINLOG,BIT,BLOB,BLOCK,BOOL,BOOLEAN,BOTH,BTREE,BY,BYTE,CACHE,CALL,CASCADE,CASCADED,CASE,CATALOG_NAME,CHAIN,CHANGE,CHANGED,CHANNEL,CHAR,CHARACTER,CHARSET,CHECK,CHECKSUM,CIPHER,CLASS_ORIGIN,CLIENT,CLOSE,COALESCE,CODE,COLLATE,COLLATION,COLUMN,COLUMN_FORMAT,COLUMN_NAME,COLUMNS,COMMENT,COMMIT,COMMITTED,COMPACT,COMPLETION,COMPRESSED,COMPRESSION,CONCURRENT,CONDITION,CONNECTION,CONSISTENT,CONSTRAINT,CONSTRAINT_CATALOG,CONSTRAINT_NAME,CONSTRAINT_SCHEMA,CONTAINS,CONTEXT,CONTINUE,CONVERT,CPU,CREATE,CROSS,CUBE,CURRENT,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,CURSOR_NAME,DATA,DATABASE,DATABASES,DATAFILE,DATE,DATETIME,DAY,DAY_HOUR,DAY_MICROSECOND,DAY_MINUTE,DAY_SECOND,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFAULT_AUTH,DEFINER,DELAY_KEY_WRITE,DELAYED,DELETE,DES_KEY_FILE,DESC,DESCRIBE,DETERMINISTIC,DIAGNOSTICS,DIRECTORY,DISABLE,DISCARD,DISK,DISTINCT,DISTINCTROW,DIV,DO,DOUBLE,DROP,DUAL,DUMPFILE,DUPLICATE,DYNAMIC,EACH,ELSE,ELSEIF,ENABLE,ENCLOSED,ENCRYPTION,END,ENDS,ENGINE,ENGINES,ENUM,ERROR,ERRORS,ESCAPE,ESCAPED,EVENT,EVENTS,EVERY,EXCHANGE,EXECUTE,EXISTS,EXIT,EXPANSION,EXPIRE,EXPLAIN,EXPORT,EXTENDED,EXTENT_SIZE,FAST,FAULTS,FETCH,FIELDS,FILE,FILE_BLOCK_SIZE,FILTER,FIRST,FIXED,FLOAT,FLOAT4,FLOAT8,FLUSH,FOLLOWS,FOR,FORCE,FOREIGN,FORMAT,FOUND,FROM,FULL,FULLTEXT,FUNCTION,GENERAL,GENERATED,GEOMETRY,GEOMETRYCOLLECTION,GET,GET_FORMAT,GLOBAL,GRANT,GRANTS,GROUP,GROUP_REPLICATION,HANDLER,HASH,HAVING,HELP,HIGH_PRIORITY,HOST,HOSTS,HOUR,HOUR_MICROSECOND,HOUR_MINUTE,HOUR_SECOND,IDENTIFIED,IF,IGNORE,IGNORE_SERVER_IDS,IMPORT,IN,INDEX,INDEXES,INFILE,INITIAL_SIZE,INNER,INOUT,INSENSITIVE,INSERT,INSERT_METHOD,INSTALL,INSTANCE,INT,INT1,INT2,INT3,INT4,INT8,INTEGER,INTERVAL,INTO,INVOKER,IO,IO_AFTER_GTIDS,IO_BEFORE_GTIDS,IO_THREAD,IPC,IS,ISOLATION,ISSUER,ITERATE,JOIN,JSON,KEY,KEY_BLOCK_SIZE,KEYS,KILL,LANGUAGE,LAST,LEADING,LEAVE,LEAVES,LEFT,LESS,LEVEL,LIKE,LIMIT,LINEAR,LINES,LINESTRING,LIST,LOAD,LOCAL,LOCALTIME,LOCALTIMESTAMP,LOCK,LOCKS,LOGFILE,LOGS,LONG,LONGBLOB,LONGTEXT,LOOP,LOW_PRIORITY,MASTER,MASTER_AUTO_POSITION,MASTER_BIND,MASTER_CONNECT_RETRY,MASTER_DELAY,MASTER_HEARTBEAT_PERIOD,MASTER_HOST,MASTER_LOG_FILE,MASTER_LOG_POS,MASTER_PASSWORD,MASTER_PORT,MASTER_RETRY_COUNT,MASTER_SERVER_ID,MASTER_SSL,MASTER_SSL_CA,MASTER_SSL_CAPATH,MASTER_SSL_CERT,MASTER_SSL_CIPHER,MASTER_SSL_CRL,MASTER_SSL_CRLPATH,MASTER_SSL_KEY,MASTER_SSL_VERIFY_SERVER_CERT,MASTER_TLS_VERSION,MASTER_USER,MATCH,MAX_CONNECTIONS_PER_HOUR,MAX_QUERIES_PER_HOUR,MAX_ROWS,MAX_SIZE,MAX_STATEMENT_TIME,MAX_UPDATES_PER_HOUR,MAX_USER_CONNECTIONS,MAXVALUE,MEDIUM,MEDIUMBLOB,MEDIUMINT,MEDIUMTEXT,MEMORY,MERGE,MESSAGE_TEXT,MICROSECOND,MIDDLEINT,MIGRATE,MIN_ROWS,MINUTE,MINUTE_MICROSECOND,MINUTE_SECOND,MOD,MODE,MODIFIES,MODIFY,MONTH,MULTILINESTRING,MULTIPOINT,MULTIPOLYGON,MUTEX,MYSQL_ERRNO,NAME,NAMES,NATIONAL,NATURAL,NCHAR,NDB,NDBCLUSTER,NEVER,NEW,NEXT,NO,NO_WAIT,NO_WRITE_TO_BINLOG,NODEGROUP,NONBLOCKING,NONE,NOT,NULL,NUMBER,NUMERIC,NVARCHAR,OFFSET,OLD_PASSWORD,ON,ONE,ONLY,OPEN,OPTIMIZE,OPTIMIZER_COSTS,OPTION,OPTIONALLY,OPTIONS,OR,ORDER,OUT,OUTER,OUTFILE,OWNER,PACK_KEYS,PAGE,PARSE_GCOL_EXPR,PARSER,PARTIAL,PARTITION,PARTITIONING,PARTITIONS,PASSWORD,PHASE,PLUGIN,PLUGIN_DIR,PLUGINS,POINT,POLYGON,PORT,PRECEDES,PRECISION,PREPARE,PRESERVE,PREV,PRIMARY,PRIVILEGES,PROCEDURE,PROCESSLIST,PROFILE,PROFILES,PROXY,PURGE,QUARTER,QUERY,QUICK,RANGE,READ,READ_ONLY,READ_WRITE,READS,REAL,REBUILD,RECOVER,REDO_BUFFER_SIZE,REDOFILE,REDUNDANT,REFERENCES,REGEXP,RELAY,RELAY_LOG_FILE,RELAY_LOG_POS,RELAY_THREAD,RELAYLOG,RELEASE,RELOAD,REMOVE,RENAME,REORGANIZE,REPAIR,REPEAT,REPEATABLE,REPLACE,REPLICATE_DO_DB,REPLICATE_DO_TABLE,REPLICATE_IGNORE_DB,REPLICATE_IGNORE_TABLE,REPLICATE_REWRITE_DB,REPLICATE_WILD_DO_TABLE,REPLICATE_WILD_IGNORE_TABLE,REPLICATION,REQUIRE,RESET,RESIGNAL,RESTORE,RESTRICT,RESUME,RETURN,RETURNED_SQLSTATE,RETURNS,REVERSE,REVOKE,RIGHT,RLIKE,ROLLBACK,ROLLUP,ROTATE,ROUTINE,ROW,ROW_COUNT,ROW_FORMAT,ROWS,RTREE,SAVEPOINT,SCHEDULE,SCHEMA,SCHEMA_NAME,SCHEMAS,SECOND,SECOND_MICROSECOND,SECURITY,SELECT,SENSITIVE,SEPARATOR,SERIAL,SERIALIZABLE,SERVER,SESSION,SET,SHARE,SHOW,SHUTDOWN,SIGNAL,SIGNED,SIMPLE,SLAVE,SLOW,SMALLINT,SNAPSHOT,SOCKET,SOME,SONAME,SOUNDS,SOURCE,SPATIAL,SPECIFIC,SQL,SQL_AFTER_GTIDS,SQL_AFTER_MTS_GAPS,SQL_BEFORE_GTIDS,SQL_BIG_RESULT,SQL_BUFFER_RESULT,SQL_CACHE,SQL_CALC_FOUND_ROWS,SQL_NO_CACHE,SQL_SMALL_RESULT,SQL_THREAD,SQL_TSI_DAY,SQL_TSI_HOUR,SQL_TSI_MINUTE,SQL_TSI_MONTH,SQL_TSI_QUARTER,SQL_TSI_SECOND,SQL_TSI_WEEK,SQL_TSI_YEAR,SQLEXCEPTION,SQLSTATE,SQLWARNING,SSL,STACKED,START,STARTING,STARTS,STATS_AUTO_RECALC,STATS_PERSISTENT,STATS_SAMPLE_PAGES,STATUS,STOP,STORAGE,STORED,STRAIGHT_JOIN,STRING,SUBCLASS_ORIGIN,SUBJECT,SUBPARTITION,SUBPARTITIONS,SUPER,SUSPEND,SWAPS,SWITCHES,TABLE,TABLE_CHECKSUM,TABLE_NAME,TABLES,TABLESPACE,TEMPORARY,TEMPTABLE,TERMINATED,TEXT,THAN,THEN,TIME,TIMESTAMP,TIMESTAMPADD,TIMESTAMPDIFF,TINYBLOB,TINYINT,TINYTEXT,TO,TRAILING,TRANSACTION,TRIGGER,TRIGGERS,TRUNCATE,TYPE,TYPES,UNCOMMITTED,UNDEFINED,UNDO,UNDO_BUFFER_SIZE,UNDOFILE,UNICODE,UNINSTALL,UNION,UNIQUE,UNKNOWN,UNLOCK,UNSIGNED,UNTIL,UPDATE,UPGRADE,USAGE,USE,USE_FRM,USER,USER_RESOURCES,USING,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,VALIDATION,VALUE,VALUES,VARBINARY,VARCHAR,VARCHARACTER,VARIABLES,VARYING,VIEW,VIRTUAL,WAIT,WARNINGS,WEEK,WEIGHT_STRING,WHEN,WHERE,WHILE,WITH,WITHOUT,WORK,WRAPPER,WRITE,X509,XA,XID,XML,XOR,YEAR,YEAR_MONTH,ZEROFILL,FALSE,TRUE";
+
+    public static final String SQLSERVER_KEYWORDS = "ADD,ALL,ALTER,AND,ANY,AS,ASC,AUTHORIZATION,BACKUP,BEGIN,BETWEEN,BREAK,BROWSE,BULK,BY,CASCADE,CASE,CHECK,CHECKPOINT,CLOSE,CLUSTERED,COALESCE,COLLATE,COLUMN,COMMIT,COMPUTE,CONSTRAINT,CONTAINS,CONTAINSTABLE,CONTINUE,CONVERT,CREATE,CROSS,CURRENT,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,DATABASE,DBCC,DEALLOCATE,DECLARE,DEFAULT,DELETE,DENY,DESC,DISK,DISTINCT,DISTRIBUTED,DOUBLE,DROP,DUMMY,DUMP,ELSE,END,ERRLVL,ESCAPE,EXCEPT,EXEC,EXECUTE,EXISTS,EXIT,FETCH,FILE,FILLFACTOR,FOR,FOREIGN,FREETEXT,FREETEXTTABLE,FROM,FULL,FUNCTION,GOTO,GRANT,GROUP,HAVING,HOLDLOCK,IDENTITY,IDENTITY_INSERT,IDENTITYCOL,IF,IN,INDEX,INNER,INSERT,INTERSECT,INTO,IS,JOIN,KEY,KILL,LEFT,LIKE,LINENO,LOAD,NATIONAL,NOCHECK,NONCLUSTERED,NOT,NULL,NULLIF,OF,OFF,OFFSETS,ON,OPEN,OPENDATASOURCE,OPENQUERY,OPENROWSET,OPENXML,OPTION,OR,ORDER,OUTER,OVER,PERCENT,PLAN,PRECISION,PRIMARY,PRINT,PROC,PROCEDURE,PUBLIC,RAISERROR,READ,READTEXT,RECONFIGURE,REFERENCES,REPLICATION,RESTORE,RESTRICT,RETURN,REVOKE,RIGHT,ROLLBACK,ROWCOUNT,ROWGUIDCOL,RULE,SAVE,SCHEMA,SELECT,SESSION_USER,SET,SETUSER,SHUTDOWN,SOME,STATISTICS,SYSTEM_USER,TABLE,TEXTSIZE,THEN,TO,TOP,TRAN,TRANSACTION,TRIGGER,TRUNCATE,TSEQUAL,UNION,UNIQUE,UPDATE,UPDATETEXT,USE,USER,VALUES,VARYING,VIEW,WAITFOR,WHEN,WHERE,WHILE,WITH,WRITETEXT";
+
+    public static final String ORACLE_KEYWORDS = "ACCESS,ADD,ALL,ALTER,AND,ANY,ARRAYLEN,AS,ASC,AUDIT,BETWEEN,BY,CHAR,CHECK,CLUSTER,COLUMN,COMMENT,COMPRESS,CONNECT,CREATE,CURRENT,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FILE,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IMMEDIATE,IN,INCREMENT,INDEX,INITIAL,INSERT,INTEGER,INTERSECT,INTO,IS,LEVEL,LIKE,LOCK,LONG,MAXEXTENTS,MINUS,MODE,MODIFY,NOAUDIT,NOCOMPRESS,NOT,NOTFOUND,NOWAIT,NULL,NUMBER,OF,OFFLINE,ON,ONLINE,OPTION,OR,ORDER,PCTFREE,PRIOR,PRIVILEGES,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,ROW,ROWID,ROWLABEL,ROWNUM,ROWS,SELECT,SESSION,SET,SHARE,SIZE,SMALLINT,SQLBUF,START,SUCCESSFUL,SYNONYM,TABLE,THEN,TO,TRIGGER,UID,UNION,UNIQUE,UPDATE,USER,VALIDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHENEVER,WHERE,WITH";
+}
\ No newline at end of file
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
index 2290fb43..39f12eac 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
@@ -84,8 +84,11 @@ public class ObReaderUtils {
             return;
         }
         List<String> columns = context.getColumns();
+
         // 最后参与排序的索引列
+
         context.setPkColumns(pkColumns);
+
         int[] pkIndexs = new int[pkColumns.length];
         for (int i = 0, n = pkColumns.length; i < n; i++) {
             String pkc = pkColumns[i];
@@ -131,6 +134,13 @@ public class ObReaderUtils {
                     realIndex.add(columnName);
                 }
             }
+            //fix:将主键中的关键字转义
+            DatabaseKeywordTransformer.setDatabaseType(DataBaseType.MySql);
+            if(isOracleMode(context.getCompatibleMode())){
+                DatabaseKeywordTransformer.setDatabaseType(DataBaseType.Oracle);
+            }
+            DatabaseKeywordTransformer.transferDatabaseKeywords(realIndex);
+
             String[] pks = new String[realIndex.size()];
             realIndex.toArray(pks);
             return pks;

From 4e916b0f4b125d1b806206292fa345a984d031ff Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Wed, 22 Dec 2021 17:17:12 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=94=B1?=
 =?UTF-8?q?=E4=BA=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=9D=E7=95=99=E5=AD=97?=
 =?UTF-8?q?=E6=98=AF=E8=A1=A8=E5=90=8D=E6=88=96=E8=80=85=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E6=97=B6=E5=BC=95=E8=B5=B7=E7=9A=84sql=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10reader/util/DatabaseKeywordTransformer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
index ccbbfb25..2a330ccb 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
@@ -27,7 +27,7 @@ public  class DatabaseKeywordTransformer {
         if(databaseType==DataBaseType.MySql){
             databaseKeywords=keywordsFromString2HashSet(DatabaseKeywords.MYSQL_KEYWORDS);
         }
-        else if(databaseType==DataBaseType.Oracle){
+        else if(databaseType==DataBaseType.Oracle || databaseType==DataBaseType.OceanBase){
             databaseKeywords=keywordsFromString2HashSet(DatabaseKeywords.ORACLE_KEYWORDS);
         }
         else if(databaseType==DataBaseType.SQLServer){
@@ -45,7 +45,7 @@ public  class DatabaseKeywordTransformer {
                 if(databaseType==DataBaseType.MySql){
                     keyword='`'+keyword+'`';
                 }
-                else if(databaseType==DataBaseType.Oracle){
+                else if(databaseType==DataBaseType.Oracle || databaseType==DataBaseType.OceanBase){
                     keyword='"'+keyword+'"';
                 }
                 else if(databaseType==DataBaseType.SQLServer){

From 738c11e0e3e3e71d57b5b1799e560ecd96d0cb2e Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Wed, 22 Dec 2021 19:54:38 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=94=B1?=
 =?UTF-8?q?=E4=BA=8ESQL=E4=B8=AD=E7=9A=84=E4=BF=9D=E7=95=99=E5=AD=97?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E8=A1=A8=E5=90=8D=E6=88=96=E8=80=85=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E8=80=8C=E5=BC=95=E8=B5=B7=E7=9A=84sql?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10reader/OceanBaseReader.java   | 21 +++---
 .../util/DatabaseKeywordTransformer.java      | 68 ++++++++++---------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
index db9d34e0..04d28482 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
@@ -37,20 +37,17 @@ public class OceanBaseReader extends Reader {
             if (userConfigedFetchSize != null) {
                 LOG.warn("The [fetchSize] is not recognized, please use readBatchSize instead.");
             }
-
             this.originalConfig.set(Constant.FETCH_SIZE, Integer.MIN_VALUE);
-
             setDatabaseType(originalConfig);
-
-
-
             this.readerJob = new ReaderJob();
-            this.readerJob.init(this.originalConfig,DATABASE_TYPE);
+            this.readerJob.init(this.originalConfig, DATABASE_TYPE);
         }
+
         @Override
-        public  void prepare(){
+        public void prepare() {
             //ObReaderUtils.DATABASE_TYPE获取当前数据库的语法模式
         }
+
         @Override
         public void preCheck() {
             init();
@@ -80,7 +77,7 @@ public class OceanBaseReader extends Reader {
             Configuration connConf = Configuration.from(conns.get(0).toString());
             List<String> jdbcUrls = connConf.getList(Key.JDBC_URL, String.class);
             String jdbcUrl = jdbcUrls.get(0);
-            if(jdbcUrl.startsWith(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING)) {
+            if (jdbcUrl.startsWith(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING)) {
                 String[] ss = jdbcUrl.split(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING_PATTERN);
                 if (ss.length != 3) {
                     LOG.warn("unrecognized jdbc url: " + jdbcUrl);
@@ -97,11 +94,11 @@ public class OceanBaseReader extends Reader {
                 if (ObReaderUtils.isOracleMode(compatibleMode)) {
                     ObReaderUtils.DATABASE_TYPE = DataBaseType.OceanBase;
                 }
-            } catch (Exception e){
+
+            } catch (Exception e) {
                 LOG.warn("error in get compatible mode, using mysql as default: " + e.getMessage());
-            }
-            finally {
-                DATABASE_TYPE=ObReaderUtils.DATABASE_TYPE;
+            } finally {
+                DATABASE_TYPE = ObReaderUtils.DATABASE_TYPE;
             }
         }
     }
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
index 2a330ccb..6d85cf69 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
@@ -1,65 +1,67 @@
 package com.alibaba.datax.plugin.reader.oceanbasev10reader.util;
 
 //java api
+
 import java.util.HashSet;
 import java.util.List;
 
 //dataX api
 import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 
-//该类用于转义数据库中的关键字
-public  class DatabaseKeywordTransformer {
+/**
+ * 该类用于转义数据库中的关键字
+ *
+ * @author:qianzhang
+ */
+public class DatabaseKeywordTransformer {
     private static DataBaseType databaseType;
     static HashSet<String> databaseKeywords;
-    private static HashSet<String> keywordsFromString2HashSet(final String Keywords){
-        String[] keywordArray =Keywords.split(",");
-        HashSet<String> res=new HashSet<String>();
-        for(String keyword: keywordArray){
+
+    private static HashSet<String> keywordsFromString2HashSet(final String keywords) {
+        String[] keywordArray = keywords.split(",");
+        HashSet<String> res = new HashSet<String>();
+        for (String keyword : keywordArray) {
             res.add(keyword);
         }
         return res;
     }
+
     public static void setDatabaseType(final DataBaseType databaseType) throws Exception {
-        if(databaseType==DatabaseKeywordTransformer.databaseType){
-            return ;
+        if (databaseType == DatabaseKeywordTransformer.databaseType) {
+            return;
         }
         DatabaseKeywordTransformer.databaseType = databaseType;
-        if(databaseType==DataBaseType.MySql){
-            databaseKeywords=keywordsFromString2HashSet(DatabaseKeywords.MYSQL_KEYWORDS);
-        }
-        else if(databaseType==DataBaseType.Oracle || databaseType==DataBaseType.OceanBase){
-            databaseKeywords=keywordsFromString2HashSet(DatabaseKeywords.ORACLE_KEYWORDS);
-        }
-        else if(databaseType==DataBaseType.SQLServer){
-            databaseKeywords=keywordsFromString2HashSet(DatabaseKeywords.SQLSERVER_KEYWORDS);
-        }
-        else{
+        if (databaseType == DataBaseType.MySql) {
+            databaseKeywords = keywordsFromString2HashSet(DatabaseKeywords.MYSQL_KEYWORDS);
+        } else if (databaseType == DataBaseType.Oracle || databaseType == DataBaseType.OceanBase) {
+            databaseKeywords = keywordsFromString2HashSet(DatabaseKeywords.ORACLE_KEYWORDS);
+        } else if (databaseType == DataBaseType.SQLServer) {
+            databaseKeywords = keywordsFromString2HashSet(DatabaseKeywords.SQLSERVER_KEYWORDS);
+        } else {
             throw new Exception("sorry,unknown database tpye...");
         }
     }
 
-    public static void transferDatabaseKeywords(List<String> keywords){
-        for(int i=0;i<keywords.size();i++){
-            String keyword=keywords.get(i).toUpperCase();
-            if(databaseKeywords.contains(keyword)){
-                if(databaseType==DataBaseType.MySql){
-                    keyword='`'+keyword+'`';
-                }
-                else if(databaseType==DataBaseType.Oracle || databaseType==DataBaseType.OceanBase){
-                    keyword='"'+keyword+'"';
-                }
-                else if(databaseType==DataBaseType.SQLServer){
-                    keyword='['+keyword+']';
+    public static void transferDatabaseKeywords(List<String> keywords) {
+        for (int i = 0; i < keywords.size(); i++) {
+            String keyword = keywords.get(i).toUpperCase();
+            if (databaseKeywords.contains(keyword)) {
+                if (databaseType == DataBaseType.MySql) {
+                    keyword = '`' + keyword + '`';
+                } else if (databaseType == DataBaseType.Oracle || databaseType == DataBaseType.OceanBase) {
+                    keyword = '"' + keyword + '"';
+                } else if (databaseType == DataBaseType.SQLServer) {
+                    keyword = '[' + keyword + ']';
                 }
             }
-            keyword=keyword.toLowerCase();
-            keywords.set(i,keyword);
+            keyword = keyword.toLowerCase();
+            keywords.set(i, keyword);
         }
     }
 }
 
 
-final class DatabaseKeywords{
+final class DatabaseKeywords {
 
     public static final String MYSQL_KEYWORDS = "ACCESSIBLE,ACCOUNT,ACTION,ADD,AFTER,AGAINST,AGGREGATE,ALGORITHM,ALL,ALTER,ALWAYS,ANALYSE,AND,ANY,AS,ASC,ASCII,ASENSITIVE,AT,AUTO_INCREMENT,AUTOEXTEND_SIZE,AVG,AVG_ROW_LENGTH,BACKUP,BEFORE,BEGIN,BETWEEN,BIGINT,BINARY,BINLOG,BIT,BLOB,BLOCK,BOOL,BOOLEAN,BOTH,BTREE,BY,BYTE,CACHE,CALL,CASCADE,CASCADED,CASE,CATALOG_NAME,CHAIN,CHANGE,CHANGED,CHANNEL,CHAR,CHARACTER,CHARSET,CHECK,CHECKSUM,CIPHER,CLASS_ORIGIN,CLIENT,CLOSE,COALESCE,CODE,COLLATE,COLLATION,COLUMN,COLUMN_FORMAT,COLUMN_NAME,COLUMNS,COMMENT,COMMIT,COMMITTED,COMPACT,COMPLETION,COMPRESSED,COMPRESSION,CONCURRENT,CONDITION,CONNECTION,CONSISTENT,CONSTRAINT,CONSTRAINT_CATALOG,CONSTRAINT_NAME,CONSTRAINT_SCHEMA,CONTAINS,CONTEXT,CONTINUE,CONVERT,CPU,CREATE,CROSS,CUBE,CURRENT,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,CURSOR_NAME,DATA,DATABASE,DATABASES,DATAFILE,DATE,DATETIME,DAY,DAY_HOUR,DAY_MICROSECOND,DAY_MINUTE,DAY_SECOND,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFAULT_AUTH,DEFINER,DELAY_KEY_WRITE,DELAYED,DELETE,DES_KEY_FILE,DESC,DESCRIBE,DETERMINISTIC,DIAGNOSTICS,DIRECTORY,DISABLE,DISCARD,DISK,DISTINCT,DISTINCTROW,DIV,DO,DOUBLE,DROP,DUAL,DUMPFILE,DUPLICATE,DYNAMIC,EACH,ELSE,ELSEIF,ENABLE,ENCLOSED,ENCRYPTION,END,ENDS,ENGINE,ENGINES,ENUM,ERROR,ERRORS,ESCAPE,ESCAPED,EVENT,EVENTS,EVERY,EXCHANGE,EXECUTE,EXISTS,EXIT,EXPANSION,EXPIRE,EXPLAIN,EXPORT,EXTENDED,EXTENT_SIZE,FAST,FAULTS,FETCH,FIELDS,FILE,FILE_BLOCK_SIZE,FILTER,FIRST,FIXED,FLOAT,FLOAT4,FLOAT8,FLUSH,FOLLOWS,FOR,FORCE,FOREIGN,FORMAT,FOUND,FROM,FULL,FULLTEXT,FUNCTION,GENERAL,GENERATED,GEOMETRY,GEOMETRYCOLLECTION,GET,GET_FORMAT,GLOBAL,GRANT,GRANTS,GROUP,GROUP_REPLICATION,HANDLER,HASH,HAVING,HELP,HIGH_PRIORITY,HOST,HOSTS,HOUR,HOUR_MICROSECOND,HOUR_MINUTE,HOUR_SECOND,IDENTIFIED,IF,IGNORE,IGNORE_SERVER_IDS,IMPORT,IN,INDEX,INDEXES,INFILE,INITIAL_SIZE,INNER,INOUT,INSENSITIVE,INSERT,INSERT_METHOD,INSTALL,INSTANCE,INT,INT1,INT2,INT3,INT4,INT8,INTEGER,INTERVAL,INTO,INVOKER,IO,IO_AFTER_GTIDS,IO_BEFORE_GTIDS,IO_THREAD,IPC,IS,ISOLATION,ISSUER,ITERATE,JOIN,JSON,KEY,KEY_BLOCK_SIZE,KEYS,KILL,LANGUAGE,LAST,LEADING,LEAVE,LEAVES,LEFT,LESS,LEVEL,LIKE,LIMIT,LINEAR,LINES,LINESTRING,LIST,LOAD,LOCAL,LOCALTIME,LOCALTIMESTAMP,LOCK,LOCKS,LOGFILE,LOGS,LONG,LONGBLOB,LONGTEXT,LOOP,LOW_PRIORITY,MASTER,MASTER_AUTO_POSITION,MASTER_BIND,MASTER_CONNECT_RETRY,MASTER_DELAY,MASTER_HEARTBEAT_PERIOD,MASTER_HOST,MASTER_LOG_FILE,MASTER_LOG_POS,MASTER_PASSWORD,MASTER_PORT,MASTER_RETRY_COUNT,MASTER_SERVER_ID,MASTER_SSL,MASTER_SSL_CA,MASTER_SSL_CAPATH,MASTER_SSL_CERT,MASTER_SSL_CIPHER,MASTER_SSL_CRL,MASTER_SSL_CRLPATH,MASTER_SSL_KEY,MASTER_SSL_VERIFY_SERVER_CERT,MASTER_TLS_VERSION,MASTER_USER,MATCH,MAX_CONNECTIONS_PER_HOUR,MAX_QUERIES_PER_HOUR,MAX_ROWS,MAX_SIZE,MAX_STATEMENT_TIME,MAX_UPDATES_PER_HOUR,MAX_USER_CONNECTIONS,MAXVALUE,MEDIUM,MEDIUMBLOB,MEDIUMINT,MEDIUMTEXT,MEMORY,MERGE,MESSAGE_TEXT,MICROSECOND,MIDDLEINT,MIGRATE,MIN_ROWS,MINUTE,MINUTE_MICROSECOND,MINUTE_SECOND,MOD,MODE,MODIFIES,MODIFY,MONTH,MULTILINESTRING,MULTIPOINT,MULTIPOLYGON,MUTEX,MYSQL_ERRNO,NAME,NAMES,NATIONAL,NATURAL,NCHAR,NDB,NDBCLUSTER,NEVER,NEW,NEXT,NO,NO_WAIT,NO_WRITE_TO_BINLOG,NODEGROUP,NONBLOCKING,NONE,NOT,NULL,NUMBER,NUMERIC,NVARCHAR,OFFSET,OLD_PASSWORD,ON,ONE,ONLY,OPEN,OPTIMIZE,OPTIMIZER_COSTS,OPTION,OPTIONALLY,OPTIONS,OR,ORDER,OUT,OUTER,OUTFILE,OWNER,PACK_KEYS,PAGE,PARSE_GCOL_EXPR,PARSER,PARTIAL,PARTITION,PARTITIONING,PARTITIONS,PASSWORD,PHASE,PLUGIN,PLUGIN_DIR,PLUGINS,POINT,POLYGON,PORT,PRECEDES,PRECISION,PREPARE,PRESERVE,PREV,PRIMARY,PRIVILEGES,PROCEDURE,PROCESSLIST,PROFILE,PROFILES,PROXY,PURGE,QUARTER,QUERY,QUICK,RANGE,READ,READ_ONLY,READ_WRITE,READS,REAL,REBUILD,RECOVER,REDO_BUFFER_SIZE,REDOFILE,REDUNDANT,REFERENCES,REGEXP,RELAY,RELAY_LOG_FILE,RELAY_LOG_POS,RELAY_THREAD,RELAYLOG,RELEASE,RELOAD,REMOVE,RENAME,REORGANIZE,REPAIR,REPEAT,REPEATABLE,REPLACE,REPLICATE_DO_DB,REPLICATE_DO_TABLE,REPLICATE_IGNORE_DB,REPLICATE_IGNORE_TABLE,REPLICATE_REWRITE_DB,REPLICATE_WILD_DO_TABLE,REPLICATE_WILD_IGNORE_TABLE,REPLICATION,REQUIRE,RESET,RESIGNAL,RESTORE,RESTRICT,RESUME,RETURN,RETURNED_SQLSTATE,RETURNS,REVERSE,REVOKE,RIGHT,RLIKE,ROLLBACK,ROLLUP,ROTATE,ROUTINE,ROW,ROW_COUNT,ROW_FORMAT,ROWS,RTREE,SAVEPOINT,SCHEDULE,SCHEMA,SCHEMA_NAME,SCHEMAS,SECOND,SECOND_MICROSECOND,SECURITY,SELECT,SENSITIVE,SEPARATOR,SERIAL,SERIALIZABLE,SERVER,SESSION,SET,SHARE,SHOW,SHUTDOWN,SIGNAL,SIGNED,SIMPLE,SLAVE,SLOW,SMALLINT,SNAPSHOT,SOCKET,SOME,SONAME,SOUNDS,SOURCE,SPATIAL,SPECIFIC,SQL,SQL_AFTER_GTIDS,SQL_AFTER_MTS_GAPS,SQL_BEFORE_GTIDS,SQL_BIG_RESULT,SQL_BUFFER_RESULT,SQL_CACHE,SQL_CALC_FOUND_ROWS,SQL_NO_CACHE,SQL_SMALL_RESULT,SQL_THREAD,SQL_TSI_DAY,SQL_TSI_HOUR,SQL_TSI_MINUTE,SQL_TSI_MONTH,SQL_TSI_QUARTER,SQL_TSI_SECOND,SQL_TSI_WEEK,SQL_TSI_YEAR,SQLEXCEPTION,SQLSTATE,SQLWARNING,SSL,STACKED,START,STARTING,STARTS,STATS_AUTO_RECALC,STATS_PERSISTENT,STATS_SAMPLE_PAGES,STATUS,STOP,STORAGE,STORED,STRAIGHT_JOIN,STRING,SUBCLASS_ORIGIN,SUBJECT,SUBPARTITION,SUBPARTITIONS,SUPER,SUSPEND,SWAPS,SWITCHES,TABLE,TABLE_CHECKSUM,TABLE_NAME,TABLES,TABLESPACE,TEMPORARY,TEMPTABLE,TERMINATED,TEXT,THAN,THEN,TIME,TIMESTAMP,TIMESTAMPADD,TIMESTAMPDIFF,TINYBLOB,TINYINT,TINYTEXT,TO,TRAILING,TRANSACTION,TRIGGER,TRIGGERS,TRUNCATE,TYPE,TYPES,UNCOMMITTED,UNDEFINED,UNDO,UNDO_BUFFER_SIZE,UNDOFILE,UNICODE,UNINSTALL,UNION,UNIQUE,UNKNOWN,UNLOCK,UNSIGNED,UNTIL,UPDATE,UPGRADE,USAGE,USE,USE_FRM,USER,USER_RESOURCES,USING,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,VALIDATION,VALUE,VALUES,VARBINARY,VARCHAR,VARCHARACTER,VARIABLES,VARYING,VIEW,VIRTUAL,WAIT,WARNINGS,WEEK,WEIGHT_STRING,WHEN,WHERE,WHILE,WITH,WITHOUT,WORK,WRAPPER,WRITE,X509,XA,XID,XML,XOR,YEAR,YEAR_MONTH,ZEROFILL,FALSE,TRUE";
 

From bd43216cf8110703bc7f99ec0d0dcac56ac666fe Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Thu, 23 Dec 2021 13:38:37 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8F=90?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E4=B8=8A=E8=BF=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10reader/ext/ReaderJob.java     |  3 +--
 .../util/DatabaseKeywordTransformer.java      | 19 +++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
index efeec2e9..dfa1adbf 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
@@ -17,14 +17,13 @@ import org.slf4j.LoggerFactory;
 
 
 public class ReaderJob extends CommonRdbmsReader.Job {
-
+    private Logger LOG=LoggerFactory.getLogger(OceanBaseReader.Task.class);
     public ReaderJob() {
         super(ObReaderUtils.DATABASE_TYPE);
 
     }
     public void init(Configuration originalConfig,DataBaseType databaseType){
         //将config中的column和table中的关键字进行转义
-        final Logger LOG = LoggerFactory.getLogger(OceanBaseReader.Task.class);
         try {
             DatabaseKeywordTransformer.setDatabaseType(databaseType);
         }catch (Exception e){
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
index 6d85cf69..3c3e03f7 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
@@ -2,8 +2,10 @@ package com.alibaba.datax.plugin.reader.oceanbasev10reader.util;
 
 //java api
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 //dataX api
 import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
@@ -15,15 +17,10 @@ import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
  */
 public class DatabaseKeywordTransformer {
     private static DataBaseType databaseType;
-    static HashSet<String> databaseKeywords;
+    static Set<String> databaseKeywords;
 
-    private static HashSet<String> keywordsFromString2HashSet(final String keywords) {
-        String[] keywordArray = keywords.split(",");
-        HashSet<String> res = new HashSet<String>();
-        for (String keyword : keywordArray) {
-            res.add(keyword);
-        }
-        return res;
+    private static Set<String> keywordsFromString2HashSet(final String keywords) {
+        return new HashSet(Arrays.asList(keywords.split(",")));
     }
 
     public static void setDatabaseType(final DataBaseType databaseType) throws Exception {
@@ -35,8 +32,6 @@ public class DatabaseKeywordTransformer {
             databaseKeywords = keywordsFromString2HashSet(DatabaseKeywords.MYSQL_KEYWORDS);
         } else if (databaseType == DataBaseType.Oracle || databaseType == DataBaseType.OceanBase) {
             databaseKeywords = keywordsFromString2HashSet(DatabaseKeywords.ORACLE_KEYWORDS);
-        } else if (databaseType == DataBaseType.SQLServer) {
-            databaseKeywords = keywordsFromString2HashSet(DatabaseKeywords.SQLSERVER_KEYWORDS);
         } else {
             throw new Exception("sorry,unknown database tpye...");
         }
@@ -50,8 +45,6 @@ public class DatabaseKeywordTransformer {
                     keyword = '`' + keyword + '`';
                 } else if (databaseType == DataBaseType.Oracle || databaseType == DataBaseType.OceanBase) {
                     keyword = '"' + keyword + '"';
-                } else if (databaseType == DataBaseType.SQLServer) {
-                    keyword = '[' + keyword + ']';
                 }
             }
             keyword = keyword.toLowerCase();
@@ -65,7 +58,5 @@ final class DatabaseKeywords {
 
     public static final String MYSQL_KEYWORDS = "ACCESSIBLE,ACCOUNT,ACTION,ADD,AFTER,AGAINST,AGGREGATE,ALGORITHM,ALL,ALTER,ALWAYS,ANALYSE,AND,ANY,AS,ASC,ASCII,ASENSITIVE,AT,AUTO_INCREMENT,AUTOEXTEND_SIZE,AVG,AVG_ROW_LENGTH,BACKUP,BEFORE,BEGIN,BETWEEN,BIGINT,BINARY,BINLOG,BIT,BLOB,BLOCK,BOOL,BOOLEAN,BOTH,BTREE,BY,BYTE,CACHE,CALL,CASCADE,CASCADED,CASE,CATALOG_NAME,CHAIN,CHANGE,CHANGED,CHANNEL,CHAR,CHARACTER,CHARSET,CHECK,CHECKSUM,CIPHER,CLASS_ORIGIN,CLIENT,CLOSE,COALESCE,CODE,COLLATE,COLLATION,COLUMN,COLUMN_FORMAT,COLUMN_NAME,COLUMNS,COMMENT,COMMIT,COMMITTED,COMPACT,COMPLETION,COMPRESSED,COMPRESSION,CONCURRENT,CONDITION,CONNECTION,CONSISTENT,CONSTRAINT,CONSTRAINT_CATALOG,CONSTRAINT_NAME,CONSTRAINT_SCHEMA,CONTAINS,CONTEXT,CONTINUE,CONVERT,CPU,CREATE,CROSS,CUBE,CURRENT,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,CURSOR_NAME,DATA,DATABASE,DATABASES,DATAFILE,DATE,DATETIME,DAY,DAY_HOUR,DAY_MICROSECOND,DAY_MINUTE,DAY_SECOND,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFAULT_AUTH,DEFINER,DELAY_KEY_WRITE,DELAYED,DELETE,DES_KEY_FILE,DESC,DESCRIBE,DETERMINISTIC,DIAGNOSTICS,DIRECTORY,DISABLE,DISCARD,DISK,DISTINCT,DISTINCTROW,DIV,DO,DOUBLE,DROP,DUAL,DUMPFILE,DUPLICATE,DYNAMIC,EACH,ELSE,ELSEIF,ENABLE,ENCLOSED,ENCRYPTION,END,ENDS,ENGINE,ENGINES,ENUM,ERROR,ERRORS,ESCAPE,ESCAPED,EVENT,EVENTS,EVERY,EXCHANGE,EXECUTE,EXISTS,EXIT,EXPANSION,EXPIRE,EXPLAIN,EXPORT,EXTENDED,EXTENT_SIZE,FAST,FAULTS,FETCH,FIELDS,FILE,FILE_BLOCK_SIZE,FILTER,FIRST,FIXED,FLOAT,FLOAT4,FLOAT8,FLUSH,FOLLOWS,FOR,FORCE,FOREIGN,FORMAT,FOUND,FROM,FULL,FULLTEXT,FUNCTION,GENERAL,GENERATED,GEOMETRY,GEOMETRYCOLLECTION,GET,GET_FORMAT,GLOBAL,GRANT,GRANTS,GROUP,GROUP_REPLICATION,HANDLER,HASH,HAVING,HELP,HIGH_PRIORITY,HOST,HOSTS,HOUR,HOUR_MICROSECOND,HOUR_MINUTE,HOUR_SECOND,IDENTIFIED,IF,IGNORE,IGNORE_SERVER_IDS,IMPORT,IN,INDEX,INDEXES,INFILE,INITIAL_SIZE,INNER,INOUT,INSENSITIVE,INSERT,INSERT_METHOD,INSTALL,INSTANCE,INT,INT1,INT2,INT3,INT4,INT8,INTEGER,INTERVAL,INTO,INVOKER,IO,IO_AFTER_GTIDS,IO_BEFORE_GTIDS,IO_THREAD,IPC,IS,ISOLATION,ISSUER,ITERATE,JOIN,JSON,KEY,KEY_BLOCK_SIZE,KEYS,KILL,LANGUAGE,LAST,LEADING,LEAVE,LEAVES,LEFT,LESS,LEVEL,LIKE,LIMIT,LINEAR,LINES,LINESTRING,LIST,LOAD,LOCAL,LOCALTIME,LOCALTIMESTAMP,LOCK,LOCKS,LOGFILE,LOGS,LONG,LONGBLOB,LONGTEXT,LOOP,LOW_PRIORITY,MASTER,MASTER_AUTO_POSITION,MASTER_BIND,MASTER_CONNECT_RETRY,MASTER_DELAY,MASTER_HEARTBEAT_PERIOD,MASTER_HOST,MASTER_LOG_FILE,MASTER_LOG_POS,MASTER_PASSWORD,MASTER_PORT,MASTER_RETRY_COUNT,MASTER_SERVER_ID,MASTER_SSL,MASTER_SSL_CA,MASTER_SSL_CAPATH,MASTER_SSL_CERT,MASTER_SSL_CIPHER,MASTER_SSL_CRL,MASTER_SSL_CRLPATH,MASTER_SSL_KEY,MASTER_SSL_VERIFY_SERVER_CERT,MASTER_TLS_VERSION,MASTER_USER,MATCH,MAX_CONNECTIONS_PER_HOUR,MAX_QUERIES_PER_HOUR,MAX_ROWS,MAX_SIZE,MAX_STATEMENT_TIME,MAX_UPDATES_PER_HOUR,MAX_USER_CONNECTIONS,MAXVALUE,MEDIUM,MEDIUMBLOB,MEDIUMINT,MEDIUMTEXT,MEMORY,MERGE,MESSAGE_TEXT,MICROSECOND,MIDDLEINT,MIGRATE,MIN_ROWS,MINUTE,MINUTE_MICROSECOND,MINUTE_SECOND,MOD,MODE,MODIFIES,MODIFY,MONTH,MULTILINESTRING,MULTIPOINT,MULTIPOLYGON,MUTEX,MYSQL_ERRNO,NAME,NAMES,NATIONAL,NATURAL,NCHAR,NDB,NDBCLUSTER,NEVER,NEW,NEXT,NO,NO_WAIT,NO_WRITE_TO_BINLOG,NODEGROUP,NONBLOCKING,NONE,NOT,NULL,NUMBER,NUMERIC,NVARCHAR,OFFSET,OLD_PASSWORD,ON,ONE,ONLY,OPEN,OPTIMIZE,OPTIMIZER_COSTS,OPTION,OPTIONALLY,OPTIONS,OR,ORDER,OUT,OUTER,OUTFILE,OWNER,PACK_KEYS,PAGE,PARSE_GCOL_EXPR,PARSER,PARTIAL,PARTITION,PARTITIONING,PARTITIONS,PASSWORD,PHASE,PLUGIN,PLUGIN_DIR,PLUGINS,POINT,POLYGON,PORT,PRECEDES,PRECISION,PREPARE,PRESERVE,PREV,PRIMARY,PRIVILEGES,PROCEDURE,PROCESSLIST,PROFILE,PROFILES,PROXY,PURGE,QUARTER,QUERY,QUICK,RANGE,READ,READ_ONLY,READ_WRITE,READS,REAL,REBUILD,RECOVER,REDO_BUFFER_SIZE,REDOFILE,REDUNDANT,REFERENCES,REGEXP,RELAY,RELAY_LOG_FILE,RELAY_LOG_POS,RELAY_THREAD,RELAYLOG,RELEASE,RELOAD,REMOVE,RENAME,REORGANIZE,REPAIR,REPEAT,REPEATABLE,REPLACE,REPLICATE_DO_DB,REPLICATE_DO_TABLE,REPLICATE_IGNORE_DB,REPLICATE_IGNORE_TABLE,REPLICATE_REWRITE_DB,REPLICATE_WILD_DO_TABLE,REPLICATE_WILD_IGNORE_TABLE,REPLICATION,REQUIRE,RESET,RESIGNAL,RESTORE,RESTRICT,RESUME,RETURN,RETURNED_SQLSTATE,RETURNS,REVERSE,REVOKE,RIGHT,RLIKE,ROLLBACK,ROLLUP,ROTATE,ROUTINE,ROW,ROW_COUNT,ROW_FORMAT,ROWS,RTREE,SAVEPOINT,SCHEDULE,SCHEMA,SCHEMA_NAME,SCHEMAS,SECOND,SECOND_MICROSECOND,SECURITY,SELECT,SENSITIVE,SEPARATOR,SERIAL,SERIALIZABLE,SERVER,SESSION,SET,SHARE,SHOW,SHUTDOWN,SIGNAL,SIGNED,SIMPLE,SLAVE,SLOW,SMALLINT,SNAPSHOT,SOCKET,SOME,SONAME,SOUNDS,SOURCE,SPATIAL,SPECIFIC,SQL,SQL_AFTER_GTIDS,SQL_AFTER_MTS_GAPS,SQL_BEFORE_GTIDS,SQL_BIG_RESULT,SQL_BUFFER_RESULT,SQL_CACHE,SQL_CALC_FOUND_ROWS,SQL_NO_CACHE,SQL_SMALL_RESULT,SQL_THREAD,SQL_TSI_DAY,SQL_TSI_HOUR,SQL_TSI_MINUTE,SQL_TSI_MONTH,SQL_TSI_QUARTER,SQL_TSI_SECOND,SQL_TSI_WEEK,SQL_TSI_YEAR,SQLEXCEPTION,SQLSTATE,SQLWARNING,SSL,STACKED,START,STARTING,STARTS,STATS_AUTO_RECALC,STATS_PERSISTENT,STATS_SAMPLE_PAGES,STATUS,STOP,STORAGE,STORED,STRAIGHT_JOIN,STRING,SUBCLASS_ORIGIN,SUBJECT,SUBPARTITION,SUBPARTITIONS,SUPER,SUSPEND,SWAPS,SWITCHES,TABLE,TABLE_CHECKSUM,TABLE_NAME,TABLES,TABLESPACE,TEMPORARY,TEMPTABLE,TERMINATED,TEXT,THAN,THEN,TIME,TIMESTAMP,TIMESTAMPADD,TIMESTAMPDIFF,TINYBLOB,TINYINT,TINYTEXT,TO,TRAILING,TRANSACTION,TRIGGER,TRIGGERS,TRUNCATE,TYPE,TYPES,UNCOMMITTED,UNDEFINED,UNDO,UNDO_BUFFER_SIZE,UNDOFILE,UNICODE,UNINSTALL,UNION,UNIQUE,UNKNOWN,UNLOCK,UNSIGNED,UNTIL,UPDATE,UPGRADE,USAGE,USE,USE_FRM,USER,USER_RESOURCES,USING,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,VALIDATION,VALUE,VALUES,VARBINARY,VARCHAR,VARCHARACTER,VARIABLES,VARYING,VIEW,VIRTUAL,WAIT,WARNINGS,WEEK,WEIGHT_STRING,WHEN,WHERE,WHILE,WITH,WITHOUT,WORK,WRAPPER,WRITE,X509,XA,XID,XML,XOR,YEAR,YEAR_MONTH,ZEROFILL,FALSE,TRUE";
 
-    public static final String SQLSERVER_KEYWORDS = "ADD,ALL,ALTER,AND,ANY,AS,ASC,AUTHORIZATION,BACKUP,BEGIN,BETWEEN,BREAK,BROWSE,BULK,BY,CASCADE,CASE,CHECK,CHECKPOINT,CLOSE,CLUSTERED,COALESCE,COLLATE,COLUMN,COMMIT,COMPUTE,CONSTRAINT,CONTAINS,CONTAINSTABLE,CONTINUE,CONVERT,CREATE,CROSS,CURRENT,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,DATABASE,DBCC,DEALLOCATE,DECLARE,DEFAULT,DELETE,DENY,DESC,DISK,DISTINCT,DISTRIBUTED,DOUBLE,DROP,DUMMY,DUMP,ELSE,END,ERRLVL,ESCAPE,EXCEPT,EXEC,EXECUTE,EXISTS,EXIT,FETCH,FILE,FILLFACTOR,FOR,FOREIGN,FREETEXT,FREETEXTTABLE,FROM,FULL,FUNCTION,GOTO,GRANT,GROUP,HAVING,HOLDLOCK,IDENTITY,IDENTITY_INSERT,IDENTITYCOL,IF,IN,INDEX,INNER,INSERT,INTERSECT,INTO,IS,JOIN,KEY,KILL,LEFT,LIKE,LINENO,LOAD,NATIONAL,NOCHECK,NONCLUSTERED,NOT,NULL,NULLIF,OF,OFF,OFFSETS,ON,OPEN,OPENDATASOURCE,OPENQUERY,OPENROWSET,OPENXML,OPTION,OR,ORDER,OUTER,OVER,PERCENT,PLAN,PRECISION,PRIMARY,PRINT,PROC,PROCEDURE,PUBLIC,RAISERROR,READ,READTEXT,RECONFIGURE,REFERENCES,REPLICATION,RESTORE,RESTRICT,RETURN,REVOKE,RIGHT,ROLLBACK,ROWCOUNT,ROWGUIDCOL,RULE,SAVE,SCHEMA,SELECT,SESSION_USER,SET,SETUSER,SHUTDOWN,SOME,STATISTICS,SYSTEM_USER,TABLE,TEXTSIZE,THEN,TO,TOP,TRAN,TRANSACTION,TRIGGER,TRUNCATE,TSEQUAL,UNION,UNIQUE,UPDATE,UPDATETEXT,USE,USER,VALUES,VARYING,VIEW,WAITFOR,WHEN,WHERE,WHILE,WITH,WRITETEXT";
-
     public static final String ORACLE_KEYWORDS = "ACCESS,ADD,ALL,ALTER,AND,ANY,ARRAYLEN,AS,ASC,AUDIT,BETWEEN,BY,CHAR,CHECK,CLUSTER,COLUMN,COMMENT,COMPRESS,CONNECT,CREATE,CURRENT,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FILE,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IMMEDIATE,IN,INCREMENT,INDEX,INITIAL,INSERT,INTEGER,INTERSECT,INTO,IS,LEVEL,LIKE,LOCK,LONG,MAXEXTENTS,MINUS,MODE,MODIFY,NOAUDIT,NOCOMPRESS,NOT,NOTFOUND,NOWAIT,NULL,NUMBER,OF,OFFLINE,ON,ONLINE,OPTION,OR,ORDER,PCTFREE,PRIOR,PRIVILEGES,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,ROW,ROWID,ROWLABEL,ROWNUM,ROWS,SELECT,SESSION,SET,SHARE,SIZE,SMALLINT,SQLBUF,START,SUCCESSFUL,SYNONYM,TABLE,THEN,TO,TRIGGER,UID,UNION,UNIQUE,UPDATE,USER,VALIDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHENEVER,WHERE,WITH";
 }
\ No newline at end of file

From 30ed711131c84f8401e06e186434f5ed340f647f Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Thu, 23 Dec 2021 13:46:26 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
index dfa1adbf..2584ca33 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
@@ -26,8 +26,8 @@ public class ReaderJob extends CommonRdbmsReader.Job {
         //将config中的column和table中的关键字进行转义
         try {
             DatabaseKeywordTransformer.setDatabaseType(databaseType);
-        }catch (Exception e){
-            LOG.warn("database type is "+databaseType+e.getMessage());
+        } catch (Exception e) {
+            LOG.warn("database type is " + databaseType + e.getMessage());
         }
         List<String> columns=originalConfig.getList(Key.COLUMN,String.class);
         DatabaseKeywordTransformer.transferDatabaseKeywords(columns);

From b017102e0e59ec36e9863a2a2fa90d55a376d5ad Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Thu, 23 Dec 2021 15:20:56 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10reader/ext/ReaderJob.java     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
index 2584ca33..d574e3e1 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
@@ -17,32 +17,35 @@ import org.slf4j.LoggerFactory;
 
 
 public class ReaderJob extends CommonRdbmsReader.Job {
-    private Logger LOG=LoggerFactory.getLogger(OceanBaseReader.Task.class);
+    private Logger LOG = LoggerFactory.getLogger(OceanBaseReader.Task.class);
+
     public ReaderJob() {
         super(ObReaderUtils.DATABASE_TYPE);
 
     }
-    public void init(Configuration originalConfig,DataBaseType databaseType){
+
+    public void init(Configuration originalConfig, DataBaseType databaseType) {
         //将config中的column和table中的关键字进行转义
         try {
             DatabaseKeywordTransformer.setDatabaseType(databaseType);
         } catch (Exception e) {
             LOG.warn("database type is " + databaseType + e.getMessage());
         }
-        List<String> columns=originalConfig.getList(Key.COLUMN,String.class);
+        List<String> columns = originalConfig.getList(Key.COLUMN, String.class);
         DatabaseKeywordTransformer.transferDatabaseKeywords(columns);
         originalConfig.set(Key.COLUMN, columns);
 
-        List<JSONObject> conns=originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK,JSONObject.class);
-        for(int i=0;i<conns.size();i++){
-            JSONObject conn=conns.get(i);
-            Configuration connConfig=Configuration.from(conn.toString());
-            List<String> tables=connConfig.getList(Key.TABLE,String.class);
+        List<JSONObject> conns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, JSONObject.class);
+        for (int i = 0; i < conns.size(); i++) {
+            JSONObject conn = conns.get(i);
+            Configuration connConfig = Configuration.from(conn.toString());
+            List<String> tables = connConfig.getList(Key.TABLE, String.class);
             DatabaseKeywordTransformer.transferDatabaseKeywords(tables);
-            originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK,i,Key.TABLE),tables);
+            originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, i, Key.TABLE), tables);
         }
         super.init(originalConfig);
     }
+
     @Override
     public List<Configuration> split(Configuration originalConfig, int adviceNumber) {
         List<Configuration> list = super.split(originalConfig, adviceNumber);

From 19a44e8d9d1f40e1fbf4b2b0b105f346c00fbfbe Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Thu, 23 Dec 2021 18:10:08 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E4=B8=80=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10reader/OceanBaseReader.java   |  14 +-
 .../oceanbasev10reader/ext/ReaderJob.java     |  16 +--
 .../oceanbasev10reader/ext/ReaderTask.java    |  24 ++--
 .../util/ObReaderUtils.java                   | 125 ++++++++++--------
 .../oceanbasev10reader/util/TaskContext.java  |   1 +
 5 files changed, 94 insertions(+), 86 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
index 04d28482..fc461597 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
@@ -1,12 +1,8 @@
 package com.alibaba.datax.plugin.reader.oceanbasev10reader;
 
-import java.sql.Array;
 import java.sql.Connection;
-import java.util.ArrayList;
 import java.util.List;
 
-import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.DatabaseKeywordTransformer;
-import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,7 +22,6 @@ public class OceanBaseReader extends Reader {
     public static class Job extends Reader.Job {
         private Configuration originalConfig = null;
         private ReaderJob readerJob;
-        private DataBaseType DATABASE_TYPE;
         private static final Logger LOG = LoggerFactory.getLogger(Task.class);
 
         @Override
@@ -40,7 +35,7 @@ public class OceanBaseReader extends Reader {
             this.originalConfig.set(Constant.FETCH_SIZE, Integer.MIN_VALUE);
             setDatabaseType(originalConfig);
             this.readerJob = new ReaderJob();
-            this.readerJob.init(this.originalConfig, DATABASE_TYPE);
+            this.readerJob.init(this.originalConfig);
         }
 
         @Override
@@ -51,7 +46,7 @@ public class OceanBaseReader extends Reader {
         @Override
         public void preCheck() {
             init();
-            this.readerJob.preCheck(this.originalConfig, ObReaderUtils.DATABASE_TYPE);
+            this.readerJob.preCheck(this.originalConfig, ObReaderUtils.compatibleMode);
 
         }
 
@@ -92,13 +87,12 @@ public class OceanBaseReader extends Reader {
                 Connection conn = DBUtil.getConnection(DataBaseType.OceanBase, obJdbcUrl, username, password);
                 String compatibleMode = ObReaderUtils.getCompatibleMode(conn);
                 if (ObReaderUtils.isOracleMode(compatibleMode)) {
-                    ObReaderUtils.DATABASE_TYPE = DataBaseType.OceanBase;
+                    ObReaderUtils.compatibleMode = DataBaseType.Oracle;
+                    ObReaderUtils.databaseType = DataBaseType.OceanBase;
                 }
 
             } catch (Exception e) {
                 LOG.warn("error in get compatible mode, using mysql as default: " + e.getMessage());
-            } finally {
-                DATABASE_TYPE = ObReaderUtils.DATABASE_TYPE;
             }
         }
     }
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
index d574e3e1..2a31aaa1 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
@@ -9,7 +9,6 @@ import com.alibaba.datax.plugin.rdbms.reader.Key;
 import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 import com.alibaba.datax.plugin.rdbms.writer.Constant;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.OceanBaseReader;
-import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.DatabaseKeywordTransformer;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.ObReaderUtils;
 import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
@@ -20,19 +19,14 @@ public class ReaderJob extends CommonRdbmsReader.Job {
     private Logger LOG = LoggerFactory.getLogger(OceanBaseReader.Task.class);
 
     public ReaderJob() {
-        super(ObReaderUtils.DATABASE_TYPE);
-
+        super(ObReaderUtils.databaseType);
     }
 
-    public void init(Configuration originalConfig, DataBaseType databaseType) {
+    @Override
+    public void init(Configuration originalConfig) {
         //将config中的column和table中的关键字进行转义
-        try {
-            DatabaseKeywordTransformer.setDatabaseType(databaseType);
-        } catch (Exception e) {
-            LOG.warn("database type is " + databaseType + e.getMessage());
-        }
         List<String> columns = originalConfig.getList(Key.COLUMN, String.class);
-        DatabaseKeywordTransformer.transferDatabaseKeywords(columns);
+        ObReaderUtils.transferDatabaseKeywords(columns);
         originalConfig.set(Key.COLUMN, columns);
 
         List<JSONObject> conns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, JSONObject.class);
@@ -40,7 +34,7 @@ public class ReaderJob extends CommonRdbmsReader.Job {
             JSONObject conn = conns.get(i);
             Configuration connConfig = Configuration.from(conn.toString());
             List<String> tables = connConfig.getList(Key.TABLE, String.class);
-            DatabaseKeywordTransformer.transferDatabaseKeywords(tables);
+            ObReaderUtils.transferDatabaseKeywords(tables);
             originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, i, Key.TABLE), tables);
         }
         super.init(originalConfig);
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
index 073bb3cb..b5314ad8 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
@@ -41,11 +41,12 @@ public class ReaderTask extends CommonRdbmsReader.Task {
     private boolean reuseConn = false;
 
     public ReaderTask(int taskGroupId, int taskId) {
-        super(ObReaderUtils.DATABASE_TYPE, taskGroupId, taskId);
+        super(ObReaderUtils.compatibleMode, taskGroupId, taskId);
         this.taskGroupId = taskGroupId;
         this.taskId = taskId;
     }
 
+    @Override
     public void init(Configuration readerSliceConfig) {
         /* for database connection */
         username = readerSliceConfig.getString(Key.USERNAME);
@@ -54,7 +55,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
         queryTimeoutSeconds = readerSliceConfig.getInt(Config.QUERY_TIMEOUT_SECOND,
                 Config.DEFAULT_QUERY_TIMEOUT_SECOND);
         // ob10的处理
-        if(jdbcUrl.startsWith(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING)) {
+        if (jdbcUrl.startsWith(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING)) {
             String[] ss = jdbcUrl.split(com.alibaba.datax.plugin.rdbms.writer.Constant.OB10_SPLIT_STRING_PATTERN);
             if (ss.length == 3) {
                 LOG.info("this is ob1_0 jdbc url.");
@@ -63,7 +64,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
             }
         }
 
-        if (ObReaderUtils.DATABASE_TYPE == DataBaseType.OceanBase) {
+        if (ObReaderUtils.databaseType == DataBaseType.OceanBase) {
             jdbcUrl = jdbcUrl.replace("jdbc:mysql:", "jdbc:oceanbase:") + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
             compatibleMode = ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
         } else {
@@ -72,7 +73,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
         LOG.info("this is ob1_0 jdbc url. user=" + username + " :url=" + jdbcUrl);
         mandatoryEncoding = readerSliceConfig.getString(Key.MANDATORY_ENCODING, "");
         retryLimit = readerSliceConfig.getInt(Config.RETRY_LIMIT, Config.DEFAULT_RETRY_LIMIT);
-        LOG.info("retryLimit: "+ retryLimit);
+        LOG.info("retryLimit: " + retryLimit);
     }
 
     private void buildSavePoint(TaskContext context) {
@@ -83,7 +84,6 @@ public class ReaderTask extends CommonRdbmsReader.Task {
     }
 
     /**
-     *
      * 如果isTableMode && table有PK
      * <p>
      * 则支持断点续读 (若pk不在原始的columns中,则追加到尾部,但不传给下游)
@@ -92,7 +92,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
      */
     @Override
     public void startRead(Configuration readerSliceConfig, RecordSender recordSender,
-            TaskPluginCollector taskPluginCollector, int fetchSize) {
+                          TaskPluginCollector taskPluginCollector, int fetchSize) {
         String querySql = readerSliceConfig.getString(Key.QUERY_SQL);
         String table = readerSliceConfig.getString(Key.TABLE);
         PerfTrace.getInstance().addTaskDetails(taskId, table + "," + jdbcUrl);
@@ -131,14 +131,14 @@ public class ReaderTask extends CommonRdbmsReader.Task {
     }
 
     private void startRead0(boolean isTableMode, TaskContext context, RecordSender recordSender,
-            TaskPluginCollector taskPluginCollector) {
+                            TaskPluginCollector taskPluginCollector) {
         // 不是table模式 直接使用原来的做法
         if (!isTableMode) {
             doRead(recordSender, taskPluginCollector, context);
             return;
         }
         // check primary key index
-        Connection conn = DBUtil.getConnection(ObReaderUtils.DATABASE_TYPE, jdbcUrl, username, password);
+        Connection conn = DBUtil.getConnection(ObReaderUtils.databaseType, jdbcUrl, username, password);
         ObReaderUtils.initConn4Reader(conn, queryTimeoutSeconds);
         context.setConn(conn);
         try {
@@ -184,11 +184,11 @@ public class ReaderTask extends CommonRdbmsReader.Task {
                 }
             } catch (Throwable e) {
                 if (retryLimit == ++retryCount) {
-                    throw RdbmsException.asQueryException(ObReaderUtils.DATABASE_TYPE, new Exception(e),
+                    throw RdbmsException.asQueryException(ObReaderUtils.compatibleMode, new Exception(e),
                             context.getQuerySql(), context.getTable(), username);
                 }
                 LOG.error("read fail, retry count " + retryCount + ", sleep 60 second, save point:" +
-                        context.getSavePoint() + ", error: "+ e.getMessage());
+                        context.getSavePoint() + ", error: " + e.getMessage());
                 ObReaderUtils.sleep(60000); // sleep 10s
             }
             // 假如原来的查询有查出数据,则改成增量查询
@@ -227,7 +227,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
             LOG.info("connection is alive, will reuse this connection.");
         } else {
             LOG.info("Create new connection for reader.");
-            conn = DBUtil.getConnection(ObReaderUtils.DATABASE_TYPE, jdbcUrl, username, password);
+            conn = DBUtil.getConnection(ObReaderUtils.databaseType, jdbcUrl, username, password);
             ObReaderUtils.initConn4Reader(conn, queryTimeoutSeconds);
             context.setConn(conn);
         }
@@ -287,7 +287,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
             ObReaderUtils.close(null, null, context.getConn());
             context.setConn(null);
             LOG.error("reader data fail", e);
-            throw RdbmsException.asQueryException(ObReaderUtils.DATABASE_TYPE, e, context.getQuerySql(),
+            throw RdbmsException.asQueryException(ObReaderUtils.compatibleMode, e, context.getQuerySql(),
                     context.getTable(), username);
         } finally {
             perfRecord.end();
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
index 39f12eac..5084523e 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
@@ -6,18 +6,12 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.Set;
-import java.util.TreeSet;
 
+import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -32,21 +26,54 @@ import com.alibaba.datax.common.element.LongColumn;
 import com.alibaba.datax.common.element.Record;
 import com.alibaba.datax.common.element.StringColumn;
 import com.alibaba.datax.plugin.rdbms.util.DBUtil;
-import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
 
+import javax.xml.crypto.Data;
+
 public class ObReaderUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(ObReaderUtils.class);
+    private static final String MYSQL_KEYWORDS = "ACCESSIBLE,ACCOUNT,ACTION,ADD,AFTER,AGAINST,AGGREGATE,ALGORITHM,ALL,ALTER,ALWAYS,ANALYSE,AND,ANY,AS,ASC,ASCII,ASENSITIVE,AT,AUTO_INCREMENT,AUTOEXTEND_SIZE,AVG,AVG_ROW_LENGTH,BACKUP,BEFORE,BEGIN,BETWEEN,BIGINT,BINARY,BINLOG,BIT,BLOB,BLOCK,BOOL,BOOLEAN,BOTH,BTREE,BY,BYTE,CACHE,CALL,CASCADE,CASCADED,CASE,CATALOG_NAME,CHAIN,CHANGE,CHANGED,CHANNEL,CHAR,CHARACTER,CHARSET,CHECK,CHECKSUM,CIPHER,CLASS_ORIGIN,CLIENT,CLOSE,COALESCE,CODE,COLLATE,COLLATION,COLUMN,COLUMN_FORMAT,COLUMN_NAME,COLUMNS,COMMENT,COMMIT,COMMITTED,COMPACT,COMPLETION,COMPRESSED,COMPRESSION,CONCURRENT,CONDITION,CONNECTION,CONSISTENT,CONSTRAINT,CONSTRAINT_CATALOG,CONSTRAINT_NAME,CONSTRAINT_SCHEMA,CONTAINS,CONTEXT,CONTINUE,CONVERT,CPU,CREATE,CROSS,CUBE,CURRENT,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,CURSOR_NAME,DATA,DATABASE,DATABASES,DATAFILE,DATE,DATETIME,DAY,DAY_HOUR,DAY_MICROSECOND,DAY_MINUTE,DAY_SECOND,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFAULT_AUTH,DEFINER,DELAY_KEY_WRITE,DELAYED,DELETE,DES_KEY_FILE,DESC,DESCRIBE,DETERMINISTIC,DIAGNOSTICS,DIRECTORY,DISABLE,DISCARD,DISK,DISTINCT,DISTINCTROW,DIV,DO,DOUBLE,DROP,DUAL,DUMPFILE,DUPLICATE,DYNAMIC,EACH,ELSE,ELSEIF,ENABLE,ENCLOSED,ENCRYPTION,END,ENDS,ENGINE,ENGINES,ENUM,ERROR,ERRORS,ESCAPE,ESCAPED,EVENT,EVENTS,EVERY,EXCHANGE,EXECUTE,EXISTS,EXIT,EXPANSION,EXPIRE,EXPLAIN,EXPORT,EXTENDED,EXTENT_SIZE,FAST,FAULTS,FETCH,FIELDS,FILE,FILE_BLOCK_SIZE,FILTER,FIRST,FIXED,FLOAT,FLOAT4,FLOAT8,FLUSH,FOLLOWS,FOR,FORCE,FOREIGN,FORMAT,FOUND,FROM,FULL,FULLTEXT,FUNCTION,GENERAL,GENERATED,GEOMETRY,GEOMETRYCOLLECTION,GET,GET_FORMAT,GLOBAL,GRANT,GRANTS,GROUP,GROUP_REPLICATION,HANDLER,HASH,HAVING,HELP,HIGH_PRIORITY,HOST,HOSTS,HOUR,HOUR_MICROSECOND,HOUR_MINUTE,HOUR_SECOND,IDENTIFIED,IF,IGNORE,IGNORE_SERVER_IDS,IMPORT,IN,INDEX,INDEXES,INFILE,INITIAL_SIZE,INNER,INOUT,INSENSITIVE,INSERT,INSERT_METHOD,INSTALL,INSTANCE,INT,INT1,INT2,INT3,INT4,INT8,INTEGER,INTERVAL,INTO,INVOKER,IO,IO_AFTER_GTIDS,IO_BEFORE_GTIDS,IO_THREAD,IPC,IS,ISOLATION,ISSUER,ITERATE,JOIN,JSON,KEY,KEY_BLOCK_SIZE,KEYS,KILL,LANGUAGE,LAST,LEADING,LEAVE,LEAVES,LEFT,LESS,LEVEL,LIKE,LIMIT,LINEAR,LINES,LINESTRING,LIST,LOAD,LOCAL,LOCALTIME,LOCALTIMESTAMP,LOCK,LOCKS,LOGFILE,LOGS,LONG,LONGBLOB,LONGTEXT,LOOP,LOW_PRIORITY,MASTER,MASTER_AUTO_POSITION,MASTER_BIND,MASTER_CONNECT_RETRY,MASTER_DELAY,MASTER_HEARTBEAT_PERIOD,MASTER_HOST,MASTER_LOG_FILE,MASTER_LOG_POS,MASTER_PASSWORD,MASTER_PORT,MASTER_RETRY_COUNT,MASTER_SERVER_ID,MASTER_SSL,MASTER_SSL_CA,MASTER_SSL_CAPATH,MASTER_SSL_CERT,MASTER_SSL_CIPHER,MASTER_SSL_CRL,MASTER_SSL_CRLPATH,MASTER_SSL_KEY,MASTER_SSL_VERIFY_SERVER_CERT,MASTER_TLS_VERSION,MASTER_USER,MATCH,MAX_CONNECTIONS_PER_HOUR,MAX_QUERIES_PER_HOUR,MAX_ROWS,MAX_SIZE,MAX_STATEMENT_TIME,MAX_UPDATES_PER_HOUR,MAX_USER_CONNECTIONS,MAXVALUE,MEDIUM,MEDIUMBLOB,MEDIUMINT,MEDIUMTEXT,MEMORY,MERGE,MESSAGE_TEXT,MICROSECOND,MIDDLEINT,MIGRATE,MIN_ROWS,MINUTE,MINUTE_MICROSECOND,MINUTE_SECOND,MOD,MODE,MODIFIES,MODIFY,MONTH,MULTILINESTRING,MULTIPOINT,MULTIPOLYGON,MUTEX,MYSQL_ERRNO,NAME,NAMES,NATIONAL,NATURAL,NCHAR,NDB,NDBCLUSTER,NEVER,NEW,NEXT,NO,NO_WAIT,NO_WRITE_TO_BINLOG,NODEGROUP,NONBLOCKING,NONE,NOT,NULL,NUMBER,NUMERIC,NVARCHAR,OFFSET,OLD_PASSWORD,ON,ONE,ONLY,OPEN,OPTIMIZE,OPTIMIZER_COSTS,OPTION,OPTIONALLY,OPTIONS,OR,ORDER,OUT,OUTER,OUTFILE,OWNER,PACK_KEYS,PAGE,PARSE_GCOL_EXPR,PARSER,PARTIAL,PARTITION,PARTITIONING,PARTITIONS,PASSWORD,PHASE,PLUGIN,PLUGIN_DIR,PLUGINS,POINT,POLYGON,PORT,PRECEDES,PRECISION,PREPARE,PRESERVE,PREV,PRIMARY,PRIVILEGES,PROCEDURE,PROCESSLIST,PROFILE,PROFILES,PROXY,PURGE,QUARTER,QUERY,QUICK,RANGE,READ,READ_ONLY,READ_WRITE,READS,REAL,REBUILD,RECOVER,REDO_BUFFER_SIZE,REDOFILE,REDUNDANT,REFERENCES,REGEXP,RELAY,RELAY_LOG_FILE,RELAY_LOG_POS,RELAY_THREAD,RELAYLOG,RELEASE,RELOAD,REMOVE,RENAME,REORGANIZE,REPAIR,REPEAT,REPEATABLE,REPLACE,REPLICATE_DO_DB,REPLICATE_DO_TABLE,REPLICATE_IGNORE_DB,REPLICATE_IGNORE_TABLE,REPLICATE_REWRITE_DB,REPLICATE_WILD_DO_TABLE,REPLICATE_WILD_IGNORE_TABLE,REPLICATION,REQUIRE,RESET,RESIGNAL,RESTORE,RESTRICT,RESUME,RETURN,RETURNED_SQLSTATE,RETURNS,REVERSE,REVOKE,RIGHT,RLIKE,ROLLBACK,ROLLUP,ROTATE,ROUTINE,ROW,ROW_COUNT,ROW_FORMAT,ROWS,RTREE,SAVEPOINT,SCHEDULE,SCHEMA,SCHEMA_NAME,SCHEMAS,SECOND,SECOND_MICROSECOND,SECURITY,SELECT,SENSITIVE,SEPARATOR,SERIAL,SERIALIZABLE,SERVER,SESSION,SET,SHARE,SHOW,SHUTDOWN,SIGNAL,SIGNED,SIMPLE,SLAVE,SLOW,SMALLINT,SNAPSHOT,SOCKET,SOME,SONAME,SOUNDS,SOURCE,SPATIAL,SPECIFIC,SQL,SQL_AFTER_GTIDS,SQL_AFTER_MTS_GAPS,SQL_BEFORE_GTIDS,SQL_BIG_RESULT,SQL_BUFFER_RESULT,SQL_CACHE,SQL_CALC_FOUND_ROWS,SQL_NO_CACHE,SQL_SMALL_RESULT,SQL_THREAD,SQL_TSI_DAY,SQL_TSI_HOUR,SQL_TSI_MINUTE,SQL_TSI_MONTH,SQL_TSI_QUARTER,SQL_TSI_SECOND,SQL_TSI_WEEK,SQL_TSI_YEAR,SQLEXCEPTION,SQLSTATE,SQLWARNING,SSL,STACKED,START,STARTING,STARTS,STATS_AUTO_RECALC,STATS_PERSISTENT,STATS_SAMPLE_PAGES,STATUS,STOP,STORAGE,STORED,STRAIGHT_JOIN,STRING,SUBCLASS_ORIGIN,SUBJECT,SUBPARTITION,SUBPARTITIONS,SUPER,SUSPEND,SWAPS,SWITCHES,TABLE,TABLE_CHECKSUM,TABLE_NAME,TABLES,TABLESPACE,TEMPORARY,TEMPTABLE,TERMINATED,TEXT,THAN,THEN,TIME,TIMESTAMP,TIMESTAMPADD,TIMESTAMPDIFF,TINYBLOB,TINYINT,TINYTEXT,TO,TRAILING,TRANSACTION,TRIGGER,TRIGGERS,TRUNCATE,TYPE,TYPES,UNCOMMITTED,UNDEFINED,UNDO,UNDO_BUFFER_SIZE,UNDOFILE,UNICODE,UNINSTALL,UNION,UNIQUE,UNKNOWN,UNLOCK,UNSIGNED,UNTIL,UPDATE,UPGRADE,USAGE,USE,USE_FRM,USER,USER_RESOURCES,USING,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,VALIDATION,VALUE,VALUES,VARBINARY,VARCHAR,VARCHARACTER,VARIABLES,VARYING,VIEW,VIRTUAL,WAIT,WARNINGS,WEEK,WEIGHT_STRING,WHEN,WHERE,WHILE,WITH,WITHOUT,WORK,WRAPPER,WRITE,X509,XA,XID,XML,XOR,YEAR,YEAR_MONTH,ZEROFILL,FALSE,TRUE";
+    private static final String ORACLE_KEYWORDS = "ACCESS,ADD,ALL,ALTER,AND,ANY,ARRAYLEN,AS,ASC,AUDIT,BETWEEN,BY,CHAR,CHECK,CLUSTER,COLUMN,COMMENT,COMPRESS,CONNECT,CREATE,CURRENT,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FILE,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IMMEDIATE,IN,INCREMENT,INDEX,INITIAL,INSERT,INTEGER,INTERSECT,INTO,IS,LEVEL,LIKE,LOCK,LONG,MAXEXTENTS,MINUS,MODE,MODIFY,NOAUDIT,NOCOMPRESS,NOT,NOTFOUND,NOWAIT,NULL,NUMBER,OF,OFFLINE,ON,ONLINE,OPTION,OR,ORDER,PCTFREE,PRIOR,PRIVILEGES,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,ROW,ROWID,ROWLABEL,ROWNUM,ROWS,SELECT,SESSION,SET,SHARE,SIZE,SMALLINT,SQLBUF,START,SUCCESSFUL,SYNONYM,TABLE,THEN,TO,TRIGGER,UID,UNION,UNIQUE,UPDATE,USER,VALIDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHENEVER,WHERE,WITH";
 
+    private static Set<String> databaseKeywords;
+    private static DataBaseType currentKeywordsTpye;
     final static public String OB_COMPATIBLE_MODE = "obCompatibilityMode";
     final static public String OB_COMPATIBLE_MODE_ORACLE = "ORACLE";
     final static public String OB_COMPATIBLE_MODE_MYSQL = "MYSQL";
 
-    public static DataBaseType DATABASE_TYPE = DataBaseType.MySql;
+    public static DataBaseType compatibleMode = DataBaseType.MySql;
+
+    public static DataBaseType databaseType = DataBaseType.MySql;
+
+
+    private static Set<String> keywordsFromString2HashSet(final String keywords) {
+        return new HashSet(Arrays.asList(keywords.split(",")));
+    }
+
+    public static void transferDatabaseKeywords(List<String> keywords) {
+        //判断是否需要更改关键字集合
+        if (databaseKeywords == null || currentKeywordsTpye != compatibleMode) {
+            if (isOracleMode(compatibleMode.toString())) {
+                databaseKeywords = keywordsFromString2HashSet(ORACLE_KEYWORDS);
+            } else {
+                databaseKeywords = keywordsFromString2HashSet(MYSQL_KEYWORDS);
+            }
+            currentKeywordsTpye = compatibleMode;
+        }
+        char escapeChar = isOracleMode(compatibleMode.toString()) ? '"' : '`';
+        for (int i = 0; i < keywords.size(); i++) {
+            String keyword = keywords.get(i).toUpperCase();
+            if (databaseKeywords.contains(keyword)) {
+                keyword = escapeChar + keyword + escapeChar;
+            }
+            keyword = keyword.toLowerCase();
+            keywords.set(i, keyword);
+        }
+    }
 
     public static void initConn4Reader(Connection conn, long queryTimeoutSeconds) {
         String setQueryTimeout = "set ob_query_timeout=" + (queryTimeoutSeconds * 1000 * 1000L);
@@ -57,7 +84,7 @@ public class ObReaderUtils {
             stmt = conn.createStatement();
             stmt.execute(setQueryTimeout);
             stmt.execute(setTrxTimeout);
-            LOG.warn("setAutoCommit=true;"+setQueryTimeout+";"+setTrxTimeout+";");
+            LOG.warn("setAutoCommit=true;" + setQueryTimeout + ";" + setTrxTimeout + ";");
         } catch (Throwable e) {
             LOG.warn("initConn4Reader fail", e);
         } finally {
@@ -73,7 +100,6 @@ public class ObReaderUtils {
     }
 
     /**
-     *
      * @param conn
      * @param context
      */
@@ -115,9 +141,9 @@ public class ObReaderUtils {
         String sql = "show index from " + tableName + " where Key_name='PRIMARY'";
         if (isOracleMode(context.getCompatibleMode())) {
             tableName = tableName.toUpperCase();
-            sql = "SELECT cols.column_name Column_name "+
+            sql = "SELECT cols.column_name Column_name " +
                     "FROM all_constraints cons, all_cons_columns cols " +
-                    "WHERE cols.table_name = '" + tableName+ "' AND cons.constraint_type = 'P' " +
+                    "WHERE cols.table_name = '" + tableName + "' AND cons.constraint_type = 'P' " +
                     "AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner";
         }
         LOG.info("get primary key by sql: " + sql);
@@ -134,12 +160,7 @@ public class ObReaderUtils {
                     realIndex.add(columnName);
                 }
             }
-            //fix:将主键中的关键字转义
-            DatabaseKeywordTransformer.setDatabaseType(DataBaseType.MySql);
-            if(isOracleMode(context.getCompatibleMode())){
-                DatabaseKeywordTransformer.setDatabaseType(DataBaseType.Oracle);
-            }
-            DatabaseKeywordTransformer.transferDatabaseKeywords(realIndex);
+            transferDatabaseKeywords(realIndex);
 
             String[] pks = new String[realIndex.size()];
             realIndex.toArray(pks);
@@ -166,7 +187,7 @@ public class ObReaderUtils {
         if (StringUtils.isNotEmpty(indexName)) {
             String weakReadHint = weakRead ? "+READ_CONSISTENCY(WEAK)," : "+";
             sql += " /*" + weakReadHint + "index(" + context.getTable() + " " + indexName + ")*/ ";
-        } else if (weakRead){
+        } else if (weakRead) {
             sql += " /*+READ_CONSISTENCY(WEAK)*/ ";
         }
         sql += StringUtils.join(context.getColumns(), ',');
@@ -197,7 +218,6 @@ public class ObReaderUtils {
      * 增量查的SQL
      *
      * @param conn
-     *
      * @param context
      * @return sql
      */
@@ -207,8 +227,8 @@ public class ObReaderUtils {
         String sql = "select ";
         if (StringUtils.isNotEmpty(indexName)) {
             String weakReadHint = weakRead ? "+READ_CONSISTENCY(WEAK)," : "+";
-            sql += " /*"+ weakReadHint + "index(" + context.getTable() + " " + indexName + ")*/ ";
-        } else if (weakRead){
+            sql += " /*" + weakReadHint + "index(" + context.getTable() + " " + indexName + ")*/ ";
+        } else if (weakRead) {
             sql += " /*+READ_CONSISTENCY(WEAK)*/ ";
         }
         sql += StringUtils.join(context.getColumns(), ',') + " from " + context.getTable();
@@ -305,7 +325,7 @@ public class ObReaderUtils {
         final char rightBracket = ')';
         if (str != null && str.contains(String.valueOf(leftBracket)) && str.contains(String.valueOf(rightBracket)) &&
                 str.indexOf(leftBracket) < str.indexOf(rightBracket)) {
-            return str.substring(str.indexOf(leftBracket)+1, str.indexOf(rightBracket));
+            return str.substring(str.indexOf(leftBracket) + 1, str.indexOf(rightBracket));
         }
         return str;
     }
@@ -374,7 +394,7 @@ public class ObReaderUtils {
 
     /**
      * 找出where条件中的列名，目前仅支持全部为and条件，并且操作符为大于、大约等于、等于、小于、小于等于和不等于的表达式。
-     *
+     * <p>
      * test coverage: - c6 = 20180710 OR c4 = 320: no index selected - 20180710
      * = c6: correct index selected - 20180710 = c6 and c4 = 320 or c2 < 100: no
      * index selected
@@ -426,17 +446,17 @@ public class ObReaderUtils {
         if (isOracleMode(compatibleMode)) {
             tableName = tableName.toUpperCase();
             sql = "SELECT INDEX_NAME Key_name, COLUMN_NAME Column_name " +
-                  "from dba_ind_columns where TABLE_NAME = '" + tableName +"' " +
+                    "from dba_ind_columns where TABLE_NAME = '" + tableName + "' " +
                     " union all " +
-                  "SELECT DISTINCT " +
-                      "CASE " +
-                          "WHEN cons.CONSTRAINT_TYPE = 'P' THEN 'PRIMARY' " +
-                          "WHEN cons.CONSTRAINT_TYPE = 'U' THEN cons.CONSTRAINT_NAME " +
-                          "ELSE '' " +
-                      "END AS Key_name, " +
-                      "cols.column_name Column_name " +
-                  "FROM all_constraints cons, all_cons_columns cols " +
-                  "WHERE cols.table_name = '" + tableName + "' AND cons.constraint_type in('P', 'U') " +
+                    "SELECT DISTINCT " +
+                    "CASE " +
+                    "WHEN cons.CONSTRAINT_TYPE = 'P' THEN 'PRIMARY' " +
+                    "WHEN cons.CONSTRAINT_TYPE = 'U' THEN cons.CONSTRAINT_NAME " +
+                    "ELSE '' " +
+                    "END AS Key_name, " +
+                    "cols.column_name Column_name " +
+                    "FROM all_constraints cons, all_cons_columns cols " +
+                    "WHERE cols.table_name = '" + tableName + "' AND cons.constraint_type in('P', 'U') " +
                     "AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner";
         }
         Statement stmt = null;
@@ -479,14 +499,13 @@ public class ObReaderUtils {
     }
 
     /**
-     *
      * @param conn
      * @param table
      * @param colNamesInCondition
      * @return
      */
     private static List<String> getIndexName(Connection conn, String table,
-            Set<String> colNamesInCondition, String compatibleMode) {
+                                             Set<String> colNamesInCondition, String compatibleMode) {
         List<String> indexNames = new ArrayList<String>();
         if (colNamesInCondition == null || colNamesInCondition.size() == 0) {
             LOG.info("there is no qulified conditions in the where clause, skip index selection.");
@@ -550,7 +569,7 @@ public class ObReaderUtils {
                     Map<Integer, String> index = new TreeMap<Integer, String>();
                     List<String> columnList = allIndexInTab.get(indexName);
                     for (int i = 1; i <= columnList.size(); i++) {
-                        index.put(i, columnList.get(i-1));
+                        index.put(i, columnList.get(i - 1));
                     }
                     allIndexs.put(indexName, index);
                 } else {
@@ -654,19 +673,19 @@ public class ObReaderUtils {
     public static void binding(PreparedStatement ps, List<Column> list) throws SQLException {
         for (int i = 0, n = list.size(); i < n; i++) {
             Column c = list.get(i);
-            if(c instanceof BoolColumn){
-                ps.setLong(i + 1, ((BoolColumn)c).asLong());
-            }else if(c instanceof BytesColumn){
-                ps.setBytes(i + 1, ((BytesColumn)c).asBytes());
-            }else if(c instanceof DateColumn){
-                ps.setTimestamp(i + 1, new Timestamp(((DateColumn)c).asDate().getTime()));
-            }else if(c instanceof DoubleColumn){
-                ps.setDouble(i + 1, ((DoubleColumn)c).asDouble());
-            }else if(c instanceof LongColumn){
-                ps.setLong(i + 1, ((LongColumn)c).asLong());
-            }else if(c instanceof StringColumn){
-                ps.setString(i + 1, ((StringColumn)c).asString());
-            }else{
+            if (c instanceof BoolColumn) {
+                ps.setLong(i + 1, ((BoolColumn) c).asLong());
+            } else if (c instanceof BytesColumn) {
+                ps.setBytes(i + 1, ((BytesColumn) c).asBytes());
+            } else if (c instanceof DateColumn) {
+                ps.setTimestamp(i + 1, new Timestamp(((DateColumn) c).asDate().getTime()));
+            } else if (c instanceof DoubleColumn) {
+                ps.setDouble(i + 1, ((DoubleColumn) c).asDouble());
+            } else if (c instanceof LongColumn) {
+                ps.setLong(i + 1, ((LongColumn) c).asLong());
+            } else if (c instanceof StringColumn) {
+                ps.setString(i + 1, ((StringColumn) c).asString());
+            } else {
                 ps.setObject(i + 1, c.getRawData());
             }
         }
@@ -702,6 +721,6 @@ public class ObReaderUtils {
     }
 
     public static boolean isOracleMode(String mode) {
-        return (mode != null && OB_COMPATIBLE_MODE_ORACLE.equals(mode));
+        return (mode != null && OB_COMPATIBLE_MODE_ORACLE.equals(mode.toString().toUpperCase()));
     }
 }
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/TaskContext.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/TaskContext.java
index ba754a37..17655a52 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/TaskContext.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/TaskContext.java
@@ -162,6 +162,7 @@ public class TaskContext {
     public String getUserSavePoint() {
         return userSavePoint;
     }
+
     public void setUserSavePoint(String userSavePoint) {
         this.userSavePoint = userSavePoint;
     }

From 55351fcbaaa94b600f7776667fee71f94e4057f2 Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Fri, 24 Dec 2021 10:02:17 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86reader=E5=92=8Cwriter=EF=BC=8C=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E5=B0=86DatabaseKeywordTransformer=E7=B1=BB=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=90=88=E5=B9=B6=E5=88=B0writer(reader)util?=
 =?UTF-8?q?s=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10reader/OceanBaseReader.java   |  5 +-
 .../oceanbasev10reader/ext/ReaderTask.java    |  6 +-
 .../util/DatabaseKeywordTransformer.java      | 62 -------------------
 .../util/ObReaderUtils.java                   |  6 +-
 .../OceanBaseV10Writer.java                   | 14 +++++
 .../util/ObWriterUtils.java                   | 31 +++++++++-
 6 files changed, 51 insertions(+), 73 deletions(-)
 delete mode 100644 oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
index fc461597..228af811 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/OceanBaseReader.java
@@ -46,7 +46,7 @@ public class OceanBaseReader extends Reader {
         @Override
         public void preCheck() {
             init();
-            this.readerJob.preCheck(this.originalConfig, ObReaderUtils.compatibleMode);
+            this.readerJob.preCheck(this.originalConfig, ObReaderUtils.databaseType);
 
         }
 
@@ -87,8 +87,7 @@ public class OceanBaseReader extends Reader {
                 Connection conn = DBUtil.getConnection(DataBaseType.OceanBase, obJdbcUrl, username, password);
                 String compatibleMode = ObReaderUtils.getCompatibleMode(conn);
                 if (ObReaderUtils.isOracleMode(compatibleMode)) {
-                    ObReaderUtils.compatibleMode = DataBaseType.Oracle;
-                    ObReaderUtils.databaseType = DataBaseType.OceanBase;
+                    ObReaderUtils.compatibleMode = ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
                 }
 
             } catch (Exception e) {
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
index b5314ad8..fab0b1fb 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
@@ -41,7 +41,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
     private boolean reuseConn = false;
 
     public ReaderTask(int taskGroupId, int taskId) {
-        super(ObReaderUtils.compatibleMode, taskGroupId, taskId);
+        super(ObReaderUtils.databaseType, taskGroupId, taskId);
         this.taskGroupId = taskGroupId;
         this.taskId = taskId;
     }
@@ -184,7 +184,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
                 }
             } catch (Throwable e) {
                 if (retryLimit == ++retryCount) {
-                    throw RdbmsException.asQueryException(ObReaderUtils.compatibleMode, new Exception(e),
+                    throw RdbmsException.asQueryException(ObReaderUtils.databaseType, new Exception(e),
                             context.getQuerySql(), context.getTable(), username);
                 }
                 LOG.error("read fail, retry count " + retryCount + ", sleep 60 second, save point:" +
@@ -287,7 +287,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
             ObReaderUtils.close(null, null, context.getConn());
             context.setConn(null);
             LOG.error("reader data fail", e);
-            throw RdbmsException.asQueryException(ObReaderUtils.compatibleMode, e, context.getQuerySql(),
+            throw RdbmsException.asQueryException(ObReaderUtils.databaseType, e, context.getQuerySql(),
                     context.getTable(), username);
         } finally {
             perfRecord.end();
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
deleted file mode 100644
index 3c3e03f7..00000000
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/DatabaseKeywordTransformer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.alibaba.datax.plugin.reader.oceanbasev10reader.util;
-
-//java api
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-//dataX api
-import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
-
-/**
- * 该类用于转义数据库中的关键字
- *
- * @author:qianzhang
- */
-public class DatabaseKeywordTransformer {
-    private static DataBaseType databaseType;
-    static Set<String> databaseKeywords;
-
-    private static Set<String> keywordsFromString2HashSet(final String keywords) {
-        return new HashSet(Arrays.asList(keywords.split(",")));
-    }
-
-    public static void setDatabaseType(final DataBaseType databaseType) throws Exception {
-        if (databaseType == DatabaseKeywordTransformer.databaseType) {
-            return;
-        }
-        DatabaseKeywordTransformer.databaseType = databaseType;
-        if (databaseType == DataBaseType.MySql) {
-            databaseKeywords = keywordsFromString2HashSet(DatabaseKeywords.MYSQL_KEYWORDS);
-        } else if (databaseType == DataBaseType.Oracle || databaseType == DataBaseType.OceanBase) {
-            databaseKeywords = keywordsFromString2HashSet(DatabaseKeywords.ORACLE_KEYWORDS);
-        } else {
-            throw new Exception("sorry,unknown database tpye...");
-        }
-    }
-
-    public static void transferDatabaseKeywords(List<String> keywords) {
-        for (int i = 0; i < keywords.size(); i++) {
-            String keyword = keywords.get(i).toUpperCase();
-            if (databaseKeywords.contains(keyword)) {
-                if (databaseType == DataBaseType.MySql) {
-                    keyword = '`' + keyword + '`';
-                } else if (databaseType == DataBaseType.Oracle || databaseType == DataBaseType.OceanBase) {
-                    keyword = '"' + keyword + '"';
-                }
-            }
-            keyword = keyword.toLowerCase();
-            keywords.set(i, keyword);
-        }
-    }
-}
-
-
-final class DatabaseKeywords {
-
-    public static final String MYSQL_KEYWORDS = "ACCESSIBLE,ACCOUNT,ACTION,ADD,AFTER,AGAINST,AGGREGATE,ALGORITHM,ALL,ALTER,ALWAYS,ANALYSE,AND,ANY,AS,ASC,ASCII,ASENSITIVE,AT,AUTO_INCREMENT,AUTOEXTEND_SIZE,AVG,AVG_ROW_LENGTH,BACKUP,BEFORE,BEGIN,BETWEEN,BIGINT,BINARY,BINLOG,BIT,BLOB,BLOCK,BOOL,BOOLEAN,BOTH,BTREE,BY,BYTE,CACHE,CALL,CASCADE,CASCADED,CASE,CATALOG_NAME,CHAIN,CHANGE,CHANGED,CHANNEL,CHAR,CHARACTER,CHARSET,CHECK,CHECKSUM,CIPHER,CLASS_ORIGIN,CLIENT,CLOSE,COALESCE,CODE,COLLATE,COLLATION,COLUMN,COLUMN_FORMAT,COLUMN_NAME,COLUMNS,COMMENT,COMMIT,COMMITTED,COMPACT,COMPLETION,COMPRESSED,COMPRESSION,CONCURRENT,CONDITION,CONNECTION,CONSISTENT,CONSTRAINT,CONSTRAINT_CATALOG,CONSTRAINT_NAME,CONSTRAINT_SCHEMA,CONTAINS,CONTEXT,CONTINUE,CONVERT,CPU,CREATE,CROSS,CUBE,CURRENT,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,CURSOR_NAME,DATA,DATABASE,DATABASES,DATAFILE,DATE,DATETIME,DAY,DAY_HOUR,DAY_MICROSECOND,DAY_MINUTE,DAY_SECOND,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFAULT_AUTH,DEFINER,DELAY_KEY_WRITE,DELAYED,DELETE,DES_KEY_FILE,DESC,DESCRIBE,DETERMINISTIC,DIAGNOSTICS,DIRECTORY,DISABLE,DISCARD,DISK,DISTINCT,DISTINCTROW,DIV,DO,DOUBLE,DROP,DUAL,DUMPFILE,DUPLICATE,DYNAMIC,EACH,ELSE,ELSEIF,ENABLE,ENCLOSED,ENCRYPTION,END,ENDS,ENGINE,ENGINES,ENUM,ERROR,ERRORS,ESCAPE,ESCAPED,EVENT,EVENTS,EVERY,EXCHANGE,EXECUTE,EXISTS,EXIT,EXPANSION,EXPIRE,EXPLAIN,EXPORT,EXTENDED,EXTENT_SIZE,FAST,FAULTS,FETCH,FIELDS,FILE,FILE_BLOCK_SIZE,FILTER,FIRST,FIXED,FLOAT,FLOAT4,FLOAT8,FLUSH,FOLLOWS,FOR,FORCE,FOREIGN,FORMAT,FOUND,FROM,FULL,FULLTEXT,FUNCTION,GENERAL,GENERATED,GEOMETRY,GEOMETRYCOLLECTION,GET,GET_FORMAT,GLOBAL,GRANT,GRANTS,GROUP,GROUP_REPLICATION,HANDLER,HASH,HAVING,HELP,HIGH_PRIORITY,HOST,HOSTS,HOUR,HOUR_MICROSECOND,HOUR_MINUTE,HOUR_SECOND,IDENTIFIED,IF,IGNORE,IGNORE_SERVER_IDS,IMPORT,IN,INDEX,INDEXES,INFILE,INITIAL_SIZE,INNER,INOUT,INSENSITIVE,INSERT,INSERT_METHOD,INSTALL,INSTANCE,INT,INT1,INT2,INT3,INT4,INT8,INTEGER,INTERVAL,INTO,INVOKER,IO,IO_AFTER_GTIDS,IO_BEFORE_GTIDS,IO_THREAD,IPC,IS,ISOLATION,ISSUER,ITERATE,JOIN,JSON,KEY,KEY_BLOCK_SIZE,KEYS,KILL,LANGUAGE,LAST,LEADING,LEAVE,LEAVES,LEFT,LESS,LEVEL,LIKE,LIMIT,LINEAR,LINES,LINESTRING,LIST,LOAD,LOCAL,LOCALTIME,LOCALTIMESTAMP,LOCK,LOCKS,LOGFILE,LOGS,LONG,LONGBLOB,LONGTEXT,LOOP,LOW_PRIORITY,MASTER,MASTER_AUTO_POSITION,MASTER_BIND,MASTER_CONNECT_RETRY,MASTER_DELAY,MASTER_HEARTBEAT_PERIOD,MASTER_HOST,MASTER_LOG_FILE,MASTER_LOG_POS,MASTER_PASSWORD,MASTER_PORT,MASTER_RETRY_COUNT,MASTER_SERVER_ID,MASTER_SSL,MASTER_SSL_CA,MASTER_SSL_CAPATH,MASTER_SSL_CERT,MASTER_SSL_CIPHER,MASTER_SSL_CRL,MASTER_SSL_CRLPATH,MASTER_SSL_KEY,MASTER_SSL_VERIFY_SERVER_CERT,MASTER_TLS_VERSION,MASTER_USER,MATCH,MAX_CONNECTIONS_PER_HOUR,MAX_QUERIES_PER_HOUR,MAX_ROWS,MAX_SIZE,MAX_STATEMENT_TIME,MAX_UPDATES_PER_HOUR,MAX_USER_CONNECTIONS,MAXVALUE,MEDIUM,MEDIUMBLOB,MEDIUMINT,MEDIUMTEXT,MEMORY,MERGE,MESSAGE_TEXT,MICROSECOND,MIDDLEINT,MIGRATE,MIN_ROWS,MINUTE,MINUTE_MICROSECOND,MINUTE_SECOND,MOD,MODE,MODIFIES,MODIFY,MONTH,MULTILINESTRING,MULTIPOINT,MULTIPOLYGON,MUTEX,MYSQL_ERRNO,NAME,NAMES,NATIONAL,NATURAL,NCHAR,NDB,NDBCLUSTER,NEVER,NEW,NEXT,NO,NO_WAIT,NO_WRITE_TO_BINLOG,NODEGROUP,NONBLOCKING,NONE,NOT,NULL,NUMBER,NUMERIC,NVARCHAR,OFFSET,OLD_PASSWORD,ON,ONE,ONLY,OPEN,OPTIMIZE,OPTIMIZER_COSTS,OPTION,OPTIONALLY,OPTIONS,OR,ORDER,OUT,OUTER,OUTFILE,OWNER,PACK_KEYS,PAGE,PARSE_GCOL_EXPR,PARSER,PARTIAL,PARTITION,PARTITIONING,PARTITIONS,PASSWORD,PHASE,PLUGIN,PLUGIN_DIR,PLUGINS,POINT,POLYGON,PORT,PRECEDES,PRECISION,PREPARE,PRESERVE,PREV,PRIMARY,PRIVILEGES,PROCEDURE,PROCESSLIST,PROFILE,PROFILES,PROXY,PURGE,QUARTER,QUERY,QUICK,RANGE,READ,READ_ONLY,READ_WRITE,READS,REAL,REBUILD,RECOVER,REDO_BUFFER_SIZE,REDOFILE,REDUNDANT,REFERENCES,REGEXP,RELAY,RELAY_LOG_FILE,RELAY_LOG_POS,RELAY_THREAD,RELAYLOG,RELEASE,RELOAD,REMOVE,RENAME,REORGANIZE,REPAIR,REPEAT,REPEATABLE,REPLACE,REPLICATE_DO_DB,REPLICATE_DO_TABLE,REPLICATE_IGNORE_DB,REPLICATE_IGNORE_TABLE,REPLICATE_REWRITE_DB,REPLICATE_WILD_DO_TABLE,REPLICATE_WILD_IGNORE_TABLE,REPLICATION,REQUIRE,RESET,RESIGNAL,RESTORE,RESTRICT,RESUME,RETURN,RETURNED_SQLSTATE,RETURNS,REVERSE,REVOKE,RIGHT,RLIKE,ROLLBACK,ROLLUP,ROTATE,ROUTINE,ROW,ROW_COUNT,ROW_FORMAT,ROWS,RTREE,SAVEPOINT,SCHEDULE,SCHEMA,SCHEMA_NAME,SCHEMAS,SECOND,SECOND_MICROSECOND,SECURITY,SELECT,SENSITIVE,SEPARATOR,SERIAL,SERIALIZABLE,SERVER,SESSION,SET,SHARE,SHOW,SHUTDOWN,SIGNAL,SIGNED,SIMPLE,SLAVE,SLOW,SMALLINT,SNAPSHOT,SOCKET,SOME,SONAME,SOUNDS,SOURCE,SPATIAL,SPECIFIC,SQL,SQL_AFTER_GTIDS,SQL_AFTER_MTS_GAPS,SQL_BEFORE_GTIDS,SQL_BIG_RESULT,SQL_BUFFER_RESULT,SQL_CACHE,SQL_CALC_FOUND_ROWS,SQL_NO_CACHE,SQL_SMALL_RESULT,SQL_THREAD,SQL_TSI_DAY,SQL_TSI_HOUR,SQL_TSI_MINUTE,SQL_TSI_MONTH,SQL_TSI_QUARTER,SQL_TSI_SECOND,SQL_TSI_WEEK,SQL_TSI_YEAR,SQLEXCEPTION,SQLSTATE,SQLWARNING,SSL,STACKED,START,STARTING,STARTS,STATS_AUTO_RECALC,STATS_PERSISTENT,STATS_SAMPLE_PAGES,STATUS,STOP,STORAGE,STORED,STRAIGHT_JOIN,STRING,SUBCLASS_ORIGIN,SUBJECT,SUBPARTITION,SUBPARTITIONS,SUPER,SUSPEND,SWAPS,SWITCHES,TABLE,TABLE_CHECKSUM,TABLE_NAME,TABLES,TABLESPACE,TEMPORARY,TEMPTABLE,TERMINATED,TEXT,THAN,THEN,TIME,TIMESTAMP,TIMESTAMPADD,TIMESTAMPDIFF,TINYBLOB,TINYINT,TINYTEXT,TO,TRAILING,TRANSACTION,TRIGGER,TRIGGERS,TRUNCATE,TYPE,TYPES,UNCOMMITTED,UNDEFINED,UNDO,UNDO_BUFFER_SIZE,UNDOFILE,UNICODE,UNINSTALL,UNION,UNIQUE,UNKNOWN,UNLOCK,UNSIGNED,UNTIL,UPDATE,UPGRADE,USAGE,USE,USE_FRM,USER,USER_RESOURCES,USING,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,VALIDATION,VALUE,VALUES,VARBINARY,VARCHAR,VARCHARACTER,VARIABLES,VARYING,VIEW,VIRTUAL,WAIT,WARNINGS,WEEK,WEIGHT_STRING,WHEN,WHERE,WHILE,WITH,WITHOUT,WORK,WRAPPER,WRITE,X509,XA,XID,XML,XOR,YEAR,YEAR_MONTH,ZEROFILL,FALSE,TRUE";
-
-    public static final String ORACLE_KEYWORDS = "ACCESS,ADD,ALL,ALTER,AND,ANY,ARRAYLEN,AS,ASC,AUDIT,BETWEEN,BY,CHAR,CHECK,CLUSTER,COLUMN,COMMENT,COMPRESS,CONNECT,CREATE,CURRENT,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FILE,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IMMEDIATE,IN,INCREMENT,INDEX,INITIAL,INSERT,INTEGER,INTERSECT,INTO,IS,LEVEL,LIKE,LOCK,LONG,MAXEXTENTS,MINUS,MODE,MODIFY,NOAUDIT,NOCOMPRESS,NOT,NOTFOUND,NOWAIT,NULL,NUMBER,OF,OFFLINE,ON,ONLINE,OPTION,OR,ORDER,PCTFREE,PRIOR,PRIVILEGES,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,ROW,ROWID,ROWLABEL,ROWNUM,ROWS,SELECT,SESSION,SET,SHARE,SIZE,SMALLINT,SQLBUF,START,SUCCESSFUL,SYNONYM,TABLE,THEN,TO,TRIGGER,UID,UNION,UNIQUE,UPDATE,USER,VALIDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHENEVER,WHERE,WITH";
-}
\ No newline at end of file
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
index 5084523e..8efee64f 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
@@ -40,14 +40,14 @@ public class ObReaderUtils {
     private static final String ORACLE_KEYWORDS = "ACCESS,ADD,ALL,ALTER,AND,ANY,ARRAYLEN,AS,ASC,AUDIT,BETWEEN,BY,CHAR,CHECK,CLUSTER,COLUMN,COMMENT,COMPRESS,CONNECT,CREATE,CURRENT,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FILE,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IMMEDIATE,IN,INCREMENT,INDEX,INITIAL,INSERT,INTEGER,INTERSECT,INTO,IS,LEVEL,LIKE,LOCK,LONG,MAXEXTENTS,MINUS,MODE,MODIFY,NOAUDIT,NOCOMPRESS,NOT,NOTFOUND,NOWAIT,NULL,NUMBER,OF,OFFLINE,ON,ONLINE,OPTION,OR,ORDER,PCTFREE,PRIOR,PRIVILEGES,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,ROW,ROWID,ROWLABEL,ROWNUM,ROWS,SELECT,SESSION,SET,SHARE,SIZE,SMALLINT,SQLBUF,START,SUCCESSFUL,SYNONYM,TABLE,THEN,TO,TRIGGER,UID,UNION,UNIQUE,UPDATE,USER,VALIDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHENEVER,WHERE,WITH";
 
     private static Set<String> databaseKeywords;
-    private static DataBaseType currentKeywordsTpye;
+    private static String currentKeywordsTpye;
     final static public String OB_COMPATIBLE_MODE = "obCompatibilityMode";
     final static public String OB_COMPATIBLE_MODE_ORACLE = "ORACLE";
     final static public String OB_COMPATIBLE_MODE_MYSQL = "MYSQL";
 
-    public static DataBaseType compatibleMode = DataBaseType.MySql;
+    public static String compatibleMode = OB_COMPATIBLE_MODE_MYSQL;
 
-    public static DataBaseType databaseType = DataBaseType.MySql;
+    public static final DataBaseType databaseType = DataBaseType.OceanBase;
 
 
     private static Set<String> keywordsFromString2HashSet(final String keywords) {
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
index 4ffaffed..bf1c9f60 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.DbUtils;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,6 +61,19 @@ public class OceanBaseV10Writer extends Writer {
 		public void init() {
 			this.originalConfig = super.getPluginJobConf();
 			checkCompatibleMode(originalConfig);
+			//将config中的column和table中的关键字进行转义
+			List<String> columns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Key.COLUMN, String.class);
+			ObWriterUtils.transferDatabaseKeywords(columns);
+			originalConfig.set(com.alibaba.datax.plugin.rdbms.reader.Key.COLUMN, columns);
+
+			List<JSONObject> conns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, JSONObject.class);
+			for (int i = 0; i < conns.size(); i++) {
+				JSONObject conn = conns.get(i);
+				Configuration connConfig = Configuration.from(conn.toString());
+				List<String> tables = connConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Key.TABLE, String.class);
+				ObWriterUtils.transferDatabaseKeywords(tables);
+				originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, i, com.alibaba.datax.plugin.rdbms.reader.Key.TABLE), tables);
+			}
 			this.commonJob = new CommonRdbmsWriter.Job(DATABASE_TYPE);
 			this.commonJob.init(this.originalConfig);
 		}
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
index 368c3d17..a8ff7a04 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
@@ -14,12 +14,39 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 public class ObWriterUtils {
-	protected static final Logger LOG = LoggerFactory.getLogger(Task.class);
+
+	private static final String MYSQL_KEYWORDS = "ACCESSIBLE,ACCOUNT,ACTION,ADD,AFTER,AGAINST,AGGREGATE,ALGORITHM,ALL,ALTER,ALWAYS,ANALYSE,AND,ANY,AS,ASC,ASCII,ASENSITIVE,AT,AUTO_INCREMENT,AUTOEXTEND_SIZE,AVG,AVG_ROW_LENGTH,BACKUP,BEFORE,BEGIN,BETWEEN,BIGINT,BINARY,BINLOG,BIT,BLOB,BLOCK,BOOL,BOOLEAN,BOTH,BTREE,BY,BYTE,CACHE,CALL,CASCADE,CASCADED,CASE,CATALOG_NAME,CHAIN,CHANGE,CHANGED,CHANNEL,CHAR,CHARACTER,CHARSET,CHECK,CHECKSUM,CIPHER,CLASS_ORIGIN,CLIENT,CLOSE,COALESCE,CODE,COLLATE,COLLATION,COLUMN,COLUMN_FORMAT,COLUMN_NAME,COLUMNS,COMMENT,COMMIT,COMMITTED,COMPACT,COMPLETION,COMPRESSED,COMPRESSION,CONCURRENT,CONDITION,CONNECTION,CONSISTENT,CONSTRAINT,CONSTRAINT_CATALOG,CONSTRAINT_NAME,CONSTRAINT_SCHEMA,CONTAINS,CONTEXT,CONTINUE,CONVERT,CPU,CREATE,CROSS,CUBE,CURRENT,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,CURSOR_NAME,DATA,DATABASE,DATABASES,DATAFILE,DATE,DATETIME,DAY,DAY_HOUR,DAY_MICROSECOND,DAY_MINUTE,DAY_SECOND,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFAULT_AUTH,DEFINER,DELAY_KEY_WRITE,DELAYED,DELETE,DES_KEY_FILE,DESC,DESCRIBE,DETERMINISTIC,DIAGNOSTICS,DIRECTORY,DISABLE,DISCARD,DISK,DISTINCT,DISTINCTROW,DIV,DO,DOUBLE,DROP,DUAL,DUMPFILE,DUPLICATE,DYNAMIC,EACH,ELSE,ELSEIF,ENABLE,ENCLOSED,ENCRYPTION,END,ENDS,ENGINE,ENGINES,ENUM,ERROR,ERRORS,ESCAPE,ESCAPED,EVENT,EVENTS,EVERY,EXCHANGE,EXECUTE,EXISTS,EXIT,EXPANSION,EXPIRE,EXPLAIN,EXPORT,EXTENDED,EXTENT_SIZE,FAST,FAULTS,FETCH,FIELDS,FILE,FILE_BLOCK_SIZE,FILTER,FIRST,FIXED,FLOAT,FLOAT4,FLOAT8,FLUSH,FOLLOWS,FOR,FORCE,FOREIGN,FORMAT,FOUND,FROM,FULL,FULLTEXT,FUNCTION,GENERAL,GENERATED,GEOMETRY,GEOMETRYCOLLECTION,GET,GET_FORMAT,GLOBAL,GRANT,GRANTS,GROUP,GROUP_REPLICATION,HANDLER,HASH,HAVING,HELP,HIGH_PRIORITY,HOST,HOSTS,HOUR,HOUR_MICROSECOND,HOUR_MINUTE,HOUR_SECOND,IDENTIFIED,IF,IGNORE,IGNORE_SERVER_IDS,IMPORT,IN,INDEX,INDEXES,INFILE,INITIAL_SIZE,INNER,INOUT,INSENSITIVE,INSERT,INSERT_METHOD,INSTALL,INSTANCE,INT,INT1,INT2,INT3,INT4,INT8,INTEGER,INTERVAL,INTO,INVOKER,IO,IO_AFTER_GTIDS,IO_BEFORE_GTIDS,IO_THREAD,IPC,IS,ISOLATION,ISSUER,ITERATE,JOIN,JSON,KEY,KEY_BLOCK_SIZE,KEYS,KILL,LANGUAGE,LAST,LEADING,LEAVE,LEAVES,LEFT,LESS,LEVEL,LIKE,LIMIT,LINEAR,LINES,LINESTRING,LIST,LOAD,LOCAL,LOCALTIME,LOCALTIMESTAMP,LOCK,LOCKS,LOGFILE,LOGS,LONG,LONGBLOB,LONGTEXT,LOOP,LOW_PRIORITY,MASTER,MASTER_AUTO_POSITION,MASTER_BIND,MASTER_CONNECT_RETRY,MASTER_DELAY,MASTER_HEARTBEAT_PERIOD,MASTER_HOST,MASTER_LOG_FILE,MASTER_LOG_POS,MASTER_PASSWORD,MASTER_PORT,MASTER_RETRY_COUNT,MASTER_SERVER_ID,MASTER_SSL,MASTER_SSL_CA,MASTER_SSL_CAPATH,MASTER_SSL_CERT,MASTER_SSL_CIPHER,MASTER_SSL_CRL,MASTER_SSL_CRLPATH,MASTER_SSL_KEY,MASTER_SSL_VERIFY_SERVER_CERT,MASTER_TLS_VERSION,MASTER_USER,MATCH,MAX_CONNECTIONS_PER_HOUR,MAX_QUERIES_PER_HOUR,MAX_ROWS,MAX_SIZE,MAX_STATEMENT_TIME,MAX_UPDATES_PER_HOUR,MAX_USER_CONNECTIONS,MAXVALUE,MEDIUM,MEDIUMBLOB,MEDIUMINT,MEDIUMTEXT,MEMORY,MERGE,MESSAGE_TEXT,MICROSECOND,MIDDLEINT,MIGRATE,MIN_ROWS,MINUTE,MINUTE_MICROSECOND,MINUTE_SECOND,MOD,MODE,MODIFIES,MODIFY,MONTH,MULTILINESTRING,MULTIPOINT,MULTIPOLYGON,MUTEX,MYSQL_ERRNO,NAME,NAMES,NATIONAL,NATURAL,NCHAR,NDB,NDBCLUSTER,NEVER,NEW,NEXT,NO,NO_WAIT,NO_WRITE_TO_BINLOG,NODEGROUP,NONBLOCKING,NONE,NOT,NULL,NUMBER,NUMERIC,NVARCHAR,OFFSET,OLD_PASSWORD,ON,ONE,ONLY,OPEN,OPTIMIZE,OPTIMIZER_COSTS,OPTION,OPTIONALLY,OPTIONS,OR,ORDER,OUT,OUTER,OUTFILE,OWNER,PACK_KEYS,PAGE,PARSE_GCOL_EXPR,PARSER,PARTIAL,PARTITION,PARTITIONING,PARTITIONS,PASSWORD,PHASE,PLUGIN,PLUGIN_DIR,PLUGINS,POINT,POLYGON,PORT,PRECEDES,PRECISION,PREPARE,PRESERVE,PREV,PRIMARY,PRIVILEGES,PROCEDURE,PROCESSLIST,PROFILE,PROFILES,PROXY,PURGE,QUARTER,QUERY,QUICK,RANGE,READ,READ_ONLY,READ_WRITE,READS,REAL,REBUILD,RECOVER,REDO_BUFFER_SIZE,REDOFILE,REDUNDANT,REFERENCES,REGEXP,RELAY,RELAY_LOG_FILE,RELAY_LOG_POS,RELAY_THREAD,RELAYLOG,RELEASE,RELOAD,REMOVE,RENAME,REORGANIZE,REPAIR,REPEAT,REPEATABLE,REPLACE,REPLICATE_DO_DB,REPLICATE_DO_TABLE,REPLICATE_IGNORE_DB,REPLICATE_IGNORE_TABLE,REPLICATE_REWRITE_DB,REPLICATE_WILD_DO_TABLE,REPLICATE_WILD_IGNORE_TABLE,REPLICATION,REQUIRE,RESET,RESIGNAL,RESTORE,RESTRICT,RESUME,RETURN,RETURNED_SQLSTATE,RETURNS,REVERSE,REVOKE,RIGHT,RLIKE,ROLLBACK,ROLLUP,ROTATE,ROUTINE,ROW,ROW_COUNT,ROW_FORMAT,ROWS,RTREE,SAVEPOINT,SCHEDULE,SCHEMA,SCHEMA_NAME,SCHEMAS,SECOND,SECOND_MICROSECOND,SECURITY,SELECT,SENSITIVE,SEPARATOR,SERIAL,SERIALIZABLE,SERVER,SESSION,SET,SHARE,SHOW,SHUTDOWN,SIGNAL,SIGNED,SIMPLE,SLAVE,SLOW,SMALLINT,SNAPSHOT,SOCKET,SOME,SONAME,SOUNDS,SOURCE,SPATIAL,SPECIFIC,SQL,SQL_AFTER_GTIDS,SQL_AFTER_MTS_GAPS,SQL_BEFORE_GTIDS,SQL_BIG_RESULT,SQL_BUFFER_RESULT,SQL_CACHE,SQL_CALC_FOUND_ROWS,SQL_NO_CACHE,SQL_SMALL_RESULT,SQL_THREAD,SQL_TSI_DAY,SQL_TSI_HOUR,SQL_TSI_MINUTE,SQL_TSI_MONTH,SQL_TSI_QUARTER,SQL_TSI_SECOND,SQL_TSI_WEEK,SQL_TSI_YEAR,SQLEXCEPTION,SQLSTATE,SQLWARNING,SSL,STACKED,START,STARTING,STARTS,STATS_AUTO_RECALC,STATS_PERSISTENT,STATS_SAMPLE_PAGES,STATUS,STOP,STORAGE,STORED,STRAIGHT_JOIN,STRING,SUBCLASS_ORIGIN,SUBJECT,SUBPARTITION,SUBPARTITIONS,SUPER,SUSPEND,SWAPS,SWITCHES,TABLE,TABLE_CHECKSUM,TABLE_NAME,TABLES,TABLESPACE,TEMPORARY,TEMPTABLE,TERMINATED,TEXT,THAN,THEN,TIME,TIMESTAMP,TIMESTAMPADD,TIMESTAMPDIFF,TINYBLOB,TINYINT,TINYTEXT,TO,TRAILING,TRANSACTION,TRIGGER,TRIGGERS,TRUNCATE,TYPE,TYPES,UNCOMMITTED,UNDEFINED,UNDO,UNDO_BUFFER_SIZE,UNDOFILE,UNICODE,UNINSTALL,UNION,UNIQUE,UNKNOWN,UNLOCK,UNSIGNED,UNTIL,UPDATE,UPGRADE,USAGE,USE,USE_FRM,USER,USER_RESOURCES,USING,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,VALIDATION,VALUE,VALUES,VARBINARY,VARCHAR,VARCHARACTER,VARIABLES,VARYING,VIEW,VIRTUAL,WAIT,WARNINGS,WEEK,WEIGHT_STRING,WHEN,WHERE,WHILE,WITH,WITHOUT,WORK,WRAPPER,WRITE,X509,XA,XID,XML,XOR,YEAR,YEAR_MONTH,ZEROFILL,FALSE,TRUE";
+	private static final String ORACLE_KEYWORDS = "ACCESS,ADD,ALL,ALTER,AND,ANY,ARRAYLEN,AS,ASC,AUDIT,BETWEEN,BY,CHAR,CHECK,CLUSTER,COLUMN,COMMENT,COMPRESS,CONNECT,CREATE,CURRENT,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FILE,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IMMEDIATE,IN,INCREMENT,INDEX,INITIAL,INSERT,INTEGER,INTERSECT,INTO,IS,LEVEL,LIKE,LOCK,LONG,MAXEXTENTS,MINUS,MODE,MODIFY,NOAUDIT,NOCOMPRESS,NOT,NOTFOUND,NOWAIT,NULL,NUMBER,OF,OFFLINE,ON,ONLINE,OPTION,OR,ORDER,PCTFREE,PRIOR,PRIVILEGES,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,ROW,ROWID,ROWLABEL,ROWNUM,ROWS,SELECT,SESSION,SET,SHARE,SIZE,SMALLINT,SQLBUF,START,SUCCESSFUL,SYNONYM,TABLE,THEN,TO,TRIGGER,UID,UNION,UNIQUE,UPDATE,USER,VALIDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHENEVER,WHERE,WITH";
 
 	private static String CHECK_MEMSTORE = "select 1 from %s.gv$memstore t where t.total>t.mem_limit * ?";
-
+	private static Set<String> databaseKeywords;
 	private static String compatibleMode = null;
+	private static String currentKeywordsTpye =null;
+	protected static final Logger LOG = LoggerFactory.getLogger(Task.class);
+	private static Set<String> keywordsFromString2HashSet(final String keywords) {
+		return new HashSet(Arrays.asList(keywords.split(",")));
+	}
 
+	public static void transferDatabaseKeywords(List<String> keywords) {
+		//判断是否需要更改关键字集合
+		if (databaseKeywords == null || currentKeywordsTpye != compatibleMode) {
+			if (isOracleMode()) {
+				databaseKeywords = keywordsFromString2HashSet(ORACLE_KEYWORDS);
+			} else {
+				databaseKeywords = keywordsFromString2HashSet(MYSQL_KEYWORDS);
+			}
+			currentKeywordsTpye = compatibleMode;
+		}
+		char escapeChar = isOracleMode() ? '"' : '`';
+		for (int i = 0; i < keywords.size(); i++) {
+			String keyword = keywords.get(i).toUpperCase();
+			if (databaseKeywords.contains(keyword)) {
+				keyword = escapeChar + keyword + escapeChar;
+			}
+			keyword = keyword.toLowerCase();
+			keywords.set(i, keyword);
+		}
+	}
 	public static boolean isMemstoreFull(Connection conn, double memstoreThreshold) {
 		PreparedStatement ps = null;
 		ResultSet rs = null;

From dcb541f04801afb9fc95f28e6aec348e216952a8 Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Mon, 27 Dec 2021 17:02:51 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=89=88=E6=9C=AC=E6=8F=90=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reader/oceanbasev10reader/ext/ReaderJob.java  |  4 ++--
 .../reader/oceanbasev10reader/ext/ReaderTask.java |  4 +++-
 .../oceanbasev10reader/util/ObReaderUtils.java    | 14 +++++---------
 .../oceanbasev10writer/OceanBaseV10Writer.java    | 15 +++++++--------
 .../task/ConcurrentTableWriterTask.java           |  7 ++++++-
 .../oceanbasev10writer/util/ObWriterUtils.java    | 10 ++++------
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
index 2a31aaa1..f69a9166 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderJob.java
@@ -26,7 +26,7 @@ public class ReaderJob extends CommonRdbmsReader.Job {
     public void init(Configuration originalConfig) {
         //将config中的column和table中的关键字进行转义
         List<String> columns = originalConfig.getList(Key.COLUMN, String.class);
-        ObReaderUtils.transferDatabaseKeywords(columns);
+        ObReaderUtils.escapeDatabaseKeywords(columns);
         originalConfig.set(Key.COLUMN, columns);
 
         List<JSONObject> conns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, JSONObject.class);
@@ -34,7 +34,7 @@ public class ReaderJob extends CommonRdbmsReader.Job {
             JSONObject conn = conns.get(i);
             Configuration connConfig = Configuration.from(conn.toString());
             List<String> tables = connConfig.getList(Key.TABLE, String.class);
-            ObReaderUtils.transferDatabaseKeywords(tables);
+            ObReaderUtils.escapeDatabaseKeywords(tables);
             originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, i, Key.TABLE), tables);
         }
         super.init(originalConfig);
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
index fab0b1fb..254b334c 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
@@ -66,10 +66,12 @@ public class ReaderTask extends CommonRdbmsReader.Task {
 
         if (ObReaderUtils.databaseType == DataBaseType.OceanBase) {
             jdbcUrl = jdbcUrl.replace("jdbc:mysql:", "jdbc:oceanbase:") + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
-            compatibleMode = ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
         } else {
             jdbcUrl = jdbcUrl + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
         }
+        if(ObReaderUtils.compatibleMode==ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE){
+            compatibleMode=ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
+        }
         LOG.info("this is ob1_0 jdbc url. user=" + username + " :url=" + jdbcUrl);
         mandatoryEncoding = readerSliceConfig.getString(Key.MANDATORY_ENCODING, "");
         retryLimit = readerSliceConfig.getInt(Config.RETRY_LIMIT, Config.DEFAULT_RETRY_LIMIT);
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
index 8efee64f..143171db 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
@@ -40,7 +40,6 @@ public class ObReaderUtils {
     private static final String ORACLE_KEYWORDS = "ACCESS,ADD,ALL,ALTER,AND,ANY,ARRAYLEN,AS,ASC,AUDIT,BETWEEN,BY,CHAR,CHECK,CLUSTER,COLUMN,COMMENT,COMPRESS,CONNECT,CREATE,CURRENT,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FILE,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IMMEDIATE,IN,INCREMENT,INDEX,INITIAL,INSERT,INTEGER,INTERSECT,INTO,IS,LEVEL,LIKE,LOCK,LONG,MAXEXTENTS,MINUS,MODE,MODIFY,NOAUDIT,NOCOMPRESS,NOT,NOTFOUND,NOWAIT,NULL,NUMBER,OF,OFFLINE,ON,ONLINE,OPTION,OR,ORDER,PCTFREE,PRIOR,PRIVILEGES,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,ROW,ROWID,ROWLABEL,ROWNUM,ROWS,SELECT,SESSION,SET,SHARE,SIZE,SMALLINT,SQLBUF,START,SUCCESSFUL,SYNONYM,TABLE,THEN,TO,TRIGGER,UID,UNION,UNIQUE,UPDATE,USER,VALIDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHENEVER,WHERE,WITH";
 
     private static Set<String> databaseKeywords;
-    private static String currentKeywordsTpye;
     final static public String OB_COMPATIBLE_MODE = "obCompatibilityMode";
     final static public String OB_COMPATIBLE_MODE_ORACLE = "ORACLE";
     final static public String OB_COMPATIBLE_MODE_MYSQL = "MYSQL";
@@ -54,23 +53,20 @@ public class ObReaderUtils {
         return new HashSet(Arrays.asList(keywords.split(",")));
     }
 
-    public static void transferDatabaseKeywords(List<String> keywords) {
-        //判断是否需要更改关键字集合
-        if (databaseKeywords == null || currentKeywordsTpye != compatibleMode) {
+    public static void escapeDatabaseKeywords(List<String> keywords) {
+        if (databaseKeywords == null) {
             if (isOracleMode(compatibleMode.toString())) {
                 databaseKeywords = keywordsFromString2HashSet(ORACLE_KEYWORDS);
             } else {
                 databaseKeywords = keywordsFromString2HashSet(MYSQL_KEYWORDS);
             }
-            currentKeywordsTpye = compatibleMode;
         }
         char escapeChar = isOracleMode(compatibleMode.toString()) ? '"' : '`';
         for (int i = 0; i < keywords.size(); i++) {
-            String keyword = keywords.get(i).toUpperCase();
-            if (databaseKeywords.contains(keyword)) {
+            String keyword = keywords.get(i);
+            if (databaseKeywords.contains(keyword.toUpperCase())) {
                 keyword = escapeChar + keyword + escapeChar;
             }
-            keyword = keyword.toLowerCase();
             keywords.set(i, keyword);
         }
     }
@@ -160,7 +156,7 @@ public class ObReaderUtils {
                     realIndex.add(columnName);
                 }
             }
-            transferDatabaseKeywords(realIndex);
+            escapeDatabaseKeywords(realIndex);
 
             String[] pks = new String[realIndex.size()];
             realIndex.toArray(pks);
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
index bf1c9f60..417fccb3 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
@@ -3,7 +3,6 @@ package com.alibaba.datax.plugin.writer.oceanbasev10writer;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.DbUtils;
 import com.alibaba.fastjson.JSONObject;
@@ -62,17 +61,17 @@ public class OceanBaseV10Writer extends Writer {
 			this.originalConfig = super.getPluginJobConf();
 			checkCompatibleMode(originalConfig);
 			//将config中的column和table中的关键字进行转义
-			List<String> columns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Key.COLUMN, String.class);
-			ObWriterUtils.transferDatabaseKeywords(columns);
-			originalConfig.set(com.alibaba.datax.plugin.rdbms.reader.Key.COLUMN, columns);
+			List<String> columns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.writer.Key.COLUMN, String.class);
+			ObWriterUtils.escapeDatabaseKeywords(columns);
+			originalConfig.set(com.alibaba.datax.plugin.rdbms.writer.Key.COLUMN, columns);
 
-			List<JSONObject> conns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, JSONObject.class);
+			List<JSONObject> conns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.writer.Constant.CONN_MARK, JSONObject.class);
 			for (int i = 0; i < conns.size(); i++) {
 				JSONObject conn = conns.get(i);
 				Configuration connConfig = Configuration.from(conn.toString());
-				List<String> tables = connConfig.getList(com.alibaba.datax.plugin.rdbms.reader.Key.TABLE, String.class);
-				ObWriterUtils.transferDatabaseKeywords(tables);
-				originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.reader.Constant.CONN_MARK, i, com.alibaba.datax.plugin.rdbms.reader.Key.TABLE), tables);
+				List<String> tables = connConfig.getList(com.alibaba.datax.plugin.rdbms.writer.Key.TABLE, String.class);
+				ObWriterUtils.escapeDatabaseKeywords(tables);
+				originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.writer.Constant.CONN_MARK, i, com.alibaba.datax.plugin.rdbms.writer.Key.TABLE), tables);
 			}
 			this.commonJob = new CommonRdbmsWriter.Job(DATABASE_TYPE);
 			this.commonJob.init(this.originalConfig);
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
index cbc9a936..f07c543b 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
@@ -15,6 +15,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.regex.Pattern;
 
 import com.alibaba.datax.common.element.Column;
 import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ObClientConnHolder;
@@ -105,7 +106,11 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
         checkConnHolder.initConnection();
         if (isOracleCompatibleMode) {
            connectInfo.databaseName =  connectInfo.databaseName.toUpperCase();
-           table = table.toUpperCase();
+           //在转义的情况下不翻译
+           if(!Pattern.matches("\"\\w*\"",table)){
+			   table = table.toUpperCase();
+		   }
+
            LOG.info(String.format("this is oracle compatible mode, change database to %s, table to %s",
                    connectInfo.databaseName, table));
         }
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
index a8ff7a04..8e9b4204 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
@@ -21,26 +21,24 @@ public class ObWriterUtils {
 	private static String CHECK_MEMSTORE = "select 1 from %s.gv$memstore t where t.total>t.mem_limit * ?";
 	private static Set<String> databaseKeywords;
 	private static String compatibleMode = null;
-	private static String currentKeywordsTpye =null;
 	protected static final Logger LOG = LoggerFactory.getLogger(Task.class);
 	private static Set<String> keywordsFromString2HashSet(final String keywords) {
 		return new HashSet(Arrays.asList(keywords.split(",")));
 	}
 
-	public static void transferDatabaseKeywords(List<String> keywords) {
+	public static void escapeDatabaseKeywords(List<String> keywords) {
 		//判断是否需要更改关键字集合
-		if (databaseKeywords == null || currentKeywordsTpye != compatibleMode) {
+		if (databaseKeywords == null) {
 			if (isOracleMode()) {
 				databaseKeywords = keywordsFromString2HashSet(ORACLE_KEYWORDS);
 			} else {
 				databaseKeywords = keywordsFromString2HashSet(MYSQL_KEYWORDS);
 			}
-			currentKeywordsTpye = compatibleMode;
 		}
 		char escapeChar = isOracleMode() ? '"' : '`';
 		for (int i = 0; i < keywords.size(); i++) {
-			String keyword = keywords.get(i).toUpperCase();
-			if (databaseKeywords.contains(keyword)) {
+			String keyword = keywords.get(i);
+			if (databaseKeywords.contains(keyword.toUpperCase())) {
 				keyword = escapeChar + keyword + escapeChar;
 			}
 			keyword = keyword.toLowerCase();

From 9f09039a23aee7fa42a4cd140c81aee7687518ce Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Mon, 27 Dec 2021 17:49:49 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10reader/ext/ReaderTask.java    | 26 ++++----
 .../util/ObReaderUtils.java                   |  2 +-
 .../OceanBaseV10Writer.java                   | 30 +++++-----
 .../task/ConcurrentTableWriterTask.java       | 59 +++++++++----------
 .../util/ObWriterUtils.java                   |  1 -
 5 files changed, 55 insertions(+), 63 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
index 254b334c..1376f113 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
@@ -1,13 +1,5 @@
 package com.alibaba.datax.plugin.reader.oceanbasev10reader.ext;
 
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.datax.common.element.Column;
 import com.alibaba.datax.common.element.Record;
 import com.alibaba.datax.common.plugin.RecordSender;
@@ -19,11 +11,17 @@ import com.alibaba.datax.plugin.rdbms.reader.CommonRdbmsReader;
 import com.alibaba.datax.plugin.rdbms.reader.Constant;
 import com.alibaba.datax.plugin.rdbms.reader.Key;
 import com.alibaba.datax.plugin.rdbms.util.DBUtil;
-import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
 import com.alibaba.datax.plugin.rdbms.util.RdbmsException;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.Config;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.ObReaderUtils;
 import com.alibaba.datax.plugin.reader.oceanbasev10reader.util.TaskContext;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ReaderTask extends CommonRdbmsReader.Task {
     private static final Logger LOG = LoggerFactory.getLogger(ReaderTask.class);
@@ -64,13 +62,9 @@ public class ReaderTask extends CommonRdbmsReader.Task {
             }
         }
 
-        if (ObReaderUtils.databaseType == DataBaseType.OceanBase) {
-            jdbcUrl = jdbcUrl.replace("jdbc:mysql:", "jdbc:oceanbase:") + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
-        } else {
-            jdbcUrl = jdbcUrl + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
-        }
-        if(ObReaderUtils.compatibleMode==ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE){
-            compatibleMode=ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
+        jdbcUrl = jdbcUrl.replace("jdbc:mysql:", "jdbc:oceanbase:") + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
+        if (ObReaderUtils.compatibleMode == ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE) {
+            compatibleMode = ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
         }
         LOG.info("this is ob1_0 jdbc url. user=" + username + " :url=" + jdbcUrl);
         mandatoryEncoding = readerSliceConfig.getString(Key.MANDATORY_ENCODING, "");
diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
index 143171db..878aaea6 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
@@ -717,6 +717,6 @@ public class ObReaderUtils {
     }
 
     public static boolean isOracleMode(String mode) {
-        return (mode != null && OB_COMPATIBLE_MODE_ORACLE.equals(mode.toString().toUpperCase()));
+        return (mode != null && OB_COMPATIBLE_MODE_ORACLE.equalsIgnoreCase(mode));
     }
 }
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
index 417fccb3..ede2eb01 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/OceanBaseV10Writer.java
@@ -1,15 +1,5 @@
 package com.alibaba.datax.plugin.writer.oceanbasev10writer;
 
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.DbUtils;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.datax.common.plugin.RecordReceiver;
 import com.alibaba.datax.common.spi.Writer;
 import com.alibaba.datax.common.util.Configuration;
@@ -20,7 +10,16 @@ import com.alibaba.datax.plugin.rdbms.writer.Constant;
 import com.alibaba.datax.plugin.rdbms.writer.Key;
 import com.alibaba.datax.plugin.rdbms.writer.util.WriterUtil;
 import com.alibaba.datax.plugin.writer.oceanbasev10writer.task.ConcurrentTableWriterTask;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.DbUtils;
 import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.ObWriterUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 2016-04-07
@@ -61,17 +60,17 @@ public class OceanBaseV10Writer extends Writer {
 			this.originalConfig = super.getPluginJobConf();
 			checkCompatibleMode(originalConfig);
 			//将config中的column和table中的关键字进行转义
-			List<String> columns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.writer.Key.COLUMN, String.class);
+			List<String> columns = originalConfig.getList(Key.COLUMN, String.class);
 			ObWriterUtils.escapeDatabaseKeywords(columns);
-			originalConfig.set(com.alibaba.datax.plugin.rdbms.writer.Key.COLUMN, columns);
+			originalConfig.set(Key.COLUMN, columns);
 
-			List<JSONObject> conns = originalConfig.getList(com.alibaba.datax.plugin.rdbms.writer.Constant.CONN_MARK, JSONObject.class);
+			List<JSONObject> conns = originalConfig.getList(Constant.CONN_MARK, JSONObject.class);
 			for (int i = 0; i < conns.size(); i++) {
 				JSONObject conn = conns.get(i);
 				Configuration connConfig = Configuration.from(conn.toString());
-				List<String> tables = connConfig.getList(com.alibaba.datax.plugin.rdbms.writer.Key.TABLE, String.class);
+				List<String> tables = connConfig.getList(Key.TABLE, String.class);
 				ObWriterUtils.escapeDatabaseKeywords(tables);
-				originalConfig.set(String.format("%s[%d].%s", com.alibaba.datax.plugin.rdbms.writer.Constant.CONN_MARK, i, com.alibaba.datax.plugin.rdbms.writer.Key.TABLE), tables);
+				originalConfig.set(String.format("%s[%d].%s", Constant.CONN_MARK, i, Key.TABLE), tables);
 			}
 			this.commonJob = new CommonRdbmsWriter.Job(DATABASE_TYPE);
 			this.commonJob.init(this.originalConfig);
@@ -235,6 +234,7 @@ public class OceanBaseV10Writer extends Writer {
 		/**
 		 * 注意：此方法每个 Task 都会执行一次。 最佳实践：此处适当封装确保简洁清晰完成数据写入工作。
 		 */
+		@Override
 		public void startWrite(RecordReceiver recordReceiver) {
 			this.writerTask.startWrite(recordReceiver, this.writerSliceConfig, super.getTaskPluginCollector());
 		}
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
index f07c543b..cf39cf28 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
@@ -1,7 +1,27 @@
 package com.alibaba.datax.plugin.writer.oceanbasev10writer.task;
 
+import com.alibaba.datax.common.element.Column;
+import com.alibaba.datax.common.element.Record;
+import com.alibaba.datax.common.exception.DataXException;
+import com.alibaba.datax.common.plugin.RecordReceiver;
+import com.alibaba.datax.common.plugin.TaskPluginCollector;
+import com.alibaba.datax.common.util.Configuration;
+import com.alibaba.datax.plugin.rdbms.util.DBUtil;
+import com.alibaba.datax.plugin.rdbms.util.DBUtilErrorCode;
+import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
+import com.alibaba.datax.plugin.rdbms.writer.CommonRdbmsWriter;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.Config;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ConnHolder;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ObClientConnHolder;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ServerConnectInfo;
+import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.ObWriterUtils;
+import com.alipay.oceanbase.obproxy.data.TableEntryKey;
+import com.alipay.oceanbase.obproxy.util.ObPartitionIdCalculator;
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.sql.Connection;
-//import java.sql.PreparedStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -15,29 +35,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.regex.Pattern;
 
-import com.alibaba.datax.common.element.Column;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ObClientConnHolder;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.alibaba.datax.common.element.Record;
-import com.alibaba.datax.common.exception.DataXException;
-import com.alibaba.datax.common.plugin.RecordReceiver;
-import com.alibaba.datax.common.plugin.TaskPluginCollector;
-import com.alibaba.datax.common.util.Configuration;
-import com.alibaba.datax.plugin.rdbms.util.DBUtil;
-import com.alibaba.datax.plugin.rdbms.util.DBUtilErrorCode;
-import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
-import com.alibaba.datax.plugin.rdbms.writer.CommonRdbmsWriter;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.Config;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ConnHolder;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.ext.ServerConnectInfo;
-import com.alibaba.datax.plugin.writer.oceanbasev10writer.util.ObWriterUtils;
-import com.alipay.oceanbase.obproxy.data.TableEntryKey;
-import com.alipay.oceanbase.obproxy.util.ObPartitionIdCalculator;
+//import java.sql.PreparedStatement;
 
 public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
     private static final Logger LOG = LoggerFactory.getLogger(ConcurrentTableWriterTask.class);
@@ -105,14 +104,14 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 				connectInfo.getFullUserName(), connectInfo.password);
         checkConnHolder.initConnection();
         if (isOracleCompatibleMode) {
-           connectInfo.databaseName =  connectInfo.databaseName.toUpperCase();
-           //在转义的情况下不翻译
-           if(!Pattern.matches("\"\\w*\"",table)){
-			   table = table.toUpperCase();
-		   }
+			connectInfo.databaseName = connectInfo.databaseName.toUpperCase();
+			//在转义的情况下不翻译
+			if (table.startsWith("\"") && table.endsWith("\"")) {
+				table = table.toUpperCase();
+			}
 
-           LOG.info(String.format("this is oracle compatible mode, change database to %s, table to %s",
-                   connectInfo.databaseName, table));
+			LOG.info(String.format("this is oracle compatible mode, change database to %s, table to %s",
+					connectInfo.databaseName, table));
         }
 
         if (config.getBool(Config.USE_PART_CALCULATOR, Config.DEFAULT_USE_PART_CALCULATOR)) {
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
index 8e9b4204..072a0f21 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
@@ -41,7 +41,6 @@ public class ObWriterUtils {
 			if (databaseKeywords.contains(keyword.toUpperCase())) {
 				keyword = escapeChar + keyword + escapeChar;
 			}
-			keyword = keyword.toLowerCase();
 			keywords.set(i, keyword);
 		}
 	}

From b1334308a08b7c6ffdd2edbdc43f055ad1aef0ea Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Tue, 28 Dec 2021 10:10:43 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E6=8A=8A=E8=BD=AC=E4=B9=89=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10writer/task/ConcurrentTableWriterTask.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
index cf39cf28..1e6d27c6 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
@@ -106,7 +106,7 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
         if (isOracleCompatibleMode) {
 			connectInfo.databaseName = connectInfo.databaseName.toUpperCase();
 			//在转义的情况下不翻译
-			if (table.startsWith("\"") && table.endsWith("\"")) {
+			if (!(table.startsWith("\"") && table.endsWith("\""))) {
 				table = table.toUpperCase();
 			}
 

From ce29ae7ee5d7ac5163c30b80ef0b41c361ced7b8 Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Tue, 28 Dec 2021 18:25:16 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E6=9C=AC=E6=AC=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E8=BD=AC=E4=B9=89=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=8D=E9=9C=80=E8=A6=81=E8=BF=9B=E8=A1=8C=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=86=99=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/ObReaderUtils.java                   | 71 +++++++++----------
 .../task/ConcurrentTableWriterTask.java       | 38 +++++++---
 .../util/ObWriterUtils.java                   | 44 +++++++++---
 3 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
index 878aaea6..20c2f922 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/util/ObReaderUtils.java
@@ -1,37 +1,22 @@
 package com.alibaba.datax.plugin.reader.oceanbasev10reader.util;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import com.alibaba.datax.common.element.*;
+import com.alibaba.datax.plugin.rdbms.util.DBUtil;
 import com.alibaba.datax.plugin.rdbms.util.DataBaseType;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.alibaba.datax.common.element.BoolColumn;
-import com.alibaba.datax.common.element.BytesColumn;
-import com.alibaba.datax.common.element.Column;
-import com.alibaba.datax.common.element.DateColumn;
-import com.alibaba.datax.common.element.DoubleColumn;
-import com.alibaba.datax.common.element.LongColumn;
-import com.alibaba.datax.common.element.Record;
-import com.alibaba.datax.common.element.StringColumn;
-import com.alibaba.datax.plugin.rdbms.util.DBUtil;
-import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
-import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
-
-import javax.xml.crypto.Data;
+import java.sql.*;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class ObReaderUtils {
 
@@ -53,21 +38,32 @@ public class ObReaderUtils {
         return new HashSet(Arrays.asList(keywords.split(",")));
     }
 
-    public static void escapeDatabaseKeywords(List<String> keywords) {
+    public static String escapeDatabaseKeywords(String keyword) {
         if (databaseKeywords == null) {
-            if (isOracleMode(compatibleMode.toString())) {
+            if (isOracleMode(compatibleMode)) {
                 databaseKeywords = keywordsFromString2HashSet(ORACLE_KEYWORDS);
             } else {
                 databaseKeywords = keywordsFromString2HashSet(MYSQL_KEYWORDS);
             }
         }
-        char escapeChar = isOracleMode(compatibleMode.toString()) ? '"' : '`';
+        char escapeChar = isOracleMode(compatibleMode) ? '"' : '`';
+        if (databaseKeywords.contains(keyword.toUpperCase())) {
+            keyword = escapeChar + keyword + escapeChar;
+        }
+        return keyword;
+    }
+
+    public static void escapeDatabaseKeywords(List<String> keywords) {
         for (int i = 0; i < keywords.size(); i++) {
-            String keyword = keywords.get(i);
-            if (databaseKeywords.contains(keyword.toUpperCase())) {
-                keyword = escapeChar + keyword + escapeChar;
-            }
-            keywords.set(i, keyword);
+            keywords.set(i, escapeDatabaseKeywords(keywords.get(i)));
+        }
+    }
+
+    public static Boolean isEscapeMode(String keyword) {
+        if (isOracleMode(compatibleMode)) {
+            return keyword.startsWith("\"") && keyword.endsWith("\"");
+        } else {
+            return keyword.startsWith("`") && keyword.endsWith("`");
         }
     }
 
@@ -151,12 +147,15 @@ public class ObReaderUtils {
             ps = conn.createStatement();
             rs = ps.executeQuery(sql);
             while (rs.next()) {
-                String columnName = StringUtils.lowerCase(rs.getString("Column_name"));
+                String columnName = rs.getString("Column_name");
+                columnName = escapeDatabaseKeywords(columnName);
+                if (!isEscapeMode(columnName)) {
+                    columnName.toLowerCase();
+                }
                 if (!realIndex.contains(columnName)) {
                     realIndex.add(columnName);
                 }
             }
-            escapeDatabaseKeywords(realIndex);
 
             String[] pks = new String[realIndex.size()];
             realIndex.toArray(pks);
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
index 1e6d27c6..eb1222c3 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
@@ -62,6 +62,7 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 	private ObPartitionIdCalculator partCalculator = null;
 
 	private HashMap<Long, List<Record>> groupInsertValues;
+	List<Record> unknownPartRecords = new ArrayList<Record>();
 //	private List<Record> unknownPartRecords;
 	private List<Integer> partitionKeyIndexes;
 	
@@ -307,6 +308,18 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 				}
 			}
 		}
+		if(unknownPartRecords.size()>0){
+			int retry = 0;
+			while (true) {
+				try {
+					concurrentWriter.addBatchRecords(unknownPartRecords);
+					break;
+				} catch (InterruptedException e) {
+					retry++;
+					LOG.info("Concurrent table writer is interrupted, retry {}", retry);
+				}
+			}
+		}
 	}
 	
 	private void addRecordToCache(final Record record) {
@@ -347,21 +360,24 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 				groupInsertValues.put(partId, groupValues);
 			}
 		} else {
-			LOG.warn("add unknown part record {}", record);
-			List<Record> unknownPartRecords = new ArrayList<Record>();
+			LOG.debug("add unknown part record {}", record);
+
 			unknownPartRecords.add(record);
 			int i = 0;
-			while (true) {
-				if (i > 0) {
-					LOG.info("retry add batch record the {} times", i);
-				}
-				try {
-					concurrentWriter.addBatchRecords(unknownPartRecords);
-					break;
-				} catch (InterruptedException e) {
-					LOG.info("Concurrent table writer is interrupted");
+			if(unknownPartRecords.size()>batchSize){
+				while (true) {
+					if (i > 0) {
+						LOG.info("retry add batch record the {} times", i);
+					}
+					try {
+						concurrentWriter.addBatchRecords(unknownPartRecords);
+						break;
+					} catch (InterruptedException e) {
+						LOG.info("Concurrent table writer is interrupted");
+					}
 				}
 			}
+
 		}
 	}
 
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
index 072a0f21..f4c4f439 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
 
 import java.sql.*;
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class ObWriterUtils {
 
@@ -26,8 +25,8 @@ public class ObWriterUtils {
 		return new HashSet(Arrays.asList(keywords.split(",")));
 	}
 
-	public static void escapeDatabaseKeywords(List<String> keywords) {
-		//判断是否需要更改关键字集合
+	//java中的String的坑
+	public static String escapeDatabaseKeywords(String keyword) {
 		if (databaseKeywords == null) {
 			if (isOracleMode()) {
 				databaseKeywords = keywordsFromString2HashSet(ORACLE_KEYWORDS);
@@ -36,12 +35,22 @@ public class ObWriterUtils {
 			}
 		}
 		char escapeChar = isOracleMode() ? '"' : '`';
+		if (databaseKeywords.contains(keyword.toUpperCase())) {
+			keyword = escapeChar + keyword + escapeChar;
+		}
+		return keyword;
+	}
+
+	public static void escapeDatabaseKeywords(List<String> keywords) {
 		for (int i = 0; i < keywords.size(); i++) {
-			String keyword = keywords.get(i);
-			if (databaseKeywords.contains(keyword.toUpperCase())) {
-				keyword = escapeChar + keyword + escapeChar;
-			}
-			keywords.set(i, keyword);
+			keywords.set(i, escapeDatabaseKeywords(keywords.get(i)));
+		}
+	}
+	public static Boolean isEscapeMode(String keyword){
+		if(isOracleMode()){
+			return keyword.startsWith("\"") && keyword.endsWith("\"");
+		}else{
+			return keyword.startsWith("`") && keyword.endsWith("`");
 		}
 	}
 	public static boolean isMemstoreFull(Connection conn, double memstoreThreshold) {
@@ -94,7 +103,16 @@ public class ObWriterUtils {
 	}
 
 	private static int[] getColumnIndex(List<String> columnsInIndex, List<String> allColumns) {
-		allColumns = allColumns.stream().map(String::toUpperCase).collect(Collectors.toList());
+		/**
+		 * JDK8的stream模型：将一种数据结构转化成通用的数据模型，并可在该模型上进行操作
+		 * map:接受一个函数引用，用于操作元素
+		 * collect：接受一个Collectors方法，用于将中间数据模型转化成目标数据结构
+		 */
+		for (int i = 0; i < allColumns.size(); i++) {
+			if (!ObWriterUtils.isEscapeMode(allColumns.get(i))) {
+				allColumns.set(i, allColumns.get(i).toUpperCase());
+			}
+		}
 		int[] colIdx = new int[columnsInIndex.size()];
 		for (int i = 0; i < columnsInIndex.size(); i++) {
 			int index = allColumns.indexOf(columnsInIndex.get(i));
@@ -146,7 +164,11 @@ public class ObWriterUtils {
 			rs = stmt.executeQuery(sql);
 			while (rs.next()) {
 				String keyName = rs.getString("Key_name");
-				String columnName = StringUtils.upperCase(rs.getString("Column_name"));
+				String columnName = rs.getString("Column_name");
+				columnName=escapeDatabaseKeywords(columnName);
+				if(!ObWriterUtils.isEscapeMode(columnName)){
+					columnName=columnName.toUpperCase();
+				}
 				List<String> s = uniqueKeys.get(keyName);
 				if (s == null) {
 					s = new ArrayList();
@@ -159,6 +181,7 @@ public class ObWriterUtils {
 		} finally {
 			asyncClose(rs, stmt, null);
 		}
+		//ObWriterUtils.escapeDatabaseKeywords(uniqueKeys);
 		return uniqueKeys;
 	}
 
@@ -315,6 +338,7 @@ public class ObWriterUtils {
 	 * @param e
 	 * @return
 	 */
+
 	public static boolean isFatalError(SQLException e) {
 		String sqlState = e.getSQLState();
 		if (StringUtils.startsWith(sqlState, "08")) {

From 042aa2d86599162367024a3072fdb34547736a4e Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Tue, 28 Dec 2021 19:32:15 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E5=9C=A8=E4=B8=8A=E4=B8=AA=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84=E5=9F=BA=E7=A1=80=E4=B8=8A=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10writer/task/ConcurrentTableWriterTask.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
index eb1222c3..bed0598d 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
@@ -308,7 +308,7 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 				}
 			}
 		}
-		if(unknownPartRecords.size()>0){
+		if (unknownPartRecords.size() > 0) {
 			int retry = 0;
 			while (true) {
 				try {
@@ -364,7 +364,7 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 
 			unknownPartRecords.add(record);
 			int i = 0;
-			if(unknownPartRecords.size()>batchSize){
+			if (unknownPartRecords.size() > batchSize) {
 				while (true) {
 					if (i > 0) {
 						LOG.info("retry add batch record the {} times", i);

From c96a366a4eab44acc114f7a31275ba243701352c Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Wed, 29 Dec 2021 19:23:34 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E6=8A=8A=E5=86=97=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=90=88=E5=B9=B6=E6=88=90=E4=BA=86=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=EF=BC=8C=E5=88=A0=E9=99=A4=E4=BA=86=E4=B8=8D?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10reader/ext/ReaderTask.java    |  2 +-
 .../task/ConcurrentTableWriterTask.java       | 72 +++++++------------
 .../util/ObWriterUtils.java                   |  8 +--
 3 files changed, 28 insertions(+), 54 deletions(-)

diff --git a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
index 1376f113..a43dcebd 100644
--- a/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
+++ b/oceanbasev10reader/src/main/java/com/alibaba/datax/plugin/reader/oceanbasev10reader/ext/ReaderTask.java
@@ -63,7 +63,7 @@ public class ReaderTask extends CommonRdbmsReader.Task {
         }
 
         jdbcUrl = jdbcUrl.replace("jdbc:mysql:", "jdbc:oceanbase:") + "&socketTimeout=1800000&connectTimeout=60000"; //socketTimeout 半个小时
-        if (ObReaderUtils.compatibleMode == ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE) {
+        if (ObReaderUtils.compatibleMode.equals(ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE)) {
             compatibleMode = ObReaderUtils.OB_COMPATIBLE_MODE_ORACLE;
         }
         LOG.info("this is ob1_0 jdbc url. user=" + username + " :url=" + jdbcUrl);
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
index bed0598d..bd34b4a6 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
@@ -294,31 +294,14 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 	}
 
 	private void addLeftRecords() {
+		//不需要刷新Cache，已经是最后一批数据了
 		for (List<Record> groupValues : groupInsertValues.values()) {
 			if (groupValues.size() > 0 ) {
-				int retry = 0;
-				while (true) {
-					try {
-						concurrentWriter.addBatchRecords(groupValues);
-						break;
-					} catch (InterruptedException e) {
-						retry++;
-						LOG.info("Concurrent table writer is interrupted, retry {}", retry);
-					}
-				}
+				addRecordsToWriteQueue(groupValues);
 			}
 		}
 		if (unknownPartRecords.size() > 0) {
-			int retry = 0;
-			while (true) {
-				try {
-					concurrentWriter.addBatchRecords(unknownPartRecords);
-					break;
-				} catch (InterruptedException e) {
-					retry++;
-					LOG.info("Concurrent table writer is interrupted, retry {}", retry);
-				}
-			}
+			addRecordsToWriteQueue(unknownPartRecords);
 		}
 	}
 	
@@ -344,43 +327,40 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 			groupValues.add(record);
 			if (groupValues.size() >= batchSize) {
 				int i = 0;
-				while (true) {
-					if (i > 0) {
-						LOG.info("retry add batch record the {} times", i);
-					}
-					try {
-						concurrentWriter.addBatchRecords(groupValues);
-						printEveryTime();
-						break;
-					} catch (InterruptedException e) {
-						LOG.info("Concurrent table writer is interrupted");
-					}
-				}
-				groupValues = new ArrayList<Record>(batchSize);
+				groupValues =addRecordsToWriteQueue(groupValues);
 				groupInsertValues.put(partId, groupValues);
 			}
 		} else {
 			LOG.debug("add unknown part record {}", record);
-
 			unknownPartRecords.add(record);
-			int i = 0;
 			if (unknownPartRecords.size() > batchSize) {
-				while (true) {
-					if (i > 0) {
-						LOG.info("retry add batch record the {} times", i);
-					}
-					try {
-						concurrentWriter.addBatchRecords(unknownPartRecords);
-						break;
-					} catch (InterruptedException e) {
-						LOG.info("Concurrent table writer is interrupted");
-					}
-				}
+				unknownPartRecords=addRecordsToWriteQueue(unknownPartRecords);
 			}
 
 		}
 	}
 
+	/**
+	 *
+	 * @param records
+	 * @return 返回一个新的Cache用于存储接下来的数据
+	 */
+	private List<Record> addRecordsToWriteQueue(List<Record> records) {
+		int i = 0;
+		while (true) {
+			if (i > 0) {
+				LOG.info("retry add batch record the {} times", i);
+			}
+			try {
+				concurrentWriter.addBatchRecords(records);
+				break;
+			} catch (InterruptedException e) {
+				i++;
+				LOG.info("Concurrent table writer is interrupted");
+			}
+		}
+		return new ArrayList<Record>(batchSize);
+	}
 	private void checkMemStore() {
 		Connection checkConn = checkConnHolder.reconnect();
 		long now = System.currentTimeMillis();
diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
index f4c4f439..ff1648a1 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/util/ObWriterUtils.java
@@ -25,7 +25,6 @@ public class ObWriterUtils {
 		return new HashSet(Arrays.asList(keywords.split(",")));
 	}
 
-	//java中的String的坑
 	public static String escapeDatabaseKeywords(String keyword) {
 		if (databaseKeywords == null) {
 			if (isOracleMode()) {
@@ -103,11 +102,6 @@ public class ObWriterUtils {
 	}
 
 	private static int[] getColumnIndex(List<String> columnsInIndex, List<String> allColumns) {
-		/**
-		 * JDK8的stream模型：将一种数据结构转化成通用的数据模型，并可在该模型上进行操作
-		 * map:接受一个函数引用，用于操作元素
-		 * collect：接受一个Collectors方法，用于将中间数据模型转化成目标数据结构
-		 */
 		for (int i = 0; i < allColumns.size(); i++) {
 			if (!ObWriterUtils.isEscapeMode(allColumns.get(i))) {
 				allColumns.set(i, allColumns.get(i).toUpperCase());
@@ -167,7 +161,7 @@ public class ObWriterUtils {
 				String columnName = rs.getString("Column_name");
 				columnName=escapeDatabaseKeywords(columnName);
 				if(!ObWriterUtils.isEscapeMode(columnName)){
-					columnName=columnName.toUpperCase();
+					columnName = columnName.toUpperCase();
 				}
 				List<String> s = uniqueKeys.get(keyName);
 				if (s == null) {

From c140ca35fba4f01e71bd492a2f5376e4d0877383 Mon Sep 17 00:00:00 2001
From: sanChouIsACat <993924507@qq.com>
Date: Thu, 30 Dec 2021 11:09:58 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=8A?=
 =?UTF-8?q?=E8=BF=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oceanbasev10writer/task/ConcurrentTableWriterTask.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
index bd34b4a6..e6b4a561 100644
--- a/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
+++ b/oceanbasev10writer/src/main/java/com/alibaba/datax/plugin/writer/oceanbasev10writer/task/ConcurrentTableWriterTask.java
@@ -326,15 +326,14 @@ public class ConcurrentTableWriterTask extends CommonRdbmsWriter.Task {
 			}
 			groupValues.add(record);
 			if (groupValues.size() >= batchSize) {
-				int i = 0;
-				groupValues =addRecordsToWriteQueue(groupValues);
+				groupValues = addRecordsToWriteQueue(groupValues);
 				groupInsertValues.put(partId, groupValues);
 			}
 		} else {
 			LOG.debug("add unknown part record {}", record);
 			unknownPartRecords.add(record);
-			if (unknownPartRecords.size() > batchSize) {
-				unknownPartRecords=addRecordsToWriteQueue(unknownPartRecords);
+			if (unknownPartRecords.size() >= batchSize) {
+				unknownPartRecords = addRecordsToWriteQueue(unknownPartRecords);
 			}
 
 		}