Merge pull request #30 from lyft/fix_guava

Fix guava conflicts
lyft · Mar 12, 2021 · 8805e1a · 8805e1a
2 parents 3599fde + 3cbfe1b
commit 8805e1a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/...twork-shuffle/src/main/java/org/apache/spark/network/shuffle/RemoteBlockPushResolver.java b/...twork-shuffle/src/main/java/org/apache/spark/network/shuffle/RemoteBlockPushResolver.java
@@ -39,6 +39,7 @@
 import java.util.concurrent.Executors;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
@@ -786,7 +787,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-      return Objects.toStringHelper(this)
+      return MoreObjects.toStringHelper(this)
         .add("appId", appId)
         .add("shuffleId", shuffleId)
         .toString();

diff --git a/...shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/FinalizeShuffleMerge.java b/...shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/FinalizeShuffleMerge.java
@@ -17,6 +17,7 @@
 
 package org.apache.spark.network.shuffle.protocol;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import io.netty.buffer.ByteBuf;
 
@@ -51,7 +52,7 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
       .add("appId", appId)
       .add("shuffleId", shuffleId)
       .toString();

diff --git a/...etwork-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/MergeStatuses.java b/...etwork-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/MergeStatuses.java
@@ -19,6 +19,7 @@
 
 import java.util.Arrays;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import io.netty.buffer.ByteBuf;
 import org.roaringbitmap.RoaringBitmap;
@@ -76,7 +77,7 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
       .add("shuffleId", shuffleId)
       .add("reduceId size", reduceIds.length)
       .toString();

diff --git a/...work-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/PushBlockStream.java b/...work-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/PushBlockStream.java
@@ -17,6 +17,7 @@
 
 package org.apache.spark.network.shuffle.protocol;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import io.netty.buffer.ByteBuf;
 
@@ -59,7 +60,7 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
       .add("appId", appId)
       .add("shuffleId", shuffleId)
       .add("mapIndex", mapIndex)