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

Fixing a case where datatype mismatch was happenning in join (#15541)

This commit is contained in:
Soumyava 2023-12-12 12:50:32 -08:00 committed by GitHub
parent 91ca8e73d6
commit 38f3cf9e65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
View File

@ -215,7 +215,7 @@ public class DruidJoinRule extends RelOptRule
if (postJoinFilter != null) { if (postJoinFilter != null) {
relBuilder = relBuilder.filter(postJoinFilter); relBuilder = relBuilder.filter(postJoinFilter);
} }
relBuilder.convert(join.getRowType(), false);
call.transformTo(relBuilder.build()); call.transformTo(relBuilder.build());
} }

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

@ -6466,4 +6466,85 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
) )
); );
} }
@Test
public void testLeftJoinsOnTwoWithTables()
{
Map<String, Object> context = new HashMap<>(QUERY_CONTEXT_DEFAULT);
testQuery(
"with raw1 as (\n"
+ " select\n"
+ " dim1,\n"
+ " count(*)/2 as c\n"
+ " from foo\n"
+ " GROUP BY 1\n"
+ "),\n"
+ " raw2 as (\n"
+ " select \n"
+ " dim1,\n"
+ " count(*)/2 as c\n"
+ " from foo\n"
+ " GROUP BY 1\n"
+ ")\n"
+ "select\n"
+ " r1.c-r2.c\n"
+ "from raw1 r1\n"
+ "left join raw2 r2\n"
+ "on r1.dim1 = r2.dim1",
context,
ImmutableList.of(
newScanQueryBuilder()
.dataSource(
join(
new QueryDataSource(
GroupByQuery.builder()
.setInterval(querySegmentSpec(Filtration.eternity()))
.setGranularity(Granularities.ALL)
.setDataSource(new TableDataSource(CalciteTests.DATASOURCE1))
.setDimensions(new DefaultDimensionSpec("dim1", "d0", ColumnType.STRING))
.setAggregatorSpecs(aggregators(new CountAggregatorFactory("a0")))
.setPostAggregatorSpecs(expressionPostAgg(
"p0",
"(\"a0\" / 2)",
ColumnType.LONG
))
.setContext(context)
.build()
),
new QueryDataSource(
GroupByQuery.builder()
.setInterval(querySegmentSpec(Filtration.eternity()))
.setGranularity(Granularities.ALL)
.setDataSource(new TableDataSource(CalciteTests.DATASOURCE1))
.setDimensions(new DefaultDimensionSpec("dim1", "d0", ColumnType.STRING))
.setAggregatorSpecs(aggregators(new CountAggregatorFactory("a0")))
.setPostAggregatorSpecs(expressionPostAgg(
"p0",
"(\"a0\" / 2)",
ColumnType.LONG
))
.setContext(context)
.build()
),
"j0.",
"(\"d0\" == \"j0.d0\")",
JoinType.LEFT
)
)
.intervals(querySegmentSpec(Filtration.eternity()))
.columns("v0")
.virtualColumns(expressionVirtualColumn("v0", "(\"p0\" - \"j0.p0\")", ColumnType.LONG))
.context(context)
.build()
),
ImmutableList.of(
new Object[]{0L},
new Object[]{0L},
new Object[]{0L},
new Object[]{0L},
new Object[]{0L},
new Object[]{0L}
)
);
}
} }