You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by dw...@apache.org on 2019/07/05 13:34:36 UTC
[flink] 02/03: [hotfix][table-api] Remove CompositePlannerConfig
This is an automated email from the ASF dual-hosted git repository.
dwysakowicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 767d92489093acbf74fd29142cf3ad9eb39e2592
Author: Dawid Wysakowicz <dw...@apache.org>
AuthorDate: Thu Jul 4 12:12:09 2019 +0200
[hotfix][table-api] Remove CompositePlannerConfig
---
.../org/apache/flink/table/api/TableConfig.java | 7 ++--
.../table/api/internal/CompositePlannerConfig.java | 45 ----------------------
.../batch/table/JavaTableEnvironmentITCase.java | 2 +-
.../table/api/batch/table/CorrelateTest.scala | 2 +-
.../table/api/stream/table/CorrelateTest.scala | 2 +-
.../flink/table/plan/NormalizationRulesTest.scala | 4 +-
6 files changed, 8 insertions(+), 54 deletions(-)
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/TableConfig.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/TableConfig.java
index 8bdc461..6ee7f8d 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/TableConfig.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/TableConfig.java
@@ -20,7 +20,6 @@ package org.apache.flink.table.api;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.common.time.Time;
-import org.apache.flink.table.api.internal.CompositePlannerConfig;
import org.apache.flink.util.Preconditions;
import java.math.MathContext;
@@ -45,7 +44,7 @@ public class TableConfig {
/**
* Defines the configuration of Planner for Table API and SQL queries.
*/
- private CompositePlannerConfig plannerConfig = new CompositePlannerConfig();
+ private PlannerConfig plannerConfig = PlannerConfig.EMPTY_CONFIG;
/**
* Defines the default context for decimal division calculation.
@@ -110,8 +109,8 @@ public class TableConfig {
* Sets the configuration of Planner for Table API and SQL queries.
* Changing the configuration has no effect after the first query has been defined.
*/
- public void addPlannerConfig(PlannerConfig plannerConfig) {
- this.plannerConfig.addConfig(Preconditions.checkNotNull(plannerConfig));
+ public void setPlannerConfig(PlannerConfig plannerConfig) {
+ this.plannerConfig = Preconditions.checkNotNull(plannerConfig);
}
/**
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/CompositePlannerConfig.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/CompositePlannerConfig.java
deleted file mode 100644
index 9f3a4ae..0000000
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/CompositePlannerConfig.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.api.internal;
-
-import org.apache.flink.annotation.Internal;
-import org.apache.flink.table.api.PlannerConfig;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * A {@link PlannerConfig} to pass multiple different configs under a single object. It allows storing only a single
- * instance of a given class. If there is an object of the same class already, it is replaced with the new one.
- */
-@Internal
-public class CompositePlannerConfig implements PlannerConfig {
- private final Map<Class<? extends PlannerConfig>, PlannerConfig> configs = new HashMap<>();
-
- public void addConfig(PlannerConfig config) {
- configs.put(config.getClass(), config);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T extends PlannerConfig> Optional<T> unwrap(Class<T> type) {
- return (Optional<T>) Optional.ofNullable(configs.get(type));
- }
-}
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
index b05608a..6f35d96 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
@@ -562,7 +562,7 @@ public class JavaTableEnvironmentITCase extends TableProgramsCollectionTestBase
.replaceLogicalOptRuleSet(RuleSets.ofList())
.replacePhysicalOptRuleSet(RuleSets.ofList())
.build();
- tableEnv.getConfig().addPlannerConfig(cc);
+ tableEnv.getConfig().setPlannerConfig(cc);
DataSet<Tuple3<Integer, Long, String>> ds = CollectionDataSets.get3TupleDataSet(env);
Table t = tableEnv.fromDataSet(ds);
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CorrelateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CorrelateTest.scala
index 1a71389..9ec49d1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CorrelateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CorrelateTest.scala
@@ -180,7 +180,7 @@ class CorrelateTest extends TableTestBase {
.replaceLogicalOptRuleSet(RuleSets.ofList(logicalRuleSet.toList))
.build()
- util.tableEnv.getConfig.addPlannerConfig(cc)
+ util.tableEnv.getConfig.setPlannerConfig(cc)
val sourceTable = util.addTable[(Int, Long, String)]("MyTable", 'a, 'b, 'c)
val function = util.addFunction("func1", new TableFunc0)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CorrelateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CorrelateTest.scala
index e62a2f9..7f62dee 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CorrelateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CorrelateTest.scala
@@ -284,7 +284,7 @@ class CorrelateTest extends TableTestBase {
.replaceLogicalOptRuleSet(RuleSets.ofList(logicalRuleSet.toList))
.build()
- util.tableEnv.getConfig.addPlannerConfig(cc)
+ util.tableEnv.getConfig.setPlannerConfig(cc)
val sourceTable = util.addTable[(Int, Long, String)]("MyTable", 'a, 'b, 'c)
val function = util.addFunction("func1", new TableFunc0)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/NormalizationRulesTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/NormalizationRulesTest.scala
index f0a560c..910b719 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/NormalizationRulesTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/NormalizationRulesTest.scala
@@ -40,7 +40,7 @@ class NormalizationRulesTest extends TableTestBase {
.replaceLogicalOptRuleSet(RuleSets.ofList())
.replacePhysicalOptRuleSet(RuleSets.ofList())
.build()
- util.tableEnv.getConfig.addPlannerConfig(cc)
+ util.tableEnv.getConfig.setPlannerConfig(cc)
val t = util.addTable[(Int, Long, String)]("MyTable", 'a, 'b, 'c)
@@ -76,7 +76,7 @@ class NormalizationRulesTest extends TableTestBase {
.replaceLogicalOptRuleSet(RuleSets.ofList())
.replacePhysicalOptRuleSet(RuleSets.ofList())
.build()
- util.tableEnv.getConfig.addPlannerConfig(cc)
+ util.tableEnv.getConfig.setPlannerConfig(cc)
val t = util.addTable[(Int, Long, String)]("MyTable", 'a, 'b, 'c)