wuchong commented on a change in pull request #12436:
URL: https://github.com/apache/flink/pull/12436#discussion_r435038062
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
##########
@@ -1643,19 +1648,25 @@ object ScalarOperatorGens {
val resultTypeTerm = primitiveTypeTermForType(componentInfo)
val defaultTerm = primitiveDefaultValue(componentInfo)
+ index.literalValue match {
+ case Some(v: Int) if v < 1 =>
+ throw new ValidationException(
+ s"Array element access needs an index starting at 1 but was $v.")
+ case _ => //nothing
+ }
val idxStr = s"${index.resultTerm} - 1"
val arrayIsNull = s"${array.resultTerm}.isNullAt($idxStr)"
val arrayGet =
rowFieldReadAccess(ctx, idxStr, array.resultTerm, componentInfo)
val arrayAccessCode =
- s"""
- |${array.code}
- |${index.code}
- |boolean $nullTerm = ${array.nullTerm} || ${index.nullTerm} ||
$arrayIsNull;
- |$resultTypeTerm $resultTerm = $nullTerm ? $defaultTerm : $arrayGet;
- |""".stripMargin
-
+ s"""
+ |${array.code}
+ |${index.code}
+ |boolean $nullTerm = ${array.nullTerm} || ${index.nullTerm} ||
$arrayIsNull ||
Review comment:
Move `$arrayIsNull` to the end? Otherwise, it is possible to throw
`ArrayIndexOutOfBoundsException`. You can try to test `f11[3]`. Maybe we should
rename `arrayIsNull` to `arrayElementIsNull`.
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
##########
@@ -1643,19 +1648,25 @@ object ScalarOperatorGens {
val resultTypeTerm = primitiveTypeTermForType(componentInfo)
val defaultTerm = primitiveDefaultValue(componentInfo)
+ index.literalValue match {
+ case Some(v: Int) if v < 1 =>
+ throw new ValidationException(
+ s"Array element access needs an index starting at 1 but was $v.")
+ case _ => //nothing
+ }
val idxStr = s"${index.resultTerm} - 1"
val arrayIsNull = s"${array.resultTerm}.isNullAt($idxStr)"
val arrayGet =
rowFieldReadAccess(ctx, idxStr, array.resultTerm, componentInfo)
val arrayAccessCode =
- s"""
- |${array.code}
- |${index.code}
- |boolean $nullTerm = ${array.nullTerm} || ${index.nullTerm} ||
$arrayIsNull;
- |$resultTypeTerm $resultTerm = $nullTerm ? $defaultTerm : $arrayGet;
- |""".stripMargin
-
+ s"""
+ |${array.code}
+ |${index.code}
+ |boolean $nullTerm = ${array.nullTerm} || ${index.nullTerm} ||
$arrayIsNull ||
+ | ${idxStr} < 0 || ${idxStr} >= ${array.resultTerm}.size();
Review comment:
`${idxStr}` -> `$idxStr`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
