Skip to content

[FLINK-22523][table-planner-blink] TUMBLE TVF should throw helpful exception when specifying second interval parameter #15803

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
wuchong merged 1 commit into from
May 11, 2021
Merged

[FLINK-22523][table-planner-blink] TUMBLE TVF should throw helpful exception when specifying second interval parameter #15803

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
5 changes: 4 additions & 1 deletion .../src/main/java/org/apache/flink/table/planner/functions/sql/SqlCumulateTableFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ public boolean checkOperandTypes(SqlCallBinding callBinding, boolean throwOnFail
if (!checkIntervalOperands(callBinding, 2)) {
return throwValidationSignatureErrorOrReturnFalse(callBinding, throwOnFailure);
}
if (callBinding.getOperandCount() == 5) {
return throwValidationSignatureErrorOrReturnFalse(callBinding, throwOnFailure);
}
// check time attribute
return throwExceptionOrReturnFalse(
checkTimeColumnDescriptorOperand(callBinding, 1), throwOnFailure);
Expand All @@ -66,7 +69,7 @@ public boolean checkOperandTypes(SqlCallBinding callBinding, boolean throwOnFail
public String getAllowedSignatures(SqlOperator op, String opName) {
return opName
+ "(TABLE table_name, DESCRIPTOR(timecol), "
+ "datetime interval, datetime interval[, datetime interval])";
+ "datetime interval, datetime interval)";
}
}
}
5 changes: 4 additions & 1 deletion ...blink/src/main/java/org/apache/flink/table/planner/functions/sql/SqlHopTableFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ public boolean checkOperandTypes(SqlCallBinding callBinding, boolean throwOnFail
if (!checkIntervalOperands(callBinding, 2)) {
return throwValidationSignatureErrorOrReturnFalse(callBinding, throwOnFailure);
}
if (callBinding.getOperandCount() == 5) {
return throwValidationSignatureErrorOrReturnFalse(callBinding, throwOnFailure);
}
// check time attribute
return throwExceptionOrReturnFalse(
checkTimeColumnDescriptorOperand(callBinding, 1), throwOnFailure);
Expand All @@ -66,7 +69,7 @@ public boolean checkOperandTypes(SqlCallBinding callBinding, boolean throwOnFail
public String getAllowedSignatures(SqlOperator op, String opName) {
return opName
+ "(TABLE table_name, DESCRIPTOR(timecol), "
+ "datetime interval, datetime interval[, datetime interval])";
+ "datetime interval, datetime interval)";
}
}
}
7 changes: 4 additions & 3 deletions ...nk/src/main/java/org/apache/flink/table/planner/functions/sql/SqlTumbleTableFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,17 @@ public boolean checkOperandTypes(SqlCallBinding callBinding, boolean throwOnFail
if (!checkIntervalOperands(callBinding, 2)) {
return throwValidationSignatureErrorOrReturnFalse(callBinding, throwOnFailure);
}
if (callBinding.getOperandCount() == 4) {
return throwValidationSignatureErrorOrReturnFalse(callBinding, throwOnFailure);
}
// check time attribute
return throwExceptionOrReturnFalse(
checkTimeColumnDescriptorOperand(callBinding, 1), throwOnFailure);
}

@Override
public String getAllowedSignatures(SqlOperator op, String opName) {
return opName
+ "(TABLE table_name, DESCRIPTOR(timecol), datetime interval"
+ "[, datetime interval])";
return opName + "(TABLE table_name, DESCRIPTOR(timecol), datetime interval)";
}
}
}
55 changes: 55 additions & 0 deletions ...c/test/scala/org/apache/flink/table/planner/plan/stream/sql/WindowTableFunctionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,59 @@ class WindowTableFunctionTest extends TableTestBase {
util.verifyExplain(sql)
}

@Test
def testInvalidTumbleParameters(): Unit = {
val sql =
"""
|SELECT *
|FROM TABLE(TUMBLE(
| TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '15' MINUTE, INTERVAL '5' MINUTE))
|""".stripMargin

thrown.expectMessage("Supported form(s): " +
"TUMBLE(TABLE table_name, DESCRIPTOR(timecol), datetime interval)")
thrown.expect(classOf[ValidationException])
util.verifyExplain(sql)
}

@Test
def testInvalidHopParameters(): Unit = {
val sql =
"""
|SELECT *
|FROM TABLE(
| HOP(
| TABLE MyTable,
| DESCRIPTOR(rowtime),
| INTERVAL '1' MINUTE,
| INTERVAL '15' MINUTE,
| INTERVAL '5' MINUTE))
|""".stripMargin

thrown.expectMessage("Supported form(s): " +
"HOP(TABLE table_name, DESCRIPTOR(timecol), datetime interval, datetime interval)")
thrown.expect(classOf[ValidationException])
util.verifyExplain(sql)
}

@Test
def testInvalidCumulateParameters(): Unit = {
val sql =
"""
|SELECT *
|FROM TABLE(
| CUMULATE(
| TABLE MyTable,
| DESCRIPTOR(rowtime),
| INTERVAL '1' MINUTE,
| INTERVAL '15' MINUTE,
| INTERVAL '5' MINUTE))
|""".stripMargin

thrown.expectMessage("Supported form(s): " +
"CUMULATE(TABLE table_name, DESCRIPTOR(timecol), datetime interval, datetime interval)")
thrown.expect(classOf[ValidationException])
util.verifyExplain(sql)
}

}