Added oracle database support #902

15168326318 · 2019-04-25T04:30:47Z

重新提一次pr，和#649 的一样。

lovepoem · 2019-04-25T04:32:55Z

Now the com/alibaba/fescar is changed to io/seata

xingfudeshi · 2019-04-25T04:57:17Z

thanks.could you do us a favor?the package name and copyright need to be updated.

slievrly · 2019-04-25T06:03:34Z

pom.xml

                <repository>
-                    <id>openSource</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                    <id>releases</id>


why changed？

Please revert the following:

<distributionManagement> <snapshotRepository> <id>oss_seata</id> <url>https://oss.sonatype.org/content/repositories/snapshots</url> </snapshotRepository>

…lop_seata_oracle # Conflicts: # pom.xml # rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionProxy.java # rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceManager.java # rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java # rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLVisitorFactory.java # rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordCheckerFactory.java # rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorFactory.java # server/src/main/resources/registry.conf

…_seata_oracle

rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorFactory.java

GFriedrich · 2019-04-25T09:41:47Z

rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordCheckerFactory.java

@@ -36,6 +36,8 @@
    public static KeywordChecker getKeywordChecker(String dbType) {
        if (dbType.equals(JdbcConstants.MYSQL)) {
            return MySQLKeywordChecker.getInstance();
+        } else  if (dbType.equals(JdbcConstants.ORACLE)) {


Maybe using switch here makes things more readable - I guess there will be even more types in the future.

GFriedrich · 2019-04-25T09:51:54Z

rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCacheOracle.java

+/**
+ * The type Table meta cache.
+ */
+public class TableMetaCacheOracle {


This class is only used by the new undo manager, but the BaseTransactionalExecutor still uses the default TableMetaCache.
Additionally the resultSetMetaToSchema method already contains parts for "H2 drivers" and other stuff. So I would think of having additional Oracle stuff in the already existing TableMetaCache instead of inventing another class.

我觉得还是在BaseTransactionalExecutor 这里加比较好。

Ok, but why does this class then contain some "H2 driver" parts? I mean this class is for Oracle only, right?
(see line 281)

GFriedrich · 2019-04-25T09:54:34Z

rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLVisitorFactory.java

@@ -66,7 +66,19 @@ public static SQLRecognizer get(String sql, String dbType) {
                    recognizer = new MySQLSelectForUpdateRecognizer(sql, ast);
                }
            }
-        } else {
+        }  else if (JdbcConstants.ORACLE.equalsIgnoreCase(dbType)) {


Not sure if equalsIgnoreCase is really required here. Otherwise a switch statement would be a better solution.

GFriedrich · 2019-04-25T09:56:14Z

rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionProxy.java

@@ -184,7 +185,11 @@ private void processGlobalTransactionCommit() throws SQLException {

        try {
            if (context.hasUndoLog()) {
-                UndoLogManager.flushUndoLogs(this);
+               if(JdbcConstants.ORACLE.equalsIgnoreCase(this.getDbType())) {


Maybe some factory class should take care of returning an undo manager. Otherwise you will have this kind of logic at several places.

io.seata.rm.datasource.undo.*; is a wrong type

…oracle

lovepoem · 2019-04-26T05:46:06Z

rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionProxy.java

@@ -184,7 +185,11 @@ private void processGlobalTransactionCommit() throws SQLException {

        try {
            if (context.hasUndoLog()) {
-                UndoLogManager.flushUndoLogs(this);
+               if(JdbcConstants.ORACLE.equalsIgnoreCase(this.getDbType())) {


io.seata.rm.datasource.undo.*; is a wrong type

lovepoem · 2019-04-26T05:46:31Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java

-import io.seata.rm.datasource.sql.struct.TableMeta;
-import io.seata.rm.datasource.sql.struct.TableMetaCache;
-import io.seata.rm.datasource.sql.struct.TableRecords;
+import io.seata.rm.datasource.sql.struct.*;


is a wrong type

lovepoem · 2019-04-26T05:47:59Z

pom.xml

                <repository>
-                    <id>openSource</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                    <id>releases</id>


Please revert the following:

<distributionManagement> <snapshotRepository> <id>oss_seata</id> <url>https://oss.sonatype.org/content/repositories/snapshots</url> </snapshotRepository>

codecov-io · 2019-04-26T07:00:31Z

Codecov Report

Merging #902 into develop will decrease coverage by 2.56%.
The diff coverage is 0.59%.

@@              Coverage Diff              @@
##             develop     #902      +/-   ##
=============================================
- Coverage      48.32%   45.76%   -2.57%     
  Complexity      1653     1653              
=============================================
  Files            333      343      +10     
  Lines          11669    12322     +653     
  Branches        1448     1549     +101     
=============================================
  Hits            5639     5639              
- Misses          5401     6053     +652     
- Partials         629      630       +1

Impacted Files	Coverage Δ	Complexity Δ
...a/io/seata/rm/datasource/exec/ExecuteTemplate.java	`0% <ø> (ø)`	`0 <0> (ø)`	⬇️
...tasource/undo/oracle/OracleUndoInsertExecutor.java	`0% <0%> (ø)`	`0 <0> (?)`
.../rm/datasource/exec/BaseTransactionalExecutor.java	`33.89% <0%> (-1.82%)`	`6 <0> (ø)`
.../io/seata/rm/datasource/sql/SQLVisitorFactory.java	`21.42% <0%> (-11.91%)`	`2 <0> (ø)`
...tasource/undo/oracle/OracleUndoDeleteExecutor.java	`0% <0%> (ø)`	`0 <0> (?)`
...eata/rm/datasource/undo/KeywordCheckerFactory.java	`16.66% <0%> (-8.34%)`	`1 <0> (ø)`
...seata/rm/datasource/undo/UndoLogManagerOracle.java	`0% <0%> (ø)`	`0 <0> (?)`
...java/io/seata/rm/datasource/DataSourceManager.java	`25.75% <0%> (-1.67%)`	`7 <0> (ø)`
...n/java/io/seata/rm/datasource/ConnectionProxy.java	`9.09% <0%> (-0.22%)`	`4 <0> (ø)`
...ource/sql/druid/oracle/OracleUpdateRecognizer.java	`0% <0%> (ø)`	`0 <0> (?)`
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 21add28...6f58367. Read the comment docs.

…oracle

15168326318 · 2019-07-24T04:44:40Z

BaseTransactionalExecutor冲突解决了

slievrly · 2019-07-24T08:58:17Z

server/src/main/resources/file.conf

@@ -28,7 +28,7 @@ transport {
 }
 service {
  #vgroup->rgroup
-  vgroup_mapping.my_test_tx_group = "default"
+  vgroup_mapping.txServiceGroup = "default"


README.md

slievrly · 2019-07-25T04:32:33Z

slievrly · 2019-07-25T06:53:55Z

缺少context字段

slievrly

For metadata problems that must use the uppercase table name to get the oracle database, it is recommended to convert directly to uppercase.

rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceManager.java

15168326318 · 2019-07-29T10:01:02Z

bug都修改完成了。 @slievrly

rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCacheOracle.java

slievrly · 2019-07-31T02:34:14Z

server/src/main/resources/file.conf

@@ -76,7 +76,6 @@ store {
    datasource = "dbcp"
    ## mysql/oracle/h2/oceanbase etc.
    db-type = "mysql"
-    driver-class-name = "com.mysql.jdbc.Driver"


slievrly

LGTM

15168326318 and others added 8 commits March 20, 2019 14:45

增加oracle数据库的支持

7828822

修改ORACLEKeywordChecker，按最新MySQLKeywordChecker修改，命名规范化。

ca6a13a

增加代码注释，规范代码。

d91306d

Merge branch 'feature_oracle' into develop_oracle

e158a84

报ORACLE开头的类名该为Oracle

ab359d4

.* is an incorrect type，去掉.* 这样的引用。但idea自己会导入这样的引用。

99cdcce

.* is an incorrect type，去掉.* 这样的引用。但idea自己会导入这样的引用。

d53f60a

修改注释

e9cfa63

lovepoem added this to the 0.8.0 milestone Apr 25, 2019

xingfudeshi added the type: feature Category issues or prs related to feature request. label Apr 25, 2019

本地环境修改

494af9d

slievrly reviewed Apr 25, 2019

View reviewed changes

15168326318 and others added 3 commits April 25, 2019 14:50

Merge branch 'develop' of https://github.com/seata/seata into develop…

64e0086

…_seata_oracle

Merge branch 'develop' into develop_oracle

01cd039

GFriedrich suggested changes Apr 25, 2019

View reviewed changes

lovepoem and others added 4 commits April 25, 2019 19:05

Merge branch 'develop' into develop_oracle

df93d81

支持oracle数据修改

74aa7a3

Merge remote-tracking branch 'ccg/develop_oracle' into develop_seata_…

2374132

…oracle

修改一个小问题。

39bf981

lovepoem requested changes Apr 26, 2019

View reviewed changes

15168326318 and others added 2 commits April 26, 2019 14:24

还原distributionManagement

c4f8f3b

Update pom.xml

aa2a015

15168326318 and others added 4 commits April 26, 2019 15:25

增加数据库判断处理

b4cace4

Merge remote-tracking branch 'ccg/develop_oracle' into develop_seata_…

d63c35c

…oracle

修改日志

8e5b4be

Merge branch 'develop' into develop_oracle

b29dd71

ccg added 2 commits July 24, 2019 12:37

解决BaseTransactionalExecutor冲突

286edee

增加oracle创建undo表的sql

b31c4f7

Merge branch 'develop' into develop_oracle

0c899f6

slievrly reviewed Jul 24, 2019

View reviewed changes

ccg added 2 commits July 24, 2019 18:16

增加oracle undo表增加context字段

5b8c547

Merge remote-tracking branch 'origin/develop_oracle' into develop_oracle

6b60cc8

slievrly reviewed Jul 25, 2019

View reviewed changes

rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceManager.java Outdated Show resolved Hide resolved

lovepoem and others added 4 commits July 27, 2019 08:40

Merge branch 'develop' into develop_oracle

fa2fde9

oracle支持跨用户访问，表名大小写。

6a076b9

Merge remote-tracking branch 'origin/develop_oracle' into develop_oracle

7aff7a2

去掉read.md中 oracle sql脚本

fa519d5

Merge branch 'develop' into develop_oracle

cc6b0d7

slievrly reviewed Jul 30, 2019

View reviewed changes

rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCacheOracle.java Show resolved Hide resolved

rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCacheOracle.java Outdated Show resolved Hide resolved

lovepoem requested changes Jul 30, 2019

View reviewed changes

ccg added 2 commits July 31, 2019 09:27

去掉多余的代码

a85472e

还原file.conf文件

1d61330

slievrly reviewed Jul 31, 2019

View reviewed changes

ccg and others added 2 commits July 31, 2019 10:51

还原file.conf文件的driver-class-name = "com.mysql.jdbc.Driver"

54f9ba9

Merge branch 'develop' into develop_oracle

6f58367

lovepoem approved these changes Jul 31, 2019

View reviewed changes

slievrly approved these changes Jul 31, 2019

View reviewed changes

lovepoem merged commit 69f1f2f into apache:develop Jul 31, 2019

fescar-robot mentioned this pull request Aug 2, 2019

[WeeklyReport] Weekly report for Seata 2019-7-26 to 2019-8-2 #1391

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added oracle database support #902

Added oracle database support #902

15168326318 commented Apr 25, 2019 •

edited by lovepoem

lovepoem commented Apr 25, 2019

xingfudeshi commented Apr 25, 2019

slievrly Apr 25, 2019

lovepoem Apr 26, 2019

GFriedrich Apr 25, 2019

GFriedrich Apr 25, 2019

15168326318 Apr 26, 2019

GFriedrich Apr 26, 2019

GFriedrich Apr 25, 2019

GFriedrich Apr 25, 2019

lovepoem Apr 26, 2019

lovepoem Apr 26, 2019

lovepoem Apr 26, 2019

lovepoem Apr 26, 2019

codecov-io commented Apr 26, 2019 •

edited

15168326318 commented Jul 24, 2019

slievrly Jul 24, 2019

slievrly commented Jul 25, 2019

slievrly commented Jul 25, 2019

slievrly left a comment

15168326318 commented Jul 29, 2019

slievrly Jul 31, 2019

slievrly left a comment

Added oracle database support #902

Added oracle database support #902

Conversation

15168326318 commented Apr 25, 2019 • edited by lovepoem

lovepoem commented Apr 25, 2019

xingfudeshi commented Apr 25, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Apr 26, 2019 • edited

Codecov Report

15168326318 commented Jul 24, 2019

Choose a reason for hiding this comment

slievrly commented Jul 25, 2019

slievrly commented Jul 25, 2019

slievrly left a comment

Choose a reason for hiding this comment

15168326318 commented Jul 29, 2019

Choose a reason for hiding this comment

slievrly left a comment

Choose a reason for hiding this comment

15168326318 commented Apr 25, 2019 •

edited by lovepoem

codecov-io commented Apr 26, 2019 •

edited