This is an automated email from the ASF dual-hosted git repository. leonard pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit f44b6764cbd7708748b27b2ab49cf81980819806 Author: Jiabao Sun <[email protected]> AuthorDate: Tue Sep 12 15:39:31 2023 +0800 [FLINK-33023][table-planner][JUnit5 Migration] Module: flink-table-planner/planner/alias (TableTestBase) --- ...ClearJoinHintWithCapitalizeJoinHintShuttleTest.java | 14 +++++++------- ...ClearJoinHintWithInvalidPropagationShuttleTest.java | 12 ++++++------ ...rJoinHintWithInvalidPropagationShuttleTestBase.java | 8 ++++---- ...ookupJoinHintWithInvalidPropagationShuttleTest.java | 18 +++++++++--------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithCapitalizeJoinHintShuttleTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithCapitalizeJoinHintShuttleTest.java index 210cc122c7d..86b0157502a 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithCapitalizeJoinHintShuttleTest.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithCapitalizeJoinHintShuttleTest.java @@ -31,13 +31,13 @@ import org.apache.calcite.rel.core.JoinRelType; import org.apache.calcite.rel.hint.RelHint; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.sql.type.SqlTypeName; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Collections; /** Tests clearing lookup join hint case-insensitive in stream. */ -public class ClearJoinHintWithCapitalizeJoinHintShuttleTest +class ClearJoinHintWithCapitalizeJoinHintShuttleTest extends ClearJoinHintWithInvalidPropagationShuttleTestBase { @Override @@ -50,8 +50,8 @@ public class ClearJoinHintWithCapitalizeJoinHintShuttleTest return false; } - @Before - public void before() throws Exception { + @BeforeEach + void before() throws Exception { super.before(); util.tableEnv() @@ -72,7 +72,7 @@ public class ClearJoinHintWithCapitalizeJoinHintShuttleTest } @Test - public void testClearCaseInsensitiveLookupHint() { + void testClearCaseInsensitiveLookupHint() { // SELECT /*+ lookUp('table'='lookup', 'retry-predicate'='lookup_miss', // 'retry-strategy'='fixed_delay', 'fixed-delay'='155 ms', 'max-attempts'='10', // 'async'='true', 'output-mode'='allow_unordered','capacity'='1000', 'time-out'='300 s') @@ -130,7 +130,7 @@ public class ClearJoinHintWithCapitalizeJoinHintShuttleTest } @Override - public void verifyRelPlan(RelNode node) { + protected void verifyRelPlan(RelNode node) { String plan = buildRelPlanWithQueryBlockAlias(node); util.assertEqualsOrExpand("beforePropagatingHints", plan, true); diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithInvalidPropagationShuttleTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithInvalidPropagationShuttleTest.java index 6801c602539..d4ebef36706 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithInvalidPropagationShuttleTest.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithInvalidPropagationShuttleTest.java @@ -26,10 +26,10 @@ import org.apache.flink.table.planner.utils.TableTestUtil; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.JoinRelType; import org.apache.calcite.rel.hint.RelHint; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** Tests clearing join hint with invalid propagation in batch. */ -public class ClearJoinHintWithInvalidPropagationShuttleTest +class ClearJoinHintWithInvalidPropagationShuttleTest extends ClearJoinHintWithInvalidPropagationShuttleTestBase { @Override TableTestUtil getTableTestUtil() { @@ -42,7 +42,7 @@ public class ClearJoinHintWithInvalidPropagationShuttleTest } @Test - public void testNoNeedToClearJoinHint() { + void testNoNeedToClearJoinHint() { // SELECT /*+ BROADCAST(t1)*/t1.a FROM t1 JOIN t2 ON t1.a = t2.a RelHint joinHintInView = RelHint.builder(JoinStrategy.BROADCAST.getJoinHintName()).hintOption("t1").build(); @@ -60,7 +60,7 @@ public class ClearJoinHintWithInvalidPropagationShuttleTest } @Test - public void testClearJoinHintWithInvalidPropagationToViewWhileViewHasJoinHints() { + void testClearJoinHintWithInvalidPropagationToViewWhileViewHasJoinHints() { // SELECT /*+ BROADCAST(t3)*/t4.a FROM ( // SELECT /*+ BROADCAST(t1)*/t1.a FROM t1 JOIN t2 ON t1.a = t2.a // ) t4 JOIN t3 ON t4.a = t3.a @@ -91,7 +91,7 @@ public class ClearJoinHintWithInvalidPropagationShuttleTest } @Test - public void testClearJoinHintWithInvalidPropagationToViewWhileViewHasNoJoinHints() { + void testClearJoinHintWithInvalidPropagationToViewWhileViewHasNoJoinHints() { // SELECT /*+ BROADCAST(t3)*/t4.a FROM ( // SELECT t1.a FROM t1 JOIN t2 ON t1.a = t2.a // ) t4 JOIN t3 ON t4.a = t3.a @@ -119,7 +119,7 @@ public class ClearJoinHintWithInvalidPropagationShuttleTest } @Test - public void testClearJoinHintWithoutPropagatingToView() { + void testClearJoinHintWithoutPropagatingToView() { // SELECT /*+ BROADCAST(t1)*/t4.a FROM ( // SELECT t1.a FROM t1 JOIN t2 ON t1.a = t2.a // ) t4 JOIN t3 ON t4.a = t3.a diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithInvalidPropagationShuttleTestBase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithInvalidPropagationShuttleTestBase.java index 105f4e42a38..745becc26ff 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithInvalidPropagationShuttleTestBase.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearJoinHintWithInvalidPropagationShuttleTestBase.java @@ -34,12 +34,12 @@ import org.apache.flink.table.utils.CatalogManagerMocks; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rel.RelNode; import org.apache.calcite.sql.SqlExplainLevel; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import java.util.Collections; /** A base class for testing clearing join hint with invalid propagation. */ -public abstract class ClearJoinHintWithInvalidPropagationShuttleTestBase extends TableTestBase { +abstract class ClearJoinHintWithInvalidPropagationShuttleTestBase extends TableTestBase { protected final TableTestUtil util = getTableTestUtil(); @@ -67,8 +67,8 @@ public abstract class ClearJoinHintWithInvalidPropagationShuttleTestBase extends .build(); protected final FlinkRelBuilder builder = plannerMocks.getPlannerContext().createRelBuilder(); - @Before - public void before() throws Exception { + @BeforeEach + void before() throws Exception { util.tableEnv().registerCatalog("testCatalog", catalog); util.tableEnv().executeSql("use catalog testCatalog"); diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearLookupJoinHintWithInvalidPropagationShuttleTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearLookupJoinHintWithInvalidPropagationShuttleTest.java index 13c8f7e6eb5..0e89a4aa2b2 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearLookupJoinHintWithInvalidPropagationShuttleTest.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/alias/ClearLookupJoinHintWithInvalidPropagationShuttleTest.java @@ -38,13 +38,13 @@ import org.apache.calcite.sql.SqlOperatorBinding; import org.apache.calcite.sql.fun.SqlCollectionTableOperator; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.sql.validate.SqlModality; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Collections; /** Tests clearing lookup join hint with invalid propagation in stream. */ -public class ClearLookupJoinHintWithInvalidPropagationShuttleTest +class ClearLookupJoinHintWithInvalidPropagationShuttleTest extends ClearJoinHintWithInvalidPropagationShuttleTestBase { @Override TableTestUtil getTableTestUtil() { @@ -56,8 +56,8 @@ public class ClearLookupJoinHintWithInvalidPropagationShuttleTest return false; } - @Before - public void before() throws Exception { + @BeforeEach + void before() throws Exception { super.before(); util.tableEnv() @@ -84,7 +84,7 @@ public class ClearLookupJoinHintWithInvalidPropagationShuttleTest } @Test - public void testNoNeedToClearLookupHint() { + void testNoNeedToClearLookupHint() { // SELECT /*+ LOOKUP('table'='lookup', 'retry-predicate'='lookup_miss', // 'retry-strategy'='fixed_delay', 'fixed-delay'='155 ms', 'max-attempts'='10', // 'async'='true', 'output-mode'='allow_unordered','capacity'='1000', 'time-out'='300 s') @@ -129,7 +129,7 @@ public class ClearLookupJoinHintWithInvalidPropagationShuttleTest } @Test - public void testClearLookupHintWithInvalidPropagationToSubQuery() { + void testClearLookupHintWithInvalidPropagationToSubQuery() { // SELECT /*+ LOOKUP('table'='src', 'retry-predicate'='lookup_miss', // 'retry-strategy'='fixed_delay', 'fixed-delay'='155 ms', 'max-attempts'='10', // 'async'='true', 'output-mode'='allow_unordered','capacity'='1000', 'time-out'='300 s') @@ -187,7 +187,7 @@ public class ClearLookupJoinHintWithInvalidPropagationShuttleTest } @Test - public void testNoNeedToClearLookupHintWhileJoinWithUnnest() { + void testNoNeedToClearLookupHintWhileJoinWithUnnest() { // SELECT /*+ LOOKUP('table'='d', 'retry-predicate'='lookup_miss', // 'retry-strategy'='fixed_delay', 'fixed-delay'='155 ms', 'max-attempts'='10', // 'async'='true', 'output-mode'='allow_unordered','capacity'='1000', 'time-out'='300 s') @@ -224,7 +224,7 @@ public class ClearLookupJoinHintWithInvalidPropagationShuttleTest } @Test - public void testNoNeedToClearLookupHintWhileJoinWithUDTF() { + void testNoNeedToClearLookupHintWhileJoinWithUDTF() { // SELECT /*+ LOOKUP('table'='d', 'retry-predicate'='lookup_miss', // 'retry-strategy'='fixed_delay', 'fixed-delay'='155 ms', 'max-attempts'='10', // 'async'='true', 'output-mode'='allow_unordered','capacity'='1000', 'time-out'='300 s')
