-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-35164][table] Support
ALTER CATALOG RESET syntax
- Loading branch information
1 parent
4611817
commit 4ff585e
Showing
13 changed files
with
344 additions
and
10 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
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
76 changes: 76 additions & 0 deletions
76
.../flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAlterCatalogReset.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,76 @@ | ||
| /* | ||
| * 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.flink.sql.parser.ddl; | ||
|
|
||
| import org.apache.flink.sql.parser.SqlUnparseUtils; | ||
|
|
||
| import org.apache.calcite.sql.SqlIdentifier; | ||
| import org.apache.calcite.sql.SqlLiteral; | ||
| import org.apache.calcite.sql.SqlNode; | ||
| import org.apache.calcite.sql.SqlNodeList; | ||
| import org.apache.calcite.sql.SqlWriter; | ||
| import org.apache.calcite.sql.parser.SqlParserPos; | ||
| import org.apache.calcite.util.ImmutableNullableList; | ||
| import org.apache.calcite.util.NlsString; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| /** ALTER CATALOG catalog_name RESET (key1, ...). */ | ||
| public class SqlAlterCatalogReset extends SqlAlterCatalog { | ||
|
|
||
| private final SqlNodeList propertyKeyList; | ||
|
|
||
| public SqlAlterCatalogReset( | ||
| SqlParserPos position, SqlIdentifier catalogName, SqlNodeList propertyKeyList) { | ||
| super(position, catalogName); | ||
| this.propertyKeyList = requireNonNull(propertyKeyList, "propertyKeyList cannot be null"); | ||
| } | ||
|
|
||
| @Override | ||
| public List<SqlNode> getOperandList() { | ||
| return ImmutableNullableList.of(catalogName, propertyKeyList); | ||
| } | ||
|
|
||
| public SqlNodeList getPropertyList() { | ||
| return propertyKeyList; | ||
| } | ||
|
|
||
| public Set<String> getResetKeys() { | ||
| return propertyKeyList.getList().stream() | ||
| .map(key -> ((NlsString) SqlLiteral.value(key)).getValue()) | ||
| .collect(Collectors.toSet()); | ||
| } | ||
|
|
||
| @Override | ||
| public void unparse(SqlWriter writer, int leftPrec, int rightPrec) { | ||
| super.unparse(writer, leftPrec, rightPrec); | ||
| writer.keyword("RESET"); | ||
| SqlWriter.Frame withFrame = writer.startList("(", ")"); | ||
| for (SqlNode property : propertyKeyList) { | ||
| SqlUnparseUtils.printIndent(writer); | ||
| property.unparse(writer, leftPrec, rightPrec); | ||
| } | ||
| writer.newlineAndIndent(); | ||
| writer.endList(withFrame); | ||
| } | ||
| } |
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
78 changes: 78 additions & 0 deletions
78
...-java/src/main/java/org/apache/flink/table/operations/ddl/AlterCatalogResetOperation.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,78 @@ | ||
| /* | ||
| * 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.flink.table.operations.ddl; | ||
|
|
||
| import org.apache.flink.annotation.Internal; | ||
| import org.apache.flink.configuration.Configuration; | ||
| import org.apache.flink.table.api.ValidationException; | ||
| import org.apache.flink.table.api.internal.TableResultImpl; | ||
| import org.apache.flink.table.api.internal.TableResultInternal; | ||
| import org.apache.flink.table.catalog.CatalogDescriptor; | ||
| import org.apache.flink.table.catalog.exceptions.CatalogException; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.apache.flink.util.Preconditions.checkNotNull; | ||
|
|
||
| /** Operation to describe an ALTER CATALOG RESET statement. */ | ||
| @Internal | ||
| public class AlterCatalogResetOperation implements AlterOperation { | ||
| private final String catalogName; | ||
| private final Set<String> resetKeys; | ||
|
|
||
| public AlterCatalogResetOperation(String catalogName, Set<String> resetKeys) { | ||
| this.catalogName = checkNotNull(catalogName); | ||
| this.resetKeys = Collections.unmodifiableSet(checkNotNull(resetKeys)); | ||
| } | ||
|
|
||
| public String getCatalogName() { | ||
| return catalogName; | ||
| } | ||
|
|
||
| public Set<String> getResetKeys() { | ||
| return resetKeys; | ||
| } | ||
|
|
||
| @Override | ||
| public String asSummaryString() { | ||
| return String.format( | ||
| "ALTER CATALOG %s\n%s", | ||
| catalogName, | ||
| resetKeys.stream() | ||
| .map(key -> String.format(" RESET '%s'", key)) | ||
| .collect(Collectors.joining(",\n"))); | ||
| } | ||
|
|
||
| @Override | ||
| public TableResultInternal execute(Context ctx) { | ||
| try { | ||
| Configuration resetConf = new Configuration(); | ||
| resetKeys.forEach(key -> resetConf.setString(key, "")); | ||
| ctx.getCatalogManager() | ||
| .alterCatalog(catalogName, CatalogDescriptor.of(catalogName, resetConf)); | ||
|
|
||
| return TableResultImpl.TABLE_RESULT_OK; | ||
| } catch (CatalogException e) { | ||
| throw new ValidationException( | ||
| String.format("Could not execute %s", asSummaryString()), e); | ||
| } | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
...a/org/apache/flink/table/planner/operations/converters/SqlAlterCatalogResetConverter.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,48 @@ | ||
| /* | ||
| * 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.flink.table.planner.operations.converters; | ||
|
|
||
| import org.apache.flink.sql.parser.ddl.SqlAlterCatalogReset; | ||
| import org.apache.flink.table.api.ValidationException; | ||
| import org.apache.flink.table.catalog.CommonCatalogOptions; | ||
| import org.apache.flink.table.operations.Operation; | ||
| import org.apache.flink.table.operations.ddl.AlterCatalogResetOperation; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| /** A converter for {@link SqlAlterCatalogReset}. */ | ||
| public class SqlAlterCatalogResetConverter implements SqlNodeConverter<SqlAlterCatalogReset> { | ||
|
|
||
| @Override | ||
| public Operation convertSqlNode( | ||
| SqlAlterCatalogReset sqlAlterCatalogReset, ConvertContext context) { | ||
| String type = CommonCatalogOptions.CATALOG_TYPE.key(); | ||
| Set<String> resetKeys = sqlAlterCatalogReset.getResetKeys(); | ||
| if (resetKeys.isEmpty() || resetKeys.contains(type)) { | ||
| String exMsg = | ||
| resetKeys.isEmpty() | ||
| ? "ALTER CATALOG RESET does not support empty key" | ||
| : String.format( | ||
| "ALTER CATALOG RESET does not support changing '%s'", type); | ||
| throw new ValidationException(exMsg); | ||
| } | ||
| return new AlterCatalogResetOperation( | ||
| sqlAlterCatalogReset.catalogName(), sqlAlterCatalogReset.getResetKeys()); | ||
| } | ||
| } |
Oops, something went wrong.