Sync w/ main branch

Author: hsiang-c

native/core/src/execution/planner.rs

@@ -1328,13 +1328,7 @@ impl PhysicalPlanner {
                 // SortExec fails in some cases if we do not unpack dictionary-encoded arrays, and
                 // it would be more efficient if we could avoid that.
                 // https://github.com/apache/datafusion-comet/issues/963
-
-                // TODO optimize this so that we only add the CopyExec if needed
-                // https://github.com/apache/datafusion-comet/issues/2131
-                let child_copied = Arc::new(CopyExec::new(
-                    Arc::clone(&child.native_plan),
-                    CopyMode::UnpackOrDeepCopy,
-                ));
+                let child_copied = Self::wrap_in_copy_exec(Arc::clone(&child.native_plan));
 
                 let mut sort_exec: Arc<dyn ExecutionPlan> = Arc::new(
                     SortExec::new(LexOrdering::new(exprs?).unwrap(), Arc::clone(&child_copied))