yaooqinn commented on a change in pull request #27197: [SPARK-30507][SQL]
TableCalalog reserved properties shoudn't be changed via options or tblpropeties
URL: https://github.com/apache/spark/pull/27197#discussion_r366935046
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/connector/catalog/CatalogV2Util.scala
##########
@@ -268,43 +267,12 @@ private[sql] object CatalogV2Util {
def convertTableProperties(
properties: Map[String, String],
options: Map[String, String],
- location: Option[String],
comment: Option[String],
provider: String): Map[String, String] = {
- if (options.contains("path") && location.isDefined) {
- throw new AnalysisException(
- "LOCATION and 'path' in OPTIONS are both used to indicate the custom
table path, " +
- "you can only specify one of them.")
- }
-
- if ((options.contains(TableCatalog.PROP_COMMENT)
- || properties.contains(TableCatalog.PROP_COMMENT)) && comment.isDefined)
{
- throw new AnalysisException(
- s"COMMENT and option/property '${TableCatalog.PROP_COMMENT}' " +
- s"are both used to set the table comment, you can only specify one
of them.")
- }
-
- if (options.contains(TableCatalog.PROP_PROVIDER)
- || properties.contains(TableCatalog.PROP_PROVIDER)) {
- throw new AnalysisException(
- "USING and option/property 'provider' are both used to set the
provider implementation, " +
- "you can only specify one of them.")
- }
-
- val filteredOptions = options.filterKeys(_ != "path")
-
- // create table properties from TBLPROPERTIES and OPTIONS clauses
- val tableProperties = new mutable.HashMap[String, String]()
- tableProperties ++= properties
- tableProperties ++= filteredOptions
-
- // convert USING, LOCATION, and COMMENT clauses to table properties
- tableProperties += (TableCatalog.PROP_PROVIDER -> provider)
- comment.map(text => tableProperties += (TableCatalog.PROP_COMMENT -> text))
- location.orElse(options.get("path")).map(
- loc => tableProperties += (TableCatalog.PROP_LOCATION -> loc))
-
- tableProperties.toMap
+ properties ++
+ options.filterKeys(!_.equalsIgnoreCase("path")) ++
Review comment:
nice catch
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
