You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2022/02/24 07:37:01 UTC
[flink] 05/05: [FLINK-26297][table-planner] Rename PlannerConfiguration to PlannerConfig
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 56da73a457a9c9150db90d58627bf2c8a08ebf7c
Author: Marios Trivyzas <ma...@gmail.com>
AuthorDate: Wed Feb 23 12:47:24 2022 +0200
[FLINK-26297][table-planner] Rename PlannerConfiguration to PlannerConfig
To be consistent with `TableConfig`, `ExecNodeConfig`, etc.
This closes #18888.
---
.../delegation/{PlannerConfiguration.java => PlannerConfig.java} | 4 ++--
.../apache/flink/table/planner/plan/nodes/exec/ExecNodeConfig.java | 6 +++---
.../org/apache/flink/table/planner/delegation/PlannerBase.scala | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/PlannerConfiguration.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/PlannerConfig.java
similarity index 92%
rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/PlannerConfiguration.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/PlannerConfig.java
index 92e4e70..3563d76 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/PlannerConfiguration.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/delegation/PlannerConfig.java
@@ -29,13 +29,13 @@ import java.util.Optional;
* configuration. The table configuration has precedence.
*/
@Internal
-public final class PlannerConfiguration implements ReadableConfig {
+public final class PlannerConfig implements ReadableConfig {
private final ReadableConfig tableConfig;
private final ReadableConfig executorConfig;
- PlannerConfiguration(ReadableConfig tableConfig, ReadableConfig executorConfig) {
+ PlannerConfig(ReadableConfig tableConfig, ReadableConfig executorConfig) {
this.tableConfig = tableConfig;
this.executorConfig = executorConfig;
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/ExecNodeConfig.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/ExecNodeConfig.java
index ebb2138..183ce14 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/ExecNodeConfig.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/ExecNodeConfig.java
@@ -26,15 +26,15 @@ import org.apache.flink.table.api.TableConfig;
import org.apache.flink.table.api.config.ExecutionConfigOptions;
import org.apache.flink.table.planner.codegen.CodeGeneratorContext;
import org.apache.flink.table.planner.delegation.PlannerBase;
-import org.apache.flink.table.planner.delegation.PlannerConfiguration;
+import org.apache.flink.table.planner.delegation.PlannerConfig;
import java.time.ZoneId;
import java.util.Optional;
/**
- * Configuration view which is used combine the {@link PlannerConfiguration} with the {@link
+ * Configuration view which is used combine the {@link PlannerConfig} with the {@link
* ExecNodeBase#getNodeConfig()} configuration. The persisted configuration of the {@link ExecNode}
- * which is deserialized from the JSON plan has precedence over the {@link PlannerConfiguration}.
+ * which is deserialized from the JSON plan has precedence over the {@link PlannerConfig}.
*/
@Internal
public final class ExecNodeConfig implements ReadableConfig {
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/delegation/PlannerBase.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/delegation/PlannerBase.scala
index 4442160..9194de1 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/delegation/PlannerBase.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/delegation/PlannerBase.scala
@@ -102,7 +102,7 @@ abstract class PlannerBase(
private var parser: Parser = _
private var currentDialect: SqlDialect = getTableConfig.getSqlDialect
- private val plannerConfiguration: ReadableConfig = new PlannerConfiguration(
+ private val plannerConfiguration: ReadableConfig = new PlannerConfig(
tableConfig.getConfiguration,
executor.getConfiguration)