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.

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

bugfix: filter repeated lock #1839

Merged
merged 4 commits into from
Oct 31, 2019
Merged

Conversation

zjinlei
Copy link
Contributor

@zjinlei zjinlei commented Oct 29, 2019

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

fixes #1833

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

Ⅳ. Describe how to verify it

1.use @Transcation
2.batch write such as insert id (123),(124),(125)
3.update 123

Ⅴ. Special notes for reviews

@codecov-io
Copy link

codecov-io commented Oct 29, 2019

Codecov Report

Merging #1839 into develop will increase coverage by 0.11%.
The diff coverage is 50%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1839      +/-   ##
=============================================
+ Coverage      54.95%   55.06%   +0.11%     
- Complexity      2352     2354       +2     
=============================================
  Files            421      422       +1     
  Lines          14266    14271       +5     
  Branches        1682     1712      +30     
=============================================
+ Hits            7840     7859      +19     
- Misses          5681     5683       +2     
+ Partials         745      729      -16
Impacted Files Coverage Δ Complexity Δ
...rc/main/java/io/seata/common/util/LambdaUtils.java 0% <ø> (ø) 0 <0> (?)
...a/io/seata/core/store/db/LockStoreDataBaseDAO.java 52.87% <50%> (-0.04%) 20 <0> (ø)
...server/store/file/FileTransactionStoreManager.java 60.85% <0%> (+0.65%) 30% <0%> (+1%) ⬆️
...ource/sql/struct/cache/AbstractTableMetaCache.java 91.17% <0%> (+2.94%) 11% <0%> (+1%) ⬆️
...rotobuf/convertor/RegisterTMResponseConvertor.java 84.84% <0%> (+3.03%) 3% <0%> (ø) ⬇️
...rotobuf/convertor/RegisterRMResponseConvertor.java 84.84% <0%> (+3.03%) 3% <0%> (ø) ⬇️
...otobuf/convertor/GlobalBeginResponseConvertor.java 96.96% <0%> (+3.03%) 3% <0%> (ø) ⬇️
...obuf/convertor/BranchRollbackRequestConvertor.java 96.42% <0%> (+3.57%) 3% <0%> (ø) ⬇️
...otobuf/convertor/BranchCommitRequestConvertor.java 100% <0%> (+3.57%) 3% <0%> (ø) ⬇️
... and 8 more

(cherry picked from commit 0f5c1db)
@zjinlei zjinlei added this to the 1.0 milestone Oct 30, 2019
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.

I recommend putting the duplicate lockkey in rm.

@slievrly
Copy link
Member

@zjinlei How to move the distinct logic to DataBaseLocker#acquireLock? Avoid where in the sql statement is too long

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

Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

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

LGTM.

@xingfudeshi xingfudeshi merged commit 5730057 into apache:develop Oct 31, 2019
@zjinlei zjinlei deleted the bugfix/repeatedRowKey branch November 11, 2019 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

the branch register request failed while having multiple locks on one row
4 participants