jerqi commented on code in PR #742:
URL: https://github.com/apache/incubator-uniffle/pull/742#discussion_r1144194839
##########
common/src/test/java/org/apache/uniffle/common/netty/protocol/NettyProtocolTestUtils.java:
##########
@@ -0,0 +1,119 @@
+package org.apache.uniffle.common.netty.protocol;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import io.netty.buffer.ByteBuf;
+import org.apache.uniffle.common.ShuffleBlockInfo;
+import org.apache.uniffle.common.ShuffleServerInfo;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public class NettyProtocolTestUtils {
+
+ static class SendShuffleDataRequestTest extends SendShuffleDataRequest {
+ public SendShuffleDataRequestTest(long requestId, String appId, int
shuffleId, long requireId, Map<Integer, List<ShuffleBlockInfo>>
partitionToBlocks, long timestamp) {
+ super(requestId, appId, shuffleId, requireId, partitionToBlocks,
timestamp);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ SendShuffleDataRequestTest that = (SendShuffleDataRequestTest) o;
+ Map<Integer, List<ShuffleBlockInfoTest>> map1 = Maps.newHashMap();
+ Map<Integer, List<ShuffleBlockInfoTest>> map2 = Maps.newHashMap();
+ for (Map.Entry<Integer, List<ShuffleBlockInfo>> entry :
this.getPartitionToBlocks().entrySet()) {
+ map1.put(entry.getKey(), toShuffleBlockInfoTestList(entry.getValue()));
+ }
+ for (Map.Entry<Integer, List<ShuffleBlockInfo>> entry :
that.getPartitionToBlocks().entrySet()) {
+ map2.put(entry.getKey(), toShuffleBlockInfoTestList(entry.getValue()));
+ }
+ return this.requestId == that.requestId
+ && this.getShuffleId() == that.getShuffleId()
+ && this.getRequireId() == that.getRequireId()
+ && this.getTimestamp() == that.getTimestamp()
+ && this.getAppId().equals(that.getAppId())
+ && map1.equals(map2);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(requestId, this.getAppId(), this.getShuffleId(),
this.getRequireId(),
+ this.getPartitionToBlocks(), this.getTimestamp());
+ }
+ }
+
+ static class ShuffleBlockInfoTest extends ShuffleBlockInfo {
+ public ShuffleBlockInfoTest(int shuffleId, int partitionId, long blockId,
int length, long crc, ByteBuf data, List<ShuffleServerInfo> shuffleServerInfos,
int uncompressLength, long freeMemory, long taskAttemptId) {
+ super(shuffleId, partitionId, blockId, length, crc, data,
shuffleServerInfos, uncompressLength, freeMemory, taskAttemptId);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ ShuffleBlockInfoTest that = (ShuffleBlockInfoTest) o;
+ return this.getPartitionId() == that.getPartitionId()
+ && this.getBlockId() == that.getBlockId()
+ && this.getLength() == that.getLength()
+ && this.getShuffleId() == that.getShuffleId()
+ && this.getCrc() == that.getCrc()
+ && this.getTaskAttemptId() == that.getTaskAttemptId()
+ && this.getUncompressLength() == that.getUncompressLength()
+ && this.getFreeMemory() == that.getFreeMemory()
+ && this.getData().equals(that.getData())
+ &&
this.getShuffleServerInfos().equals(that.getShuffleServerInfos());
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(this.getPartitionId(), this.getBlockId(),
this.getLength(), this.getShuffleId(),
+ this.getCrc(), this.getTaskAttemptId(), this.getData(),
this.getShuffleServerInfos(),
+ this.getUncompressLength(), this.getFreeMemory());
+ }
+ }
+
+ private static SendShuffleDataRequestTest
toSendShuffleDataRequestTest(SendShuffleDataRequest sendShuffleDataRequest) {
+ return new SendShuffleDataRequestTest(sendShuffleDataRequest.requestId,
+ sendShuffleDataRequest.getAppId(),
+ sendShuffleDataRequest.getShuffleId(),
+ sendShuffleDataRequest.getRequireId(),
+ sendShuffleDataRequest.getPartitionToBlocks(),
+ sendShuffleDataRequest.getTimestamp());
+ }
+
+ private static List<ShuffleBlockInfoTest>
toShuffleBlockInfoTestList(List<ShuffleBlockInfo> shuffleBlockInfoList) {
+ List<ShuffleBlockInfoTest> res = Lists.newArrayList();
+ for (ShuffleBlockInfo shuffleBlockInfo : shuffleBlockInfoList) {
+ res.add(toShuffleBlockInfoTest(shuffleBlockInfo));
+ }
+ return res;
+ }
+
+ private static ShuffleBlockInfoTest toShuffleBlockInfoTest(ShuffleBlockInfo
shuffleBlockInfo) {
+ return new ShuffleBlockInfoTest(shuffleBlockInfo.getShuffleId(),
+ shuffleBlockInfo.getPartitionId(),
+ shuffleBlockInfo.getBlockId(),
+ shuffleBlockInfo.getLength(),
+ shuffleBlockInfo.getCrc(),
+ shuffleBlockInfo.getData(),
+ shuffleBlockInfo.getShuffleServerInfos(),
+ shuffleBlockInfo.getUncompressLength(),
+ shuffleBlockInfo.getFreeMemory(),
+ shuffleBlockInfo.getTaskAttemptId());
+ }
+
+ public static boolean compareSendShuffleDataRequest(SendShuffleDataRequest
req1, SendShuffleDataRequest req2) {
Review Comment:
Class SendShuffleDataRequestTest seems unnecessary.
```
return req1.getPartitionId() == req2.getPartitionId()
&& req1.getBlockId() == req2.getBlockId()
&& req1.getLength() == req2.getLength()
&& req1.getShuffleId() == req2.getShuffleId()
&& req1.getCrc() == req2.getCrc()
&& req1.getTaskAttemptId() == req2.getTaskAttemptId()
&& req1.getUncompressLength() == req2.getUncompressLength()
&& req1.getFreeMemory() == req2.getFreeMemory()
&& req1.getData().equals(req2.getData())
&& CompareShuffleInfos(req1.getShuffleServerInfos(),
req2.getShuffleServerInfos());
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
