libenchao commented on a change in pull request #12436:
URL: https://github.com/apache/flink/pull/12436#discussion_r434372145
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
##########
@@ -1643,19 +1648,28 @@ 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"""
Review comment:
why change the indent?
##########
File path:
flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/ArrayTypeTest.scala
##########
@@ -375,4 +375,27 @@ class ArrayTypeTest extends ArrayTypeTestBase {
"[1984-03-12, 1984-02-10]"
)
}
+
+ @Test
+ def testArrayIndexStaticCheckForTableApi(): Unit = {
+ thrown.expect(classOf[ValidationException])
+ thrown.expectMessage("Array element access needs an index starting at 1
but was 0.")
+ testTableApi( 'f2.at(0), "1")
Review comment:
additional space.
##########
File path:
flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
##########
@@ -1643,19 +1648,28 @@ 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} ||
+ | ${idxStr} < 0 ||
+ | ${idxStr} >= ${array.resultTerm}.size() ||
+ | $arrayIsNull;
Review comment:
`$arrayIsNull` should be put before `${idxStr} >=
${array.resultTerm}.size()`?
----------------------------------------------------------------
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
