Commit3a925f2

committed

[FLINK-38750][table] Validation of queries with functions erroneously invoked under select fails with StackOverflow

1 parentbb2b1db commit3a925f2Copy full SHA for 3a925f2

File tree

+26

-3

lines changed

+26

-3

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@`
`31`	`31`	`importorg.apache.flink.table.types.logical.LogicalType;`
`32`	`32`
`33`	`33`	`importorg.apache.calcite.rel.type.RelDataType;`
`34`		`-importorg.apache.calcite.runtime.CalciteContextException;`
`35`	`34`	`importorg.apache.calcite.sql.SqlCallBinding;`
`36`	`35`	`importorg.apache.calcite.sql.type.SqlOperandTypeInference;`
`37`	`36`
`@@ -81,7 +80,7 @@ public void inferOperandTypes(`
`81`	`80`	`false)) {`
`82`	`81`	`inferOperandTypesOrError(unwrapTypeFactory(callBinding),callContext,operandTypes);`
`83`	`82`	`}`
`84`		`- }catch (ValidationException\|CalciteContextExceptione) {`
	`83`	`+ }catch (ValidationExceptione) {`
`85`	`84`	`// let operand checker fail`
`86`	`85`	`}catch (Throwablet) {`
`87`	`86`	`throwcreateUnexpectedException(callContext,t);`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -36,6 +36,7 @@ import org.apache.calcite.rel.`type`.RelDataType
`36`	`36`	`importorg.apache.calcite.rel.{RelFieldCollation,RelRoot}`
`37`	`37`	`importorg.apache.calcite.rel.hint.RelHint`
`38`	`38`	`importorg.apache.calcite.rex.{RexInputRef,RexNode}`
	`39`	`+importorg.apache.calcite.runtime.CalciteContextException`
`39`	`40`	`importorg.apache.calcite.sql.{SqlBasicCall,SqlCall,SqlHint,SqlKind,SqlNode,SqlNodeList,SqlOperatorTable,SqlSelect,SqlTableRef}`
`40`	`41`	`importorg.apache.calcite.sql.advise.SqlAdvisorValidator`
`41`	`42`	`importorg.apache.calcite.sql.util.SqlShuttle`
`@@ -202,7 +203,13 @@ class FlinkPlannerImpl(`
`202`	`203`	`}`
`203`	`204`	`}catch {`
`204`	`205`	`casee:RuntimeException=>`
`205`		`-thrownewValidationException(s"SQL validation failed.${e.getMessage}", e)`
	`206`	`+valreason=`
	`207`	`+if (e.getCause!=null&& e.getCause.isInstanceOf[CalciteContextException]) {`
	`208`	`+ e.getCause`
	`209`	`+ }else {`
	`210`	`+ e`
	`211`	`+ }`
	`212`	`+thrownewValidationException(s"SQL validation failed.${reason.getMessage}", reason)`
`206`	`213`	`}`
`207`	`214`	`}`
`208`	`215`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,23 @@ class CalcTest extends TableTestBase {`
`108`	`108`	`.isThrownBy(()=> util.tableEnv.sqlQuery("SELECT a, foo FROM MyTable"))`
`109`	`109`	`}`
`110`	`110`
	`111`	`+@Test`
	`112`	`+deftestCoalesceOnInvalidField():Unit= {`
	`113`	`+ assertThatExceptionOfType(classOf[ValidationException])`
	`114`	`+ .isThrownBy(()=> util.verifyExecPlan("SELECT coalesce(SELECT invalid)"))`
	`115`	`+ .havingRootCause()`
	`116`	`+ .withMessageContaining("Column 'invalid' not found in any table")`
	`117`	`+ }`
	`118`	`+`
	`119`	`+@Test`
	`120`	`+deftestNestedCoalesceOnInvalidField():Unit= {`
	`121`	`+ assertThatExceptionOfType(classOf[ValidationException])`
	`122`	`+ .isThrownBy(`
	`123`	`+ ()=> util.verifyExecPlan("SELECT coalesce(SELECT coalesce(SELECT coalesce(invalid)))"))`
	`124`	`+ .havingRootCause()`
	`125`	`+ .withMessageContaining("Column 'invalid' not found in any table")`
	`126`	`+ }`
	`127`	`+`
`111`	`128`	`@Test`
`112`	`129`	`deftestPrimitiveMapType():Unit= {`
`113`	`130`	`util.verifyExecPlan("SELECT MAP[b, 30, 10, a] FROM MyTable")`

Comments

(0)