From a11013b3c7d7d0f778f64076e7c6b44019637b27 Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Mon, 30 Mar 2026 09:55:09 -0700 Subject: [PATCH] Fix merging conflict --- .../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 febfa0486927e..46b2cde2eed95 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