Repository: spark Updated Branches: refs/heads/branch-1.2 c07592e40 -> d993a44de
[SPARK-4326] fix unidoc There are two issues: 1. specifying guava 11.0.2 will cause hashInt not found in unidoc (any reason to force the version here?) 2. unidoc doesn't recognize static class defined in a base class aarondav srowen vanzin Author: Xiangrui Meng <[email protected]> Closes #3253 from mengxr/SPARK-4326 and squashes the following commits: 53967bf [Xiangrui Meng] fix unidoc (cherry picked from commit 4b0c1edfdf457cde0e39083c47961184059efded) Signed-off-by: Aaron Davidson <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d993a44d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d993a44d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d993a44d Branch: refs/heads/branch-1.2 Commit: d993a44de2bf91e93c5ad3f84d35ff4e55f4b2fb Parents: c07592e Author: Xiangrui Meng <[email protected]> Authored: Thu Nov 13 13:16:20 2014 -0800 Committer: Aaron Davidson <[email protected]> Committed: Thu Nov 13 13:16:51 2014 -0800 ---------------------------------------------------------------------- network/common/pom.xml | 1 - network/shuffle/pom.xml | 1 - .../org/apache/spark/network/shuffle/protocol/OpenBlocks.java | 1 + .../apache/spark/network/shuffle/protocol/RegisterExecutor.java | 1 + .../org/apache/spark/network/shuffle/protocol/StreamHandle.java | 4 ++-- .../org/apache/spark/network/shuffle/protocol/UploadBlock.java | 2 ++ 6 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d993a44d/network/common/pom.xml ---------------------------------------------------------------------- diff --git a/network/common/pom.xml b/network/common/pom.xml index a6bee7e..2bd0a7d 100644 --- a/network/common/pom.xml +++ b/network/common/pom.xml @@ -51,7 +51,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>11.0.2</version> <!-- yarn 2.4.0's version --> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/d993a44d/network/shuffle/pom.xml ---------------------------------------------------------------------- diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml index be78331..12ff034 100644 --- a/network/shuffle/pom.xml +++ b/network/shuffle/pom.xml @@ -52,7 +52,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>11.0.2</version> <!-- yarn 2.4.0's version --> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/d993a44d/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java ---------------------------------------------------------------------- diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java index 60485ba..62fce9b 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java +++ b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java @@ -23,6 +23,7 @@ import com.google.common.base.Objects; import io.netty.buffer.ByteBuf; import org.apache.spark.network.protocol.Encoders; +import org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type; /** Request to read a set of blocks. Returns {@link StreamHandle}. */ public class OpenBlocks extends BlockTransferMessage { http://git-wip-us.apache.org/repos/asf/spark/blob/d993a44d/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java ---------------------------------------------------------------------- diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java index 38acae3..7eb4385 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java +++ b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java @@ -21,6 +21,7 @@ import com.google.common.base.Objects; import io.netty.buffer.ByteBuf; import org.apache.spark.network.protocol.Encoders; +import org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type; /** * Initial registration message between an executor and its local shuffle server. http://git-wip-us.apache.org/repos/asf/spark/blob/d993a44d/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java ---------------------------------------------------------------------- diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java index 21369c8..bc9daa6 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java +++ b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java @@ -17,11 +17,11 @@ package org.apache.spark.network.shuffle.protocol; -import java.io.Serializable; - import com.google.common.base.Objects; import io.netty.buffer.ByteBuf; +import org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type; + /** * Identifier for a fixed number of chunks to read from a stream created by an "open blocks" * message. This is used by {@link org.apache.spark.network.shuffle.OneForOneBlockFetcher}. http://git-wip-us.apache.org/repos/asf/spark/blob/d993a44d/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java ---------------------------------------------------------------------- diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java index 38abe29..0b23e11 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java +++ b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java @@ -23,6 +23,8 @@ import com.google.common.base.Objects; import io.netty.buffer.ByteBuf; import org.apache.spark.network.protocol.Encoders; +import org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type; + /** Request to upload a block with a certain StorageLevel. Returns nothing (empty byte array). */ public class UploadBlock extends BlockTransferMessage { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
