Skip to content

Commit 9e5a131

Browse files
funky-eyesfunky-eyes
authored
optimize: upgrade the Druid version (apache#3780)
1 parent 0672229 commit 9e5a131

20 files changed

Lines changed: 135 additions & 120 deletions

File tree

‎bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<httpclient.version>4.5.8</httpclient.version>
9999
<httpcore.version>4.4.11</httpcore.version>
100100
<antlr4.version>4.8</antlr4.version>
101-
<druid.version>1.1.23</druid.version>
101+
<druid.version>1.2.6</druid.version>
102102
<caffeine.version>2.7.0</caffeine.version>
103103
<oracle.client.version>10.2.0.3.0</oracle.client.version>
104104
<mysql.client.version>5.1.35</mysql.client.version>

‎core/src/main/java/io/seata/core/constants/DBType.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ public enum DBType {
7272
/**
7373
* Oceanbase db type.
7474
*/
75-
OCEANBASE;
75+
OCEANBASE,
76+
77+
/**
78+
* Maria db type.
79+
*/
80+
MARIADB;
7681

7782
/**
7883
* Valueof db type.

‎rm-datasource/src/main/java/io/seata/rm/datasource/util/XAUtils.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
*/
1616
package io.seata.rm.datasource.util;
1717

18+
import java.lang.reflect.Constructor;
19+
import java.sql.Connection;
20+
import java.sql.Driver;
21+
import java.sql.SQLException;
22+
import javax.sql.XAConnection;
23+
import javax.transaction.xa.XAException;
1824
import com.alibaba.druid.util.JdbcUtils;
1925
import com.alibaba.druid.util.MySqlUtils;
2026
import com.alibaba.druid.util.PGUtils;
2127
import io.seata.rm.BaseDataSourceResource;
28+
import io.seata.sqlparser.util.JdbcConstants;
2229
import org.mariadb.jdbc.MariaDbConnection;
2330
import org.mariadb.jdbc.MariaXaConnection;
2431
import org.slf4j.Logger;
2532
import org.slf4j.LoggerFactory;
2633

27-
import javax.sql.XAConnection;
28-
import javax.transaction.xa.XAException;
29-
import java.lang.reflect.Constructor;
30-
import java.sql.Connection;
31-
import java.sql.Driver;
32-
import java.sql.SQLException;
33-
3434
public class XAUtils {
3535

3636
private static final Logger LOGGER = LoggerFactory.getLogger(XAUtils.class);
@@ -44,11 +44,11 @@ public static XAConnection createXAConnection(Connection physicalConn, BaseDataS
4444
}
4545

4646
public static XAConnection createXAConnection(Connection physicalConn, Driver driver, String dbType) throws SQLException {
47-
if (JdbcUtils.MYSQL.equals(dbType)) {
47+
if (JdbcConstants.MYSQL.equals(dbType)) {
4848
return MySqlUtils.createXAConnection(driver, physicalConn);
4949
} else {
5050
switch (dbType) {
51-
case JdbcUtils.ORACLE:
51+
case JdbcConstants.ORACLE:
5252
try {
5353
// https://github.com/alibaba/druid/issues/3707
5454
// before Druid issue fixed, just make ORACLE XA connection in my way.
@@ -62,9 +62,9 @@ public static XAConnection createXAConnection(Connection physicalConn, Driver dr
6262
} catch (XAException xae) {
6363
throw new SQLException("create xaConnection error", xae);
6464
}
65-
case JdbcUtils.MARIADB:
65+
case JdbcConstants.MARIADB:
6666
return new MariaXaConnection((MariaDbConnection)physicalConn);
67-
case JdbcUtils.POSTGRESQL:
67+
case JdbcConstants.POSTGRESQL:
6868
return PGUtils.createXAConnection(physicalConn);
6969
default:
7070
throw new SQLException("xa not support dbType: " + dbType);

‎rm-datasource/src/test/java/io/seata/rm/datasource/exec/BatchInsertExecutorTest.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,25 @@
1515
*/
1616
package io.seata.rm.datasource.exec;
1717

18-
import com.alibaba.druid.util.JdbcConstants;
18+
import java.sql.SQLException;
19+
import java.util.ArrayList;
20+
import java.util.Arrays;
21+
import java.util.HashMap;
22+
import java.util.List;
23+
import java.util.Map;
1924
import io.seata.common.exception.NotSupportYetException;
2025
import io.seata.rm.datasource.ConnectionProxy;
2126
import io.seata.rm.datasource.PreparedStatementProxy;
2227
import io.seata.rm.datasource.exec.mysql.MySQLInsertExecutor;
2328
import io.seata.rm.datasource.sql.struct.TableMeta;
2429
import io.seata.sqlparser.SQLInsertRecognizer;
2530
import io.seata.sqlparser.struct.Null;
31+
import io.seata.sqlparser.util.JdbcConstants;
2632
import org.junit.jupiter.api.Assertions;
2733
import org.junit.jupiter.api.BeforeEach;
2834
import org.junit.jupiter.api.Test;
2935
import org.mockito.Mockito;
3036

31-
import java.sql.SQLException;
32-
import java.util.*;
3337

3438
import static org.mockito.Mockito.doReturn;
3539
import static org.mockito.Mockito.mock;

‎rm-datasource/src/test/java/io/seata/rm/datasource/exec/MultiExecutorTest.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,35 @@
1515
*/
1616
package io.seata.rm.datasource.exec;
1717

18+
import java.lang.reflect.Field;
19+
import java.sql.SQLException;
20+
import java.sql.Types;
21+
import java.util.List;
22+
import java.util.Map;
23+
import java.util.Objects;
24+
import java.util.Set;
25+
import java.util.stream.Collectors;
26+
27+
import org.junit.jupiter.api.Assertions;
28+
import org.junit.jupiter.api.BeforeAll;
29+
import org.junit.jupiter.api.Test;
30+
1831
import com.alibaba.druid.mock.MockStatement;
1932
import com.alibaba.druid.mock.MockStatementBase;
2033
import com.alibaba.druid.pool.DruidDataSource;
21-
import com.alibaba.druid.sql.SQLUtils;
22-
import com.alibaba.druid.sql.ast.SQLStatement;
23-
import com.alibaba.druid.util.JdbcConstants;
2434
import com.google.common.collect.Lists;
35+
2536
import io.seata.common.exception.NotSupportYetException;
2637
import io.seata.rm.datasource.ConnectionProxy;
2738
import io.seata.rm.datasource.DataSourceProxy;
2839
import io.seata.rm.datasource.StatementProxy;
2940
import io.seata.rm.datasource.mock.MockDriver;
30-
import io.seata.rm.datasource.mock.MockExecuteHandlerImpl;
3141
import io.seata.rm.datasource.sql.SQLVisitorFactory;
3242
import io.seata.rm.datasource.sql.struct.TableRecords;
3343
import io.seata.rm.datasource.undo.SQLUndoLog;
3444
import io.seata.sqlparser.SQLRecognizer;
3545
import io.seata.sqlparser.SQLType;
36-
import org.junit.jupiter.api.Assertions;
37-
import org.junit.jupiter.api.BeforeAll;
38-
import org.junit.jupiter.api.Test;
39-
40-
import java.lang.reflect.Field;
41-
import java.sql.SQLException;
42-
import java.sql.Types;
43-
import java.util.List;
44-
import java.util.Map;
45-
import java.util.Objects;
46-
import java.util.Set;
47-
import java.util.stream.Collectors;
46+
import io.seata.sqlparser.util.JdbcConstants;
4847

4948
public class MultiExecutorTest {
5049

‎rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactoryTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
*/
1616
package io.seata.rm.datasource.sql.struct;
1717

18-
import com.alibaba.druid.util.JdbcConstants;
18+
import org.junit.jupiter.api.Assertions;
19+
import org.junit.jupiter.api.Test;
20+
1921
import io.seata.common.loader.EnhancedServiceNotFoundException;
2022
import io.seata.rm.datasource.sql.struct.cache.MysqlTableMetaCache;
2123
import io.seata.rm.datasource.sql.struct.cache.OracleTableMetaCache;
22-
import org.junit.jupiter.api.Assertions;
23-
import org.junit.jupiter.api.Test;
24+
import io.seata.sqlparser.util.JdbcConstants;
2425

2526
/**
2627
* @author guoyao

‎rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableRecordsTest.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,24 @@
1515
*/
1616
package io.seata.rm.datasource.sql.struct;
1717

18+
import java.sql.ResultSet;
19+
import java.sql.SQLException;
20+
import java.sql.Types;
21+
import java.util.List;
22+
23+
import org.junit.jupiter.api.Assertions;
24+
import org.junit.jupiter.api.BeforeEach;
25+
import org.junit.jupiter.api.Test;
26+
1827
import com.alibaba.druid.mock.MockStatement;
1928
import com.alibaba.druid.mock.MockStatementBase;
2029
import com.alibaba.druid.pool.DruidDataSource;
21-
import com.alibaba.druid.util.JdbcConstants;
22-
2330
import com.google.common.collect.Lists;
31+
2432
import io.seata.common.exception.ShouldNeverHappenException;
2533
import io.seata.rm.datasource.DataSourceProxy;
2634
import io.seata.rm.datasource.mock.MockDriver;
27-
import org.junit.jupiter.api.Assertions;
28-
import org.junit.jupiter.api.BeforeEach;
29-
import org.junit.jupiter.api.Test;
30-
31-
import java.sql.ResultSet;
32-
import java.sql.SQLException;
33-
import java.sql.Types;
34-
import java.util.List;
35+
import io.seata.sqlparser.util.JdbcConstants;
3536

3637
/**
3738
* the table records test

‎rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCacheTest.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@
1515
*/
1616
package io.seata.rm.datasource.sql.struct.cache;
1717

18+
import java.sql.SQLException;
19+
import java.sql.Types;
20+
import java.util.Collections;
21+
22+
import org.junit.jupiter.api.Assertions;
23+
import org.junit.jupiter.api.Test;
24+
1825
import com.alibaba.druid.pool.DruidDataSource;
19-
import com.alibaba.druid.util.JdbcConstants;
26+
2027
import io.seata.common.exception.ShouldNeverHappenException;
2128
import io.seata.rm.datasource.DataSourceProxy;
2229
import io.seata.rm.datasource.mock.MockDriver;
@@ -26,12 +33,7 @@
2633
import io.seata.rm.datasource.sql.struct.TableMeta;
2734
import io.seata.rm.datasource.sql.struct.TableMetaCache;
2835
import io.seata.rm.datasource.sql.struct.TableMetaCacheFactory;
29-
import org.junit.jupiter.api.Assertions;
30-
import org.junit.jupiter.api.Test;
31-
32-
import java.sql.SQLException;
33-
import java.sql.Types;
34-
import java.util.Collections;
36+
import io.seata.sqlparser.util.JdbcConstants;
3537

3638
/**
3739
* The table meta fetch test.

‎rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/cache/OracleTableMetaCacheTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818
import java.sql.SQLException;
1919
import java.sql.Types;
2020

21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Test;
23+
2124
import com.alibaba.druid.pool.DruidDataSource;
22-
import com.alibaba.druid.util.JdbcConstants;
2325

2426
import io.seata.rm.datasource.DataSourceProxy;
2527
import io.seata.rm.datasource.mock.MockDriver;
2628
import io.seata.rm.datasource.sql.struct.TableMeta;
2729
import io.seata.rm.datasource.sql.struct.TableMetaCache;
2830
import io.seata.rm.datasource.sql.struct.TableMetaCacheFactory;
29-
import org.junit.jupiter.api.Assertions;
30-
import org.junit.jupiter.api.Test;
31+
import io.seata.sqlparser.util.JdbcConstants;
3132

3233
/**
3334
* @author will.zjw

‎rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/cache/PostgresqlTableMetaCacheTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818
import java.sql.SQLException;
1919
import java.sql.Types;
2020

21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Test;
23+
2124
import com.alibaba.druid.pool.DruidDataSource;
22-
import com.alibaba.druid.util.JdbcConstants;
2325

2426
import io.seata.rm.datasource.DataSourceProxy;
2527
import io.seata.rm.datasource.mock.MockDriver;
2628
import io.seata.rm.datasource.sql.struct.TableMeta;
2729
import io.seata.rm.datasource.sql.struct.TableMetaCache;
2830
import io.seata.rm.datasource.sql.struct.TableMetaCacheFactory;
29-
import org.junit.jupiter.api.Assertions;
30-
import org.junit.jupiter.api.Test;
31+
import io.seata.sqlparser.util.JdbcConstants;
3132

3233
/**
3334
* @author will.zjw

0 commit comments

Comments
 (0)