remove centos profile and fix merge conflict

apache · Jun 11, 2024 · df7acae · df7acae
1 parent 4ad7869
commit df7acae
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -447,13 +447,6 @@ under the License.
       </properties>
     </profile>
 
-    <profile>
-      <id>release-centos7</id>
-      <properties>
-        <jni.dir>${project.basedir}/../core/target/x86_64-unknown-linux-gnu/release</jni.dir>
-      </properties>
-    </profile>
-
     <profile>
       <id>Win-x86</id>
       <activation>

diff --git a/...rc/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala b/...rc/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala
@@ -391,12 +391,7 @@ object CometShuffleExchangeExec extends ShimCometShuffleExchangeExec {
           val pageSize = SparkEnv.get.memoryManager.pageSizeBytes
 
           val sorter = UnsafeExternalRowSorter.createWithRecordComparator(
-<<<<<<< HEAD
-            //StructType.fromAttributes(outputAttributes),
             StructType(outputAttributes.map(a => StructField(a.name, a.dataType, a.nullable, a.metadata))),
-=======
-            fromAttributes(outputAttributes),
->>>>>>> apache/main
             recordComparatorSupplier,
             prefixComparator,
             prefixComputer,