Skip to content

Revert "fix: skip already deleted relations in database delete (#24717)" - #24725

Merged
XuPeng-SH merged 1 commit into
matrixorigin:mainfrom
gouhongshen:codex/revert-skip-deleted-relations-main
May 30, 2026
Merged

Revert "fix: skip already deleted relations in database delete (#24717)"#24725
XuPeng-SH merged 1 commit into
matrixorigin:mainfrom
gouhongshen:codex/revert-skip-deleted-relations-main

Conversation

@gouhongshen

@gouhongshen gouhongshen commented May 30, 2026

Copy link
Copy Markdown
Contributor

This reverts commit 1285f0e.

What type of PR is this?

  • API-change
  • BUG
  • Improvement
  • Documentation
  • Feature
  • Test and CI
  • Code Refactoring

Which issue(s) this PR fixes:

issue #24711

What this PR does / why we need it:

Revert "fix: skip already deleted relations in database delete (#24717)"

Tested with:

source $HOME/.zshrc && moenv && go test ./pkg/vm/engine/disttae

@mergify mergify Bot added the kind/bug Something isn't working label May 30, 2026
@gouhongshen
gouhongshen marked this pull request as ready for review May 30, 2026 14:15
@gouhongshen
gouhongshen requested a review from XuPeng-SH as a code owner May 30, 2026 14:15
@qodo-code-review

Copy link
Copy Markdown

Qodo reviews are paused for this user.

Troubleshooting steps vary by plan Learn more →

On a Teams plan?
Reviews resume once this user has a paid seat and their Git account is linked in Qodo.
Link Git account →

Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center?
These require an Enterprise plan - Contact us
Contact us →

@matrix-meow matrix-meow added the size/M Denotes a PR that changes [100,499] lines label May 30, 2026
@XuPeng-SH
XuPeng-SH merged commit 0bfda60 into matrixorigin:main May 30, 2026
32 of 34 checks passed
XuPeng-SH pushed a commit that referenced this pull request Jun 1, 2026
This reverts commit 0bfda60.

## What type of PR is this?

- [ ] API-change
- [x] BUG
- [ ] Improvement
- [ ] Documentation
- [ ] Feature
- [ ] Test and CI
- [ ] Code Refactoring

## Which issue(s) this PR fixes:

issue #24711

## What this PR does / why we need it:

Restore the main fix from #24717 after #24725 reverted it.

The original fix is still needed for restore-account database delete:
when a relation was already deleted in the current transaction,
`Engine.Delete(database)` should skip that relation only when
`tableOps.existAndDeleted` proves it was deleted, while preserving other
errors.

Tested with:

```
source $HOME/.zshrc && moenv && go test ./pkg/vm/engine/disttae
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug Something isn't working size/M Denotes a PR that changes [100,499] lines

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants