adding in complex array type element access on case when

walterddr · Oct 23, 2017 · a5f2aff · walterddr · Oct 23, 2017 · a5f2aff
1 parent b2b9463
commit a5f2aff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...s/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala b/...s/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala
@@ -212,6 +212,10 @@ class ScalarOperatorsTest extends ScalarOperatorsTestBase {
   @Test
   def testOtherExpressions(): Unit = {
 
+    // array type test
+    testSqlApi("CASE WHEN f18 IS NOT NULL THEN f18[0] ELSE NULL END", "1")
+    testSqlApi("CASE WHEN f19 IS NOT NULL THEN f19[0] ELSE NULL END", "(1, a)")
+
     // nested field null type
     testSqlApi("CASE WHEN f13.f1 IS NULL THEN 'a' ELSE 'b' END", "a")
     testSqlApi("CASE WHEN f13.f1 IS NOT NULL THEN 'a' ELSE 'b' END", "b")

diff --git a/...ble/src/test/scala/org/apache/flink/table/expressions/utils/ScalarOperatorsTestBase.scala b/...ble/src/test/scala/org/apache/flink/table/expressions/utils/ScalarOperatorsTestBase.scala
@@ -21,15 +21,15 @@ package org.apache.flink.table.expressions.utils
 import java.sql.Date
 
 import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.java.typeutils.RowTypeInfo
+import org.apache.flink.api.java.typeutils.{ObjectArrayTypeInfo, RowTypeInfo}
 import org.apache.flink.table.api.Types
 import org.apache.flink.table.functions.ScalarFunction
 import org.apache.flink.types.Row
 
 class ScalarOperatorsTestBase extends ExpressionTestBase {
 
   def testData: Row = {
-    val testData = new Row(18)
+    val testData = new Row(20)
     testData.setField(0, 1: Byte)
     testData.setField(1, 1: Short)
     testData.setField(2, 1)
@@ -48,6 +48,8 @@ class ScalarOperatorsTestBase extends ExpressionTestBase {
     testData.setField(15, Date.valueOf("1996-11-10"))
     testData.setField(16, BigDecimal("0.00000000").bigDecimal)
     testData.setField(17, BigDecimal("10.0").bigDecimal)
+    testData.setField(18, Array[Int](1,2))
+    testData.setField(19, Array[(Int, String)]((1,"a"), (2, "b")))
     testData
   }
 
@@ -70,7 +72,9 @@ class ScalarOperatorsTestBase extends ExpressionTestBase {
       Types.STRING,
       Types.SQL_DATE,
       Types.DECIMAL,
-      Types.DECIMAL
+      Types.DECIMAL,
+      Types.OBJECT_ARRAY(Types.INT),
+      ObjectArrayTypeInfo.getInfoFor(Types.ROW(Types.INT, Types.STRING))
       ).asInstanceOf[TypeInformation[Any]]
   }