zhouyejoe commented on a change in pull request #33034:
URL: https://github.com/apache/spark/pull/33034#discussion_r679523883
##########
File path:
common/network-common/src/main/java/org/apache/spark/network/protocol/MergedBlockMetaRequest.java
##########
@@ -49,36 +56,39 @@ public Type type() {
@Override
public int encodedLength() {
- return 8 + Encoders.Strings.encodedLength(appId) + 4 + 4;
+ return 8 + Encoders.Strings.encodedLength(appId) + 4 + 4 + 4;
}
@Override
public void encode(ByteBuf buf) {
buf.writeLong(requestId);
Encoders.Strings.encode(buf, appId);
buf.writeInt(shuffleId);
+ buf.writeInt(shuffleMergeId);
buf.writeInt(reduceId);
}
public static MergedBlockMetaRequest decode(ByteBuf buf) {
long requestId = buf.readLong();
String appId = Encoders.Strings.decode(buf);
int shuffleId = buf.readInt();
+ int shuffleMergeId = buf.readInt();
int reduceId = buf.readInt();
- return new MergedBlockMetaRequest(requestId, appId, shuffleId, reduceId);
+ return new MergedBlockMetaRequest(requestId, appId, shuffleId,
shuffleMergeId, reduceId);
}
@Override
public int hashCode() {
- return Objects.hashCode(requestId, appId, shuffleId, reduceId);
+ return Objects.hashCode(requestId, appId, shuffleId, shuffleMergeId,
reduceId);
}
@Override
public boolean equals(Object other) {
if (other instanceof MergedBlockMetaRequest) {
MergedBlockMetaRequest o = (MergedBlockMetaRequest) other;
- return requestId == o.requestId && shuffleId == o.shuffleId && reduceId
== o.reduceId
- && Objects.equal(appId, o.appId);
+ return requestId == o.requestId && shuffleId == o.shuffleId &&
+ shuffleMergeId == o.shuffleMergeId && reduceId == o.reduceId
+ && Objects.equal(appId, o.appId);
Review comment:
Nit: Indent
--
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]
