From 1201058474a28abd8bce6587268d86a6baa3815c Mon Sep 17 00:00:00 2001 From: Kenan Adel <160222053+KenanAdel@users.noreply.github.com> Date: Fri, 19 Jun 2026 17:51:48 +0300 Subject: [PATCH 1/2] SPARK-57576: [SQL] Generalize exception messages for set operations on MAP and VARIANT types --- common/utils/src/main/resources/error/error-conditions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/utils/src/main/resources/error/error-conditions.json b/common/utils/src/main/resources/error/error-conditions.json index 8e7125a07c1e8..714a029c3c7cb 100644 --- a/common/utils/src/main/resources/error/error-conditions.json +++ b/common/utils/src/main/resources/error/error-conditions.json @@ -8363,12 +8363,12 @@ }, "SET_OPERATION_ON_MAP_TYPE" : { "message" : [ - "Cannot have MAP type columns in DataFrame which calls set operations (INTERSECT, EXCEPT, etc.), but the type of column is ." + "Cannot have MAP type columns in set operations (INTERSECT, EXCEPT, etc.), but the type of column is ." ] }, "SET_OPERATION_ON_VARIANT_TYPE" : { "message" : [ - "Cannot have VARIANT type columns in DataFrame which calls set operations (INTERSECT, EXCEPT, etc.), but the type of column is ." + "Cannot have VARIANT type columns in set operations (INTERSECT, EXCEPT, etc.), but the type of column is ." ] }, "SET_PATH_WHEN_DISABLED" : { From 05a9c5332291f7b44f7a1c2055728e9dc9543eaa Mon Sep 17 00:00:00 2001 From: Kenan Adel <160222053+KenanAdel@users.noreply.github.com> Date: Fri, 19 Jun 2026 18:37:20 +0300 Subject: [PATCH 2/2] Empty commit to trigger and restart