diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/plan/rules/logical/PushFilterIntoTableSourceScanRule.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/plan/rules/logical/PushFilterIntoTableSourceScanRule.scala index 5326f17975b84..ada01e348ac0f 100644 --- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/plan/rules/logical/PushFilterIntoTableSourceScanRule.scala +++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/plan/rules/logical/PushFilterIntoTableSourceScanRule.scala @@ -46,7 +46,8 @@ class PushFilterIntoTableSourceScanRule extends RelOptRule( override def matches(call: RelOptRuleCall): Boolean = { val config = call.getPlanner.getContext.asInstanceOf[FlinkContext].getTableConfig - if (!config.getConf.getBoolean(OptimizerConfigOptions.SQL_OPTIMIZER_PREDICATE_PUSHDOWN_ENABLED)) { + if (!config.getConf.getBoolean( + OptimizerConfigOptions.SQL_OPTIMIZER_PREDICATE_PUSHDOWN_ENABLED)) { return false } diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/plan/batch/sql/SortLimitTest.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/plan/batch/sql/SortLimitTest.scala index ad4246724b587..f0c43b15acf8f 100644 --- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/plan/batch/sql/SortLimitTest.scala +++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/plan/batch/sql/SortLimitTest.scala @@ -30,7 +30,8 @@ class SortLimitTest extends TableTestBase { private val util = batchTestUtil() util.addTableSource[(Int, Long, String)]("MyTable", 'a, 'b, 'c) - util.tableEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, 200) + util.tableEnv.getConfig.getConf.setInteger( + ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, 200) @Test def testNonRangeSortWithoutOffset(): Unit = { diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/plan/batch/sql/SortTest.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/plan/batch/sql/SortTest.scala index 634bc9c7a828e..801f35cb19b07 100644 --- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/plan/batch/sql/SortTest.scala +++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/plan/batch/sql/SortTest.scala @@ -35,7 +35,8 @@ class SortTest extends TableTestBase { def testNonRangeSortOnSingleFieldWithoutForceLimit(): Unit = { util.tableEnv.getConfig.getConf.setBoolean( BatchExecSortRule.SQL_EXEC_SORT_RANGE_ENABLED, false) - util.tableEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, -1) + util.tableEnv.getConfig.getConf.setInteger( + ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, -1) util.verifyPlan("SELECT * FROM MyTable ORDER BY a DESC") } @@ -43,7 +44,8 @@ class SortTest extends TableTestBase { def testNonRangeSortOnMultiFieldsWithoutForceLimit(): Unit = { util.tableEnv.getConfig.getConf.setBoolean( BatchExecSortRule.SQL_EXEC_SORT_RANGE_ENABLED, false) - util.tableEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, -1) + util.tableEnv.getConfig.getConf.setInteger( + ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, -1) util.verifyPlan("SELECT * FROM MyTable ORDER BY a DESC, b") } @@ -51,21 +53,24 @@ class SortTest extends TableTestBase { def testNonRangeSortWithForceLimit(): Unit = { util.tableEnv.getConfig.getConf.setBoolean( BatchExecSortRule.SQL_EXEC_SORT_RANGE_ENABLED, false) - util.tableEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, 200) + util.tableEnv.getConfig.getConf.setInteger( + ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, 200) util.verifyPlan("SELECT * FROM MyTable ORDER BY a DESC") } @Test def testRangeSortWithoutForceLimit(): Unit = { util.tableEnv.getConfig.getConf.setBoolean(BatchExecSortRule.SQL_EXEC_SORT_RANGE_ENABLED, true) - util.tableEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, -1) + util.tableEnv.getConfig.getConf.setInteger( + ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, -1) util.verifyPlan("SELECT * FROM MyTable ORDER BY a DESC") } @Test def testRangeSortWithForceLimit(): Unit = { util.tableEnv.getConfig.getConf.setBoolean(BatchExecSortRule.SQL_EXEC_SORT_RANGE_ENABLED, true) - util.tableEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, 200) + util.tableEnv.getConfig.getConf.setInteger( + ExecutionConfigOptions.SQL_EXEC_SORT_DEFAULT_LIMIT, 200) util.verifyPlan("SELECT * FROM MyTable ORDER BY a DESC") } } diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/batch/sql/agg/AggregateReduceGroupingITCase.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/batch/sql/agg/AggregateReduceGroupingITCase.scala index ea735453213da..64a35455956dd 100644 --- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/batch/sql/agg/AggregateReduceGroupingITCase.scala +++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/batch/sql/agg/AggregateReduceGroupingITCase.scala @@ -127,7 +127,7 @@ class AggregateReduceGroupingITCase extends BatchTestBase { OptimizerConfigOptions.SQL_OPTIMIZER_AGG_PHASE_STRATEGY, "TWO_PHASE") // set smaller parallelism to avoid MemoryAllocationException tEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_RESOURCE_DEFAULT_PARALLELISM, 2) - tEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_RESOURCE_HASH_AGG_TABLE_MEM, 2) // 2M + tEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_RESOURCE_HASH_AGG_TABLE_MEM, 2) testSingleAggOnTable() } @@ -136,7 +136,7 @@ class AggregateReduceGroupingITCase extends BatchTestBase { tEnv.getConfig.getConf.setString(ExecutionConfigOptions.SQL_EXEC_DISABLED_OPERATORS, "SortAgg") tEnv.getConfig.getConf.setString( OptimizerConfigOptions.SQL_OPTIMIZER_AGG_PHASE_STRATEGY, "ONE_PHASE") - tEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_RESOURCE_HASH_AGG_TABLE_MEM, 2) // 2M + tEnv.getConfig.getConf.setInteger(ExecutionConfigOptions.SQL_RESOURCE_HASH_AGG_TABLE_MEM, 2) testSingleAggOnTable() } diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithAggTestBase.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithAggTestBase.scala index 8d45f4c3ddfbd..0e3970e9ff30b 100644 --- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithAggTestBase.scala +++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithAggTestBase.scala @@ -40,10 +40,12 @@ class StreamingWithAggTestBase( tEnv.getConfig.withIdleStateRetentionTime(Time.hours(1)) if (aggMode.isLocalAggEnabled) { tEnv.getConfig.getConf.setString( - OptimizerConfigOptions.SQL_OPTIMIZER_AGG_PHASE_STRATEGY, AggPhaseEnforcer.TWO_PHASE.toString) + OptimizerConfigOptions.SQL_OPTIMIZER_AGG_PHASE_STRATEGY, + AggPhaseEnforcer.TWO_PHASE.toString) } else { tEnv.getConfig.getConf.setString( - OptimizerConfigOptions.SQL_OPTIMIZER_AGG_PHASE_STRATEGY, AggPhaseEnforcer.ONE_PHASE.toString) + OptimizerConfigOptions.SQL_OPTIMIZER_AGG_PHASE_STRATEGY, + AggPhaseEnforcer.ONE_PHASE.toString) } } } diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithMiniBatchTestBase.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithMiniBatchTestBase.scala index 40bf8d371a3a9..397427bca1da0 100644 --- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithMiniBatchTestBase.scala +++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithMiniBatchTestBase.scala @@ -39,7 +39,8 @@ abstract class StreamingWithMiniBatchTestBase( case MiniBatchOn => tableConfig.getConf.setBoolean( ExecutionConfigOptions.SQL_EXEC_MINIBATCH_ENABLED, true) - tableConfig.getConf.setString(ExecutionConfigOptions.SQL_EXEC_MINIBATCH_ALLOW_LATENCY, "1 s") + tableConfig.getConf.setString( + ExecutionConfigOptions.SQL_EXEC_MINIBATCH_ALLOW_LATENCY, "1 s") tableConfig.getConf.setLong(ExecutionConfigOptions.SQL_EXEC_MINIBATCH_SIZE, 3L) case MiniBatchOff => tableConfig.getConf.removeConfig(ExecutionConfigOptions.SQL_EXEC_MINIBATCH_ALLOW_LATENCY)