Skip to content

[SPARK-46043][SQL][FOLLOWUP] do not resolve v2 table provider with custom session catalog #45440

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
wants to merge 1 commit into from
Closed

[SPARK-46043][SQL][FOLLOWUP] do not resolve v2 table provider with custom session catalog #45440

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
9 changes: 8 additions & 1 deletion 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 @@ -81,10 +81,17 @@ class V2SessionCatalog(catalog: SessionCatalog)
new CaseInsensitiveStringMap(propertiesWithPath.asJava)
}

private def hasCustomSessionCatalog: Boolean = {
catalog.conf.contains(SQLConf.V2_SESSION_CATALOG_IMPLEMENTATION.key)
}

override def loadTable(ident: Identifier): Table = {
try {
val table = catalog.getTableMetadata(ident.asTableIdentifier)
if (table.provider.isDefined) {
// The custom session catalog may extend `DelegatingCatalogExtension` and rely on the returned
// table here. To avoid breaking it we do not resolve the table provider and still return
// `V1Table` if the custom session catalog is present.
if (table.provider.isDefined && !hasCustomSessionCatalog) {
val qualifiedTableName = QualifiedTableName(table.database, table.identifier.table)
// Check if the table is in the v1 table cache to skip the v2 table lookup.
if (catalog.getCachedTable(qualifiedTableName) != null) {
Expand Down