Format codestyle

Author: wankunde

common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/NoOpMergedShuffleFileManager.java

@@ -44,12 +44,12 @@ public NoOpMergedShuffleFileManager(TransportConf transportConf, File recoveryFi
 
   @Override
   public StreamCallbackWithID receiveBlockDataAsStream(PushBlockStream msg) {
-    throw new UnsupportedOperationException("Cannot handle merged shuffle remove");
+    throw new UnsupportedOperationException("Cannot handle shuffle block merge");
   }
 
   @Override
   public MergeStatuses finalizeShuffleMerge(FinalizeShuffleMerge msg) throws IOException {
-    throw new UnsupportedOperationException("Cannot handle merged shuffle remove");
+    throw new UnsupportedOperationException("Cannot handle shuffle block merge");
   }
 
   @Override
@@ -69,7 +69,7 @@ public ManagedBuffer getMergedBlockData(
       int shuffleMergeId,
       int reduceId,
       int chunkId) {
-    throw new UnsupportedOperationException("Cannot handle merged shuffle remove");
+    throw new UnsupportedOperationException("Cannot handle shuffle block merge");
   }
 
   @Override
@@ -78,12 +78,12 @@ public MergedBlockMeta getMergedBlockMeta(
       int shuffleId,
       int shuffleMergeId,
       int reduceId) {
-    throw new UnsupportedOperationException("Cannot handle merged shuffle remove");
+    throw new UnsupportedOperationException("Cannot handle shuffle block merge");
   }
 
   @Override
   public String[] getMergedBlockDirs(String appId) {
-    throw new UnsupportedOperationException("Cannot handle merged shuffle remove");
+    throw new UnsupportedOperationException("Cannot handle shuffle block merge");
   }
 
   @Override

common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RemoteBlockPushResolver.java

@@ -57,7 +57,6 @@
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 
-import org.apache.spark.network.shuffle.protocol.RemoveShuffleMerge;
 import org.roaringbitmap.RoaringBitmap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,6 +71,7 @@
 import org.apache.spark.network.shuffle.protocol.FinalizeShuffleMerge;
 import org.apache.spark.network.shuffle.protocol.MergeStatuses;
 import org.apache.spark.network.shuffle.protocol.PushBlockStream;
+import org.apache.spark.network.shuffle.protocol.RemoveShuffleMerge;
 import org.apache.spark.network.shuffledb.DB;
 import org.apache.spark.network.shuffledb.DBBackend;
 import org.apache.spark.network.shuffledb.DBIterator;

common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RemoveShuffleMerge.java

@@ -21,6 +21,7 @@
 import io.netty.buffer.ByteBuf;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+
 import org.apache.spark.network.protocol.Encoders;
 
 /**

common/network-shuffle/src/test/java/org/apache/spark/network/shuffle/RemoteBlockPushResolverSuite.java

@@ -37,7 +37,6 @@
 import com.google.common.collect.ImmutableMap;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.spark.network.shuffle.protocol.RemoveShuffleMerge;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -58,6 +57,7 @@
 import org.apache.spark.network.shuffle.protocol.FinalizeShuffleMerge;
 import org.apache.spark.network.shuffle.protocol.MergeStatuses;
 import org.apache.spark.network.shuffle.protocol.PushBlockStream;
+import org.apache.spark.network.shuffle.protocol.RemoveShuffleMerge;
 import org.apache.spark.network.util.MapConfigProvider;
 import org.apache.spark.network.util.TransportConf;
 

resource-managers/yarn/src/test/scala/org/apache/spark/network/yarn/YarnShuffleServiceSuite.scala

@@ -323,7 +323,7 @@ abstract class YarnShuffleServiceSuite extends SparkFunSuite with Matchers {
 
     val dataFileReload3Again =
       ShuffleTestAccessor.getMergedShuffleDataFile(mergeManager3, partitionId3, 1)
-    dataFileReload3Again.length() should be (294)
+    dataFileReload3Again.length() should be ((4 * 5 + 1) * DUMMY_BLOCK_DATA.length)
     s3.stop()
   }