From 5a259f5fa9dfdb4181228cfae38badddc517bac8 Mon Sep 17 00:00:00 2001 From: Michael Armbrust Date: Thu, 7 May 2015 23:17:46 +0000 Subject: [PATCH] fix typos --- .../spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala | 4 ++-- .../main/scala/org/apache/spark/sql/hive/HiveContext.scala | 4 ++-- .../main/scala/org/apache/spark/sql/hive/test/TestHive.scala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala index ab69d72e80439..17519b5518b85 100644 --- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala +++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala @@ -37,7 +37,7 @@ import org.apache.hadoop.hive.ql.session.SessionState import org.apache.thrift.transport.TSocket import org.apache.spark.Logging -import org.apache.spark.sql.hive.HiveShim +import org.apache.spark.sql.hive.{HiveContext, HiveShim} import org.apache.spark.util.Utils private[hive] object SparkSQLCLIDriver { @@ -81,7 +81,7 @@ private[hive] object SparkSQLCLIDriver { } val cliConf = new HiveConf(classOf[SessionState]) // Override the location of the metastore since this is only used for local execution. - HiveContext.newTemporaryConfiguation().foreach { + HiveContext.newTemporaryConfiguration().foreach { case (key, value) => cliConf.set(key, value) } val sessionState = new CliSessionState(cliConf) diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala index b1dc74f45869d..cd45b79b8c822 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala @@ -134,7 +134,7 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) { logInfo(s"Initilizing execution hive, version $hiveExecutionVersion") new ClientWrapper( version = IsolatedClientLoader.hiveVersion(hiveExecutionVersion), - config = newTemporaryConfiguation()) + config = newTemporaryConfiguration()) } SessionState.setCurrentSessionState(executionHive.state) @@ -463,7 +463,7 @@ private[hive] object HiveContext { val HIVE_METASTORE_JARS: String = "spark.sql.hive.metastore.jars" /** Constructs a configuration for hive, where the metastore is located in a temp directory. */ - def newTemporaryConfiguation(): Map[String, String] = { + def newTemporaryConfiguration(): Map[String, String] = { val tempDir = Utils.createTempDir() val localMetastore = new File(tempDir, "metastore") Map( diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala index 61fb61685a213..1f40a5340c2ce 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala @@ -76,7 +76,7 @@ class TestHiveContext(sc: SparkContext) extends HiveContext(sc) { /** Sets up the system initially or after a RESET command */ protected override def configure(): Map[String, String] = - newTemporaryConfiguation() ++ Map("hive.metastore.warehouse.dir" -> warehousePath.toString) + newTemporaryConfiguration() ++ Map("hive.metastore.warehouse.dir" -> warehousePath.toString) val testTempDir = Utils.createTempDir()