Skip to content

[Backport 2.19-dev] Fix join type ambiguous issue when specify the join type with sql-like join criteria #4476

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
LantaoJin merged 1 commit into from
Oct 9, 2025
Merged

[Backport 2.19-dev] Fix join type ambiguous issue when specify the join type with sql-like join criteria #4476

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
2 changes: 1 addition & 1 deletion ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public UnresolvedPlan visitJoinCommand(OpenSearchPPLParser.JoinCommandContext ct
Argument.ArgumentMap argumentMap = Argument.ArgumentMap.of(arguments);
if (argumentMap.get("type") != null) {
Join.JoinType joinTypeFromArgument = ArgumentFactory.getJoinType(argumentMap);
if (sqlLike && joinType != joinTypeFromArgument) {
if (sqlLike && joinType != joinTypeFromArgument && ctx.sqlLikeJoinType() != null) {
throw new SemanticCheckException(
"Join type is ambiguous, remove either the join type before JOIN keyword or 'type='"
+ " option.");
Expand Down
22 changes: 22 additions & 0 deletions ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLJoinTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,4 +1068,26 @@ public void testJoinWithMaxLessThanZero() {
Throwable t = Assert.assertThrows(SemanticCheckException.class, () -> getRelNode(ppl));
verifyErrorMessageContains(t, "max option must be a positive integer");
}

@Test
public void testSqlLikeJoinWithSpecificJoinType() {
String ppl = "source=EMP | join type=left left=l right=r on l.DEPTNO=r.DEPTNO DEPT";
RelNode root = getRelNode(ppl);
String expectedLogical =
"LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5],"
+ " COMM=[$6], DEPTNO=[$7], r.DEPTNO=[$8], DNAME=[$9], LOC=[$10])\n"
+ " LogicalJoin(condition=[=($7, $8)], joinType=[left])\n"
+ " LogicalTableScan(table=[[scott, EMP]])\n"
+ " LogicalTableScan(table=[[scott, DEPT]])\n";
verifyLogical(root, expectedLogical);
verifyResultCount(root, 14);

String expectedSparkSql =
"SELECT `EMP`.`EMPNO`, `EMP`.`ENAME`, `EMP`.`JOB`, `EMP`.`MGR`, `EMP`.`HIREDATE`,"
+ " `EMP`.`SAL`, `EMP`.`COMM`, `EMP`.`DEPTNO`, `DEPT`.`DEPTNO` `r.DEPTNO`,"
+ " `DEPT`.`DNAME`, `DEPT`.`LOC`\n"
+ "FROM `scott`.`EMP`\n"
+ "LEFT JOIN `scott`.`DEPT` ON `EMP`.`DEPTNO` = `DEPT`.`DEPTNO`";
verifyPPLToSparkSQL(root, expectedSparkSql);
}
}
Loading