This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 464811a243c [SPARK-45078][SQL][3.4] Fix `array_insert`
ImplicitCastInputTypes not work
464811a243c is described below
commit 464811a243cbf1502a26d4440c484cfce13d4ddc
Author: Jia Fan <fanjiaemi...@qq.com>
AuthorDate: Mon Sep 18 11:55:23 2023 -0700
[SPARK-45078][SQL][3.4] Fix `array_insert` ImplicitCastInputTypes not work
### What changes were proposed in this pull request?
This is a backport PR for https://github.com/apache/spark/pull/42951, to
fix `array_insert` ImplicitCastInputTypes not work.
### Why are the changes needed?
Fix error behavior in `array_insert`
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Add new test.
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #42960 from Hisoka-X/arrayinsert-fix-3.4.
Authored-by: Jia Fan <fanjiaemi...@qq.com>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
.../spark/sql/catalyst/expressions/collectionOperations.scala | 1 -
sql/core/src/test/resources/sql-tests/inputs/array.sql | 1 +
sql/core/src/test/resources/sql-tests/results/ansi/array.sql.out | 8 ++++++++
sql/core/src/test/resources/sql-tests/results/array.sql.out | 8 ++++++++
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala
index fd4249f4776..629ae0499b4 100644
---
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala
+++
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala
@@ -4642,7 +4642,6 @@ case class ArrayInsert(
}
case (e1, e2, e3) => Seq.empty
}
- Seq.empty
}
override def checkInputDataTypes(): TypeCheckResult = {
diff --git a/sql/core/src/test/resources/sql-tests/inputs/array.sql
b/sql/core/src/test/resources/sql-tests/inputs/array.sql
index 606ed14cbe0..b3834b2e816 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/array.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/array.sql
@@ -141,6 +141,7 @@ select array_insert(array(1, 2, 3, NULL), cast(NULL as
INT), 4);
select array_insert(array(1, 2, 3, NULL), 4, cast(NULL as INT));
select array_insert(array(2, 3, NULL, 4), 5, 5);
select array_insert(array(2, 3, NULL, 4), -5, 1);
+select array_insert(array(1), 2, cast(2 as tinyint));
set spark.sql.legacy.negativeIndexInArrayInsert=true;
select array_insert(array(1, 3, 4), -2, 2);
diff --git a/sql/core/src/test/resources/sql-tests/results/ansi/array.sql.out
b/sql/core/src/test/resources/sql-tests/results/ansi/array.sql.out
index 6d17904271d..2aa818a48ef 100644
--- a/sql/core/src/test/resources/sql-tests/results/ansi/array.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/ansi/array.sql.out
@@ -659,6 +659,14 @@ struct<array_insert(array(2, 3, NULL, 4), -5,
1):array<int>>
[1,2,3,null,4]
+-- !query
+select array_insert(array(1), 2, cast(2 as tinyint))
+-- !query schema
+struct<array_insert(array(1), 2, CAST(2 AS TINYINT)):array<int>>
+-- !query output
+[1,2]
+
+
-- !query
set spark.sql.legacy.negativeIndexInArrayInsert=true
-- !query schema
diff --git a/sql/core/src/test/resources/sql-tests/results/array.sql.out
b/sql/core/src/test/resources/sql-tests/results/array.sql.out
index 8943c36ea42..322bff9a886 100644
--- a/sql/core/src/test/resources/sql-tests/results/array.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/array.sql.out
@@ -540,6 +540,14 @@ struct<array_insert(array(2, 3, NULL, 4), -5,
1):array<int>>
[1,2,3,null,4]
+-- !query
+select array_insert(array(1), 2, cast(2 as tinyint))
+-- !query schema
+struct<array_insert(array(1), 2, CAST(2 AS TINYINT)):array<int>>
+-- !query output
+[1,2]
+
+
-- !query
set spark.sql.legacy.negativeIndexInArrayInsert=true
-- !query schema
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
