Github user shivaram commented on a diff in the pull request:
https://github.com/apache/spark/pull/13635#discussion_r67387218
--- Diff: sql/core/src/main/scala/org/apache/spark/sql/api/r/SQLUtils.scala
---
@@ -18,27 +18,56 @@
package org.apache.spark.sql.api.r
import java.io.{ByteArrayInputStream, ByteArrayOutputStream,
DataInputStream, DataOutputStream}
+import java.util.{Map => JMap}
import scala.collection.JavaConverters._
import scala.util.matching.Regex
+import org.apache.spark.SparkContext
import org.apache.spark.api.java.{JavaRDD, JavaSparkContext}
import org.apache.spark.api.r.SerDe
import org.apache.spark.broadcast.Broadcast
+import org.apache.spark.internal.config.CATALOG_IMPLEMENTATION
import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.{DataFrame, Row, SaveMode, SQLContext}
+import org.apache.spark.sql.{DataFrame, Dataset, Row, SaveMode,
SparkSession, SQLContext}
import org.apache.spark.sql.catalyst.expressions.GenericRowWithSchema
+import org.apache.spark.sql.execution.command.ShowTablesCommand
import org.apache.spark.sql.types._
private[sql] object SQLUtils {
SerDe.registerSqlSerDe((readSqlObject, writeSqlObject))
- def createSQLContext(jsc: JavaSparkContext): SQLContext = {
- SQLContext.getOrCreate(jsc.sc)
+ private[this] def withHiveExternalCatalog(sc: SparkContext):
SparkContext = {
+ sc.conf.set(CATALOG_IMPLEMENTATION.key, "hive")
+ sc
}
- def getJavaSparkContext(sqlCtx: SQLContext): JavaSparkContext = {
- new JavaSparkContext(sqlCtx.sparkContext)
+ def getOrCreateSparkSession(
+ jsc: JavaSparkContext,
+ sparkConfigMap: JMap[Object, Object],
+ enableHiveSupport: Boolean): SparkSession = {
+ val spark = if (SparkSession.hiveClassesArePresent &&
enableHiveSupport) {
+
SparkSession.builder().sparkContext(withHiveExternalCatalog(jsc.sc)).getOrCreate()
+ } else {
--- End diff --
Would be good to print a info message here that hive classes are not found
and that we are creating a SparkContext without hive support
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
