Merge pull request apache#203 from shivaram/sparkr-hive-fix

Fix HiveContext package name

Author: shivaram

pkg/R/sparkR.R

@@ -247,15 +247,15 @@ sparkRSQL.init <- function(jsc) {
 
 sparkRHive.init <- function(jsc) {
   if (exists(".sparkRHivesc", envir = .sparkREnv)) {
-    cat("Re-using existing HiveContext. Please restart R to create a new  HiveContext\n")
+    cat("Re-using existing HiveContext. Please restart R to create a new HiveContext\n")
     return(get(".sparkRHivesc", envir = .sparkREnv))
   }
 
   ssc <- callJMethod(jsc, "sc")
   hiveCtx <- tryCatch({
-    newJObject("org.apache.spark.sql.HiveContext", ssc)
+    newJObject("org.apache.spark.sql.hive.HiveContext", ssc)
   }, error = function(err) {
-    stop("Hive is not build with SparkSQL")
+    stop("Spark SQL is not built with Hive support")
   })
 
   assign(".sparkRHivesc", hiveCtx, envir = .sparkREnv)

pkg/inst/tests/test_sparkSQL.R

@@ -297,7 +297,7 @@ test_that("save() as parquet file", {
 
 test_that("test HiveContext", {
   hiveCtx <- tryCatch({
-    newJObject("org.apache.spark.sql.TestHiveContext", ssc)
+    newJObject("org.apache.spark.sql.hive.test.TestHiveContext", ssc)
   }, error = function(err) {
     skip("Hive is not build with SparkSQL, skipped")
   })