Weird Bug Fix

common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java

@@ -416,7 +416,7 @@ public void initializeApplication(ApplicationInitializationContext context) {
     String appId = context.getApplicationId().toString();
     try {
       ByteBuffer appServiceData = context.getApplicationDataForService();
-      String payload = JavaUtils.bytesToString(appServiceData);
+      String payload = JavaUtils.bytesToString(appServiceData.slice());
       String shuffleSecret;
       Map<String, Object> metaInfo;
       try {

common/utils/src/main/java/org/apache/spark/network/util/JavaUtils.java

@@ -68,7 +68,7 @@ public static int nonNegativeHash(Object obj) {
    * converted back to the same string through {@link #bytesToString(ByteBuffer)}.
    */
   public static ByteBuffer stringToBytes(String s) {
-    return StandardCharsets.UTF_8.encode(s);
+    return ByteBuffer.wrap(s.getBytes(StandardCharsets.UTF_8));
   }
 
   /**

connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowSerializer.scala

@@ -37,11 +37,7 @@ import org.apache.spark.sql.Row
 import org.apache.spark.sql.catalyst.DefinedByConstructorParams
 import org.apache.spark.sql.catalyst.encoders.AgnosticEncoder
 import org.apache.spark.sql.catalyst.encoders.AgnosticEncoders._
-<<<<<<< HEAD
 import org.apache.spark.sql.catalyst.util.{SparkDateTimeUtils, SparkIntervalUtils}
-=======
-import org.apache.spark.sql.catalyst.util.{IntervalUtils, SparkDateTimeUtils}
->>>>>>> apache/master
 import org.apache.spark.sql.errors.ExecutionErrors
 import org.apache.spark.sql.types.Decimal
 import org.apache.spark.sql.util.ArrowUtils