AMashenkov commented on code in PR #5026: URL: https://github.com/apache/ignite-3/pull/5026#discussion_r1913130708
########## modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TpchQueryPlannerTest.java: ########## @@ -17,75 +17,44 @@ package org.apache.ignite.internal.sql.engine.planner; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.apache.ignite.internal.sql.engine.planner.AbstractTpcQueryPlannerTest.TpcSuiteInfo; -import com.google.common.io.CharStreams; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UncheckedIOException; -import java.nio.charset.StandardCharsets; -import org.apache.calcite.plan.RelOptUtil; -import org.apache.calcite.sql.SqlExplainLevel; -import org.apache.ignite.internal.sql.engine.framework.TestBuilders; -import org.apache.ignite.internal.sql.engine.framework.TestCluster; -import org.apache.ignite.internal.sql.engine.framework.TestNode; -import org.apache.ignite.internal.sql.engine.prepare.MultiStepPlan; -import org.apache.ignite.internal.sql.engine.util.Cloner; -import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.internal.sql.engine.util.tpch.TpchHelper; import org.apache.ignite.internal.sql.engine.util.tpch.TpchTables; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; /** * Tests ensures a planner generates optimal plan for TPC-H queries. * * @see org.apache.ignite.internal.sql.engine.benchmarks.TpchParseBenchmark */ // TODO https://issues.apache.org/jira/browse/IGNITE-21986 validate other query plans and make test parameterized. -public class TpchQueryPlannerTest extends AbstractPlannerTest { - private static TestCluster CLUSTER; - - @BeforeAll - static void startCluster() { - CLUSTER = TestBuilders.cluster().nodes("N1").build(); - CLUSTER.start(); - - TestNode node = CLUSTER.node("N1"); - - node.initSchema(TpchTables.LINEITEM.ddlScript()); +@TpcSuiteInfo( + tables = TpchTables.class, + queryLoader = "getQueryString", + planLoader = "getQueryPlan" +) +public class TpchQueryPlannerTest extends AbstractTpcQueryPlannerTest { + @ParameterizedTest + // Query #7 contains disjunctive predicate that switches its part from run to run, making Review Comment: Discussed. We agreed the real reason is Calcite RexUtils code generates unstable conditions order. BWT, on our side, we should use LinkedHashSet/Map to preserve stable digest/plan/toString results. Let's create a ticket. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
