[spark] branch branch-3.4 updated: [SPARK-42507][SQL][TESTS] Simplify ORC schema merging conflict error check

[xinrong]

This is an automated email from the ASF dual-hosted git repository.

xinrong 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 f394322be3b [SPARK-42507][SQL][TESTS] Simplify ORC schema merging 
conflict error check
f394322be3b is described below

commit f394322be3b9a0451e0dff158129b607549b9160
Author: Dongjoon Hyun <dongj...@apache.org>
AuthorDate: Tue Feb 21 17:48:09 2023 +0800

    [SPARK-42507][SQL][TESTS] Simplify ORC schema merging conflict error check
    
    ### What changes were proposed in this pull request?
    
    This PR aims to simplify ORC schema merging conflict error check.
    
    ### Why are the changes needed?
    
    Currently, `branch-3.4` CI is broken because the order of partitions.
    - https://github.com/apache/spark/runs/11463120795
    - https://github.com/apache/spark/runs/11463886897
    - https://github.com/apache/spark/runs/11467827738
    - https://github.com/apache/spark/runs/11471484144
    - https://github.com/apache/spark/runs/11471507531
    - https://github.com/apache/spark/runs/11474764316
    
    ![Screenshot 2023-02-20 at 12 30 19 
PM](https://user-images.githubusercontent.com/9700541/220193503-6d6ce2ce-3fd6-4b01-b91c-bc1ec1f41c03.png)
    
    ### Does this PR introduce _any_ user-facing change?
    
    No
    
    ### How was this patch tested?
    
    Pass the CIs.
    
    Closes #40101 from dongjoon-hyun/SPARK-42507.
    
    Authored-by: Dongjoon Hyun <dongj...@apache.org>
    Signed-off-by: Xinrong Meng <xinr...@apache.org>
    (cherry picked from commit 0c20263dcd0c394f8bfd6fa2bfc62031135de06a)
    Signed-off-by: Xinrong Meng <xinr...@apache.org>
---
 .../spark/sql/execution/datasources/orc/OrcSourceSuite.scala       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcSourceSuite.scala
 
b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcSourceSuite.scala
index c821276431e..024f5f6b67e 100644
--- 
a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcSourceSuite.scala
+++ 
b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcSourceSuite.scala
@@ -455,11 +455,8 @@ abstract class OrcSuite
             throw new UnsupportedOperationException(s"Unknown ORC 
implementation: $impl")
         }
 
-        checkError(
-          exception = innerException.asInstanceOf[SparkException],
-          errorClass = "CANNOT_MERGE_INCOMPATIBLE_DATA_TYPE",
-          parameters = Map("left" -> "\"BIGINT\"", "right" -> "\"STRING\"")
-        )
+        assert(innerException.asInstanceOf[SparkException].getErrorClass ===
+          "CANNOT_MERGE_INCOMPATIBLE_DATA_TYPE")
       }
 
       // it is ok if no schema merging


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org