You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ja...@apache.org on 2023/03/17 15:41:48 UTC
[flink] 01/02: [hotfix][table] Rename SqlToOperationConverter to SqlNodeToOperationConversion
This is an automated email from the ASF dual-hosted git repository.
jark pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit fa0dd3559e9697e21795a2634d8d99a0b7efdcf3
Author: Jark Wu <ja...@apache.org>
AuthorDate: Fri Mar 17 17:58:34 2023 +0800
[hotfix][table] Rename SqlToOperationConverter to SqlNodeToOperationConversion
---
.../apache/flink/table/planner/delegation/ParserImpl.java | 4 ++--
.../table/planner/operations/SqlCreateTableConverter.java | 2 +-
...onConverter.java => SqlNodeToOperationConversion.java} | 9 +++++----
.../operations/SqlDdlToOperationConverterTest.java | 15 +++++++++------
.../operations/SqlDmlToOperationConverterTest.java | 7 ++++---
...ase.java => SqlNodeToOperationConversionTestBase.java} | 6 +++---
.../operations/SqlOtherOperationConverterTest.java | 4 ++--
7 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/ParserImpl.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/ParserImpl.java
index 4fb660d1d1c..6371f7a7778 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/ParserImpl.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/ParserImpl.java
@@ -30,7 +30,7 @@ import org.apache.flink.table.planner.calcite.FlinkTypeFactory;
import org.apache.flink.table.planner.calcite.RexFactory;
import org.apache.flink.table.planner.calcite.SqlToRexConverter;
import org.apache.flink.table.planner.expressions.RexNodeExpression;
-import org.apache.flink.table.planner.operations.SqlToOperationConverter;
+import org.apache.flink.table.planner.operations.SqlNodeToOperationConversion;
import org.apache.flink.table.planner.parse.CalciteParser;
import org.apache.flink.table.planner.parse.ExtendedParser;
import org.apache.flink.table.types.logical.LogicalType;
@@ -103,7 +103,7 @@ public class ParserImpl implements Parser {
List<SqlNode> parsed = sqlNodeList.getList();
Preconditions.checkArgument(parsed.size() == 1, "only single statement supported");
return Collections.singletonList(
- SqlToOperationConverter.convert(planner, catalogManager, parsed.get(0))
+ SqlNodeToOperationConversion.convert(planner, catalogManager, parsed.get(0))
.orElseThrow(() -> new TableException("Unsupported query: " + statement)));
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlCreateTableConverter.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlCreateTableConverter.java
index 294ab1c2386..7983a12caa1 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlCreateTableConverter.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlCreateTableConverter.java
@@ -93,7 +93,7 @@ class SqlCreateTableConverter {
PlannerQueryOperation query =
(PlannerQueryOperation)
- SqlToOperationConverter.convert(
+ SqlNodeToOperationConversion.convert(
flinkPlanner, catalogManager, sqlCreateTableAs.getAsQuery())
.orElseThrow(
() ->
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlToOperationConverter.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlNodeToOperationConversion.java
similarity index 99%
rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlToOperationConverter.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlNodeToOperationConversion.java
index ac88cfb78c2..64f2a3a6636 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlToOperationConverter.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/operations/SqlNodeToOperationConversion.java
@@ -242,7 +242,7 @@ import java.util.stream.Collectors;
* <p>Every #convert() should return a {@link Operation} which can be used in {@link
* org.apache.flink.table.delegation.Planner}.
*/
-public class SqlToOperationConverter {
+public class SqlNodeToOperationConversion {
private final FlinkPlannerImpl flinkPlanner;
private final CatalogManager catalogManager;
private final SqlCreateTableConverter createTableConverter;
@@ -250,7 +250,8 @@ public class SqlToOperationConverter {
// ~ Constructors -----------------------------------------------------------
- private SqlToOperationConverter(FlinkPlannerImpl flinkPlanner, CatalogManager catalogManager) {
+ private SqlNodeToOperationConversion(
+ FlinkPlannerImpl flinkPlanner, CatalogManager catalogManager) {
this.flinkPlanner = flinkPlanner;
this.catalogManager = catalogManager;
this.createTableConverter =
@@ -285,8 +286,8 @@ public class SqlToOperationConverter {
private static Optional<Operation> convertValidatedSqlNode(
FlinkPlannerImpl flinkPlanner, CatalogManager catalogManager, SqlNode validated) {
beforeConversion();
- SqlToOperationConverter converter =
- new SqlToOperationConverter(flinkPlanner, catalogManager);
+ SqlNodeToOperationConversion converter =
+ new SqlNodeToOperationConversion(flinkPlanner, catalogManager);
if (validated instanceof SqlCreateCatalog) {
return Optional.of(converter.convertCreateCatalog((SqlCreateCatalog) validated));
} else if (validated instanceof SqlDropCatalog) {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlDdlToOperationConverterTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlDdlToOperationConverterTest.java
index d5d097f9f78..674dcccc3c1 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlDdlToOperationConverterTest.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlDdlToOperationConverterTest.java
@@ -89,8 +89,8 @@ import static org.apache.flink.table.planner.utils.OperationMatchers.withSchema;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-/** Test cases for the DDL statements for {@link SqlToOperationConverter}. */
-public class SqlDdlToOperationConverterTest extends SqlToOperationConverterTestBase {
+/** Test cases for the DDL statements for {@link SqlNodeToOperationConversion}. */
+public class SqlDdlToOperationConverterTest extends SqlNodeToOperationConversionTestBase {
@Test
public void testCreateDatabase() {
@@ -305,7 +305,8 @@ public class SqlDdlToOperationConverterTest extends SqlToOperationConverterTestB
final CalciteParser parser = getParserBySqlDialect(SqlDialect.DEFAULT);
SqlNode node = parser.parse(sql);
assertThat(node).isInstanceOf(SqlCreateTable.class);
- Operation operation = SqlToOperationConverter.convert(planner, catalogManager, node).get();
+ Operation operation =
+ SqlNodeToOperationConversion.convert(planner, catalogManager, node).get();
assertThat(operation).isInstanceOf(CreateTableOperation.class);
CreateTableOperation op = (CreateTableOperation) operation;
CatalogTable catalogTable = op.getCatalogTable();
@@ -341,7 +342,8 @@ public class SqlDdlToOperationConverterTest extends SqlToOperationConverterTestB
SqlNode node = parser.parse(sql);
assertThat(node).isInstanceOf(SqlCreateTable.class);
- Operation operation = SqlToOperationConverter.convert(planner, catalogManager, node).get();
+ Operation operation =
+ SqlNodeToOperationConversion.convert(planner, catalogManager, node).get();
assertThat(operation).isInstanceOf(CreateTableOperation.class);
CreateTableOperation op = (CreateTableOperation) operation;
CatalogTable catalogTable = op.getCatalogTable();
@@ -753,7 +755,8 @@ public class SqlDdlToOperationConverterTest extends SqlToOperationConverterTestB
final CalciteParser parser = getParserBySqlDialect(SqlDialect.DEFAULT);
SqlNode node = parser.parse(sql);
assertThat(node).isInstanceOf(SqlCreateTable.class);
- Operation operation = SqlToOperationConverter.convert(planner, catalogManager, node).get();
+ Operation operation =
+ SqlNodeToOperationConversion.convert(planner, catalogManager, node).get();
TableSchema schema = ((CreateTableOperation) operation).getCatalogTable().getSchema();
Object[] expectedDataTypes = testItems.stream().map(item -> item.expectedType).toArray();
assertThat(schema.getFieldDataTypes()).isEqualTo(expectedDataTypes);
@@ -2340,6 +2343,6 @@ public class SqlDdlToOperationConverterTest extends SqlToOperationConverterTestB
final CalciteParser parser = getParserBySqlDialect(SqlDialect.DEFAULT);
SqlNode node = parser.parse(sql);
- return SqlToOperationConverter.convert(planner, catalogManager, node).get();
+ return SqlNodeToOperationConversion.convert(planner, catalogManager, node).get();
}
}
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlDmlToOperationConverterTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlDmlToOperationConverterTest.java
index 3b0b8c8e50e..e11f0bb4459 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlDmlToOperationConverterTest.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlDmlToOperationConverterTest.java
@@ -52,8 +52,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.InstanceOfAssertFactories.type;
-/** Test cases for the DML statements for {@link SqlToOperationConverter}. */
-public class SqlDmlToOperationConverterTest extends SqlToOperationConverterTestBase {
+/** Test cases for the DML statements for {@link SqlNodeToOperationConversion}. */
+public class SqlDmlToOperationConverterTest extends SqlNodeToOperationConversionTestBase {
@Test
public void testExplainWithSelect() {
@@ -313,7 +313,8 @@ public class SqlDmlToOperationConverterTest extends SqlToOperationConverterTestB
CalciteParser parser = getParserBySqlDialect(SqlDialect.DEFAULT);
SqlNode node = parser.parse(sql);
assertThat(node).isInstanceOf(SqlRichExplain.class);
- Operation operation = SqlToOperationConverter.convert(planner, catalogManager, node).get();
+ Operation operation =
+ SqlNodeToOperationConversion.convert(planner, catalogManager, node).get();
assertThat(operation).isInstanceOf(ExplainOperation.class);
}
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlToOperationConverterTestBase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlNodeToOperationConversionTestBase.java
similarity index 96%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlToOperationConverterTestBase.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlNodeToOperationConversionTestBase.java
index d9c8281dee0..72e6b6d40cc 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlToOperationConverterTestBase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlNodeToOperationConversionTestBase.java
@@ -58,7 +58,7 @@ import java.util.function.Supplier;
import static org.apache.calcite.jdbc.CalciteSchemaBuilder.asRootSchema;
/** Test base for testing convert sql statement to operation. */
-public class SqlToOperationConverterTestBase {
+public class SqlNodeToOperationConversionTestBase {
private final boolean isStreamingMode = false;
private final TableConfig tableConfig = TableConfig.getDefault();
protected final Catalog catalog = new GenericInMemoryCatalog("MockCatalog", "default");
@@ -126,14 +126,14 @@ public class SqlToOperationConverterTestBase {
protected Operation parse(String sql, FlinkPlannerImpl planner, CalciteParser parser) {
SqlNode node = parser.parse(sql);
- return SqlToOperationConverter.convert(planner, catalogManager, node).get();
+ return SqlNodeToOperationConversion.convert(planner, catalogManager, node).get();
}
protected Operation parse(String sql) {
FlinkPlannerImpl planner = getPlannerBySqlDialect(SqlDialect.DEFAULT);
final CalciteParser parser = getParserBySqlDialect(SqlDialect.DEFAULT);
SqlNode node = parser.parse(sql);
- return SqlToOperationConverter.convert(planner, catalogManager, node).get();
+ return SqlNodeToOperationConversion.convert(planner, catalogManager, node).get();
}
protected FlinkPlannerImpl getPlannerBySqlDialect(SqlDialect sqlDialect) {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlOtherOperationConverterTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlOtherOperationConverterTest.java
index a58005fc70f..f0efc01f55a 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlOtherOperationConverterTest.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlOtherOperationConverterTest.java
@@ -53,9 +53,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
/**
* Test cases for the statements that neither belong to DDL nor DML for {@link
- * SqlToOperationConverter}.
+ * SqlNodeToOperationConversion}.
*/
-public class SqlOtherOperationConverterTest extends SqlToOperationConverterTestBase {
+public class SqlOtherOperationConverterTest extends SqlNodeToOperationConversionTestBase {
@Test
public void testUseCatalog() {