Skip to content

10415: Type match between resultType and function's dataType #10472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
walterddr merged 13 commits into from
Mar 30, 2023
Merged

10415: Type match between resultType and function's dataType #10472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
80e1261
Merge branch 'master' of github.com:abhioncbr/pinot
abhioncbr Mar 8, 2023
54e9476
Merge branch 'master' of github.com:abhioncbr/pinot
abhioncbr Mar 9, 2023
52a93e2
Merge branch 'master' of github.com:abhioncbr/pinot
abhioncbr Mar 14, 2023
1c4ed44
Merge branch 'master' of github.com:abhioncbr/pinot
abhioncbr Mar 15, 2023
384b438
Merge branch 'master' of github.com:abhioncbr/pinot
abhioncbr Mar 20, 2023
3e98d92
Merge branch 'master' of github.com:abhioncbr/pinot
abhioncbr Mar 22, 2023
2cc18f7
Merge branch 'master' of github.com:abhioncbr/pinot
abhioncbr Mar 22, 2023
e6e02ab
Merge branch 'master' of github.com:abhioncbr/pinot
abhioncbr Mar 24, 2023
6329cf2
10415: Added initial changes for the type match
abhioncbr Mar 24, 2023
0830cfc
Merge branch 'master' of github.com:abhioncbr/pinot into 10415-type-m…
abhioncbr Mar 30, 2023
cb815c2
10415: Changes for Type match between function dataType and resultType
abhioncbr Mar 30, 2023
fc2060c
10415: Added more test scenarios for different data types.
abhioncbr Mar 30, 2023
3510c14
10415: Added more test scenarios for different data types.
abhioncbr Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...ntime/src/main/java/org/apache/pinot/query/runtime/operator/operands/FunctionOperand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ public FunctionOperand(RexExpression.FunctionCall functionCall, DataSchema dataS
Preconditions.checkNotNull(functionInfo, "Cannot find function with Name: " + functionCall.getFunctionName());
_functionInvoker = new FunctionInvoker(functionInfo);
_resultName = computeColumnName(functionCall.getFunctionName(), _childOperandList);
// TODO: Check type match between functionCall's data type and result type.
_resultType = FunctionUtils.getColumnDataType(_functionInvoker.getResultClass());
if (functionCall.getDataType() != FunctionUtils.getDataType(_functionInvoker.getResultClass())) {
_resultType = DataSchema.ColumnDataType.fromDataType(functionCall.getDataType(), true);
}
_reusableOperandHolder = new Object[operandExpressions.size()];
}

Expand Down
25 changes: 19 additions & 6 deletions pinot-query-runtime/src/test/resources/queries/Case.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
{"name": "boolCol", "type": "BOOLEAN"},
{"name": "floatCol", "type": "FLOAT"},
{"name": "doubleCol", "type": "DOUBLE"},
{"name": "longCol", "type": "LONG"},
{"name": "strCol", "type": "STRING"}
],
"inputs": [
[1, true, 2.0, 3.0, "one"],
[2, false, 4.0, 6.0, "two"],
[3, true, 6.0, 9.0, "three"],
[4, false, 8.0, 12.0, "four"]
[1, true, 2.0, 3.0, 10, "one"],
[2, false, 4.0, 6.0, 20, "two"],
[3, true, 6.0, 9.0, 5, "three"],
[4, false, 8.0, 12.0, 2, "four"]
]
}
},
Expand All @@ -29,11 +30,23 @@
{ "sql": "SELECT intCol, CASE WHEN intCol % 2 = 0 THEN intCol ELSE intCol * 2 END AS intVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN floatCol > 4.0 THEN floatCol ELSE floatCol / 2.0 END AS floatVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN doubleCol > 6.0 THEN doubleCol ELSE doubleCol / 2.0 END AS doubleVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN floatCol < 10 THEN floatCol ELSE floatCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN floatCol < 10 THEN doubleCol ELSE floatCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN floatCol < 10 THEN floatCol * 4 ELSE doubleCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN doubleCol < 10 THEN floatCol * 4 ELSE floatCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN doubleCol < 10 THEN doubleCol * 4 ELSE floatCol * 2 END AS doubleVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN doubleCol < 1.3 THEN doubleCol ELSE doubleCol / 2.0 END AS doubleVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN longCol > 10 THEN longCol * 4 ELSE longCol * 2 END AS longVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN longCol > 10 THEN longCol * 4 ELSE intCol * 2 END AS longVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN intCol > 10 THEN longCol * 4 ELSE intCol * 2 END AS longVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN longCol > 10 THEN intCol * 4 ELSE longCol * 2 END AS longVal, strCol FROM {tbl1}"},
{ "sql": "SELECT intCol, CASE WHEN longCol > 10 THEN longCol * 4 ELSE longCol * 2 END AS longVal, strCol FROM {tbl1} WHERE longCol < 10 and doubleCol < 1.3 and floatCol < 10"},
{
"ignored": true,
"comment": "See https://github.com/apache/pinot/issues/10415 for more details",
"sql": "SELECT intCol, CASE WHEN (SELECT SUM(floatCol) FROM {tbl1}) > 16.0 THEN 'Large sum' ELSE 'Small sum' END AS aggVal, strCol FROM {tbl1}"
}
},
{ "sql": "SELECT intCol, CASE WHEN (SELECT SUM(floatCol) FROM {tbl1} WHERE longCol < 10 and doubleCol < 1.3 and floatCol < 10 ) > 16.0 THEN 'Large sum' ELSE 'Small sum' END AS aggVal, strCol FROM {tbl1}"},
{ "sql": "with tmp as (select sum(floatCol) as float_sum from {tbl1} group by floatCol) select * from tmp where float_sum < 10" }
]
},
"nested_case_when_test": {
Expand Down