From d4c1a9db25ee7386f7b12e4dabb54210a9892510 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Mon, 8 May 2017 20:13:38 -0700 Subject: [PATCH 1/3] change test for relative change --- R/pkg/inst/tests/testthat/test_sparkSQL.R | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R index ab6888ea34fd..19aa61e9a56c 100644 --- a/R/pkg/inst/tests/testthat/test_sparkSQL.R +++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R @@ -677,26 +677,27 @@ test_that("jsonRDD() on a RDD with json string", { }) test_that("test tableNames and tables", { - # Making sure there are no registered temp tables from previous tests - suppressWarnings(sapply(tableNames(), function(tname) { dropTempTable(tname) })) + count <- count(listTables()) + df <- read.json(jsonPath) createOrReplaceTempView(df, "table1") - expect_equal(length(tableNames()), 1) - expect_equal(length(tableNames("default")), 1) + expect_equal(length(tableNames()), count + 1) + expect_equal(length(tableNames("default")), count + 1) + tables <- listTables() - expect_equal(count(tables), 1) + expect_equal(count(tables), count + 1) expect_equal(count(tables()), count(tables)) expect_true("tableName" %in% colnames(tables())) expect_true(all(c("tableName", "database", "isTemporary") %in% colnames(tables()))) suppressWarnings(registerTempTable(df, "table2")) tables <- listTables() - expect_equal(count(tables), 2) + expect_equal(count(tables), count + 2) suppressWarnings(dropTempTable("table1")) expect_true(dropTempView("table2")) tables <- listTables() - expect_equal(count(tables), 0) + expect_equal(count(tables), count + 0) }) test_that( From 1aa17d80590d88354065d409e1dd64961823eb2e Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Mon, 8 May 2017 20:18:08 -0700 Subject: [PATCH 2/3] to trigger Scala SQL tests - will revert this --- .../org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala index 8a5319bebe54..92182552c0c3 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala @@ -607,4 +607,5 @@ class InMemoryCatalog( StringUtils.filterPattern(catalog(db).functions.keysIterator.toSeq, pattern) } + } From b37a760417ea5f9b958a7329dbccd110478821ff Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Mon, 8 May 2017 22:47:19 -0700 Subject: [PATCH 3/3] revert --- .../org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala index 92182552c0c3..8a5319bebe54 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala @@ -607,5 +607,4 @@ class InMemoryCatalog( StringUtils.filterPattern(catalog(db).functions.keysIterator.toSeq, pattern) } - }