jerqi commented on code in PR #894: URL: https://github.com/apache/incubator-uniffle/pull/894#discussion_r1211600514
########## client-tez/src/main/java/org/apache/tez/common/ShuffleAssignmentsInfoWritable.java: ########## @@ -0,0 +1,160 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tez.common; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.hadoop.io.Writable; + +import org.apache.uniffle.common.PartitionRange; +import org.apache.uniffle.common.ShuffleAssignmentsInfo; +import org.apache.uniffle.common.ShuffleServerInfo; + + +public class ShuffleAssignmentsInfoWritable implements Writable { + private ShuffleAssignmentsInfo shuffleAssignmentsInfo; + + public ShuffleAssignmentsInfoWritable() { + + } + + public ShuffleAssignmentsInfoWritable(ShuffleAssignmentsInfo shuffleAssignmentsInfo) { + this.shuffleAssignmentsInfo = shuffleAssignmentsInfo; + } + + + @Override + public void write(DataOutput dataOutput) throws IOException { + if (shuffleAssignmentsInfo == null) { + dataOutput.writeInt(-1); + return; + } else { + dataOutput.writeInt(1); + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = shuffleAssignmentsInfo.getPartitionToServers(); + if (MapUtils.isEmpty(partitionToServers)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(partitionToServers.size()); + for (Map.Entry<Integer, List<ShuffleServerInfo>> entry : partitionToServers.entrySet()) { + dataOutput.writeInt(entry.getKey()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (ShuffleServerInfo serverInfo : entry.getValue()) { + dataOutput.writeUTF(serverInfo.getId()); + dataOutput.writeUTF(serverInfo.getHost()); + dataOutput.writeInt(serverInfo.getGrpcPort()); + } + } + } + } + + Map<ShuffleServerInfo, List<PartitionRange>> serverToPartitionRanges = shuffleAssignmentsInfo + .getServerToPartitionRanges(); + if (MapUtils.isEmpty(serverToPartitionRanges)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(serverToPartitionRanges.size()); + for (Map.Entry<ShuffleServerInfo, List<PartitionRange>> entry : serverToPartitionRanges.entrySet()) { + dataOutput.writeUTF(entry.getKey().getId()); + dataOutput.writeUTF(entry.getKey().getHost()); + dataOutput.writeInt(entry.getKey().getGrpcPort()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (PartitionRange range : entry.getValue()) { + dataOutput.writeInt(range.getStart()); + dataOutput.writeInt(range.getEnd()); + } + } + } + } + } + + @Override + public void readFields(DataInput dataInput) throws IOException { + if (dataInput.readInt() == -1) { + return; + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = new HashMap<>(); + int partitionToServersSize = dataInput.readInt(); + if (partitionToServersSize != -1) { + Integer k; + for (int i = 0; i < partitionToServersSize; i++) { + k = dataInput.readInt(); + List<ShuffleServerInfo> v = new ArrayList<>(); + int vSize = dataInput.readInt(); + if (vSize != -1) { + for (int i1 = 0; i1 < vSize; i1++) { Review Comment: Could we have better name like `shuffleServerIndex`? ########## client-tez/src/main/java/org/apache/tez/common/ShuffleAssignmentsInfoWritable.java: ########## @@ -0,0 +1,160 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tez.common; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.hadoop.io.Writable; + +import org.apache.uniffle.common.PartitionRange; +import org.apache.uniffle.common.ShuffleAssignmentsInfo; +import org.apache.uniffle.common.ShuffleServerInfo; + + +public class ShuffleAssignmentsInfoWritable implements Writable { + private ShuffleAssignmentsInfo shuffleAssignmentsInfo; + + public ShuffleAssignmentsInfoWritable() { + + } + + public ShuffleAssignmentsInfoWritable(ShuffleAssignmentsInfo shuffleAssignmentsInfo) { + this.shuffleAssignmentsInfo = shuffleAssignmentsInfo; + } + + + @Override + public void write(DataOutput dataOutput) throws IOException { + if (shuffleAssignmentsInfo == null) { + dataOutput.writeInt(-1); + return; + } else { + dataOutput.writeInt(1); + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = shuffleAssignmentsInfo.getPartitionToServers(); + if (MapUtils.isEmpty(partitionToServers)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(partitionToServers.size()); + for (Map.Entry<Integer, List<ShuffleServerInfo>> entry : partitionToServers.entrySet()) { + dataOutput.writeInt(entry.getKey()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (ShuffleServerInfo serverInfo : entry.getValue()) { + dataOutput.writeUTF(serverInfo.getId()); + dataOutput.writeUTF(serverInfo.getHost()); + dataOutput.writeInt(serverInfo.getGrpcPort()); + } + } + } + } + + Map<ShuffleServerInfo, List<PartitionRange>> serverToPartitionRanges = shuffleAssignmentsInfo + .getServerToPartitionRanges(); + if (MapUtils.isEmpty(serverToPartitionRanges)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(serverToPartitionRanges.size()); + for (Map.Entry<ShuffleServerInfo, List<PartitionRange>> entry : serverToPartitionRanges.entrySet()) { + dataOutput.writeUTF(entry.getKey().getId()); + dataOutput.writeUTF(entry.getKey().getHost()); + dataOutput.writeInt(entry.getKey().getGrpcPort()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (PartitionRange range : entry.getValue()) { + dataOutput.writeInt(range.getStart()); + dataOutput.writeInt(range.getEnd()); + } + } + } + } + } + + @Override + public void readFields(DataInput dataInput) throws IOException { + if (dataInput.readInt() == -1) { + return; Review Comment: Should we add a log here? ########## client-tez/src/main/java/org/apache/tez/common/ShuffleAssignmentsInfoWritable.java: ########## @@ -0,0 +1,160 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tez.common; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.hadoop.io.Writable; + +import org.apache.uniffle.common.PartitionRange; +import org.apache.uniffle.common.ShuffleAssignmentsInfo; +import org.apache.uniffle.common.ShuffleServerInfo; + + +public class ShuffleAssignmentsInfoWritable implements Writable { + private ShuffleAssignmentsInfo shuffleAssignmentsInfo; + + public ShuffleAssignmentsInfoWritable() { + + } + + public ShuffleAssignmentsInfoWritable(ShuffleAssignmentsInfo shuffleAssignmentsInfo) { + this.shuffleAssignmentsInfo = shuffleAssignmentsInfo; + } + + + @Override + public void write(DataOutput dataOutput) throws IOException { + if (shuffleAssignmentsInfo == null) { + dataOutput.writeInt(-1); + return; + } else { + dataOutput.writeInt(1); + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = shuffleAssignmentsInfo.getPartitionToServers(); + if (MapUtils.isEmpty(partitionToServers)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(partitionToServers.size()); + for (Map.Entry<Integer, List<ShuffleServerInfo>> entry : partitionToServers.entrySet()) { + dataOutput.writeInt(entry.getKey()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (ShuffleServerInfo serverInfo : entry.getValue()) { + dataOutput.writeUTF(serverInfo.getId()); + dataOutput.writeUTF(serverInfo.getHost()); + dataOutput.writeInt(serverInfo.getGrpcPort()); + } + } + } + } + + Map<ShuffleServerInfo, List<PartitionRange>> serverToPartitionRanges = shuffleAssignmentsInfo + .getServerToPartitionRanges(); + if (MapUtils.isEmpty(serverToPartitionRanges)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(serverToPartitionRanges.size()); + for (Map.Entry<ShuffleServerInfo, List<PartitionRange>> entry : serverToPartitionRanges.entrySet()) { + dataOutput.writeUTF(entry.getKey().getId()); + dataOutput.writeUTF(entry.getKey().getHost()); + dataOutput.writeInt(entry.getKey().getGrpcPort()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (PartitionRange range : entry.getValue()) { + dataOutput.writeInt(range.getStart()); + dataOutput.writeInt(range.getEnd()); + } + } + } + } + } + + @Override + public void readFields(DataInput dataInput) throws IOException { + if (dataInput.readInt() == -1) { + return; + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = new HashMap<>(); + int partitionToServersSize = dataInput.readInt(); + if (partitionToServersSize != -1) { + Integer k; + for (int i = 0; i < partitionToServersSize; i++) { Review Comment: Could we have a better name like `entryIndex`? ########## client-tez/src/main/java/org/apache/tez/common/ShuffleAssignmentsInfoWritable.java: ########## @@ -0,0 +1,160 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tez.common; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.hadoop.io.Writable; + +import org.apache.uniffle.common.PartitionRange; +import org.apache.uniffle.common.ShuffleAssignmentsInfo; +import org.apache.uniffle.common.ShuffleServerInfo; + + +public class ShuffleAssignmentsInfoWritable implements Writable { + private ShuffleAssignmentsInfo shuffleAssignmentsInfo; + + public ShuffleAssignmentsInfoWritable() { + + } + + public ShuffleAssignmentsInfoWritable(ShuffleAssignmentsInfo shuffleAssignmentsInfo) { + this.shuffleAssignmentsInfo = shuffleAssignmentsInfo; + } + + + @Override + public void write(DataOutput dataOutput) throws IOException { + if (shuffleAssignmentsInfo == null) { + dataOutput.writeInt(-1); + return; + } else { + dataOutput.writeInt(1); + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = shuffleAssignmentsInfo.getPartitionToServers(); + if (MapUtils.isEmpty(partitionToServers)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(partitionToServers.size()); + for (Map.Entry<Integer, List<ShuffleServerInfo>> entry : partitionToServers.entrySet()) { + dataOutput.writeInt(entry.getKey()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (ShuffleServerInfo serverInfo : entry.getValue()) { + dataOutput.writeUTF(serverInfo.getId()); + dataOutput.writeUTF(serverInfo.getHost()); + dataOutput.writeInt(serverInfo.getGrpcPort()); + } + } + } + } + + Map<ShuffleServerInfo, List<PartitionRange>> serverToPartitionRanges = shuffleAssignmentsInfo + .getServerToPartitionRanges(); + if (MapUtils.isEmpty(serverToPartitionRanges)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(serverToPartitionRanges.size()); + for (Map.Entry<ShuffleServerInfo, List<PartitionRange>> entry : serverToPartitionRanges.entrySet()) { + dataOutput.writeUTF(entry.getKey().getId()); + dataOutput.writeUTF(entry.getKey().getHost()); + dataOutput.writeInt(entry.getKey().getGrpcPort()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (PartitionRange range : entry.getValue()) { + dataOutput.writeInt(range.getStart()); + dataOutput.writeInt(range.getEnd()); + } + } + } + } + } + + @Override + public void readFields(DataInput dataInput) throws IOException { + if (dataInput.readInt() == -1) { + return; + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = new HashMap<>(); + int partitionToServersSize = dataInput.readInt(); + if (partitionToServersSize != -1) { + Integer k; + for (int i = 0; i < partitionToServersSize; i++) { + k = dataInput.readInt(); + List<ShuffleServerInfo> v = new ArrayList<>(); + int vSize = dataInput.readInt(); + if (vSize != -1) { + for (int i1 = 0; i1 < vSize; i1++) { + String id = dataInput.readUTF(); + String host = dataInput.readUTF(); + int port = dataInput.readInt(); + ShuffleServerInfo shuffleServerInfo = new ShuffleServerInfo(id, host, port); + v.add(shuffleServerInfo); + } + } + + partitionToServers.put(k, v); + } + } + + Map<ShuffleServerInfo, List<PartitionRange>> serverToPartitionRanges = new HashMap<>(); + int serverToPartitionRangesSize = dataInput.readInt(); Review Comment: ditto. ########## client-tez/src/main/java/org/apache/tez/common/ShuffleAssignmentsInfoWritable.java: ########## @@ -0,0 +1,160 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tez.common; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.hadoop.io.Writable; + +import org.apache.uniffle.common.PartitionRange; +import org.apache.uniffle.common.ShuffleAssignmentsInfo; +import org.apache.uniffle.common.ShuffleServerInfo; + + +public class ShuffleAssignmentsInfoWritable implements Writable { + private ShuffleAssignmentsInfo shuffleAssignmentsInfo; + + public ShuffleAssignmentsInfoWritable() { + + } + + public ShuffleAssignmentsInfoWritable(ShuffleAssignmentsInfo shuffleAssignmentsInfo) { + this.shuffleAssignmentsInfo = shuffleAssignmentsInfo; + } + + + @Override + public void write(DataOutput dataOutput) throws IOException { + if (shuffleAssignmentsInfo == null) { + dataOutput.writeInt(-1); + return; + } else { + dataOutput.writeInt(1); + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = shuffleAssignmentsInfo.getPartitionToServers(); + if (MapUtils.isEmpty(partitionToServers)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(partitionToServers.size()); + for (Map.Entry<Integer, List<ShuffleServerInfo>> entry : partitionToServers.entrySet()) { + dataOutput.writeInt(entry.getKey()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (ShuffleServerInfo serverInfo : entry.getValue()) { + dataOutput.writeUTF(serverInfo.getId()); + dataOutput.writeUTF(serverInfo.getHost()); + dataOutput.writeInt(serverInfo.getGrpcPort()); + } + } + } + } + + Map<ShuffleServerInfo, List<PartitionRange>> serverToPartitionRanges = shuffleAssignmentsInfo + .getServerToPartitionRanges(); + if (MapUtils.isEmpty(serverToPartitionRanges)) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(serverToPartitionRanges.size()); + for (Map.Entry<ShuffleServerInfo, List<PartitionRange>> entry : serverToPartitionRanges.entrySet()) { + dataOutput.writeUTF(entry.getKey().getId()); + dataOutput.writeUTF(entry.getKey().getHost()); + dataOutput.writeInt(entry.getKey().getGrpcPort()); + if (CollectionUtils.isEmpty(entry.getValue())) { + dataOutput.writeInt(-1); + } else { + dataOutput.writeInt(entry.getValue().size()); + for (PartitionRange range : entry.getValue()) { + dataOutput.writeInt(range.getStart()); + dataOutput.writeInt(range.getEnd()); + } + } + } + } + } + + @Override + public void readFields(DataInput dataInput) throws IOException { + if (dataInput.readInt() == -1) { + return; + } + + Map<Integer, List<ShuffleServerInfo>> partitionToServers = new HashMap<>(); + int partitionToServersSize = dataInput.readInt(); + if (partitionToServersSize != -1) { + Integer k; + for (int i = 0; i < partitionToServersSize; i++) { + k = dataInput.readInt(); + List<ShuffleServerInfo> v = new ArrayList<>(); + int vSize = dataInput.readInt(); + if (vSize != -1) { + for (int i1 = 0; i1 < vSize; i1++) { + String id = dataInput.readUTF(); + String host = dataInput.readUTF(); + int port = dataInput.readInt(); + ShuffleServerInfo shuffleServerInfo = new ShuffleServerInfo(id, host, port); + v.add(shuffleServerInfo); + } + } + + partitionToServers.put(k, v); + } + } + + Map<ShuffleServerInfo, List<PartitionRange>> serverToPartitionRanges = new HashMap<>(); + int serverToPartitionRangesSize = dataInput.readInt(); + if (serverToPartitionRangesSize != -1) { + for (int i = 0; i < serverToPartitionRangesSize; i++) { + ShuffleServerInfo k; + List<PartitionRange> v = new ArrayList<>(); + + String id = dataInput.readUTF(); + String host = dataInput.readUTF(); + int port = dataInput.readInt(); + k = new ShuffleServerInfo(id, host, port); + + int vSize = dataInput.readInt(); + if (vSize != -1) { + for (int i1 = 0; i1 < vSize; i1++) { Review Comment: ditto. -- 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]
