-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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
[Enhancement] (nereids)implement alterCatalogPropertiesCommand in ner… #45164
Open
msridhar78
wants to merge
3
commits into
apache:master
Choose a base branch
from
msridhar78:alter_catalog_properties
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 all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 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 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 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 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
52 changes: 52 additions & 0 deletions
52
...ain/java/org/apache/doris/nereids/trees/plans/commands/AlterCatalogPropertiesCommand.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.nereids.trees.plans.commands; | ||
|
|
||
| import org.apache.doris.catalog.Env; | ||
| import org.apache.doris.common.util.PropertyAnalyzer; | ||
| import org.apache.doris.nereids.trees.plans.PlanType; | ||
| import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor; | ||
| import org.apache.doris.qe.ConnectContext; | ||
| import org.apache.doris.qe.StmtExecutor; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * Represents the command for ALTER CATALOG ... SET PROPERTIES. | ||
| */ | ||
| public class AlterCatalogPropertiesCommand extends AlterCatalogCommand { | ||
| private final Map<String, String> newProperties; | ||
|
|
||
| public AlterCatalogPropertiesCommand(String catalogName, Map<String, String> properties) { | ||
| super(PlanType.ALTER_CATALOG_PROPERTIES_COMMAND, catalogName); | ||
| this.newProperties = Objects.requireNonNull(properties, "Properties cannot be null"); | ||
| } | ||
|
|
||
| @Override | ||
| public void doRun(ConnectContext ctx, StmtExecutor executor) throws Exception { | ||
| PropertyAnalyzer.checkCatalogProperties(newProperties, true); | ||
|
|
||
| Env.getCurrentEnv().getCatalogMgr().alterCatalogProps(catalogName, newProperties); | ||
| } | ||
|
|
||
| @Override | ||
| public <R, C> R accept(PlanVisitor<R, C> visitor, C context) { | ||
| return visitor.visitAlterCatalogPropertiesCommand(this, context); | ||
| } | ||
| } | ||
This file contains 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
7 changes: 7 additions & 0 deletions
7
regression-test/data/nereids_p0/test_alter_catalog_properties_command.out
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| -- This file is automatically generated. You should know what you did if you want to edit this | ||
| -- !cmd -- | ||
| test_alter_catalog_properties \nCREATE CATALOG `test_alter_catalog_properties`\nCOMMENT "Catalog for property test"\n PROPERTIES (\n"type" = "es",\n"hosts" = "http://127.0.0.1:9200"\n); | ||
|
|
||
| -- !cmd -- | ||
| test_alter_catalog_properties \nCREATE CATALOG `test_alter_catalog_properties`\nCOMMENT "Catalog for property test"\n PROPERTIES (\n"type" = "es",\n"hosts" = "http://192.168.0.1:9200"\n); | ||
|
|
55 changes: 55 additions & 0 deletions
55
regression-test/suites/nereids_p0/test_alter_catalog_properties_command.groovy
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| suite("test_alter_catalog_properties_command", "nereids_p0") { | ||
| def catalogName = "test_alter_catalog_properties" | ||
| def catalogProperties = "\"type\"=\"es\", \"hosts\"=\"http://127.0.0.1:9200\"" | ||
| def newProperties = "\"type\"=\"es\", \"hosts\"=\"http://192.168.0.1:9200\"" | ||
|
|
||
| try { | ||
| // Drop catalog if it already exists | ||
| sql("DROP CATALOG IF EXISTS ${catalogName}") | ||
|
|
||
| // Create a new catalog | ||
| sql( | ||
| """ | ||
| CREATE CATALOG ${catalogName} | ||
| COMMENT 'Catalog for property test' | ||
| PROPERTIES (${catalogProperties}) | ||
| """ | ||
| ) | ||
| // Verify the catalog was created | ||
| checkNereidsExecute("""SHOW CREATE CATALOG ${catalogName}""") | ||
| qt_cmd("""SHOW CREATE CATALOG ${catalogName}""") | ||
|
|
||
| // Alter the catalog properties | ||
| checkNereidsExecute( | ||
| """ | ||
| ALTER CATALOG ${catalogName} SET PROPERTIES (${newProperties}) | ||
| """ | ||
| ) | ||
|
|
||
| // Verify the properties were changed | ||
| checkNereidsExecute("""SHOW CREATE CATALOG ${catalogName}""") | ||
| qt_cmd("""SHOW CREATE CATALOG ${catalogName}""") | ||
|
|
||
| } finally { | ||
| // Clean up | ||
| sql("DROP CATALOG IF EXISTS ${catalogName}") | ||
| } | ||
| } | ||
|
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think should call super class's validate method here. And please do same for AlterCatalogCommentCommand