-
Notifications
You must be signed in to change notification settings - Fork 298
handle Unexpected transaction rollback #828
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
Open
1kasa
wants to merge
7
commits into
apache:master
Choose a base branch
from
1kasa:unexpected_transaction_rollback
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b009529
handle Unexpected transaction rollback
1kasa 0d5b446
fix ci Errpr
1kasa 92fdd34
Fix wrong location
1kasa d736ee6
Fix sort import
1kasa 174e136
Fix error
1kasa 30bdc58
Fix comment
1kasa 1a4b4da
Fix comment
1kasa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,6 +29,7 @@ import ( | |
"seata.apache.org/seata-go/pkg/datasource/sql/datasource" | ||
"seata.apache.org/seata-go/pkg/datasource/sql/types" | ||
"seata.apache.org/seata-go/pkg/datasource/sql/undo" | ||
serr "seata.apache.org/seata-go/pkg/util/errors" | ||
"seata.apache.org/seata-go/pkg/util/log" | ||
) | ||
|
||
|
@@ -98,7 +99,7 @@ func (b *BaseExecutor) dataValidationAndGoOn(ctx context.Context, conn *sql.Conn | |
newRowJson, _ := json.Marshal(currentImage.Rows) | ||
log.Infof("check dirty data failed, old and new data are not equal, "+ | ||
"tableName:[%s], oldRows:[%s],newRows:[%s].", afterImage.TableName, oldRowJson, newRowJson) | ||
return false, fmt.Errorf("Has dirty records when undo.") | ||
return false, serr.New(serr.SQLUndoDirtyError, "has dirty records when undo", nil) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add a unit test here, thank you. |
||
} | ||
} | ||
return true, nil | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -100,4 +100,6 @@ const ( | |
|
||
// FencePhaseError have fence phase but is not illegal value | ||
FencePhaseError | ||
|
||
SQLUndoDirtyError | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.