From aee12381ce23fe7d399aa6488486a0f750027915 Mon Sep 17 00:00:00 2001 From: Kevin Bates Date: Tue, 21 Mar 2017 14:45:43 -0700 Subject: [PATCH 1/3] [TOREE-395] disable cell result output --- .../toree/kernel/interpreter/scala/ScalaInterpreter.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala index ce983532c..c0308dd41 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala @@ -48,7 +48,7 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I protected val lastResultOut = new ByteArrayOutputStream() - protected val multiOutputStream = MultiOutputStream(List(Console.out, lastResultOut)) + protected val multiOutputStream = lastResultOut private[scala] var taskManager: TaskManager = _ /** Since the ScalaInterpreter can be started without a kernel, we need to ensure that we can compile things. From e610241a7b4caeb3d013e5c195c9030ce521102f Mon Sep 17 00:00:00 2001 From: Kevin Bates Date: Tue, 21 Mar 2017 16:51:52 -0700 Subject: [PATCH 2/3] preserve list of multiOutputStream --- .../toree/kernel/interpreter/scala/ScalaInterpreter.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala index c0308dd41..a5eee4075 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala @@ -48,7 +48,7 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I protected val lastResultOut = new ByteArrayOutputStream() - protected val multiOutputStream = lastResultOut + protected val multiOutputStream = MultiOutputStream(List(lastResultOut)) private[scala] var taskManager: TaskManager = _ /** Since the ScalaInterpreter can be started without a kernel, we need to ensure that we can compile things. From 9dee732b34140b01aaed81eb04e12fbe2571bacc Mon Sep 17 00:00:00 2001 From: Kevin Bates Date: Wed, 22 Mar 2017 14:17:47 -0700 Subject: [PATCH 3/3] remove multiOutputStream relative to cell results output --- .../integration/InterpreterActorSpecForIntegration.scala | 2 -- .../scala/integration/PostProcessorSpecForIntegration.scala | 4 +--- .../kernel/interpreter/scala/ScalaInterpreterSpecific.scala | 2 +- .../kernel/interpreter/scala/ScalaInterpreterSpecific.scala | 2 +- .../toree/kernel/interpreter/scala/ScalaInterpreter.scala | 3 +-- .../scala/AddExternalJarMagicSpecForIntegration.scala | 2 -- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/kernel/src/test/scala/integration/InterpreterActorSpecForIntegration.scala b/kernel/src/test/scala/integration/InterpreterActorSpecForIntegration.scala index a9a4ce4b5..cc151a871 100644 --- a/kernel/src/test/scala/integration/InterpreterActorSpecForIntegration.scala +++ b/kernel/src/test/scala/integration/InterpreterActorSpecForIntegration.scala @@ -57,8 +57,6 @@ class InterpreterActorSpecForIntegration extends TestKit( private val output = new ByteArrayOutputStream() private val interpreter = new ScalaInterpreter { - override protected val multiOutputStream = MultiOutputStream(List(mock[OutputStream], lastResultOut)) - override protected def bindKernelVariable(kernel: KernelLike): Unit = { } } diff --git a/kernel/src/test/scala/integration/PostProcessorSpecForIntegration.scala b/kernel/src/test/scala/integration/PostProcessorSpecForIntegration.scala index 8b392addb..5bf70ae4f 100644 --- a/kernel/src/test/scala/integration/PostProcessorSpecForIntegration.scala +++ b/kernel/src/test/scala/integration/PostProcessorSpecForIntegration.scala @@ -35,9 +35,7 @@ class PostProcessorSpecForIntegration extends FunSpec with Matchers before { // TODO: Move instantiation and start of interpreter to a beforeAll // for performance improvements - scalaInterpreter = new ScalaInterpreter { - override protected val multiOutputStream = MultiOutputStream(List(mock[OutputStream], lastResultOut)) - } + scalaInterpreter = new ScalaInterpreter scalaInterpreter.init(mock[Kernel]) diff --git a/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala b/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala index 0cb8ce335..b8a8535a4 100644 --- a/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala +++ b/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala @@ -303,7 +303,7 @@ trait ScalaInterpreterSpecific { this: ScalaInterpreter => taskManager.start() sparkIMain = - newSparkIMain(settings, new JPrintWriter(multiOutputStream, true)) + newSparkIMain(settings, new JPrintWriter(lastResultOut, true)) //logger.debug("Initializing interpreter") diff --git a/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala b/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala index 98f759910..3cf940721 100644 --- a/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala +++ b/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala @@ -278,7 +278,7 @@ trait ScalaInterpreterSpecific extends SettingsProducerLike { this: ScalaInterpr logger.debug("Initializing task manager") taskManager.start() - iMain = newIMain(settings, new JPrintWriter(multiOutputStream, true)) + iMain = newIMain(settings, new JPrintWriter(lastResultOut, true)) //logger.debug("Initializing interpreter") //iMain.initializeSynchronous() diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala index a5eee4075..debf63873 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala @@ -29,7 +29,7 @@ import org.apache.spark.repl.Main import org.apache.toree.interpreter._ import org.apache.toree.kernel.api.{KernelLike, KernelOptions} -import org.apache.toree.utils.{MultiOutputStream, TaskManager} +import org.apache.toree.utils.TaskManager import org.slf4j.LoggerFactory import org.apache.toree.kernel.BuildInfo @@ -48,7 +48,6 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I protected val lastResultOut = new ByteArrayOutputStream() - protected val multiOutputStream = MultiOutputStream(List(lastResultOut)) private[scala] var taskManager: TaskManager = _ /** Since the ScalaInterpreter can be started without a kernel, we need to ensure that we can compile things. diff --git a/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala b/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala index 6d06e72a2..d16a22b7b 100644 --- a/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala +++ b/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala @@ -38,8 +38,6 @@ class AddExternalJarMagicSpecForIntegration before { interpreter = new ScalaInterpreter { - override protected val multiOutputStream = MultiOutputStream(List(mock[OutputStream], lastResultOut)) - override protected def bindKernelVariable(kernel: KernelLike): Unit = { } } // interpreter.start()