Skip to content

[CALCITE-7334] Compiling the generated Java code throws an exception … #5177

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

Open
mihaibudiu wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −2
Open

[CALCITE-7334] Compiling the generated Java code throws an exception … #5177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.calcite.adapter.java.JavaTypeFactory;
import org.apache.calcite.linq4j.EnumerableDefaults;
import org.apache.calcite.linq4j.function.Function1;
import org.apache.calcite.linq4j.tree.BlockBuilder;
import org.apache.calcite.linq4j.tree.Expression;
import org.apache.calcite.linq4j.tree.Expressions;
Expand Down Expand Up @@ -530,9 +531,12 @@ public static EnumerableMergeJoin create(RelNode left, RelNode right,
Expressions.list(
leftExpression,
rightExpression,
Expressions.lambda(
// Force Function1: a single BOOLEAN key would otherwise
// deduce Predicate1, which does not match the signature of
// EnumerableDefaults.mergeJoin
Expressions.lambda(Function1.class,
leftKeyPhysType.record(leftExpressions), left_),
Expressions.lambda(
Expressions.lambda(Function1.class,
rightKeyPhysType.record(rightExpressions), right_),
predicate,
EnumUtils.joinSelector(joinType,
Expand Down
35 changes: 35 additions & 0 deletions core/src/test/resources/sql/sub-query.iq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10150,5 +10150,40 @@ ORDER BY emp.ename;
+--------+------------+
(8 rows)

!ok

!use scott

# Test case for [CALCITE-7334] Compiling the generated Java code throws an exception when
# a scalar sub-query is used in the SELECT list.
# Result validated against PostgreSQL 14.
select
(SELECT
COUNT(*)
FROM
"scott".emp
WHERE
v.empno >= 2), 3
from "scott".emp as v;
+--------+--------+
| EXPR$0 | EXPR$1 |
+--------+--------+
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
| 14 | 3 |
+--------+--------+
(14 rows)

!ok
# End sub-query.iq
Loading