Repository: incubator-toree
Updated Branches:
refs/heads/master 1081da163 -> 44d913719
Fix kernel info spec message structure due to spec changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/44d91371
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/44d91371
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/44d91371
Branch: refs/heads/master
Commit: 44d913719a86e9420260959af0617f7996ecac93
Parents: 1081da1
Author: Michael Poplavski <mi...@gmail.com>
Authored: Thu May 5 10:32:25 2016 -0500
Committer: Michael Poplavski <mi...@gmail.com>
Committed: Mon May 9 09:02:46 2016 -0500
----------------------------------------------------------------------
.../main/scala/org/apache/toree/boot/KernelBootstrap.scala | 6 +++---
.../kernel/protocol/v5/handler/KernelInfoRequestHandler.scala | 2 --
.../org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala | 7 +------
.../toree/kernel/protocol/v5/content/KernelInfoReply.scala | 1 -
.../kernel/protocol/v5/content/KernelInfoReplySpec.scala | 5 ++---
5 files changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/44d91371/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala b/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
index 84a2853..46603bb 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
@@ -18,6 +18,8 @@
package org.apache.toree.boot
import akka.actor.{ActorRef, ActorSystem}
+import com.typesafe.config.Config
+import org.apache.spark.SparkContext
import org.apache.toree.boot.layer._
import org.apache.toree.interpreter.Interpreter
import org.apache.toree.kernel.api.Kernel
@@ -26,8 +28,6 @@ import org.apache.toree.kernel.protocol.v5._
import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
import org.apache.toree.security.KernelSecurityManager
import org.apache.toree.utils.LogLike
-import com.typesafe.config.Config
-import org.apache.spark.SparkContext
import org.zeromq.ZMQ
import scala.util.Try
@@ -167,7 +167,7 @@ class KernelBootstrap(config: Config) extends LogLike {
@inline private def displayVersionInfo() = {
logger.info("Kernel version: " + SparkKernelInfo.implementationVersion)
- logger.info("Scala version: " + SparkKernelInfo.languageVersion)
+ logger.info("Scala version: " + SparkKernelInfo.language_info.get("version"))
logger.info("ZeroMQ (JeroMQ) version: " + ZMQ.getVersionString)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/44d91371/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandler.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandler.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandler.scala
index d5b302b..d6807de 100644
--- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandler.scala
+++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandler.scala
@@ -21,7 +21,6 @@ import org.apache.toree.kernel.protocol.v5._
import org.apache.toree.kernel.protocol.v5.content.KernelInfoReply
import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
import org.apache.toree.utils.LogLike
-import play.api.libs.json.Json
import scala.concurrent._
@@ -43,7 +42,6 @@ class KernelInfoRequestHandler(actorLoader: ActorLoader)
kernelInfo.implementation,
kernelInfo.implementationVersion,
kernelInfo.language_info,
- kernelInfo.languageVersion,
kernelInfo.banner
)
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/44d91371/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala
index 1f09326..f13857f 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala
@@ -38,12 +38,7 @@ object SparkKernelInfo {
/**
* Represents the language supported by the kernel.
*/
- val language_info = Map("name" -> "scala")
-
- /**
- * Represents the language version supported by the kernel.
- */
- val languageVersion = BuildInfo.scalaVersion
+ val language_info = Map("name" -> "scala", "version" -> BuildInfo.scalaVersion)
/**
* Represents the displayed name of the kernel.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/44d91371/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala
index f78fe55..51c1a6d 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala
@@ -25,7 +25,6 @@ case class KernelInfoReply (
implementation: String,
implementation_version: String,
language_info: Map[String, String],
- language_version: String,
banner: String
) extends KernelMessageContent {
override def content: String =
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/44d91371/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala
----------------------------------------------------------------------
diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala
index 6b247dc..12ca226 100644
--- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala
+++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala
@@ -27,14 +27,13 @@ class KernelInfoReplySpec extends FunSpec with Matchers {
"protocol_version": "x.y.z",
"implementation": "<name>",
"implementation_version": "z.y.x",
- "language_info": { "name": "<some language>" },
- "language_version": "a.b.c",
+ "language_info": { "name": "<some language>", "version": "a.b.c" },
"banner": "<some banner>"
}
""")
val kernelInfoReply: KernelInfoReply = KernelInfoReply(
- "x.y.z", "<name>", "z.y.x", Map("name" -> "<some language>"), "a.b.c", "<some banner>"
+ "x.y.z", "<name>", "z.y.x", Map("name" -> "<some language>", "version" -> "a.b.c"), "<some banner>"
)
describe("KernelInfoReply") {