This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new aab073ab1 [CELEBORN-1125] Bump guava from 14.0.1 to 32.1.3-jre
aab073ab1 is described below
commit aab073ab1613abd6382bd2e5f93906fec7aeb007
Author: Fu Chen <[email protected]>
AuthorDate: Tue Nov 21 16:18:14 2023 +0800
[CELEBORN-1125] Bump guava from 14.0.1 to 32.1.3-jre
### What changes were proposed in this pull request?
As title
### Why are the changes needed?
- bump guava from 14.0.1 to 32.1.3-jre
- refer to https://github.com/apache/spark/pull/26911, remove usages of
Guava that no longer work in Guava 27/32, and replace with workalikes. After
this PR, Celeborn no longer relies on a specific version of Guava, and is
compatible with Guava 14/27/32. we have the ability to specify Guava to 27 when
running MapReduce integration tests.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Pass GA
Closes #2090 from cfmcgrady/guava-27.
Authored-by: Fu Chen <[email protected]>
Signed-off-by: mingji <[email protected]>
---
.../network/buffer/FileSegmentManagedBuffer.java | 11 +--
.../common/network/buffer/NettyManagedBuffer.java | 7 +-
.../common/network/buffer/NioManagedBuffer.java | 7 +-
.../common/network/client/TransportClient.java | 9 +--
.../common/network/protocol/ChunkFetchFailure.java | 13 ++--
.../common/network/protocol/ChunkFetchRequest.java | 7 +-
.../common/network/protocol/ChunkFetchSuccess.java | 13 ++--
.../celeborn/common/network/protocol/Message.java | 4 +-
.../common/network/protocol/OneWayMessage.java | 11 ++-
.../common/network/protocol/OpenStream.java | 16 +++--
.../celeborn/common/network/protocol/PushData.java | 19 +++---
.../common/network/protocol/PushDataHandShake.java | 22 +++---
.../common/network/protocol/PushMergedData.java | 20 +++---
.../common/network/protocol/RegionFinish.java | 17 +++--
.../common/network/protocol/RegionStart.java | 21 +++---
.../common/network/protocol/RpcFailure.java | 13 ++--
.../common/network/protocol/RpcRequest.java | 12 +++-
.../common/network/protocol/RpcResponse.java | 12 +++-
.../common/network/protocol/StreamChunkSlice.java | 17 +++--
.../common/network/protocol/StreamHandle.java | 13 ++--
.../apache/celeborn/common/util/ThreadUtils.scala | 78 +++++++++++++++++++++-
dev/deps/dependencies-client-flink-1.14 | 3 +-
dev/deps/dependencies-client-flink-1.15 | 3 +-
dev/deps/dependencies-client-flink-1.17 | 3 +-
dev/deps/dependencies-client-flink-1.18 | 3 +-
dev/deps/dependencies-client-mr | 3 +-
dev/deps/dependencies-client-spark-2.4 | 3 +-
dev/deps/dependencies-client-spark-3.0 | 3 +-
dev/deps/dependencies-client-spark-3.1 | 3 +-
dev/deps/dependencies-client-spark-3.2 | 3 +-
dev/deps/dependencies-client-spark-3.3 | 3 +-
dev/deps/dependencies-client-spark-3.4 | 3 +-
dev/deps/dependencies-client-spark-3.5 | 3 +-
dev/deps/dependencies-server | 3 +-
pom.xml | 24 ++++++-
project/CelebornBuild.scala | 9 ++-
36 files changed, 294 insertions(+), 120 deletions(-)
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/buffer/FileSegmentManagedBuffer.java
b/common/src/main/java/org/apache/celeborn/common/network/buffer/FileSegmentManagedBuffer.java
index dbd9d71ad..6af9e4305 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/buffer/FileSegmentManagedBuffer.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/buffer/FileSegmentManagedBuffer.java
@@ -22,9 +22,10 @@ import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.file.StandardOpenOption;
-import com.google.common.base.Objects;
import com.google.common.io.ByteStreams;
import io.netty.channel.DefaultFileRegion;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.network.util.LimitedInputStream;
import org.apache.celeborn.common.network.util.TransportConf;
@@ -145,10 +146,10 @@ public final class FileSegmentManagedBuffer extends
ManagedBuffer {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("file", file)
- .add("offset", offset)
- .add("length", length)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("file", file)
+ .append("offset", offset)
+ .append("length", length)
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/buffer/NettyManagedBuffer.java
b/common/src/main/java/org/apache/celeborn/common/network/buffer/NettyManagedBuffer.java
index d3be0a6d9..60cf8625b 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/buffer/NettyManagedBuffer.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/buffer/NettyManagedBuffer.java
@@ -21,10 +21,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
-import com.google.common.base.Objects;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream;
import io.netty.buffer.Unpooled;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
/** A {@link ManagedBuffer} backed by a Netty {@link ByteBuf}. */
public class NettyManagedBuffer extends ManagedBuffer {
@@ -77,6 +78,8 @@ public class NettyManagedBuffer extends ManagedBuffer {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("buf", buf).toString();
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("buf", buf)
+ .toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/buffer/NioManagedBuffer.java
b/common/src/main/java/org/apache/celeborn/common/network/buffer/NioManagedBuffer.java
index 70a355a2e..b14cb1f8e 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/buffer/NioManagedBuffer.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/buffer/NioManagedBuffer.java
@@ -21,9 +21,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
-import com.google.common.base.Objects;
import io.netty.buffer.ByteBufInputStream;
import io.netty.buffer.Unpooled;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
/** A {@link ManagedBuffer} backed by {@link ByteBuffer}. */
public class NioManagedBuffer extends ManagedBuffer {
@@ -65,6 +66,8 @@ public class NioManagedBuffer extends ManagedBuffer {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("buf", buf).toString();
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("buf", buf)
+ .toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/client/TransportClient.java
b/common/src/main/java/org/apache/celeborn/common/network/client/TransportClient.java
index 7865732c3..482356b04 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/client/TransportClient.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/client/TransportClient.java
@@ -25,13 +25,14 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.SettableFuture;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -314,9 +315,9 @@ public class TransportClient implements Closeable {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("remoteAddress", channel.remoteAddress())
- .add("isActive", isActive())
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("remoteAdress", channel.remoteAddress())
+ .append("isActive", isActive())
.toString();
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchFailure.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchFailure.java
index 532d0bab0..b746aa753 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchFailure.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchFailure.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.protocol.PbChunkFetchRequest;
@@ -56,7 +59,7 @@ public final class ChunkFetchFailure extends ResponseMessage {
@Override
public int hashCode() {
- return Objects.hashCode(streamChunkSlice, errorString);
+ return Objects.hash(streamChunkSlice, errorString);
}
@Override
@@ -70,9 +73,9 @@ public final class ChunkFetchFailure extends ResponseMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("streamChunkId", streamChunkSlice)
- .add("errorString", errorString)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("streamChunkId", streamChunkSlice)
+ .append("errorString", errorString)
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchRequest.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchRequest.java
index 28672eac1..fe4a8a48f 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchRequest.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchRequest.java
@@ -17,8 +17,9 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
/**
* Request to fetch a sequence of a single chunk of a stream. This will
correspond to a single
@@ -67,6 +68,8 @@ public final class ChunkFetchRequest extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("streamChunkId",
streamChunkSlice).toString();
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("streamChunkId", streamChunkSlice)
+ .toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchSuccess.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchSuccess.java
index 7d5992003..d0297ec5a 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchSuccess.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchSuccess.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.network.buffer.ManagedBuffer;
import org.apache.celeborn.common.network.buffer.NettyManagedBuffer;
@@ -76,7 +79,7 @@ public final class ChunkFetchSuccess extends ResponseMessage {
@Override
public int hashCode() {
- return Objects.hashCode(streamChunkSlice, body());
+ return Objects.hash(streamChunkSlice, body());
}
@Override
@@ -90,9 +93,9 @@ public final class ChunkFetchSuccess extends ResponseMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("streamChunkId", streamChunkSlice)
- .add("buffer", body())
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("streamChunkId", streamChunkSlice)
+ .append("buffer", body())
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/Message.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/Message.java
index b2aaf7354..612dfb7bf 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/Message.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/Message.java
@@ -18,8 +18,8 @@
package org.apache.celeborn.common.network.protocol;
import java.nio.ByteBuffer;
+import java.util.Objects;
-import com.google.common.base.Objects;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@@ -56,7 +56,7 @@ public abstract class Message implements Encodable {
}
protected boolean equals(Message other) {
- return Objects.equal(body, other.body);
+ return Objects.equals(body, other.body);
}
public ByteBuffer toByteBuffer() {
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/OneWayMessage.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/OneWayMessage.java
index 68c5a4263..8824e11a3 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/OneWayMessage.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/OneWayMessage.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.network.buffer.ManagedBuffer;
import org.apache.celeborn.common.network.buffer.NettyManagedBuffer;
@@ -66,7 +69,7 @@ public final class OneWayMessage extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(body());
+ return Objects.hash(body());
}
@Override
@@ -80,6 +83,8 @@ public final class OneWayMessage extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("body", body()).toString();
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("body", body())
+ .toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/OpenStream.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/OpenStream.java
index 7919900e7..4a041e327 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/OpenStream.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/OpenStream.java
@@ -19,9 +19,11 @@ package org.apache.celeborn.common.network.protocol;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+import java.util.Objects;
-import com.google.common.base.Objects;
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
/**
* Request to read a set of blocks. Returns {@link StreamHandle}. Use
PbOpenStream instead of this
@@ -81,7 +83,7 @@ public final class OpenStream extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(
+ return Objects.hash(
Arrays.hashCode(shuffleKey), Arrays.hashCode(fileName), startMapIndex,
endMapIndex);
}
@@ -99,11 +101,11 @@ public final class OpenStream extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("shuffleKey", new String(shuffleKey, StandardCharsets.UTF_8))
- .add("fileName", new String(fileName, StandardCharsets.UTF_8))
- .add("startMapIndex", startMapIndex)
- .add("endMapIndex", endMapIndex)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("shuffleKey", new String(shuffleKey, StandardCharsets.UTF_8))
+ .append("fileName", new String(fileName, StandardCharsets.UTF_8))
+ .append("startMapIndex", startMapIndex)
+ .append("endMapIndex", endMapIndex)
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushData.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushData.java
index a3e5da3d2..f8765d5a2 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushData.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushData.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.network.buffer.ManagedBuffer;
import org.apache.celeborn.common.network.buffer.NettyManagedBuffer;
@@ -86,7 +89,7 @@ public final class PushData extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(requestId, mode, shuffleKey, partitionUniqueId,
body());
+ return Objects.hash(requestId, mode, shuffleKey, partitionUniqueId,
body());
}
@Override
@@ -104,12 +107,12 @@ public final class PushData extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("requestId", requestId)
- .add("mode", mode)
- .add("shuffleKey", shuffleKey)
- .add("partitionUniqueId", partitionUniqueId)
- .add("body size", body().size())
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("requestId", requestId)
+ .append("mode", mode)
+ .append("shuffleKey", shuffleKey)
+ .append("partitionUniqueId", partitionUniqueId)
+ .append("body size", body().size())
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushDataHandShake.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushDataHandShake.java
index dc8c04816..1f6745d72 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushDataHandShake.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushDataHandShake.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
@Deprecated
public final class PushDataHandShake extends RequestMessage {
@@ -83,8 +86,7 @@ public final class PushDataHandShake extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(
- mode, shuffleKey, partitionUniqueId, attemptId, numPartitions,
bufferSize);
+ return Objects.hash(mode, shuffleKey, partitionUniqueId, attemptId,
numPartitions, bufferSize);
}
@Override
@@ -104,13 +106,13 @@ public final class PushDataHandShake extends
RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("mode", mode)
- .add("shuffleKey", shuffleKey)
- .add("partitionUniqueId", partitionUniqueId)
- .add("attemptId", attemptId)
- .add("numSubPartitions", numPartitions)
- .add("bufferSize", bufferSize)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("mode", mode)
+ .append("shuffleKey", shuffleKey)
+ .append("partitionUniqueId", partitionUniqueId)
+ .append("attemptId", attemptId)
+ .append("numSubPartitions", numPartitions)
+ .append("bufferSize", bufferSize)
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushMergedData.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushMergedData.java
index 332e66f6f..9152e5a59 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushMergedData.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushMergedData.java
@@ -18,9 +18,11 @@
package org.apache.celeborn.common.network.protocol;
import java.util.Arrays;
+import java.util.Objects;
-import com.google.common.base.Objects;
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.network.buffer.ManagedBuffer;
import org.apache.celeborn.common.network.buffer.NettyManagedBuffer;
@@ -99,7 +101,7 @@ public final class PushMergedData extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(requestId, mode, shuffleKey);
+ return Objects.hash(requestId, mode, shuffleKey);
}
@Override
@@ -118,13 +120,13 @@ public final class PushMergedData extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("requestId", requestId)
- .add("mode", mode)
- .add("shuffleKey", shuffleKey)
- .add("partitionIds", Arrays.toString(partitionUniqueIds))
- .add("batchOffsets", Arrays.toString(batchOffsets))
- .add("body size", body().size())
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("requestId", requestId)
+ .append("mode", mode)
+ .append("shuffleKey", shuffleKey)
+ .append("partitionIds", Arrays.toString(partitionUniqueIds))
+ .append("batchOffsets", Arrays.toString(batchOffsets))
+ .append("body size", body().size())
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RegionFinish.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RegionFinish.java
index c7f804d84..0d64bdcdd 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RegionFinish.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RegionFinish.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
@Deprecated
public final class RegionFinish extends RequestMessage {
@@ -68,7 +71,7 @@ public final class RegionFinish extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(mode, shuffleKey, partitionUniqueId, attemptId);
+ return Objects.hash(mode, shuffleKey, partitionUniqueId, attemptId);
}
@Override
@@ -86,11 +89,11 @@ public final class RegionFinish extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("mode", mode)
- .add("shuffleKey", shuffleKey)
- .add("partitionUniqueId", partitionUniqueId)
- .add("attemptId", attemptId)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("mode", mode)
+ .append("shuffleKey", shuffleKey)
+ .append("partitionUniqueId", partitionUniqueId)
+ .append("attemptId", attemptId)
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RegionStart.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RegionStart.java
index 2c327c880..f12c4a010 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RegionStart.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RegionStart.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
@Deprecated
public final class RegionStart extends RequestMessage {
@@ -85,7 +88,7 @@ public final class RegionStart extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(
+ return Objects.hash(
mode, shuffleKey, partitionUniqueId, attemptId, currentRegionIndex,
isBroadcast);
}
@@ -106,13 +109,13 @@ public final class RegionStart extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("mode", mode)
- .add("shuffleKey", shuffleKey)
- .add("partitionUniqueId", partitionUniqueId)
- .add("attemptId", attemptId)
- .add("currentRegionIndex", currentRegionIndex)
- .add("isBroadcast", isBroadcast)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("mode", mode)
+ .append("shuffleKey", shuffleKey)
+ .append("partitionUniqueId", partitionUniqueId)
+ .append("attemptId", attemptId)
+ .append("currentRegionIndex", currentRegionIndex)
+ .append("isBroadcast", isBroadcast)
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcFailure.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcFailure.java
index f10419595..b49fa1b4d 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcFailure.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcFailure.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
/** Response to {@link RpcRequest} for a failed RPC. */
public final class RpcFailure extends ResponseMessage {
@@ -54,7 +57,7 @@ public final class RpcFailure extends ResponseMessage {
@Override
public int hashCode() {
- return Objects.hashCode(requestId, errorString);
+ return Objects.hash(requestId, errorString);
}
@Override
@@ -68,9 +71,9 @@ public final class RpcFailure extends ResponseMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("requestId", requestId)
- .add("errorString", errorString)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("requestId", requestId)
+ .append("errorString", errorString)
.toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcRequest.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcRequest.java
index 93066f224..8d408ec81 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcRequest.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcRequest.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.network.buffer.ManagedBuffer;
import org.apache.celeborn.common.network.buffer.NettyManagedBuffer;
@@ -74,7 +77,7 @@ public final class RpcRequest extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(requestId, body());
+ return Objects.hash(requestId, body());
}
@Override
@@ -88,6 +91,9 @@ public final class RpcRequest extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("requestId",
requestId).add("body", body()).toString();
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("requestId", requestId)
+ .append("body", body())
+ .toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcResponse.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcResponse.java
index ea3762794..4d31716a5 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcResponse.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/RpcResponse.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.network.buffer.ManagedBuffer;
import org.apache.celeborn.common.network.buffer.NettyManagedBuffer;
@@ -74,7 +77,7 @@ public final class RpcResponse extends ResponseMessage {
@Override
public int hashCode() {
- return Objects.hashCode(requestId, body());
+ return Objects.hash(requestId, body());
}
@Override
@@ -88,6 +91,9 @@ public final class RpcResponse extends ResponseMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("requestId",
requestId).add("body", body()).toString();
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("requestId", requestId)
+ .append("body", body())
+ .toString();
}
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/StreamChunkSlice.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/StreamChunkSlice.java
index 4771faf87..b0129a42b 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/StreamChunkSlice.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/StreamChunkSlice.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.celeborn.common.protocol.PbStreamChunkSlice;
@@ -68,7 +71,7 @@ public final class StreamChunkSlice implements Encodable {
@Override
public int hashCode() {
- return Objects.hashCode(streamId, chunkIndex, offset, len);
+ return Objects.hash(streamId, chunkIndex, offset, len);
}
@Override
@@ -85,11 +88,11 @@ public final class StreamChunkSlice implements Encodable {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("streamId", streamId)
- .add("chunkIndex", chunkIndex)
- .add("offset", offset)
- .add("len", len)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("streamId", streamId)
+ .append("chunkIndex", chunkIndex)
+ .append("offset", offset)
+ .append("len", len)
.toString();
}
diff --git
a/common/src/main/java/org/apache/celeborn/common/network/protocol/StreamHandle.java
b/common/src/main/java/org/apache/celeborn/common/network/protocol/StreamHandle.java
index c2428728e..859ec5fe4 100644
---
a/common/src/main/java/org/apache/celeborn/common/network/protocol/StreamHandle.java
+++
b/common/src/main/java/org/apache/celeborn/common/network/protocol/StreamHandle.java
@@ -17,8 +17,11 @@
package org.apache.celeborn.common.network.protocol;
-import com.google.common.base.Objects;
+import java.util.Objects;
+
import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
/**
* Identifier for a fixed number of chunks to read from a stream created by an
"open blocks"
@@ -56,7 +59,7 @@ public final class StreamHandle extends RequestMessage {
@Override
public int hashCode() {
- return Objects.hashCode(streamId, numChunks);
+ return Objects.hash(streamId, numChunks);
}
@Override
@@ -70,9 +73,9 @@ public final class StreamHandle extends RequestMessage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("streamId", streamId)
- .add("numChunks", numChunks)
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("streamId", streamId)
+ .append("numChunks", numChunks)
.toString();
}
}
diff --git
a/common/src/main/scala/org/apache/celeborn/common/util/ThreadUtils.scala
b/common/src/main/scala/org/apache/celeborn/common/util/ThreadUtils.scala
index 822ee0327..233bacd0b 100644
--- a/common/src/main/scala/org/apache/celeborn/common/util/ThreadUtils.scala
+++ b/common/src/main/scala/org/apache/celeborn/common/util/ThreadUtils.scala
@@ -19,6 +19,7 @@ package org.apache.celeborn.common.util
import java.util.concurrent._
import java.util.concurrent.{ForkJoinPool => SForkJoinPool,
ForkJoinWorkerThread => SForkJoinWorkerThread}
+import java.util.concurrent.locks.ReentrantLock
import scala.concurrent.{Awaitable, ExecutionContext,
ExecutionContextExecutor, Future}
import scala.concurrent.duration.{Duration, FiniteDuration}
@@ -33,7 +34,82 @@ import org.apache.celeborn.common.internal.Logging
object ThreadUtils {
private val sameThreadExecutionContext =
- ExecutionContext.fromExecutorService(MoreExecutors.sameThreadExecutor())
+ ExecutionContext.fromExecutorService(sameThreadExecutorService())
+
+ // Inspired by Guava MoreExecutors.sameThreadExecutor; inlined and converted
+ // to Scala here to avoid Guava version issues
+ def sameThreadExecutorService(): ExecutorService = new
AbstractExecutorService {
+ private val lock = new ReentrantLock()
+ private val termination = lock.newCondition()
+ private var runningTasks = 0
+ private var serviceIsShutdown = false
+
+ override def shutdown(): Unit = {
+ lock.lock()
+ try {
+ serviceIsShutdown = true
+ } finally {
+ lock.unlock()
+ }
+ }
+
+ override def shutdownNow(): java.util.List[Runnable] = {
+ shutdown()
+ java.util.Collections.emptyList()
+ }
+
+ override def isShutdown: Boolean = {
+ lock.lock()
+ try {
+ serviceIsShutdown
+ } finally {
+ lock.unlock()
+ }
+ }
+
+ override def isTerminated: Boolean = synchronized {
+ lock.lock()
+ try {
+ serviceIsShutdown && runningTasks == 0
+ } finally {
+ lock.unlock()
+ }
+ }
+
+ override def awaitTermination(timeout: Long, unit: TimeUnit): Boolean = {
+ var nanos = unit.toNanos(timeout)
+ lock.lock()
+ try {
+ while (nanos > 0 && !isTerminated()) {
+ nanos = termination.awaitNanos(nanos)
+ }
+ isTerminated()
+ } finally {
+ lock.unlock()
+ }
+ }
+
+ override def execute(command: Runnable): Unit = {
+ lock.lock()
+ try {
+ if (isShutdown()) throw new RejectedExecutionException("Executor
already shutdown")
+ runningTasks += 1
+ } finally {
+ lock.unlock()
+ }
+ try {
+ command.run()
+ } finally {
+ lock.lock()
+ try {
+ runningTasks -= 1
+ if (isTerminated()) termination.signalAll()
+ } finally {
+ lock.unlock()
+ }
+ }
+ }
+ }
/**
* An `ExecutionContextExecutor` that runs each task in the thread that
invokes `execute/submit`.
diff --git a/dev/deps/dependencies-client-flink-1.14
b/dev/deps/dependencies-client-flink-1.14
index 7e8c870ff..456250bb9 100644
--- a/dev/deps/dependencies-client-flink-1.14
+++ b/dev/deps/dependencies-client-flink-1.14
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-flink-1.15
b/dev/deps/dependencies-client-flink-1.15
index 7e8c870ff..456250bb9 100644
--- a/dev/deps/dependencies-client-flink-1.15
+++ b/dev/deps/dependencies-client-flink-1.15
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-flink-1.17
b/dev/deps/dependencies-client-flink-1.17
index 7e8c870ff..456250bb9 100644
--- a/dev/deps/dependencies-client-flink-1.17
+++ b/dev/deps/dependencies-client-flink-1.17
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-flink-1.18
b/dev/deps/dependencies-client-flink-1.18
index 7e8c870ff..456250bb9 100644
--- a/dev/deps/dependencies-client-flink-1.18
+++ b/dev/deps/dependencies-client-flink-1.18
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-mr b/dev/deps/dependencies-client-mr
index 8f6a629af..cc8ef1ade 100644
--- a/dev/deps/dependencies-client-mr
+++ b/dev/deps/dependencies-client-mr
@@ -41,9 +41,10 @@ curator-framework/2.13.0//curator-framework-2.13.0.jar
curator-recipes/2.13.0//curator-recipes-2.13.0.jar
dnsjava/2.1.7//dnsjava-2.1.7.jar
ehcache/3.3.1//ehcache-3.3.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
geronimo-jcache_1.0_spec/1.0-alpha-1//geronimo-jcache_1.0_spec-1.0-alpha-1.jar
gson/2.9.0//gson-2.9.0.jar
-guava/14.0.1//guava-14.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
guice-servlet/4.0//guice-servlet-4.0.jar
guice/4.0//guice-4.0.jar
hadoop-annotations/3.2.4//hadoop-annotations-3.2.4.jar
diff --git a/dev/deps/dependencies-client-spark-2.4
b/dev/deps/dependencies-client-spark-2.4
index b75979750..c439d7e08 100644
--- a/dev/deps/dependencies-client-spark-2.4
+++ b/dev/deps/dependencies-client-spark-2.4
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-spark-3.0
b/dev/deps/dependencies-client-spark-3.0
index 5005ba525..8ad78eccb 100644
--- a/dev/deps/dependencies-client-spark-3.0
+++ b/dev/deps/dependencies-client-spark-3.0
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-spark-3.1
b/dev/deps/dependencies-client-spark-3.1
index 6e8fd9703..1cbd01b35 100644
--- a/dev/deps/dependencies-client-spark-3.1
+++ b/dev/deps/dependencies-client-spark-3.1
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-spark-3.2
b/dev/deps/dependencies-client-spark-3.2
index 6fbebf79d..e83df4a71 100644
--- a/dev/deps/dependencies-client-spark-3.2
+++ b/dev/deps/dependencies-client-spark-3.2
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-spark-3.3
b/dev/deps/dependencies-client-spark-3.3
index 7e8c870ff..456250bb9 100644
--- a/dev/deps/dependencies-client-spark-3.3
+++ b/dev/deps/dependencies-client-spark-3.3
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-spark-3.4
b/dev/deps/dependencies-client-spark-3.4
index c6a87cc07..35698f487 100644
--- a/dev/deps/dependencies-client-spark-3.4
+++ b/dev/deps/dependencies-client-spark-3.4
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-client-spark-3.5
b/dev/deps/dependencies-client-spark-3.5
index 98abc8a5f..481caffcc 100644
--- a/dev/deps/dependencies-client-spark-3.5
+++ b/dev/deps/dependencies-client-spark-3.5
@@ -20,7 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server
index f93601cc3..89ac60462 100644
--- a/dev/deps/dependencies-server
+++ b/dev/deps/dependencies-server
@@ -21,7 +21,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar
commons-io/2.13.0//commons-io-2.13.0.jar
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
-guava/14.0.1//guava-14.0.1.jar
+failureaccess/1.0.1//failureaccess-1.0.1.jar
+guava/32.1.3-jre//guava-32.1.3-jre.jar
hadoop-client-api/3.2.4//hadoop-client-api-3.2.4.jar
hadoop-client-runtime/3.2.4//hadoop-client-runtime-3.2.4.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
diff --git a/pom.xml b/pom.xml
index 8ba97fbff..1927ebffe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<error-prone.jdk8.javac.version>9+181-r4173-1</error-prone.jdk8.javac.version>
<google.jsr305.version>1.3.9</google.jsr305.version>
<grpc.version>1.44.0</grpc.version>
- <guava.version>14.0.1</guava.version>
+ <guava.version>32.1.3-jre</guava.version>
<javaxservlet.version>3.1.0</javaxservlet.version>
<junit.version>4.13.2</junit.version>
<leveldb.version>1.8</leveldb.version>
@@ -311,6 +311,28 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index 168a6f3bd..3d7b748cf 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -42,7 +42,7 @@ object Dependencies {
val commonsLoggingVersion = "1.1.3"
val commonsLang3Version = "3.12.0"
val findbugsVersion = "1.3.9"
- val guavaVersion = "14.0.1"
+ val guavaVersion = "32.1.3-jre"
val hadoopVersion = "3.2.4"
val javaxServletVersion = "3.1.0"
val junitInterfaceVersion = "0.13.3"
@@ -72,7 +72,12 @@ object Dependencies {
val commonsLang3 = "org.apache.commons" % "commons-lang3" %
commonsLang3Version
val commonsLogging = "commons-logging" % "commons-logging" %
commonsLoggingVersion
val findbugsJsr305 = "com.google.code.findbugs" % "jsr305" % findbugsVersion
- val guava = "com.google.guava" % "guava" % guavaVersion
+ val guava = "com.google.guava" % "guava" % guavaVersion excludeAll(
+ ExclusionRule("org.checkerframework", "checker-qual"),
+ ExclusionRule("org.codehaus.mojo", "animal-sniffer-annotations"),
+ ExclusionRule("com.google.errorprone", "error_prone_annotations"),
+ ExclusionRule("com.google.guava", "listenablefuture"),
+ ExclusionRule("com.google.j2objc", "j2objc-annotations"))
val hadoopClientApi = "org.apache.hadoop" % "hadoop-client-api" %
hadoopVersion
val hadoopClientRuntime = "org.apache.hadoop" % "hadoop-client-runtime" %
hadoopVersion
val hadoopMapreduceClientApp = "org.apache.hadoop" %
"hadoop-mapreduce-client-app" % hadoopVersion excludeAll(
