You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2026/03/30 17:17:44 UTC

(spark) branch branch-4.1 updated: [SPARK-56250][SQL][FOLLOWUP][4.1] Remove confusing defensive code in SortExec.rowSorter and add warning comment

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

dongjoon pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-4.1 by this push:
     new b4905c2452cf [SPARK-56250][SQL][FOLLOWUP][4.1] Remove confusing defensive code in SortExec.rowSorter and add warning comment
b4905c2452cf is described below

commit b4905c2452cf64fa33f9758ae7595bb7ea6b0cdd
Author: Liang-Chi Hsieh <vi...@gmail.com>
AuthorDate: Mon Mar 30 10:17:31 2026 -0700

    [SPARK-56250][SQL][FOLLOWUP][4.1] Remove confusing defensive code in SortExec.rowSorter and add warning comment
    
    ### What changes were proposed in this pull request?
    
    https://github.com/apache/spark/pull/55048 was backported to 4.1 but there is an error when resolving the conflicts. This patch fixes it.
    
    ### Why are the changes needed?
    
    Restoring the build of 4.1.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No
    
    ### How was this patch tested?
    
    Unit test
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No
    
    Closes #55098 from viirya/revert-sort-exec-defensive-code-4.1.
    
    Authored-by: Liang-Chi Hsieh <vi...@gmail.com>
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 sql/core/src/main/scala/org/apache/spark/sql/execution/SortExec.scala | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SortExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SortExec.scala
index febfa0486927..46b2cde2eed9 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SortExec.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SortExec.scala
@@ -74,8 +74,6 @@ case class SortExec(
    * should make it public.
    */
   def createSorter(): UnsafeExternalRowSorter = {
-    rowSorter = new ThreadLocal[UnsafeExternalRowSorter]()
-
     val ordering = RowOrdering.create(sortOrder, output)
 
     // The comparator for comparing prefix


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