bugfix: fix can't use select for update in oracle #1780

l81893521 · 2019-10-16T06:25:01Z

Ⅰ. Describe what this PR did

when use select for update in oracle, would cause the exception occur.

Ⅱ. Does this pull request fix one issue?

#1779

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov-io · 2019-10-16T06:30:28Z

Codecov Report

Merging #1780 into develop will decrease coverage by 0.04%.
The diff coverage is 46.15%.

@@              Coverage Diff              @@
##             develop    #1780      +/-   ##
=============================================
- Coverage       55.1%   55.05%   -0.05%     
  Complexity      2355     2355              
=============================================
  Files            421      421              
  Lines          14250    14260      +10     
  Branches        1705     1708       +3     
=============================================
- Hits            7852     7851       -1     
- Misses          5678     5685       +7     
- Partials         720      724       +4

Impacted Files	Coverage Δ	Complexity Δ
...ta/rm/datasource/exec/SelectForUpdateExecutor.java	`82.35% <46.15%> (-10.33%)`	`10 <1> (+2)`
...server/store/file/FileTransactionStoreManager.java	`59.21% <0%> (-0.99%)`	`29% <0%> (ø)`
...in/java/io/seata/server/session/GlobalSession.java	`84.54% <0%> (-0.49%)`	`67% <0%> (-1%)`
...o/seata/server/coordinator/DefaultCoordinator.java	`49.59% <0%> (-0.41%)`	`27% <0%> (-1%)`

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 07f5477...a70574d. Read the comment docs.

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

…update' into fix_oracle_can_not_use_select_for_update

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

…update' into fix_oracle_can_not_use_select_for_update

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

zjinlei

LGTM

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

…_use_select_for_update

…update' into fix_oracle_can_not_use_select_for_update

…pache#1710)

)

…date' into fix_oracle_can_not_use_select_for_update

xingfudeshi

LGTM.

* 'develop' of https://github.com/seata/seata: Remove deprecated JVM arguments in Java 11 (apache#1824) style: adjust check style (apache#1820) optimize: format error log (apache#1806) optimize: update codecov.yml (apache#1815) optimize: adjust codecov configuration (apache#1811) fix unexcepted exception can roll back (apache#1796) optimize: reduce unnecessary synchronized (apache#1799) bugfix: connectionproxy prepareStatement not in global transaction (apache#1805) bugfix: fix can't use select for update in oracle (apache#1780) test:changing HashMap to LinkedHashMap for deterministic iterations (apache#1802) feature:gzip compressor (apache#1460)

fix can not use select for update in oracle

16a1dbe

l81893521 and others added 3 commits October 16, 2019 15:31

fix oracle can not use select for update

786e77c

fix oracle can not use select for update

095ae48

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

f205278

slievrly changed the title ~~bugfix: fix can not use select for update in oracle~~ bugfix: fix can't use select for update in oracle Oct 16, 2019

release savepoint

fa2a28a

ggndnn reviewed Oct 16, 2019

View reviewed changes

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

ggndnn reviewed Oct 16, 2019

View reviewed changes

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

ggndnn reviewed Oct 16, 2019

View reviewed changes

rm-datasource/src/main/java/io/seata/rm/datasource/exec/SelectForUpdateExecutor.java Show resolved Hide resolved

xingfudeshi and others added 7 commits October 17, 2019 09:22

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

20d6650

change the log level

6ce491d

change the logic

221c530

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

ef1aa49

change comment

feb6551

Merge remote-tracking branch 'will/fix_oracle_can_not_use_select_for_…

7882612

…update' into fix_oracle_can_not_use_select_for_update

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

86f40cb

ggndnn reviewed Oct 17, 2019

View reviewed changes

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

ggndnn reviewed Oct 17, 2019

View reviewed changes

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

ggndnn reviewed Oct 17, 2019

View reviewed changes

rm-datasource/src/main/java/io/seata/rm/datasource/exec/SelectForUpdateExecutor.java Show resolved Hide resolved

l81893521 added 4 commits October 17, 2019 14:25

change comment

a35f0cb

Merge remote-tracking branch 'will/fix_oracle_can_not_use_select_for_…

daa9b93

…update' into fix_oracle_can_not_use_select_for_update

change comment

977d170

change the logic

89000f9

ggndnn reviewed Oct 17, 2019

View reviewed changes

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

ggndnn reviewed Oct 17, 2019

View reviewed changes

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

l81893521 added 2 commits October 17, 2019 20:45

remove the unnecessary condition

f98fde8

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

8400d8e

zjinlei approved these changes Oct 18, 2019

View reviewed changes

ggndnn reviewed Oct 21, 2019

View reviewed changes

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

ggndnn reviewed Oct 21, 2019

View reviewed changes

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

xingfudeshi and others added 18 commits October 21, 2019 09:36

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

e3d04fa

Merge remote-tracking branch 'origin/develop' into fix_oracle_can_not…

bb71983

…_use_select_for_update

change comment

0bd88f6

Merge remote-tracking branch 'will/fix_oracle_can_not_use_select_for_…

2b611cc

…update' into fix_oracle_can_not_use_select_for_update

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

406a592

optimize:optimize rpc remoting log(apache#1787)

d0a0157

optimize: put message to logQueue (apache#1760)

fc1a879

optimize: seata server register eureka instance id (apache#1790)

4233132

test: verify that the analysis of the cause of issue 1702 is correct (a…

83bbf4b

…pache#1710)

bugfix: jdk 11 remoteAddress is null (apache#1764)

46fab40

bugfix: mysql can not get primary key value (apache#1788)

efb52e2

optimize: increase rm code coverage by db mock (apache#1674)

32d60b4

bugfix:fix auto proxy for multiple-datasource does not work (apache#1793

5ae48eb

)

feature:support gRpc (apache#1492)

c0c1bbe

fix ci

da7b196

Merge remote-tracking branch 'me/fix_oracle_can_not_use_select_for_up…

92c1c7b

…date' into fix_oracle_can_not_use_select_for_update

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

3e1cba4

Merge branch 'develop' into fix_oracle_can_not_use_select_for_update

a70574d

xingfudeshi approved these changes Oct 23, 2019

View reviewed changes

xingfudeshi merged commit 00738ac into apache:develop Oct 23, 2019

l81893521 deleted the fix_oracle_can_not_use_select_for_update branch November 2, 2019 05:30

slievrly added this to the 1.0 milestone Dec 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix: fix can't use select for update in oracle #1780

bugfix: fix can't use select for update in oracle #1780

l81893521 commented Oct 16, 2019

codecov-io commented Oct 16, 2019 •

edited

zjinlei left a comment

xingfudeshi left a comment

bugfix: fix can't use select for update in oracle #1780

bugfix: fix can't use select for update in oracle #1780

Conversation

l81893521 commented Oct 16, 2019

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov-io commented Oct 16, 2019 • edited

Codecov Report

zjinlei left a comment

Choose a reason for hiding this comment

xingfudeshi left a comment

Choose a reason for hiding this comment

codecov-io commented Oct 16, 2019 •

edited