Repository: spark Updated Branches: refs/heads/branch-2.0 42db140c5 -> bd7fd14c9
[SPARK-15037][HOTFIX] Replace `sqlContext` and `sparkSession` with `spark`. This replaces `sparkSession` with `spark` in CatalogSuite.scala. Pass the Jenkins tests. Author: Dongjoon Hyun <[email protected]> Closes #13030 from dongjoon-hyun/hotfix_sparkSession. (cherry picked from commit db3b4a20150ff7fb1caaf62ab3d2a2f1e632af36) Signed-off-by: Andrew Or <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bd7fd14c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bd7fd14c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bd7fd14c Branch: refs/heads/branch-2.0 Commit: bd7fd14c93746556bd99faa640fb6b95defef148 Parents: 42db140 Author: Dongjoon Hyun <[email protected]> Authored: Tue May 10 11:53:41 2016 -0700 Committer: Andrew Or <[email protected]> Committed: Tue May 10 11:53:59 2016 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/bd7fd14c/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala index 6dcc404..8b60802 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala @@ -536,7 +536,7 @@ class HiveDDLSuite withTable("t1") { withTempPath { dir => val path = dir.getCanonicalPath - sqlContext.range(1).write.parquet(path) + spark.range(1).write.parquet(path) sql(s"CREATE TABLE t1 USING parquet OPTIONS (PATH '$path')") val desc = sql("DESC FORMATTED t1").collect().toSeq @@ -548,7 +548,7 @@ class HiveDDLSuite test("desc table for data source table - partitioned bucketed table") { withTable("t1") { - sqlContext + spark .range(1).select('id as 'a, 'id as 'b, 'id as 'c, 'id as 'd).write .bucketBy(2, "b").sortBy("c").partitionBy("d") .saveAsTable("t1") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
