[hotfix][table] Replace TableConfig constructor with getDefault()

silenceland · Mar 18, 2022 · a924c67 · a924c67
1 parent 9fa08be
commit a924c67
Show file tree

Hide file tree

Showing 27 changed files with 36 additions and 36 deletions.
diff --git a/...nnector-hbase-1.4/src/test/java/org/apache/flink/connector/hbase1/HBaseTablePlanTest.java b/...nnector-hbase-1.4/src/test/java/org/apache/flink/connector/hbase1/HBaseTablePlanTest.java
@@ -29,7 +29,7 @@
 /** Plan tests for HBase connector, for example, testing projection push down. */
 public class HBaseTablePlanTest extends TableTestBase {
 
-    private final StreamTableTestUtil util = streamTestUtil(new TableConfig());
+    private final StreamTableTestUtil util = streamTestUtil(TableConfig.getDefault());
 
     @Test
     public void testMultipleRowKey() {

diff --git a/...nnector-hbase-2.2/src/test/java/org/apache/flink/connector/hbase2/HBaseTablePlanTest.java b/...nnector-hbase-2.2/src/test/java/org/apache/flink/connector/hbase2/HBaseTablePlanTest.java
@@ -29,7 +29,7 @@
 /** Plan tests for HBase connector, for example, testing projection push down. */
 public class HBaseTablePlanTest extends TableTestBase {
 
-    private final StreamTableTestUtil util = streamTestUtil(new TableConfig());
+    private final StreamTableTestUtil util = streamTestUtil(TableConfig.getDefault());
 
     @Test
     public void testMultipleRowKey() {

diff --git a/...connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java b/...connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
@@ -28,7 +28,7 @@
 /** Plan tests for JDBC connector, for example, testing projection push down. */
 public class JdbcTablePlanTest extends TableTestBase {
 
-    private final StreamTableTestUtil util = streamTestUtil(new TableConfig());
+    private final StreamTableTestUtil util = streamTestUtil(TableConfig.getDefault());
 
     @Before
     public void setup() {

diff --git a/.../java/org/apache/flink/table/api/bridge/java/internal/StreamTableEnvironmentImplTest.java b/.../java/org/apache/flink/table/api/bridge/java/internal/StreamTableEnvironmentImplTest.java
@@ -74,7 +74,7 @@ public void testRetractStreamDoesNotOverwriteTableConfig() {
 
     private StreamTableEnvironmentImpl getStreamTableEnvironment(
             StreamExecutionEnvironment env, DataStreamSource<Integer> elements) {
-        TableConfig tableConfig = new TableConfig();
+        TableConfig tableConfig = TableConfig.getDefault();
         CatalogManager catalogManager = CatalogManagerMocks.createEmptyCatalogManager();
         ModuleManager moduleManager = new ModuleManager();
         return new StreamTableEnvironmentImpl(

diff --git a/...able-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java b/...able-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java
@@ -278,7 +278,7 @@ public static TableEnvironmentImpl create(EnvironmentSettings settings) {
         final Executor executor = executorFactory.create(settings.getConfiguration());
 
         // use configuration to init table config
-        final TableConfig tableConfig = new TableConfig();
+        final TableConfig tableConfig = TableConfig.getDefault();
         tableConfig.setRootConfiguration(executor.getConfiguration());
         tableConfig.addConfiguration(settings.getConfiguration());
 

diff --git a/...-table/flink-table-api-java/src/test/java/org/apache/flink/table/api/TableConfigTest.java b/...-table/flink-table-api-java/src/test/java/org/apache/flink/table/api/TableConfigTest.java
@@ -34,8 +34,8 @@ public class TableConfigTest {
 
     @Rule public ExpectedException expectedException = ExpectedException.none();
 
-    private static TableConfig configByMethod = new TableConfig();
-    private static TableConfig configByConfiguration = new TableConfig();
+    private static TableConfig configByMethod = TableConfig.getDefault();
+    private static TableConfig configByConfiguration = TableConfig.getDefault();
     private static Configuration configuration = new Configuration();
 
     @Test

diff --git a/...ava/src/test/java/org/apache/flink/table/expressions/resolver/ExpressionResolverTest.java b/...ava/src/test/java/org/apache/flink/table/expressions/resolver/ExpressionResolverTest.java
@@ -350,7 +350,7 @@ public TestSpec equalTo(ResolvedExpression... resolvedExpressions) {
 
         public ExpressionResolver getResolver() {
             return ExpressionResolver.resolverFor(
-                            new TableConfig(),
+                            TableConfig.getDefault(),
                             name -> Optional.empty(),
                             new FunctionLookupMock(functions),
                             new DataTypeFactoryMock(),

diff --git a/...src/test/java/org/apache/flink/table/operations/utils/ValuesOperationTreeBuilderTest.java b/...src/test/java/org/apache/flink/table/operations/utils/ValuesOperationTreeBuilderTest.java
@@ -485,7 +485,7 @@ public TestSpec expectValidationException(String message) {
 
         public OperationTreeBuilder getTreeBuilder() {
             return OperationTreeBuilder.create(
-                    new TableConfig(),
+                    TableConfig.getDefault(),
                     new FunctionLookupMock(Collections.emptyMap()),
                     new DataTypeFactoryMock(),
                     name -> Optional.empty(), // do not support

diff --git a/...nk-table-api-java/src/test/java/org/apache/flink/table/utils/ExpressionResolverMocks.java b/...nk-table-api-java/src/test/java/org/apache/flink/table/utils/ExpressionResolverMocks.java
@@ -38,7 +38,7 @@ public final class ExpressionResolverMocks {
 
     public static ExpressionResolverBuilder forSqlExpression(SqlExpressionResolver resolver) {
         return ExpressionResolver.resolverFor(
-                new TableConfig(),
+                TableConfig.getDefault(),
                 name -> Optional.empty(),
                 new FunctionLookupMock(Collections.emptyMap()),
                 new DataTypeFactoryMock(),
@@ -55,7 +55,7 @@ public static ExpressionResolverBuilder dummyResolver() {
     public static ExpressionResolverBuilder basicResolver(
             CatalogManager catalogManager, FunctionCatalog functionCatalog, Parser parser) {
         return ExpressionResolver.resolverFor(
-                new TableConfig(),
+                TableConfig.getDefault(),
                 name -> Optional.empty(),
                 functionCatalog.asLookup(parser::parseIdentifier),
                 catalogManager.getDataTypeFactory(),

diff --git a/...ala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImplTest.scala b/...ala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImplTest.scala
@@ -78,7 +78,7 @@ class StreamTableEnvironmentImplTest {
   private def getStreamTableEnvironment(
       env: StreamExecutionEnvironment,
       elements: DataStream[Int]) = {
-    val config = new TableConfig
+    val config = TableConfig.getDefault
     val catalogManager = CatalogManagerMocks.createEmptyCatalogManager()
     val moduleManager = new ModuleManager
     new StreamTableEnvironmentImpl(

diff --git a/...le-planner/src/test/java/org/apache/flink/table/planner/catalog/JavaCatalogTableTest.java b/...le-planner/src/test/java/org/apache/flink/table/planner/catalog/JavaCatalogTableTest.java
@@ -60,9 +60,9 @@ public static Collection<Boolean> parameters() {
 
     private TableTestUtil getTestUtil() {
         if (isStreamingMode) {
-            return streamTestUtil(new TableConfig());
+            return streamTestUtil(TableConfig.getDefault());
         } else {
-            return batchTestUtil(new TableConfig());
+            return batchTestUtil(TableConfig.getDefault());
         }
     }
 

diff --git a/...table-planner/src/test/java/org/apache/flink/table/planner/delegation/ParserImplTest.java b/...table-planner/src/test/java/org/apache/flink/table/planner/delegation/ParserImplTest.java
@@ -50,7 +50,7 @@
 public class ParserImplTest {
 
     private final boolean isStreamingMode = false;
-    private final TableConfig tableConfig = new TableConfig();
+    private final TableConfig tableConfig = TableConfig.getDefault();
     private final Catalog catalog = new GenericInMemoryCatalog("MockCatalog", "default");
     private final CatalogManager catalogManager =
             CatalogManagerMocks.preparedCatalogManager().defaultCatalog("builtin", catalog).build();

diff --git a/...st/java/org/apache/flink/table/planner/expressions/converter/ExpressionConverterTest.java b/...st/java/org/apache/flink/table/planner/expressions/converter/ExpressionConverterTest.java
@@ -56,7 +56,7 @@
 /** Test for {@link ExpressionConverter}. */
 public class ExpressionConverterTest {
 
-    private final TableConfig tableConfig = new TableConfig();
+    private final TableConfig tableConfig = TableConfig.getDefault();
     private final CatalogManager catalogManager = CatalogManagerMocks.createEmptyCatalogManager();
     private final ModuleManager moduleManager = new ModuleManager();
     private final PlannerContext plannerContext =

diff --git a/.../src/test/java/org/apache/flink/table/planner/operations/SqlToOperationConverterTest.java b/.../src/test/java/org/apache/flink/table/planner/operations/SqlToOperationConverterTest.java
@@ -135,7 +135,7 @@
 /** Test cases for {@link SqlToOperationConverter}. */
 public class SqlToOperationConverterTest {
     private final boolean isStreamingMode = false;
-    private final TableConfig tableConfig = new TableConfig();
+    private final TableConfig tableConfig = TableConfig.getDefault();
     private final Catalog catalog = new GenericInMemoryCatalog("MockCatalog", "default");
     private final CatalogManager catalogManager =
             CatalogManagerMocks.preparedCatalogManager()

diff --git a/...flink/table/planner/plan/nodes/exec/processor/MultipleInputNodeCreationProcessorTest.java b/...flink/table/planner/plan/nodes/exec/processor/MultipleInputNodeCreationProcessorTest.java
@@ -49,8 +49,8 @@
 /** Tests for {@link MultipleInputNodeCreationProcessor}. */
 public class MultipleInputNodeCreationProcessorTest extends TableTestBase {
 
-    private final BatchTableTestUtil batchUtil = batchTestUtil(new TableConfig());
-    private final StreamTableTestUtil streamUtil = streamTestUtil(new TableConfig());
+    private final BatchTableTestUtil batchUtil = batchTestUtil(TableConfig.getDefault());
+    private final StreamTableTestUtil streamUtil = streamTestUtil(TableConfig.getDefault());
 
     @Test
     public void testIsChainableDataStreamSource() {

diff --git a/...rg/apache/flink/table/planner/plan/nodes/exec/serde/TemporalTableSourceSpecSerdeTest.java b/...rg/apache/flink/table/planner/plan/nodes/exec/serde/TemporalTableSourceSpecSerdeTest.java
@@ -121,7 +121,7 @@ public void testTemporalTableSourceSpecSerde(TemporalTableSourceSpec spec) throw
                 false);
 
         SerdeContext serdeCtx =
-                JsonSerdeTestUtil.configuredSerdeContext(catalogManager, new TableConfig());
+                JsonSerdeTestUtil.configuredSerdeContext(catalogManager, TableConfig.getDefault());
 
         String json = JsonSerdeTestUtil.toJson(serdeCtx, spec);
         TemporalTableSourceSpec actual =

diff --git a/...che/flink/table/planner/plan/rules/logical/ProjectWatermarkAssignerTransposeRuleTest.java b/...che/flink/table/planner/plan/rules/logical/ProjectWatermarkAssignerTransposeRuleTest.java
@@ -34,7 +34,7 @@
 
 /** Test for {@link ProjectWatermarkAssignerTransposeRule}. */
 public class ProjectWatermarkAssignerTransposeRuleTest extends TableTestBase {
-    private final StreamTableTestUtil util = streamTestUtil(new TableConfig());
+    private final StreamTableTestUtil util = streamTestUtil(TableConfig.getDefault());
 
     @Before
     public void setup() {

diff --git a/...ache/flink/table/planner/plan/rules/logical/PushWatermarkIntoTableSourceScanRuleTest.java b/...ache/flink/table/planner/plan/rules/logical/PushWatermarkIntoTableSourceScanRuleTest.java
@@ -48,7 +48,7 @@
  * PushWatermarkIntoTableSourceScanRule}.
  */
 public class PushWatermarkIntoTableSourceScanRuleTest extends TableTestBase {
-    private final StreamTableTestUtil util = streamTestUtil(new TableConfig());
+    private final StreamTableTestUtil util = streamTestUtil(TableConfig.getDefault());
 
     @Before
     public void setup() {

diff --git a/...link/table/planner/plan/rules/physical/batch/PushLocalAggIntoTableSourceScanRuleTest.java b/...link/table/planner/plan/rules/physical/batch/PushLocalAggIntoTableSourceScanRuleTest.java
@@ -34,7 +34,7 @@
  * into table source.
  */
 public class PushLocalAggIntoTableSourceScanRuleTest extends TableTestBase {
-    protected BatchTableTestUtil util = batchTestUtil(new TableConfig());
+    protected BatchTableTestUtil util = batchTestUtil(TableConfig.getDefault());
 
     @Before
     public void setup() {

diff --git a/.../flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/PlannerMocks.java b/.../flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/PlannerMocks.java
@@ -128,11 +128,11 @@ public PlannerMocks registerTemporaryTable(String tableName, Schema tableSchema)
     }
 
     public static PlannerMocks create() {
-        return new PlannerMocks(new TableConfig());
+        return new PlannerMocks(TableConfig.getDefault());
     }
 
     public static PlannerMocks create(Configuration configuration) {
-        TableConfig tableConfig = new TableConfig();
+        TableConfig tableConfig = TableConfig.getDefault();
         tableConfig.addConfiguration(configuration);
         return new PlannerMocks(tableConfig);
     }

diff --git a/...src/test/scala/org/apache/flink/table/planner/codegen/WatermarkGeneratorCodeGenTest.scala b/...src/test/scala/org/apache/flink/table/planner/codegen/WatermarkGeneratorCodeGenTest.scala
@@ -57,7 +57,7 @@ import org.junit.Test
 class WatermarkGeneratorCodeGenTest(useDefinedConstructor: Boolean) {
 
   // mock FlinkPlannerImpl to avoid discovering TableEnvironment and Executor.
-  val config = new TableConfig
+  val config = TableConfig.getDefault
   val moduleManager = new ModuleManager
   val catalogManager: CatalogManager = CatalogManagerMocks.createEmptyCatalogManager()
   val functionCatalog = new FunctionCatalog(config, catalogManager, moduleManager)

diff --git a/.../scala/org/apache/flink/table/planner/plan/metadata/AggCallSelectivityEstimatorTest.scala b/.../scala/org/apache/flink/table/planner/plan/metadata/AggCallSelectivityEstimatorTest.scala
@@ -77,7 +77,7 @@ class AggCallSelectivityEstimatorTest {
 
   private def mockScan(
       statistic: FlinkStatistic = FlinkStatistic.UNKNOWN): TableScan = {
-    val tableConfig = new TableConfig
+    val tableConfig = TableConfig.getDefault
     val moduleManager = new ModuleManager
     val catalogManager = CatalogManagerMocks.createEmptyCatalogManager()
     val rootSchema = CalciteSchema.createRootSchema(true, false).plus()

diff --git a/...c/test/scala/org/apache/flink/table/planner/plan/metadata/FlinkRelMdHandlerTestBase.scala b/...c/test/scala/org/apache/flink/table/planner/plan/metadata/FlinkRelMdHandlerTestBase.scala
@@ -80,7 +80,7 @@ import scala.collection.JavaConversions._
 
 class FlinkRelMdHandlerTestBase {
 
-  val tableConfig = new TableConfig()
+  val tableConfig = TableConfig.getDefault()
   val rootSchema: SchemaPlus = MetadataTestUtil.initRootSchema()
 
   val catalogManager: CatalogManager = CatalogManagerMocks.createEmptyCatalogManager()

diff --git a/...er/src/test/scala/org/apache/flink/table/planner/plan/nodes/calcite/RelNodeTestBase.scala b/...er/src/test/scala/org/apache/flink/table/planner/plan/nodes/calcite/RelNodeTestBase.scala
@@ -45,7 +45,7 @@ import java.util
  * TODO refactor the metadata test to extract the common logic for all related tests.
  */
 class RelNodeTestBase {
-  val tableConfig = new TableConfig()
+  val tableConfig = TableConfig.getDefault()
   val rootSchema: SchemaPlus = CalciteSchema.createRootSchema(true, false).plus()
   val catalogManager: CatalogManager = CatalogManagerMocks.createEmptyCatalogManager()
   val moduleManager = new ModuleManager

diff --git a/...lanner/src/test/scala/org/apache/flink/table/planner/plan/utils/PartitionPrunerTest.scala b/...lanner/src/test/scala/org/apache/flink/table/planner/plan/utils/PartitionPrunerTest.scala
@@ -106,7 +106,7 @@ class PartitionPrunerTest extends RexNodeTestBase {
       Map("amount" -> "200", "name" -> "Test3").asJava
     ).asJava
 
-    val config = new TableConfig
+    val config = TableConfig.getDefault
     val prunedPartitions = PartitionPruner.prunePartitions(
       config,
       partitionFieldNames,
@@ -176,7 +176,7 @@ class PartitionPrunerTest extends RexNodeTestBase {
         "f3" -> "2018-08-06 12:08:06.124").asJava
     ).asJava
 
-    val config = new TableConfig
+    val config = TableConfig.getDefault
     config.setLocalTimeZone(ZoneOffset.ofHours(0))
     val prunedPartitions = PartitionPruner.prunePartitions(
       config,

diff --git a/...e-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/BatchTestBase.scala b/...e-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/BatchTestBase.scala
@@ -62,7 +62,7 @@ class BatchTestBase extends BatchAbstractTestBase {
 
   private val settings = EnvironmentSettings.newInstance().inBatchMode().build()
   private val testingTableEnv: TestingTableEnvironment = TestingTableEnvironment
-    .create(settings, catalogManager = None, new TableConfig)
+    .create(settings, catalogManager = None, TableConfig.getDefault)
   val tEnv: TableEnvironment = testingTableEnv
   private val planner = tEnv.asInstanceOf[TableEnvironmentImpl].getPlanner.asInstanceOf[PlannerBase]
   val env: StreamExecutionEnvironment = planner.getExecEnv

diff --git a/...ink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/TableTestBase.scala b/...ink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/TableTestBase.scala
@@ -105,14 +105,14 @@ abstract class TableTestBase {
   @Rule
   def name: TestName = testName
 
-  def streamTestUtil(conf: TableConfig = new TableConfig): StreamTableTestUtil =
+  def streamTestUtil(conf: TableConfig = TableConfig.getDefault): StreamTableTestUtil =
     StreamTableTestUtil(this, conf = conf)
 
   def scalaStreamTestUtil(): ScalaStreamTableTestUtil = ScalaStreamTableTestUtil(this)
 
   def javaStreamTestUtil(): JavaStreamTableTestUtil = JavaStreamTableTestUtil(this)
 
-  def batchTestUtil(conf: TableConfig = new TableConfig): BatchTableTestUtil =
+  def batchTestUtil(conf: TableConfig = TableConfig.getDefault): BatchTableTestUtil =
     BatchTableTestUtil(this, conf = conf)
 
   def scalaBatchTestUtil(): ScalaBatchTableTestUtil = ScalaBatchTableTestUtil(this)
@@ -1222,7 +1222,7 @@ abstract class JavaTableTestUtil(
 case class StreamTableTestUtil(
     test: TableTestBase,
     catalogManager: Option[CatalogManager] = None,
-    conf: TableConfig = new TableConfig)
+    conf: TableConfig = TableConfig.getDefault)
   extends TableTestUtil(test, isStreamingMode = true, catalogManager, conf) {
 
   /**
@@ -1342,7 +1342,7 @@ case class JavaStreamTableTestUtil(test: TableTestBase) extends JavaTableTestUti
 case class BatchTableTestUtil(
     test: TableTestBase,
     catalogManager: Option[CatalogManager] = None,
-    conf: TableConfig = new TableConfig)
+    conf: TableConfig = TableConfig.getDefault)
   extends TableTestUtil(test, isStreamingMode = false, catalogManager, conf) {
 
   def buildBatchProgram(firstProgramNameToRemove: String): Unit = {