Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disable differently

This commit is contained in:
Zoltan Haindrich 2024-08-07 07:30:25 +00:00
parent 73904b520d
commit 6cef3eb6e8
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectJoinQueryMSQTest.java
View File

@ -20,7 +20,6 @@
package org.apache.druid.msq.test; package org.apache.druid.msq.test;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.msq.sql.MSQTaskSqlEngine; import org.apache.druid.msq.sql.MSQTaskSqlEngine;
import org.apache.druid.sql.calcite.BaseCalciteQueryTest; import org.apache.druid.sql.calcite.BaseCalciteQueryTest;
import org.apache.druid.sql.calcite.CalciteJoinQueryTest; import org.apache.druid.sql.calcite.CalciteJoinQueryTest;
@ -28,14 +27,8 @@ import org.apache.druid.sql.calcite.QueryTestBuilder;
import org.apache.druid.sql.calcite.SqlTestFrameworkConfig; import org.apache.druid.sql.calcite.SqlTestFrameworkConfig;
import org.apache.druid.sql.calcite.planner.JoinAlgorithm; import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
import org.apache.druid.sql.calcite.planner.PlannerContext; import org.apache.druid.sql.calcite.planner.PlannerContext;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import java.util.Map; import java.util.Map;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
/** /**
* Runs {@link CalciteJoinQueryTest} but with MSQ engine. * Runs {@link CalciteJoinQueryTest} but with MSQ engine.
*/ */
@ -44,8 +37,7 @@ public class CalciteSelectJoinQueryMSQTest
/** /**
* Run all tests with {@link JoinAlgorithm#BROADCAST}. * Run all tests with {@link JoinAlgorithm#BROADCAST}.
*/ */
@Nested public static class BroadcastTest extends Base
public class BroadcastTest extends Base
{ {
@Override @Override
protected QueryTestBuilder testBuilder() protected QueryTestBuilder testBuilder()
@ -64,8 +56,7 @@ public class CalciteSelectJoinQueryMSQTest
/** /**
* Run all tests with {@link JoinAlgorithm#SORT_MERGE}. * Run all tests with {@link JoinAlgorithm#SORT_MERGE}.
*/ */
@Nested public static class SortMergeTest extends Base
public class SortMergeTest extends Base
{ {
@Override @Override
public boolean isSortBasedJoin() public boolean isSortBasedJoin()
@ -87,24 +78,6 @@ public class CalciteSelectJoinQueryMSQTest
{ {
return JoinAlgorithm.SORT_MERGE; return JoinAlgorithm.SORT_MERGE;
} }
@Override
@MethodSource("provideQueryContexts")
@ParameterizedTest(name = "{0}")
public void testRegressionFilteredAggregatorsSubqueryJoins(Map<String, Object> queryContext)
{
assumeTrue(NullHandling.sqlCompatible(), "Returns incorrect result with replaceWithDefault");
super.testRegressionFilteredAggregatorsSubqueryJoins(queryContext);
}
@Override
@MethodSource("provideQueryContexts")
@ParameterizedTest(name = "{0}")
public void testFilterAndGroupByLookupUsingJoinOperatorWithNotFilter(Map<String, Object> queryContext)
{
assumeTrue(NullHandling.sqlCompatible(), "Returns incorrect result with replaceWithDefault");
super.testFilterAndGroupByLookupUsingJoinOperatorWithNotFilter(queryContext);
}
} }
@SqlTestFrameworkConfig.ComponentSupplier(StandardMSQComponentSupplier.class) @SqlTestFrameworkConfig.ComponentSupplier(StandardMSQComponentSupplier.class)

9
sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java
View File

@ -821,8 +821,11 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
@MethodSource("provideQueryContexts") @MethodSource("provideQueryContexts")
@ParameterizedTest(name = "{0}") @ParameterizedTest(name = "{0}")
public void testFilterAndGroupByLookupUsingJoinOperatorWithNotFilter(Map<String, Object> queryContext) public void testFilterAndGroupByLookupUsingJoinOperatorWithNotFilter(Map<String, Object> queryContext)
{ {
assumeFalse(
isRunningMSQ() && isSortBasedJoin() && NullHandling.replaceWithDefault(),
"test disabled; returns incorrect results in this mode"
);
// Cannot vectorize JOIN operator. // Cannot vectorize JOIN operator.
cannotVectorize(); cannotVectorize();
@ -5645,6 +5648,10 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
@ParameterizedTest(name = "{0}") @ParameterizedTest(name = "{0}")
public void testRegressionFilteredAggregatorsSubqueryJoins(Map<String, Object> queryContext) public void testRegressionFilteredAggregatorsSubqueryJoins(Map<String, Object> queryContext)
{ {
assumeFalse(
isRunningMSQ() && isSortBasedJoin() && NullHandling.replaceWithDefault(),
"test disabled; returns incorrect results in this mode"
);
assumeFalse(testBuilder().isDecoupledMode() && NullHandling.replaceWithDefault(), "not support in decoupled mode"); assumeFalse(testBuilder().isDecoupledMode() && NullHandling.replaceWithDefault(), "not support in decoupled mode");
cannotVectorize(); cannotVectorize();