Skip to content

Commit b300183

Browse files
committed
Rename package and add license on top of the file, remove files from
rat-excludes and removed `-Yrepl-sync` per reviewer’s request.
1 parent 9d46d85 commit b300183

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

.rat-excludes

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,6 @@ vis.min.css
4545
cloudpickle.py
4646
heapq3.py
4747
join.py
48-
SparkExprTyper.scala
49-
SparkILoop.scala
50-
SparkILoopInit.scala
51-
SparkIMain.scala
52-
SparkImports.scala
53-
SparkJLineCompletion.scala
54-
SparkJLineReader.scala
55-
SparkMemberHandlers.scala
56-
SparkReplReporter.scala
5748
sbt
5849
sbt-launch-lib.bash
5950
plugins.sbt

repl/scala-2.11/src/main/scala/org/apache/spark/repl/Main.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package org.apache.spark.repl
2020
import java.io.File
2121

2222
import scala.tools.nsc.Settings
23-
import scala.tools.nsc.interpreter.SparkILoop
2423

2524
import org.apache.spark.util.Utils
2625
import org.apache.spark._
@@ -35,7 +34,6 @@ object Main extends Logging {
3534
val s = new Settings()
3635
s.processArguments(List("-Yrepl-class-based",
3736
"-Yrepl-outdir", s"${outputDir.getAbsolutePath}",
38-
"-Yrepl-sync",
3937
"-classpath", getAddedJars.mkString(File.pathSeparator)), true)
4038
val classServer = new HttpServer(conf, outputDir, new SecurityManager(conf))
4139
var sparkContext: SparkContext = _

repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2013 LAMP/EPFL
3-
* @author Alexander Spoon
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
416
*/
517

6-
package scala
7-
package tools.nsc
8-
package interpreter
18+
package org.apache.spark.repl
919

1020
import java.io.{ BufferedReader, FileReader }
1121

1222
import Predef.{ println => _, _ }
1323
import scala.util.Properties.{ jdkHome, javaVersion, versionString, javaVmName }
24+
25+
import scala.tools.nsc.interpreter.{ JPrintWriter, ILoop }
26+
import scala.tools.nsc.Settings
1427
import scala.tools.nsc.util.stringFromStream
1528

16-
/** A Spark-specific interactive shell.
29+
/**
30+
* A Spark-specific interactive shell.
1731
*/
1832
class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
1933
extends ILoop(in0, out) {

repl/scala-2.11/src/test/scala/org/apache/spark/repl/ReplSuite.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import java.net.URLClassLoader
2222

2323
import scala.collection.mutable.ArrayBuffer
2424
import scala.concurrent.duration._
25-
import scala.tools.nsc.interpreter.SparkILoop
2625

2726
import org.apache.commons.lang3.StringEscapeUtils
2827
import org.apache.spark.{ SparkContext, SparkFunSuite }

0 commit comments

Comments
 (0)