Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize: unBranchLock romove xid #4750

Merged
merged 9 commits into from Jul 21, 2022
Merged

optimize: unBranchLock romove xid #4750

merged 9 commits into from Jul 21, 2022

Conversation

lcmvs
Copy link
Contributor

@lcmvs lcmvs commented Jul 7, 2022

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

AT模式，分支释放全局锁，直接使用branchId，不再使用xid+branchId

Ⅱ. 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

@funky-eyes funky-eyes added this to the 2.0.0 milestone Jul 7, 2022
@funky-eyes funky-eyes changed the title Optimize unlock romove xid optimize: unBranchLock romove xid Jul 7, 2022
funky-eyes
funky-eyes approved these changes Jul 7, 2022
View reviewed changes
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

lcmvs added 3 commits July 8, 2022 13:33
@lcmvs
fix
7098400
@lcmvs
Merge remote-tracking branch 'origin/optimize_unlock_romove_xid' into…
74d0337 
… optimize_unlock_romove_xid

# Conflicts:
#	changes/en-us/develop.md
#	changes/zh-cn/develop.md
@lcmvs
fix
3ce833a
@codecov-commenter
Copy link

codecov-commenter commented Jul 11, 2022 •
edited

Codecov Report

Merging #4750 (4ec77c1) into develop (3b607c2) will increase coverage by 0.36%.
The diff coverage is 20.00%.

❗ Current head 4ec77c1 differs from pull request most recent head 9d9d468. Consider uploading reports for the commit 9d9d468 to get more accurate results

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #4750      +/-   ##
=============================================
+ Coverage      48.65%   49.02%   +0.36%     
- Complexity      4069     4082      +13     
=============================================
  Files            736      736              
  Lines          25683    25679       -4     
  Branches        3170     3171       +1     
=============================================
+ Hits           12495    12588      +93     
+ Misses         11847    11749      -98     
- Partials        1341     1342       +1
Impacted Files Coverage Δ
...o/seata/server/storage/db/lock/DataBaseLocker.java 15.21% <0.00%> (ø)
...a/server/storage/db/lock/LockStoreDataBaseDAO.java 51.24% <0.00%> (+0.25%) ⬆️
...a/core/store/db/sql/lock/AbstractLockStoreSql.java 57.77% <100.00%> (ø)
...n/java/io/seata/rm/datasource/DataSourceProxy.java 61.36% <0.00%> (-19.96%) ⬇️
...java/io/seata/rm/datasource/DataSourceManager.java 14.63% <0.00%> (-9.76%) ⬇️
...r/console/impl/file/GlobalLockFileServiceImpl.java 94.87% <0.00%> (-2.57%) ⬇️
...tasource/sql/struct/cache/MysqlTableMetaCache.java 78.88% <0.00%> (-1.12%) ⬇️
...asource/sql/struct/cache/OracleTableMetaCache.java 65.68% <0.00%> (-0.99%) ⬇️
...very/registry/zk/ZookeeperRegisterServiceImpl.java 61.02% <0.00%> (-0.74%) ⬇️
...rage/redis/store/RedisTransactionStoreManager.java 66.85% <0.00%> (+1.13%) ⬆️
... and 10 more

@lcmvs
Merge branch 'develop' into optimize_unlock_romove_xid
e7b3c22 
# Conflicts:
#	changes/en-us/develop.md
#	changes/zh-cn/develop.md
@lcmvs
fix
4ec77c1
slievrly
slievrly reviewed Jul 20, 2022
View reviewed changes
server/src/main/java/io/seata/server/storage/db/lock/LockStoreDataBaseDAO.java
Connection conn = null;
PreparedStatement ps = null;
try {
conn = lockStoreDataSource.getConnection();
conn.setAutoCommit(true);
//batch release lock by branch
String batchDeleteSQL = LockStoreSqlFactory.getLogStoreSql(dbType).getBatchDeleteLockSqlByBranch(lockTable);
//batch release lock by branch list
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by xid

slievrly
slievrly approved these changes Jul 20, 2022
View reviewed changes
Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@slievrly slievrly merged commit d979af4 into apache:develop Jul 21, 2022
@slievrly slievrly modified the milestones: 2.0.0, 1.6.0 Jul 21, 2022
@funky-eyes funky-eyes mentioned this pull request Jul 22, 2022
Closed
@funky-eyes funky-eyes mentioned this pull request Nov 8, 2022
Closed
@anwanju
Copy link

anwanju commented Nov 9, 2022

升级2.0.0 LGTM

@funky-eyes funky-eyes mentioned this pull request Nov 17, 2022
Closed
@funky-eyes funky-eyes mentioned this pull request Jun 5, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slievrly slievrly slievrly approved these changes

@funky-eyes funky-eyes funky-eyes approved these changes

@jsbxyyx jsbxyyx Awaiting requested review from jsbxyyx

@l81893521 l81893521 Awaiting requested review from l81893521

Assignees
No one assigned
Labels
module/server server module type: optimize
Projects
None yet
Milestone
1.6.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lcmvs @codecov-commenter @anwanju @slievrly @funky-eyes