Skip to content

[SPARK-43203][SQL][FOLLOWUP] V2SessionCatalog.dropTable should handle null table #42056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cloud-fan wants to merge 1 commit into from
+12 −10
Closed

[SPARK-43203][SQL][FOLLOWUP] V2SessionCatalog.dropTable should handle null table #42056

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,6 @@ class V2SessionCatalog(catalog: SessionCatalog)
createTable(ident, CatalogV2Util.v2ColumnsToStructType(columns), partitions, properties)
}

override def purgeTable(ident: Identifier): Boolean = {
dropTableInternal(ident, purge = true)
}

// TODO: remove it when no tests calling this deprecated method.
override def createTable(
ident: Identifier,
Expand Down Expand Up @@ -202,6 +198,10 @@ class V2SessionCatalog(catalog: SessionCatalog)
loadTable(ident)
}

override def purgeTable(ident: Identifier): Boolean = {
dropTableInternal(ident, purge = true)
}

override def dropTable(ident: Identifier): Boolean = {
dropTableInternal(ident)
}
Expand All @@ -218,14 +218,16 @@ class V2SessionCatalog(catalog: SessionCatalog)
foundType = v1Table.tableType.name,
alternative = "DROP VIEW"
)
case null =>
false
case _ =>
catalog.invalidateCachedTable(ident.asTableIdentifier)
catalog.dropTable(
ident.asTableIdentifier,
ignoreIfNotExists = true,
purge = purge)
true
}
catalog.invalidateCachedTable(ident.asTableIdentifier)
catalog.dropTable(
ident.asTableIdentifier,
ignoreIfNotExists = true,
purge = purge)
true
} catch {
case _: NoSuchTableException =>
false
Expand Down