LuciferYang commented on code in PR #52819:
URL: https://github.com/apache/spark/pull/52819#discussion_r2492718784
##########
sql/connect/client/jdbc/src/main/scala/org/apache/spark/sql/connect/client/jdbc/SparkConnectDatabaseMetaData.scala:
##########
@@ -299,11 +304,59 @@ class SparkConnectDatabaseMetaData(conn:
SparkConnectConnection) extends Databas
new SparkConnectResultSet(df.collectResult())
}
- override def getSchemas: ResultSet =
- throw new SQLFeatureNotSupportedException
+ override def getSchemas: ResultSet = {
+ conn.checkOpen()
- override def getSchemas(catalog: String, schemaPattern: String): ResultSet =
- throw new SQLFeatureNotSupportedException
+ getSchemas(null, null)
+ }
+
+ // Schema of the returned DataFrame is:
+ // |-- TABLE_SCHEM: string (nullable = false)
+ // |-- TABLE_CATALOG: string (nullable = false)
+ private def getSchemasDataFrame(
+ catalog: String, schemaPattern: String): connect.DataFrame = {
+
+ val schemaFilterClause =
+ if (isNullOrWildcard(schemaPattern)) "1=1" else s"TABLE_SCHEM LIKE
'$schemaPattern'"
Review Comment:
What happens if schemaPattern contains a single quote?
##########
sql/connect/client/jdbc/src/main/scala/org/apache/spark/sql/connect/client/jdbc/SparkConnectDatabaseMetaData.scala:
##########
@@ -299,11 +304,59 @@ class SparkConnectDatabaseMetaData(conn:
SparkConnectConnection) extends Databas
new SparkConnectResultSet(df.collectResult())
}
- override def getSchemas: ResultSet =
- throw new SQLFeatureNotSupportedException
+ override def getSchemas: ResultSet = {
+ conn.checkOpen()
- override def getSchemas(catalog: String, schemaPattern: String): ResultSet =
- throw new SQLFeatureNotSupportedException
+ getSchemas(null, null)
+ }
+
+ // Schema of the returned DataFrame is:
+ // |-- TABLE_SCHEM: string (nullable = false)
+ // |-- TABLE_CATALOG: string (nullable = false)
+ private def getSchemasDataFrame(
+ catalog: String, schemaPattern: String): connect.DataFrame = {
+
+ val schemaFilterClause =
+ if (isNullOrWildcard(schemaPattern)) "1=1" else s"TABLE_SCHEM LIKE
'$schemaPattern'"
+
+ def internalGetSchemas(
+ catalogOpt: Option[String],
+ schemaFilterClause: String): connect.DataFrame = {
+ val catalog = catalogOpt.getOrElse(conn.getCatalog)
+ // Spark SQL supports LIKE clause in SHOW SCHEMAS command, but we can't
use that
+ // because the LIKE pattern does not follow SQL standard.
+ conn.spark.sql(s"SHOW SCHEMAS IN `$catalog`")
+ .select($"namespace".as("TABLE_SCHEM"))
+ .filter(schemaFilterClause)
+ .withColumn("TABLE_CATALOG", lit(catalog))
+ }
+
+ if (catalog == null) {
+ // search in all catalogs
+ val emptyDf = conn.spark.emptyDataFrame
+ .withColumn("TABLE_SCHEM", lit(""))
+ .withColumn("TABLE_CATALOG", lit(""))
+ conn.spark.catalog.listCatalogs().collect().map(_.name).map { catalog =>
Review Comment:
Otherwise, it would have the same naming as the outer catalog, resulting in
poorer readability.
##########
sql/connect/client/jdbc/src/main/scala/org/apache/spark/sql/connect/client/jdbc/SparkConnectDatabaseMetaData.scala:
##########
@@ -299,11 +304,59 @@ class SparkConnectDatabaseMetaData(conn:
SparkConnectConnection) extends Databas
new SparkConnectResultSet(df.collectResult())
}
- override def getSchemas: ResultSet =
- throw new SQLFeatureNotSupportedException
+ override def getSchemas: ResultSet = {
+ conn.checkOpen()
- override def getSchemas(catalog: String, schemaPattern: String): ResultSet =
- throw new SQLFeatureNotSupportedException
+ getSchemas(null, null)
+ }
+
+ // Schema of the returned DataFrame is:
+ // |-- TABLE_SCHEM: string (nullable = false)
+ // |-- TABLE_CATALOG: string (nullable = false)
+ private def getSchemasDataFrame(
+ catalog: String, schemaPattern: String): connect.DataFrame = {
+
+ val schemaFilterClause =
+ if (isNullOrWildcard(schemaPattern)) "1=1" else s"TABLE_SCHEM LIKE
'$schemaPattern'"
+
+ def internalGetSchemas(
+ catalogOpt: Option[String],
Review Comment:
It seems that all 3 call points involve deterministic values, so there's no
need to wrap them in an Option, right?
##########
sql/connect/client/jdbc/src/main/scala/org/apache/spark/sql/connect/client/jdbc/SparkConnectDatabaseMetaData.scala:
##########
@@ -299,11 +304,59 @@ class SparkConnectDatabaseMetaData(conn:
SparkConnectConnection) extends Databas
new SparkConnectResultSet(df.collectResult())
}
- override def getSchemas: ResultSet =
- throw new SQLFeatureNotSupportedException
+ override def getSchemas: ResultSet = {
+ conn.checkOpen()
- override def getSchemas(catalog: String, schemaPattern: String): ResultSet =
- throw new SQLFeatureNotSupportedException
+ getSchemas(null, null)
+ }
+
+ // Schema of the returned DataFrame is:
+ // |-- TABLE_SCHEM: string (nullable = false)
+ // |-- TABLE_CATALOG: string (nullable = false)
+ private def getSchemasDataFrame(
+ catalog: String, schemaPattern: String): connect.DataFrame = {
+
+ val schemaFilterClause =
+ if (isNullOrWildcard(schemaPattern)) "1=1" else s"TABLE_SCHEM LIKE
'$schemaPattern'"
+
+ def internalGetSchemas(
+ catalogOpt: Option[String],
Review Comment:
```suggestion
catalog: String,
```
##########
sql/connect/client/jdbc/src/main/scala/org/apache/spark/sql/connect/client/jdbc/SparkConnectDatabaseMetaData.scala:
##########
@@ -299,11 +304,59 @@ class SparkConnectDatabaseMetaData(conn:
SparkConnectConnection) extends Databas
new SparkConnectResultSet(df.collectResult())
}
- override def getSchemas: ResultSet =
- throw new SQLFeatureNotSupportedException
+ override def getSchemas: ResultSet = {
+ conn.checkOpen()
- override def getSchemas(catalog: String, schemaPattern: String): ResultSet =
- throw new SQLFeatureNotSupportedException
+ getSchemas(null, null)
+ }
+
+ // Schema of the returned DataFrame is:
+ // |-- TABLE_SCHEM: string (nullable = false)
+ // |-- TABLE_CATALOG: string (nullable = false)
+ private def getSchemasDataFrame(
+ catalog: String, schemaPattern: String): connect.DataFrame = {
+
+ val schemaFilterClause =
+ if (isNullOrWildcard(schemaPattern)) "1=1" else s"TABLE_SCHEM LIKE
'$schemaPattern'"
+
+ def internalGetSchemas(
+ catalogOpt: Option[String],
+ schemaFilterClause: String): connect.DataFrame = {
+ val catalog = catalogOpt.getOrElse(conn.getCatalog)
+ // Spark SQL supports LIKE clause in SHOW SCHEMAS command, but we can't
use that
+ // because the LIKE pattern does not follow SQL standard.
+ conn.spark.sql(s"SHOW SCHEMAS IN `$catalog`")
Review Comment:
What would happen if the `catalog` name contains backticks?
##########
sql/connect/client/jdbc/src/main/scala/org/apache/spark/sql/connect/client/jdbc/SparkConnectDatabaseMetaData.scala:
##########
@@ -299,11 +304,59 @@ class SparkConnectDatabaseMetaData(conn:
SparkConnectConnection) extends Databas
new SparkConnectResultSet(df.collectResult())
}
- override def getSchemas: ResultSet =
- throw new SQLFeatureNotSupportedException
+ override def getSchemas: ResultSet = {
+ conn.checkOpen()
- override def getSchemas(catalog: String, schemaPattern: String): ResultSet =
- throw new SQLFeatureNotSupportedException
+ getSchemas(null, null)
+ }
+
+ // Schema of the returned DataFrame is:
+ // |-- TABLE_SCHEM: string (nullable = false)
+ // |-- TABLE_CATALOG: string (nullable = false)
+ private def getSchemasDataFrame(
+ catalog: String, schemaPattern: String): connect.DataFrame = {
+
+ val schemaFilterClause =
+ if (isNullOrWildcard(schemaPattern)) "1=1" else s"TABLE_SCHEM LIKE
'$schemaPattern'"
+
+ def internalGetSchemas(
+ catalogOpt: Option[String],
+ schemaFilterClause: String): connect.DataFrame = {
+ val catalog = catalogOpt.getOrElse(conn.getCatalog)
+ // Spark SQL supports LIKE clause in SHOW SCHEMAS command, but we can't
use that
+ // because the LIKE pattern does not follow SQL standard.
+ conn.spark.sql(s"SHOW SCHEMAS IN `$catalog`")
+ .select($"namespace".as("TABLE_SCHEM"))
+ .filter(schemaFilterClause)
+ .withColumn("TABLE_CATALOG", lit(catalog))
+ }
+
+ if (catalog == null) {
+ // search in all catalogs
+ val emptyDf = conn.spark.emptyDataFrame
+ .withColumn("TABLE_SCHEM", lit(""))
+ .withColumn("TABLE_CATALOG", lit(""))
+ conn.spark.catalog.listCatalogs().collect().map(_.name).map { catalog =>
Review Comment:
```suggestion
conn.spark.catalog.listCatalogs().collect().map(_.name).map {
catalogName =>
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
