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

Enforcing type checking for flatten concat (#15903)

This commit is contained in:
Soumyava 2024-02-26 21:53:49 -08:00 committed by GitHub
parent a81429746d
commit 51cc729fd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/src/main/java/org/apache/druid/sql/calcite/rule/FlattenConcatRule.java
View File

@ -32,6 +32,7 @@ import org.apache.calcite.rex.RexUtil;
import org.apache.calcite.sql.SqlOperator;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.type.SqlTypeFamily;
import org.apache.calcite.tools.RelBuilder;
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.math.expr.Function;
import org.apache.druid.sql.calcite.expression.builtin.ConcatOperatorConversion;
@ -59,7 +60,9 @@ public class FlattenConcatRule extends RelOptRule implements SubstitutionRule
//noinspection ObjectEquality
if (newNode != oldNode) {
call.transformTo(newNode);
final RelBuilder relBuilder = call.builder().push(newNode);
relBuilder.convert(oldNode.getRowType(), false);
call.transformTo(relBuilder.build());
call.getPlanner().prune(oldNode);
}
}

30
sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
View File

@ -15312,6 +15312,36 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
.run();
}
@Test
public void testCastCharToVarcharInFlattenConcat()
{
cannotVectorize();
testQuery(
"select 'A'||cast(col as char)||'B' from (values(1)) as t(col)",
ImmutableList.of(
Druids.newScanQueryBuilder()
.dataSource(
InlineDataSource.fromIterable(
ImmutableList.of(
new Object[]{"A1B"}
),
RowSignature.builder().add("EXPR$0", ColumnType.STRING).build()
)
)
.intervals(querySegmentSpec(Filtration.eternity()))
.resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
.legacy(false)
.columns(ImmutableList.of(
"EXPR$0"
))
.build()
),
ImmutableList.of(
new Object[]{"A1B"}
)
);
}
@Test
public void testFilterParseLongNullable()
{