rebase

Author: vrozov

project/SparkBuild.scala

@@ -362,6 +362,8 @@ object SparkBuild extends PomBuild {
       "-sourcepath", (ThisBuild / baseDirectory).value.getAbsolutePath  // Required for relative source links in scaladoc
     ),
 
+    (Test / javaOptions) += s"-Dmvn.executable=${BuildCommons.sparkHome.getAbsolutePath}/build/mvn",
+
     SbtPomKeys.profiles := profiles,
 
     // Remove certain packages from Scaladoc
@@ -1305,7 +1307,7 @@ object SQL {
     // even if the project is not using it.
     PB.protocVersion := BuildCommons.protoVersion,
     // For some reason the resolution from the imported Maven build does not work for some
-    // of these dependendencies that we need to shade later on.
+    // of these dependencies that we need to shade later on.
     libraryDependencies ++= {
       Seq(
         "com.google.protobuf" % "protobuf-java" % protoVersion % "protobuf"

sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala

@@ -29,7 +29,6 @@ import jline.console.history.FileHistory
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.hive.cli.{CliDriver, CliSessionState, OptionsProcessor}
 import org.apache.hadoop.hive.common.HiveInterruptUtils
-import org.apache.hadoop.hive.common.io.SessionStream
 import org.apache.hadoop.hive.conf.HiveConf
 import org.apache.hadoop.hive.ql.Driver
 import org.apache.hadoop.hive.ql.exec.mr.HadoopJobExecHelper

sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLEnv.scala

@@ -17,24 +17,37 @@
 
 package org.apache.spark.sql.hive.thriftserver
 
-import java.io.PrintStream
+import java.io.{PrintStream, UnsupportedEncodingException}
 import java.nio.charset.StandardCharsets.UTF_8
 
+import scala.sys.exit
+
+import org.apache.hadoop.hive.common.io.SessionStream
+
 import org.apache.spark.{SparkConf, SparkContext}
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.hive.HiveExternalCatalog
 import org.apache.spark.sql.hive.HiveUtils._
 import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.internal.StaticSQLConf.CATALOG_IMPLEMENTATION
+import org.apache.spark.util.SparkExitCode.ERROR_PATH_NOT_FOUND
 import org.apache.spark.util.Utils
 
 /** A singleton object for the master program. The executors should not access this. */
 private[hive] object SparkSQLEnv extends Logging {
   logDebug("Initializing SparkSQLEnv")
 
-  val out = new PrintStream(System.out, true, UTF_8)
-  val err = new PrintStream(System.err, true, UTF_8)
+  private def createSessionStream(s: PrintStream): SessionStream = {
+    try {
+      new SessionStream(s, true, UTF_8.name ())
+    } catch {
+      case e: UnsupportedEncodingException => exit(ERROR_PATH_NOT_FOUND)
+    }
+  }
+
+  val out: SessionStream = createSessionStream(System.out)
+  val err: SessionStream = createSessionStream(System.err)
 
   var sparkSession: SparkSession = _
   var sparkContext: SparkContext = _