cloud-fan commented on code in PR #44935:
URL: https://github.com/apache/spark/pull/44935#discussion_r1469828631
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -3150,61 +3151,44 @@ class AstBuilder extends DataTypeAstBuilder with
SQLConfHelper with Logging {
if (option.NULL != null) {
if (!nullable) {
throw QueryParsingErrors.duplicateTableColumnDescriptor(
- option, colName.getText, "NOT NULL")
+ option, name, "NOT NULL")
}
nullable = false
}
Option(option.defaultExpression()).foreach { expr =>
+ if (!conf.getConf(SQLConf.ENABLE_DEFAULT_COLUMNS)) {
+ throw QueryParsingErrors.defaultColumnNotEnabledError(ctx)
+ }
if (defaultExpression.isDefined) {
throw QueryParsingErrors.duplicateTableColumnDescriptor(
- option, colName.getText, "DEFAULT")
+ option, name, "DEFAULT")
}
defaultExpression = Some(expr)
}
Option(option.generationExpression()).foreach { expr =>
if (generationExpression.isDefined) {
throw QueryParsingErrors.duplicateTableColumnDescriptor(
- option, colName.getText, "GENERATED ALWAYS AS")
+ option, name, "GENERATED ALWAYS AS")
}
generationExpression = Some(expr)
}
Option(option.commentSpec()).foreach { spec =>
if (commentSpec.isDefined) {
throw QueryParsingErrors.duplicateTableColumnDescriptor(
- option, colName.getText, "COMMENT")
+ option, name, "COMMENT")
}
commentSpec = Some(spec)
}
}
- val builder = new MetadataBuilder
- // Add comment to metadata
- commentSpec.map(visitCommentSpec).foreach {
- builder.putString("comment", _)
- }
- // Add the 'DEFAULT expression' clause in the column definition, if any,
to the column metadata.
- defaultExpression.map(visitDefaultExpression).foreach { field =>
- if (conf.getConf(SQLConf.ENABLE_DEFAULT_COLUMNS)) {
- // Add default to metadata
-
builder.putString(ResolveDefaultColumns.CURRENT_DEFAULT_COLUMN_METADATA_KEY,
field)
-
builder.putString(ResolveDefaultColumns.EXISTS_DEFAULT_COLUMN_METADATA_KEY,
field)
Review Comment:
The code is moved to `ColumnDefinition#toV1Column`. We only need to encode
the default value in `StructField` when running with v1 command.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -3150,61 +3151,44 @@ class AstBuilder extends DataTypeAstBuilder with
SQLConfHelper with Logging {
if (option.NULL != null) {
if (!nullable) {
throw QueryParsingErrors.duplicateTableColumnDescriptor(
- option, colName.getText, "NOT NULL")
+ option, name, "NOT NULL")
}
nullable = false
}
Option(option.defaultExpression()).foreach { expr =>
+ if (!conf.getConf(SQLConf.ENABLE_DEFAULT_COLUMNS)) {
+ throw QueryParsingErrors.defaultColumnNotEnabledError(ctx)
+ }
if (defaultExpression.isDefined) {
throw QueryParsingErrors.duplicateTableColumnDescriptor(
- option, colName.getText, "DEFAULT")
+ option, name, "DEFAULT")
}
defaultExpression = Some(expr)
}
Option(option.generationExpression()).foreach { expr =>
if (generationExpression.isDefined) {
throw QueryParsingErrors.duplicateTableColumnDescriptor(
- option, colName.getText, "GENERATED ALWAYS AS")
+ option, name, "GENERATED ALWAYS AS")
}
generationExpression = Some(expr)
}
Option(option.commentSpec()).foreach { spec =>
if (commentSpec.isDefined) {
throw QueryParsingErrors.duplicateTableColumnDescriptor(
- option, colName.getText, "COMMENT")
+ option, name, "COMMENT")
}
commentSpec = Some(spec)
}
}
- val builder = new MetadataBuilder
- // Add comment to metadata
- commentSpec.map(visitCommentSpec).foreach {
- builder.putString("comment", _)
- }
- // Add the 'DEFAULT expression' clause in the column definition, if any,
to the column metadata.
- defaultExpression.map(visitDefaultExpression).foreach { field =>
- if (conf.getConf(SQLConf.ENABLE_DEFAULT_COLUMNS)) {
- // Add default to metadata
-
builder.putString(ResolveDefaultColumns.CURRENT_DEFAULT_COLUMN_METADATA_KEY,
field)
-
builder.putString(ResolveDefaultColumns.EXISTS_DEFAULT_COLUMN_METADATA_KEY,
field)
- } else {
- throw QueryParsingErrors.defaultColumnNotEnabledError(ctx)
- }
- }
- // Add the 'GENERATED ALWAYS AS expression' clause in the column
definition, if any, to the
- // column metadata.
- generationExpression.map(visitGenerationExpression).foreach { field =>
- builder.putString(GeneratedColumn.GENERATION_EXPRESSION_METADATA_KEY,
field)
Review Comment:
ditto
--
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]
