-
Notifications
You must be signed in to change notification settings - Fork 28.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into hadoop-2.7-jdk11
- Loading branch information
Showing
132 changed files
with
3,681 additions
and
911 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
...fle/src/main/java/org/apache/spark/network/shuffle/protocol/GetLocalDirsForExecutors.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * 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.spark.network.shuffle.protocol; | ||
|
|
||
| import java.util.Arrays; | ||
|
|
||
| import com.google.common.base.Objects; | ||
| import io.netty.buffer.ByteBuf; | ||
|
|
||
| import org.apache.spark.network.protocol.Encoders; | ||
|
|
||
| // Needed by ScalaDoc. See SPARK-7726 | ||
| import static org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type; | ||
|
|
||
| /** Request to get the local dirs for the given executors. */ | ||
| public class GetLocalDirsForExecutors extends BlockTransferMessage { | ||
| public final String appId; | ||
| public final String[] execIds; | ||
|
|
||
| public GetLocalDirsForExecutors(String appId, String[] execIds) { | ||
| this.appId = appId; | ||
| this.execIds = execIds; | ||
| } | ||
|
|
||
| @Override | ||
| protected Type type() { return Type.GET_LOCAL_DIRS_FOR_EXECUTORS; } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hashCode(appId) * 41 + Arrays.hashCode(execIds); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return Objects.toStringHelper(this) | ||
| .add("appId", appId) | ||
| .add("execIds", Arrays.toString(execIds)) | ||
| .toString(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other instanceof GetLocalDirsForExecutors) { | ||
| GetLocalDirsForExecutors o = (GetLocalDirsForExecutors) other; | ||
| return appId.equals(o.appId) && Arrays.equals(execIds, o.execIds); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public int encodedLength() { | ||
| return Encoders.Strings.encodedLength(appId) + Encoders.StringArrays.encodedLength(execIds); | ||
| } | ||
|
|
||
| @Override | ||
| public void encode(ByteBuf buf) { | ||
| Encoders.Strings.encode(buf, appId); | ||
| Encoders.StringArrays.encode(buf, execIds); | ||
| } | ||
|
|
||
| public static GetLocalDirsForExecutors decode(ByteBuf buf) { | ||
| String appId = Encoders.Strings.decode(buf); | ||
| String[] execIds = Encoders.StringArrays.decode(buf); | ||
| return new GetLocalDirsForExecutors(appId, execIds); | ||
| } | ||
| } |
117 changes: 117 additions & 0 deletions
117
...huffle/src/main/java/org/apache/spark/network/shuffle/protocol/LocalDirsForExecutors.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /* | ||
| * 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.spark.network.shuffle.protocol; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| import com.google.common.base.Objects; | ||
| import io.netty.buffer.ByteBuf; | ||
|
|
||
| import org.apache.spark.network.protocol.Encoders; | ||
|
|
||
| // Needed by ScalaDoc. See SPARK-7726 | ||
| import static org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type; | ||
|
|
||
| /** The reply to get local dirs giving back the dirs for each of the requested executors. */ | ||
| public class LocalDirsForExecutors extends BlockTransferMessage { | ||
| private final String[] execIds; | ||
| private final int[] numLocalDirsByExec; | ||
| private final String[] allLocalDirs; | ||
|
|
||
| public LocalDirsForExecutors(Map<String, String[]> localDirsByExec) { | ||
| this.execIds = new String[localDirsByExec.size()]; | ||
| this.numLocalDirsByExec = new int[localDirsByExec.size()]; | ||
| ArrayList<String> localDirs = new ArrayList<>(); | ||
| int index = 0; | ||
| for (Map.Entry<String, String[]> e: localDirsByExec.entrySet()) { | ||
| execIds[index] = e.getKey(); | ||
| numLocalDirsByExec[index] = e.getValue().length; | ||
| Collections.addAll(localDirs, e.getValue()); | ||
| index++; | ||
| } | ||
| this.allLocalDirs = localDirs.toArray(new String[0]); | ||
| } | ||
|
|
||
| private LocalDirsForExecutors(String[] execIds, int[] numLocalDirsByExec, String[] allLocalDirs) { | ||
| this.execIds = execIds; | ||
| this.numLocalDirsByExec = numLocalDirsByExec; | ||
| this.allLocalDirs = allLocalDirs; | ||
| } | ||
|
|
||
| @Override | ||
| protected Type type() { return Type.LOCAL_DIRS_FOR_EXECUTORS; } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Arrays.hashCode(execIds); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return Objects.toStringHelper(this) | ||
| .add("execIds", Arrays.toString(execIds)) | ||
| .add("numLocalDirsByExec", Arrays.toString(numLocalDirsByExec)) | ||
| .add("allLocalDirs", Arrays.toString(allLocalDirs)) | ||
| .toString(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other instanceof LocalDirsForExecutors) { | ||
| LocalDirsForExecutors o = (LocalDirsForExecutors) other; | ||
| return Arrays.equals(execIds, o.execIds) | ||
| && Arrays.equals(numLocalDirsByExec, o.numLocalDirsByExec) | ||
| && Arrays.equals(allLocalDirs, o.allLocalDirs); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public int encodedLength() { | ||
| return Encoders.StringArrays.encodedLength(execIds) | ||
| + Encoders.IntArrays.encodedLength(numLocalDirsByExec) | ||
| + Encoders.StringArrays.encodedLength(allLocalDirs); | ||
| } | ||
|
|
||
| @Override | ||
| public void encode(ByteBuf buf) { | ||
| Encoders.StringArrays.encode(buf, execIds); | ||
| Encoders.IntArrays.encode(buf, numLocalDirsByExec); | ||
| Encoders.StringArrays.encode(buf, allLocalDirs); | ||
| } | ||
|
|
||
| public static LocalDirsForExecutors decode(ByteBuf buf) { | ||
| String[] execIds = Encoders.StringArrays.decode(buf); | ||
| int[] numLocalDirsByExec = Encoders.IntArrays.decode(buf); | ||
| String[] allLocalDirs = Encoders.StringArrays.decode(buf); | ||
| return new LocalDirsForExecutors(execIds, numLocalDirsByExec, allLocalDirs); | ||
| } | ||
|
|
||
| public Map<String, String[]> getLocalDirsByExec() { | ||
| Map<String, String[]> localDirsByExec = new HashMap<>(); | ||
| int index = 0; | ||
| int localDirsIndex = 0; | ||
| for (int length: numLocalDirsByExec) { | ||
| localDirsByExec.put(execIds[index], | ||
| Arrays.copyOfRange(allLocalDirs, localDirsIndex, localDirsIndex + length)); | ||
| localDirsIndex += length; | ||
| index++; | ||
| } | ||
| return localDirsByExec; | ||
| } | ||
| } |
Oops, something went wrong.