From 5dfc01976bb0d72489620b4f32cc12d620bb6260 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Wed, 23 Mar 2016 13:34:22 -0700 Subject: [SPARK-14014][SQL] Replace existing catalog with SessionCatalog ## What changes were proposed in this pull request? `SessionCatalog`, introduced in #11750, is a catalog that keeps track of temporary functions and tables, and delegates metastore operations to `ExternalCatalog`. This functionality overlaps a lot with the existing `analysis.Catalog`. As of this commit, `SessionCatalog` and `ExternalCatalog` will no longer be dead code. There are still things that need to be done after this patch, namely: - SPARK-14013: Properly implement temporary functions in `SessionCatalog` - SPARK-13879: Decide which DDL/DML commands to support natively in Spark - SPARK-?????: Implement the ones we do want to support through `SessionCatalog`. - SPARK-?????: Merge SQL/HiveContext ## How was this patch tested? This is largely a refactoring task so there are no new tests introduced. The particularly relevant tests are `SessionCatalogSuite` and `ExternalCatalogSuite`. Author: Andrew Or Author: Yin Huai Closes #11836 from andrewor14/use-session-catalog. --- R/pkg/inst/tests/testthat/test_sparkSQL.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'R/pkg') diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R index 63acbadfa6..eef365b42e 100644 --- a/R/pkg/inst/tests/testthat/test_sparkSQL.R +++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R @@ -1817,7 +1817,8 @@ test_that("approxQuantile() on a DataFrame", { test_that("SQL error message is returned from JVM", { retError <- tryCatch(sql(sqlContext, "select * from blah"), error = function(e) e) - expect_equal(grepl("Table not found: blah", retError), TRUE) + expect_equal(grepl("Table not found", retError), TRUE) + expect_equal(grepl("blah", retError), TRUE) }) irisDF <- suppressWarnings(createDataFrame(sqlContext, iris)) -- cgit v1.2.3