-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Enhancement] (nereids)implement alterCatalogPropertiesCommand in ner…
…eids
- Loading branch information
1 parent
8956279
commit 7b3de4b
Showing
8 changed files
with
148 additions
and
9 deletions.
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); | ||
|
56 changes: 56 additions & 0 deletions
56
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,56 @@ | ||
// 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, | ||
// 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}") | ||
} | ||
} | ||
|