Repository: spark Updated Branches: refs/heads/master 7b16e9f21 -> 3c4c1f964
[SPARK-7726] Fix Scaladoc false errors Visibility rules for static members are different in Scala and Java, and this case requires an explicit static import. Even though these are Java files, they are run through scaladoc, which enforces Scala rules. Also reverted the commit that reverts the upgrade to 2.11.6 Author: Iulian Dragos <jagua...@gmail.com> Closes #6260 from dragos/issue/scaladoc-false-error and squashes the following commits: f2e998e [Iulian Dragos] Revert "[HOTFIX] Revert "[SPARK-7092] Update spark scala version to 2.11.6"" 0bad052 [Iulian Dragos] Fix scaladoc faux-error. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3c4c1f96 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3c4c1f96 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3c4c1f96 Branch: refs/heads/master Commit: 3c4c1f96474b3e66fa1d44ac0177f548cf5a3a10 Parents: 7b16e9f Author: Iulian Dragos <jagua...@gmail.com> Authored: Tue May 19 12:14:48 2015 -0700 Committer: Patrick Wendell <patr...@databricks.com> Committed: Tue May 19 12:14:48 2015 -0700 ---------------------------------------------------------------------- .../org/apache/spark/network/shuffle/protocol/OpenBlocks.java | 3 +++ .../apache/spark/network/shuffle/protocol/RegisterExecutor.java | 3 +++ .../org/apache/spark/network/shuffle/protocol/StreamHandle.java | 3 +++ .../org/apache/spark/network/shuffle/protocol/UploadBlock.java | 3 +++ pom.xml | 4 ++-- .../src/main/scala/org/apache/spark/repl/SparkIMain.scala | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3c4c1f96/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..ce954b8 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 @@ -24,6 +24,9 @@ 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 read a set of blocks. Returns {@link StreamHandle}. */ public class OpenBlocks extends BlockTransferMessage { public final String appId; http://git-wip-us.apache.org/repos/asf/spark/blob/3c4c1f96/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..cca8b17 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 @@ -22,6 +22,9 @@ 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; + /** * Initial registration message between an executor and its local shuffle server. * Returns nothing (empty bye array). http://git-wip-us.apache.org/repos/asf/spark/blob/3c4c1f96/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 9a92202..1915295 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 @@ -20,6 +20,9 @@ package org.apache.spark.network.shuffle.protocol; import com.google.common.base.Objects; import io.netty.buffer.ByteBuf; +// Needed by ScalaDoc. See SPARK-7726 +import static 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/3c4c1f96/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 2ff9aaa..3caed59 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 @@ -24,6 +24,9 @@ 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 upload a block with a certain StorageLevel. Returns nothing (empty byte array). */ public class UploadBlock extends BlockTransferMessage { http://git-wip-us.apache.org/repos/asf/spark/blob/3c4c1f96/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d903f02..c72d7cb 100644 --- a/pom.xml +++ b/pom.xml @@ -1799,9 +1799,9 @@ <property><name>scala-2.11</name></property> </activation> <properties> - <scala.version>2.11.2</scala.version> + <scala.version>2.11.6</scala.version> <scala.binary.version>2.11</scala.binary.version> - <jline.version>2.12</jline.version> + <jline.version>2.12.1</jline.version> <jline.groupid>jline</jline.groupid> </properties> </profile> http://git-wip-us.apache.org/repos/asf/spark/blob/3c4c1f96/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala ---------------------------------------------------------------------- diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala index 1bb62c8..1cb910f 100644 --- a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala +++ b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala @@ -1129,7 +1129,7 @@ class SparkIMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings def apply(line: String): Result = debugging(s"""parse("$line")""") { var isIncomplete = false - currentRun.reporting.withIncompleteHandler((_, _) => isIncomplete = true) { + currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) { reporter.reset() val trees = newUnitParser(line).parseStats() if (reporter.hasErrors) Error --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
