You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2019/03/06 17:16:00 UTC
[spark] branch branch-2.4 updated: [SPARK-24669][SQL] Invalidate
tables in case of DROP DATABASE CASCADE
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 5ec4563 [SPARK-24669][SQL] Invalidate tables in case of DROP DATABASE CASCADE
5ec4563 is described below
commit 5ec45633fed9bae37873a36c590a3048ad4c9a0c
Author: Udbhav30 <u....@gmail.com>
AuthorDate: Wed Mar 6 09:06:10 2019 -0800
[SPARK-24669][SQL] Invalidate tables in case of DROP DATABASE CASCADE
## What changes were proposed in this pull request?
Before dropping database refresh the tables of that database, so as to refresh all cached entries associated with those tables.
We follow the same when dropping a table.
UT is added
Closes #23905 from Udbhav30/SPARK-24669.
Authored-by: Udbhav30 <u....@gmail.com>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
(cherry picked from commit 9bddf7180e9e76e1cabc580eee23962dd66f84c3)
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
.../sql/catalyst/catalog/SessionCatalog.scala | 5 +++
.../spark/sql/execution/command/DDLSuite.scala | 38 +++++++++++++++++++++-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
index afb0f00..5987a20 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
@@ -218,6 +218,11 @@ class SessionCatalog(
if (dbName == DEFAULT_DATABASE) {
throw new AnalysisException(s"Can not drop default database")
}
+ if (cascade && databaseExists(dbName)) {
+ listTables(dbName).foreach { t =>
+ invalidateCachedTable(QualifiedTableName(dbName, t.table))
+ }
+ }
externalCatalog.dropDatabase(dbName, ignoreIfNotExists, cascade)
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
index f8d98de..6ca4536 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
@@ -17,7 +17,7 @@
package org.apache.spark.sql.execution.command
-import java.io.File
+import java.io.{File, PrintWriter}
import java.net.URI
import java.util.Locale
@@ -2715,4 +2715,40 @@ abstract class DDLSuite extends QueryTest with SQLTestUtils {
}
}
}
+
+ test("Refresh table before drop database cascade") {
+ withTempDir { tempDir =>
+ val file1 = new File(tempDir + "/first.csv")
+ val writer1 = new PrintWriter(file1)
+ writer1.write("first")
+ writer1.close()
+
+ val file2 = new File(tempDir + "/second.csv")
+ val writer2 = new PrintWriter(file2)
+ writer2.write("second")
+ writer2.close()
+
+ withDatabase("foo") {
+ withTable("foo.first") {
+ sql("CREATE DATABASE foo")
+ sql(
+ s"""CREATE TABLE foo.first (id STRING)
+ |USING csv OPTIONS (path='${file1.toURI}')
+ """.stripMargin)
+ sql("SELECT * FROM foo.first")
+ checkAnswer(spark.table("foo.first"), Row("first"))
+
+ // Dropping the database and again creating same table with different path
+ sql("DROP DATABASE foo CASCADE")
+ sql("CREATE DATABASE foo")
+ sql(
+ s"""CREATE TABLE foo.first (id STRING)
+ |USING csv OPTIONS (path='${file2.toURI}')
+ """.stripMargin)
+ sql("SELECT * FROM foo.first")
+ checkAnswer(spark.table("foo.first"), Row("second"))
+ }
+ }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org