commit

Signed-off-by: weimingdiit <weimingdiit@gmail.com>

Author: weimingdiit

spark-extension-shims-spark/src/test/scala/org/apache/auron/AuronFunctionSuite.scala

@@ -358,10 +358,20 @@ class AuronFunctionSuite extends AuronQueryTest with BaseAuronSQLSuite {
           |insert into t1 values
           |  (array(named_struct('k', 'a', 'v', 1), named_struct('k', cast(null as string), 'v', 2)))
           |""".stripMargin)
+      val df = sql("select map_from_entries(c1) from t1")
       val err = intercept[Exception] {
-        sql("select map_from_entries(c1) from t1").collect()
+        df.collect()
       }
-      assert(err.getMessage.contains("null map keys"))
+      val plan = stripAQEPlan(df.queryExecution.executedPlan)
+      plan
+        .collectFirst { case op if !isNativeOrPassThrough(op) => op }
+        .foreach { op =>
+          fail(s"""
+               |Found non-native operator: ${op.nodeName}
+               |plan:
+               |${plan}""".stripMargin)
+        }
+      assert(err.getMessage.toLowerCase.contains("null map key"))
     }
   }
 
@@ -372,10 +382,20 @@ class AuronFunctionSuite extends AuronQueryTest with BaseAuronSQLSuite {
           |insert into t1 values
           |  (array(named_struct('k', 'a', 'v', 1), named_struct('k', 'a', 'v', 2)))
           |""".stripMargin)
+      val df = sql("select map_from_entries(c1) from t1")
       val err = intercept[Exception] {
-        sql("select map_from_entries(c1) from t1").collect()
+        df.collect()
       }
-      assert(err.getMessage.contains("duplicate key"))
+      val plan = stripAQEPlan(df.queryExecution.executedPlan)
+      plan
+        .collectFirst { case op if !isNativeOrPassThrough(op) => op }
+        .foreach { op =>
+          fail(s"""
+               |Found non-native operator: ${op.nodeName}
+               |plan:
+               |${plan}""".stripMargin)
+        }
+      assert(err.getMessage.toLowerCase.contains("duplicate key"))
     }
   }
 

spark-extension/src/main/scala/org/apache/spark/sql/auron/NativeConverters.scala

@@ -1098,7 +1098,7 @@ object NativeConverters extends Logging {
         buildExtScalarFunction(
           "Spark_MapFromEntries",
           e.child :: Literal
-            .create(SQLConf.get.getConf(SQLConf.MAP_KEY_DEDUP_POLICY), StringType) :: Nil,
+            .create(SQLConf.get.getConf(SQLConf.MAP_KEY_DEDUP_POLICY).toString, StringType) :: Nil,
           e.dataType)
       case e: MapConcat => buildExtScalarFunction("Spark_MapConcat", e.children, e.dataType)