[SPARK-14828][SQL] Start SparkSession in REPL instead of SQLContext

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

@@ -43,7 +43,7 @@ import org.apache.spark.SparkConf
 import org.apache.spark.SparkContext
 import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.internal.Logging
-import org.apache.spark.sql.SQLContext
+import org.apache.spark.sql.SparkSession
 import org.apache.spark.util.Utils
 
 /** The Scala interactive shell.  It provides a read-eval-print loop
@@ -129,7 +129,6 @@ class SparkILoop(
   // NOTE: Must be public for visibility
   @DeveloperApi
   var sparkContext: SparkContext = _
-  var sqlContext: SQLContext = _
 
   override def echoCommandMessage(msg: String) {
     intp.reporter printMessage msg
@@ -1027,20 +1026,15 @@ class SparkILoop(
   }
 
   @DeveloperApi
-  def createSQLContext(): SQLContext = {
-    val name = "org.apache.spark.sql.hive.HiveContext"
-    val loader = Utils.getContextOrSparkClassLoader
-    try {
-      sqlContext = loader.loadClass(name).getConstructor(classOf[SparkContext])
-        .newInstance(sparkContext).asInstanceOf[SQLContext]
-      logInfo("Created sql context (with Hive support)..")
+  // TODO: don't duplicate this code
+  def createSparkSession(): SparkSession = {
+    if (SparkSession.hiveClassesArePresent) {
+      logInfo("Creating Spark session with Hive support")
+      SparkSession.withHiveSupport(sparkContext)
+    } else {
+      logInfo("Creating Spark session")
+      new SparkSession(sparkContext)
     }
-    catch {
-      case _: java.lang.ClassNotFoundException | _: java.lang.NoClassDefFoundError =>
-        sqlContext = new SQLContext(sparkContext)
-        logInfo("Created sql context..")
-    }
-    sqlContext
   }
 
   private def getMaster(): String = {

repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala

@@ -125,21 +125,21 @@ private[repl] trait SparkILoopInit {
       command("""
         @transient val sc = {
           val _sc = org.apache.spark.repl.Main.interp.createSparkContext()
-          println("Spark context available as sc " +
+          println("Spark context available as 'sc' " +
             s"(master = ${_sc.master}, app id = ${_sc.applicationId}).")
           _sc
         }
         """)
       command("""
-        @transient val sqlContext = {
-          val _sqlContext = org.apache.spark.repl.Main.interp.createSQLContext()
-          println("SQL context available as sqlContext.")
-          _sqlContext
+        @transient val spark = {
+          val _session = org.apache.spark.repl.Main.interp.createSparkSession()
+          println("Spark session available as 'spark'.")
+          _session
         }
         """)
       command("import org.apache.spark.SparkContext._")
-      command("import sqlContext.implicits._")
-      command("import sqlContext.sql")
+      command("import spark.implicits._")
+      command("import spark.sql")
       command("import org.apache.spark.sql.functions._")
     }
   }

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

@@ -23,8 +23,8 @@ import scala.tools.nsc.GenericRunnerSettings
 
 import org.apache.spark._
 import org.apache.spark.internal.Logging
+import org.apache.spark.sql.SparkSession
 import org.apache.spark.util.Utils
-import org.apache.spark.sql.SQLContext
 
 object Main extends Logging {
 
@@ -35,7 +35,7 @@ object Main extends Logging {
   val outputDir = Utils.createTempDir(root = rootDir, namePrefix = "repl")
 
   var sparkContext: SparkContext = _
-  var sqlContext: SQLContext = _
+  var sparkSession: SparkSession = _
   // this is a public var because tests reset it.
   var interp: SparkILoop = _
 
@@ -92,19 +92,15 @@ object Main extends Logging {
     sparkContext
   }
 
-  def createSQLContext(): SQLContext = {
-    val name = "org.apache.spark.sql.hive.HiveContext"
-    val loader = Utils.getContextOrSparkClassLoader
-    try {
-      sqlContext = loader.loadClass(name).getConstructor(classOf[SparkContext])
-        .newInstance(sparkContext).asInstanceOf[SQLContext]
-      logInfo("Created sql context (with Hive support)..")
-    } catch {
-      case _: java.lang.ClassNotFoundException | _: java.lang.NoClassDefFoundError =>
-        sqlContext = new SQLContext(sparkContext)
-        logInfo("Created sql context..")
+  def createSparkSession(): SparkSession = {
+    if (SparkSession.hiveClassesArePresent) {
+      sparkSession = SparkSession.withHiveSupport(sparkContext)
+      logInfo("Created Spark session with Hive support")
+    } else {
+      sparkSession = new SparkSession(sparkContext)
+      logInfo("Created Spark session")
     }
-    sqlContext
+    sparkSession
   }
 
 }

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

@@ -38,21 +38,21 @@ class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
       processLine("""
         @transient val sc = {
           val _sc = org.apache.spark.repl.Main.createSparkContext()
-          println("Spark context available as sc " +
+          println("Spark context available as 'sc' " +
             s"(master = ${_sc.master}, app id = ${_sc.applicationId}).")
           _sc
         }
         """)
       processLine("""
-        @transient val sqlContext = {
-          val _sqlContext = org.apache.spark.repl.Main.createSQLContext()
-          println("SQL context available as sqlContext.")
-          _sqlContext
+        @transient val spark = {
+          val _session = org.apache.spark.repl.Main.createSparkSession()
+          println("Spark session available as 'spark'.")
+          _session
         }
         """)
       processLine("import org.apache.spark.SparkContext._")
-      processLine("import sqlContext.implicits._")
-      processLine("import sqlContext.sql")
+      processLine("import spark.implicits._")
+      processLine("import spark.sql")
       processLine("import org.apache.spark.sql.functions._")
     }
   }

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

@@ -249,10 +249,11 @@ class ReplSuite extends SparkFunSuite {
     assertDoesNotContain("Exception", output)
   }
 
-  test("SPARK-2576 importing SQLContext.createDataFrame.") {
+  test("SPARK-2576 importing implicits") {
     // We need to use local-cluster to test this case.
     val output = runInterpreter("local-cluster[1,1,1024]",
       """
+        |import spark.implicits._
         |case class TestCaseClass(value: Int)
         |sc.parallelize(1 to 10).map(x => TestCaseClass(x)).toDF().collect()
         |
@@ -366,7 +367,7 @@ class ReplSuite extends SparkFunSuite {
   test("define case class and create Dataset together with paste mode") {
     val output = runInterpreterInPasteMode("local-cluster[1,1,1024]",
       """
-        |import sqlContext.implicits._
+        |import spark.implicits._
         |case class TestClass(value: Int)
         |Seq(TestClass(1)).toDS()
       """.stripMargin)

sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala

@@ -907,16 +907,19 @@ class SparkSession private(
 
 object SparkSession {
 
+  private val HIVE_SHARED_STATE_CLASS_NAME = "org.apache.spark.sql.hive.HiveSharedState"
+  private val HIVE_SESSION_STATE_CLASS_NAME = "org.apache.spark.sql.hive.HiveSessionState"
+
   private def sharedStateClassName(conf: SparkConf): String = {
     conf.get(CATALOG_IMPLEMENTATION) match {
-      case "hive" => "org.apache.spark.sql.hive.HiveSharedState"
+      case "hive" => HIVE_SHARED_STATE_CLASS_NAME
       case "in-memory" => classOf[SharedState].getCanonicalName
     }
   }
 
   private def sessionStateClassName(conf: SparkConf): String = {
     conf.get(CATALOG_IMPLEMENTATION) match {
-      case "hive" => "org.apache.spark.sql.hive.HiveSessionState"
+      case "hive" => HIVE_SESSION_STATE_CLASS_NAME
       case "in-memory" => classOf[SessionState].getCanonicalName
     }
   }
@@ -938,10 +941,31 @@ object SparkSession {
     }
   }
 
-  // TODO: do we want to expose this?
+  /**
+   * Return true if Hive classes can be loaded, otherwise false.
+   */
+  private[spark] def hiveClassesArePresent: Boolean = {
+    try {
+      Utils.classForName(HIVE_SESSION_STATE_CLASS_NAME)
+      Utils.classForName(HIVE_SHARED_STATE_CLASS_NAME)
+      Utils.classForName("org.apache.hadoop.hive.conf.HiveConf")
+      true
+    } catch {
+      case _: ClassNotFoundException | _: NoClassDefFoundError => false
+    }
+  }
+
+  /**
+   * Create a new [[SparkSession]] with a catalog backed by Hive.
+   */
   def withHiveSupport(sc: SparkContext): SparkSession = {
-    sc.conf.set(CATALOG_IMPLEMENTATION.key, "hive")
-    new SparkSession(sc)
+    if (hiveClassesArePresent) {
+      sc.conf.set(CATALOG_IMPLEMENTATION.key, "hive")
+      new SparkSession(sc)
+    } else {
+      throw new IllegalArgumentException(
+        "Unable to instantiate SparkSession with Hive support because Hive classes are not found.")
+    }
   }
 
 }