cloud-fan commented on code in PR #37021:
URL: https://github.com/apache/spark/pull/37021#discussion_r911062253
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/identifiers.scala:
##########
@@ -35,18 +39,57 @@ sealed trait IdentifierWithDatabase {
def quotedString: String = {
val replacedId = quoteIdentifier(identifier)
- val replacedDb = database.map(quoteIdentifier(_))
-
- if (replacedDb.isDefined) s"`${replacedDb.get}`.`$replacedId`" else
s"`$replacedId`"
+ val replacedDb = database.map(quoteIdentifier)
+ val replacedCatalog = catalog.map(quoteIdentifier)
+
+ if (replacedCatalog.isDefined && replacedDb.isDefined) {
+ s"`${replacedCatalog.get}`.`${replacedDb.get}`.`$replacedId`"
+ } else if (replacedDb.isDefined) {
+ s"`${replacedDb.get}`.`$replacedId`"
+ } else {
+ s"`$replacedId`"
+ }
}
def unquotedString: String = {
- if (database.isDefined) s"${database.get}.$identifier" else identifier
+ if (catalog.isDefined && database.isDefined) {
+ s"${catalog.get}.${database.get}.$identifier"
+ } else if (database.isDefined) {
+ s"${database.get}.$identifier"
+ } else {
+ identifier
+ }
}
override def toString: String = quotedString
}
+object CatalystIdentifier {
+ def sessionCatalogOption(database: String): Option[String] = {
+ sessionCatalogOption(Option(database))
+ }
+
+ def sessionCatalogOption(database: Option[String]): Option[String] = {
Review Comment:
can we make it private? I think we should only expose `attachSessionCatalog`.
--
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]
