Skip to content

[SPARK-31624] Fix SHOW TBLPROPERTIES for V2 tables that leverage the session catalog #28434

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 2 commits into from
Closed

[SPARK-31624] Fix SHOW TBLPROPERTIES for V2 tables that leverage the session catalog #28434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d32a6c4
Fix SHOW TBLPROPERTIES for V2 tables that leverage the session catalog
brkyvz May 2, 2020
9828286
address
brkyvz May 3, 2020
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
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,8 @@ class ResolveSessionCatalog(
"SHOW VIEWS, only SessionCatalog supports this command.")
}

case ShowTableProperties(r: ResolvedTable, propertyKey) if isSessionCatalog(r.catalog) =>
case ShowTableProperties(
r @ ResolvedTable(_, _, _: V1Table), propertyKey) if isSessionCatalog(r.catalog) =>
ShowTablePropertiesCommand(r.identifier.asTableIdentifier, propertyKey)

case ShowTableProperties(r: ResolvedView, propertyKey) =>
Expand Down
8 changes: 6 additions & 2 deletions ...rc/main/scala/org/apache/spark/sql/execution/datasources/v2/ShowTablePropertiesExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package org.apache.spark.sql.execution.datasources.v2

import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.encoders.RowEncoder
import org.apache.spark.sql.catalyst.expressions.{Attribute, GenericRowWithSchema}
import org.apache.spark.sql.connector.catalog.Table
import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeSet, GenericRowWithSchema}
import org.apache.spark.sql.connector.catalog.{CatalogV2Util, Table, TableCatalog}

/**
* Physical plan node for showing table properties.
Expand All @@ -30,11 +30,15 @@ case class ShowTablePropertiesExec(
catalogTable: Table,
propertyKey: Option[String]) extends V2CommandExec {

override def producedAttributes: AttributeSet = AttributeSet(output)

override protected def run(): Seq[InternalRow] = {
import scala.collection.JavaConverters._
val toRow = RowEncoder(schema).resolveAndBind().createSerializer()

// The reservered properties are accessible through DESCRIBE
val properties = catalogTable.properties.asScala
.filter { case (k, v) => !CatalogV2Util.TABLE_RESERVED_PROPERTIES.contains(k) }
propertyKey match {
case Some(p) =>
val propValue = properties
Expand Down
18 changes: 17 additions & 1 deletion ...re/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSessionCatalogSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.sql.connector

import org.apache.spark.sql.{DataFrame, SaveMode}
import org.apache.spark.sql.{DataFrame, Row, SaveMode}
import org.apache.spark.sql.connector.catalog.{Identifier, Table, TableCatalog}

class DataSourceV2SQLSessionCatalogSuite
Expand Down Expand Up @@ -63,4 +63,20 @@ class DataSourceV2SQLSessionCatalogSuite
}
}
}

test("SPARK-31624: SHOW TBLPROPERTIES working with V2 tables and the session catalog") {
val t1 = "tbl"
withTable(t1) {
sql(s"CREATE TABLE $t1 (id bigint, data string) USING $v2Format TBLPROPERTIES " +
"(key='v', key2='v2')")

checkAnswer(sql(s"SHOW TBLPROPERTIES $t1"), Seq(Row("key", "v"), Row("key2", "v2")))

checkAnswer(sql(s"SHOW TBLPROPERTIES $t1('key')"), Row("key", "v"))

checkAnswer(
sql(s"SHOW TBLPROPERTIES $t1('keyX')"),
Row("keyX", s"Table default.$t1 does not have property: keyX"))
}
}
}
2 changes: 0 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2122,8 +2122,6 @@ class DataSourceV2SQLSuite
.add("value", StringType, nullable = false)

val expected = Seq(
Row(TableCatalog.PROP_OWNER, defaultUser),
Row("provider", provider),
Row("status", status),
Row("user", user))

Expand Down