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]keep connector/catalog map in consistent as much as possible (backport #46995) #47328

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2024

Why I'm doing:

There are three maps for createcatalog, which are connectors, catalogs, catalogToAccessControl.
when we create a new catalog, we put new items into these three maps one by one, but there may
be some exception, and only one or two successed, when we create the catalog again, we get
exception that the item has already exist.

What I'm doing:

keep consistent of connector/catalog asap.

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 #46995 done by [Mergify](https://mergify.com). ## Why I'm doing: There are three maps for createcatalog, which are connectors, catalogs, catalogToAccessControl. when we create a new catalog, we put new items into these three maps one by one, but there may be some exception, and only one or two successed, when we create the catalog again, we get exception that the item has already exist.

What I'm doing:

keep consistent of connector/catalog asap.

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

…46995)

Signed-off-by: zombee0 <[email protected]>
(cherry picked from commit 2cf96cb)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/connector/ConnectorMgr.java
#	fe/fe-core/src/main/java/com/starrocks/server/CatalogMgr.java
#	fe/fe-core/src/test/java/com/starrocks/server/CatalogMgrTest.java
Copy link
Contributor Author

mergify bot commented Jun 21, 2024

Cherry-pick of 2cf96cb has failed:

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

You are currently cherry-picking commit 2cf96cb785.
  (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/catalog/ExternalCatalog.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/connector/ConnectorMgr.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/CatalogMgr.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/server/CatalogMgrTest.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 Jun 21, 2024

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

@mergify mergify bot closed this Jun 21, 2024
@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-46995 branch June 21, 2024 07:18
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.

1 participant