Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ class SessionCatalog(
def invalidateCachedTable(name: TableIdentifier): Unit = {
val qualified = qualifyIdentifier(name)
invalidateCachedTable(QualifiedTableName(
qualified.catalog.get, qualified.database.get, qualified.table))
qualified.catalog.getOrElse(CatalogManager.SESSION_CATALOG_NAME),
qualified.database.get, qualified.table))
}

/** This method provides a way to invalidate all the cached plans. */
Expand Down Expand Up @@ -1133,7 +1134,8 @@ class SessionCatalog(
getLocalOrGlobalTempView(name).map(_.refresh).getOrElse {
val qualifiedIdent = qualifyIdentifier(name)
val qualifiedTableName = QualifiedTableName(
qualifiedIdent.catalog.get, qualifiedIdent.database.get, qualifiedIdent.table)
qualifiedIdent.catalog.getOrElse(CatalogManager.SESSION_CATALOG_NAME),
qualifiedIdent.database.get, qualifiedIdent.table)
tableRelationCache.invalidate(qualifiedTableName)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,8 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat
ident: TableIdentifier,
operation: String): Throwable = {
unsupportedTableOperationError(
Seq(ident.catalog.get, ident.database.get, ident.table), operation)
Seq(ident.catalog.getOrElse(CatalogManager.SESSION_CATALOG_NAME),
ident.database.get, ident.table), operation)
}

private def unsupportedTableOperationError(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.catalyst.streaming.StreamingRelationV2
import org.apache.spark.sql.catalyst.types.DataTypeUtils
import org.apache.spark.sql.catalyst.util.{GeneratedColumn, ResolveDefaultColumns, V2ExpressionBuilder}
import org.apache.spark.sql.connector.catalog.{SupportsRead, V1Table}
import org.apache.spark.sql.connector.catalog.{CatalogManager, SupportsRead, V1Table}
import org.apache.spark.sql.connector.catalog.TableCapability._
import org.apache.spark.sql.connector.expressions.{Expression => V2Expression, NullOrdering, SortDirection, SortOrder => V2SortOrder, SortValue}
import org.apache.spark.sql.connector.expressions.aggregate.{AggregateFunc, Aggregation}
Expand Down Expand Up @@ -242,7 +242,9 @@ class FindDataSourceTable(sparkSession: SparkSession) extends Rule[LogicalPlan]
private def readDataSourceTable(
table: CatalogTable, extraOptions: CaseInsensitiveStringMap): LogicalPlan = {
val qualifiedTableName =
QualifiedTableName(table.identifier.catalog.get, table.database, table.identifier.table)
QualifiedTableName(
table.identifier.catalog.getOrElse(CatalogManager.SESSION_CATALOG_NAME),
table.database, table.identifier.table)
val catalog = sparkSession.sessionState.catalog
val dsOptions = DataSourceUtils.generateDatasourceOptions(extraOptions, table)
catalog.getCachedPlan(qualifiedTableName, () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ private[hive] class HiveMetastoreCatalog(sparkSession: SparkSession) extends Log
fileType: String,
isWrite: Boolean): LogicalRelation = {
val metastoreSchema = relation.tableMeta.schema
val tableIdentifier = QualifiedTableName(relation.tableMeta.identifier.catalog.get,
val tableIdentifier = QualifiedTableName(
relation.tableMeta.identifier.catalog.getOrElse(CatalogManager.SESSION_CATALOG_NAME),
relation.tableMeta.database, relation.tableMeta.identifier.table)

val lazyPruningEnabled = sparkSession.sqlContext.conf.manageFilesourcePartitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,31 @@ class HiveMetastoreCatalogSuite extends TestHiveSingleton with SQLTestUtils {
assert(schema == expectedSchema)
}
}

test("SPARK-49211: read convertible Hive table with v1IdentifierNoCatalog enabled") {
withTable("t") {
sql("CREATE TABLE t (id INT) STORED AS PARQUET")
sql("INSERT INTO t VALUES (1)")
withSQLConf(SQLConf.LEGACY_NON_IDENTIFIER_OUTPUT_CATALOG_NAME.key -> "true") {
assert(spark.table("t").collect() === Array(Row(1)))
sql("REFRESH TABLE t")
assert(spark.table("t").collect() === Array(Row(1)))
}
}
}

test("SPARK-49211: unsupported v1 table operation reports a clean error " +
"with v1IdentifierNoCatalog enabled") {
withTable("t") {
sql("CREATE TABLE t (id INT) STORED AS PARQUET")
withSQLConf(SQLConf.LEGACY_NON_IDENTIFIER_OUTPUT_CATALOG_NAME.key -> "true") {
val e = intercept[AnalysisException] {
sql("ALTER TABLE t REPLACE COLUMNS (id INT)")
}
assert(e.getErrorClass == "UNSUPPORTED_FEATURE.TABLE_OPERATION")
}
}
}
}

class DataSourceWithHiveMetastoreCatalogSuite
Expand Down
Loading