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] Add GlobalConstraintManager to manage foreign key constraints parent and children relation (backport #50737) #50792

Merged
merged 2 commits into from
Sep 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 6, 2024

Why I'm doing:

After table swap, table's uk/fk constraints may still be not changed.

What I'm doing:

  • Add GlobalConstraintManager to manage foreign key constraints parent and children relation
  • Support uk/fk constraints changing belong with swap table.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #50737 done by [Mergify](https://mergify.com).

Why I'm doing:

After table swap, table's uk/fk constraints may still be not changed.

What I'm doing:

  • Add GlobalConstraintManager to manage foreign key constraints parent and children relation
  • Support uk/fk constraints changing belong with swap table.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

…s parent and children relation (#50737)

Signed-off-by: shuming.li <[email protected]>
(cherry picked from commit 8834cd8)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/catalog/constraint/ForeignKeyConstraint.java
Copy link
Contributor Author

mergify bot commented Sep 6, 2024

Cherry-pick of 8834cd8 has failed:

On branch mergify/bp/branch-3.3/pr-50737
Your branch is up to date with 'origin/branch-3.3'.

You are currently cherry-picking commit 8834cd818c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   fe/fe-core/src/main/java/com/starrocks/alter/AlterMVJobExecutor.java
	modified:   fe/fe-core/src/main/java/com/starrocks/alter/SchemaChangeHandler.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/BaseTableInfo.java
	deleted:    fe/fe-core/src/main/java/com/starrocks/catalog/ForeignKeyConstraint.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/HiveTable.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/MaterializedView.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/Table.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/TableProperty.java
	new file:   fe/fe-core/src/main/java/com/starrocks/catalog/constraint/Constraint.java
	new file:   fe/fe-core/src/main/java/com/starrocks/catalog/constraint/GlobalConstraintManager.java
	new file:   fe/fe-core/src/main/java/com/starrocks/catalog/constraint/TableWithFKConstraint.java
	renamed:    fe/fe-core/src/main/java/com/starrocks/catalog/UniqueConstraint.java -> fe/fe-core/src/main/java/com/starrocks/catalog/constraint/UniqueConstraint.java
	modified:   fe/fe-core/src/main/java/com/starrocks/common/util/PropertyAnalyzer.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/OlapTableFactory.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/UKFKConstraintsCollector.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/operator/UKFKConstraints.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/transformation/materialization/MaterializedViewRewriter.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/transformation/pruner/CPBiRel.java
	modified:   fe/fe-core/src/test/java/com/starrocks/alter/AlterTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/catalog/CreateTableTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/catalog/ForeignKeyConstraintTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/catalog/UniqueConstraintTest.java
	new file:   fe/fe-core/src/test/java/com/starrocks/catalog/constraint/GlobalConstraintManagerTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/sql/optimizer/rule/transformation/materialization/MvRewriteTest.java
	new file:   test/sql/test_ddl/R/test_alter_swap_table
	new file:   test/sql/test_ddl/T/test_alter_swap_table

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/catalog/constraint/ForeignKeyConstraint.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Sep 6, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-3.3/pr-50737 branch September 6, 2024 07:51
@LiShuMing LiShuMing restored the mergify/bp/branch-3.3/pr-50737 branch September 6, 2024 09:40
@LiShuMing LiShuMing reopened this Sep 6, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 6, 2024 09:40
Signed-off-by: shuming.li <[email protected]>
Copy link

sonarcloud bot commented Sep 6, 2024

@wanpengfei-git wanpengfei-git merged commit ae1d700 into branch-3.3 Sep 6, 2024
28 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-50737 branch September 6, 2024 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants