You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2021/10/29 08:39:29 UTC
[GitHub] [spark] cloud-fan opened a new pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
cloud-fan opened a new pull request #34436:
URL: https://github.com/apache/spark/pull/34436
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
Adds a new config to optionally disable padding for char type, by replacing char type with varchar type in the table schema when creating/updating tables.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
char type is a legacy in the SQL world. Its padding behavior was mostly for storage optimization at that time, which is not a useful SQL semantic. As result, [MySQL trims the spaces for char type by default](https://docs.oracle.com/cd/E17952_01/mysql-8.0-en/sql-mode.html#sqlmode_pad_char_to_full_length), [Snowflake simply treats char as an alias of varchar](https://docs.snowflake.com/en/sql-reference/data-types-text.html#char-character).
It makes sense for Spark to also demote char type by adding this config.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
no
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
new tests
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954660069
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/49215/
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954654630
Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/49215/
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
yaooqinn commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739044548
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
##########
@@ -3371,14 +3371,20 @@ object SQLConf {
val LEGACY_CHAR_VARCHAR_AS_STRING =
buildConf("spark.sql.legacy.charVarcharAsString")
.internal()
- .doc("When true, Spark will not fail if user uses char and varchar type directly in those" +
- " APIs that accept or parse data types as parameters, e.g." +
- " `SparkSession.read.schema(...)`, `SparkSession.udf.register(...)` but treat them as" +
- " string type as Spark 3.0 and earlier.")
+ .doc("When true, Spark treats CHAR/VARCHAR type the same as STRING type, which is the " +
+ "behavior of Spark 3.0 and earlier. This means no length check for CHAR/VARCHAR type and " +
+ "no padding for CHAR type when writing data to the table.")
.version("3.1.0")
.booleanConf
.createWithDefault(false)
+ val CHAR_AS_VARCHAR = buildConf("spark.sql.charAsVarchar")
+ .doc("When true, Spark replaces CHAR type with VARCHAR type in CREATE/REPLACE/ALTER TABLE " +
+ "commands, so that newly created/updated tables will not have CHAR type columns/fields. " +
+ "Existing tables with CHAR type columns/fields are not affected by this config.")
+ .booleanConf
Review comment:
missing version
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954791264
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/144746/
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan closed pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
cloud-fan closed pull request #34436:
URL: https://github.com/apache/spark/pull/34436
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739492378
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/CharVarcharUtils.scala
##########
@@ -138,6 +154,21 @@ object CharVarcharUtils extends Logging {
StructType(fields)
}
+ def getRawSchema(schema: StructType, conf: SQLConf): StructType = {
+ val fields = schema.map { field =>
+ getRawType(field.metadata).map { dt =>
+ if (conf.getConf(SQLConf.CHAR_AS_VARCHAR)) {
+ val metadata = new MetadataBuilder().withMetadata(field.metadata)
+ .remove(CHAR_VARCHAR_TYPE_STRING_METADATA_KEY).build()
Review comment:
Isn't the metadata used for char and varchar to string conversion? If `CHAR_AS_VARCHAR` is enabled, it means that we also need drop the metadata even the raw type is varchar?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739073768
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ReplaceCharWithVarchar.scala
##########
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.analysis
+
+import org.apache.spark.sql.catalyst.catalog.CatalogTable
+import org.apache.spark.sql.catalyst.plans.logical.{AddColumns, AlterColumn, CreateV2Table, LogicalPlan, ReplaceColumns, ReplaceTable}
+import org.apache.spark.sql.catalyst.rules.Rule
+import org.apache.spark.sql.catalyst.util.CharVarcharUtils
+import org.apache.spark.sql.execution.command.{AlterTableAddColumnsCommand, AlterTableChangeColumnCommand, CreateDataSourceTableCommand, CreateTableCommand}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.types.StructType
+
+object ReplaceCharWithVarchar extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ if (!conf.getConf(SQLConf.CHAR_AS_VARCHAR)) return plan
+
+ plan.resolveOperators {
+ // V2 commands
+ case cmd: CreateV2Table =>
+ cmd.copy(tableSchema = replaceCharWithVarcharInSchema(cmd.tableSchema))
+ case cmd: ReplaceTable =>
+ cmd.copy(tableSchema = replaceCharWithVarcharInSchema(cmd.tableSchema))
+ case cmd: AddColumns =>
+ cmd.copy(columnsToAdd = cmd.columnsToAdd.map { col =>
+ col.copy(dataType = CharVarcharUtils.replaceCharWithVarchar(col.dataType))
+ })
+ case cmd: AlterColumn =>
+ cmd.copy(dataType = cmd.dataType.map(CharVarcharUtils.replaceCharWithVarchar))
+ case cmd: ReplaceColumns =>
+ cmd.copy(columnsToAdd = cmd.columnsToAdd.map { col =>
+ col.copy(dataType = CharVarcharUtils.replaceCharWithVarchar(col.dataType))
+ })
+
+ // V1 commands
Review comment:
`CreateTableLikeCommand` is handled in its `run` method.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739048068
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
##########
@@ -3371,14 +3371,20 @@ object SQLConf {
val LEGACY_CHAR_VARCHAR_AS_STRING =
buildConf("spark.sql.legacy.charVarcharAsString")
.internal()
- .doc("When true, Spark will not fail if user uses char and varchar type directly in those" +
- " APIs that accept or parse data types as parameters, e.g." +
- " `SparkSession.read.schema(...)`, `SparkSession.udf.register(...)` but treat them as" +
- " string type as Spark 3.0 and earlier.")
+ .doc("When true, Spark treats CHAR/VARCHAR type the same as STRING type, which is the " +
+ "behavior of Spark 3.0 and earlier. This means no length check for CHAR/VARCHAR type and " +
+ "no padding for CHAR type when writing data to the table.")
.version("3.1.0")
.booleanConf
.createWithDefault(false)
+ val CHAR_AS_VARCHAR = buildConf("spark.sql.charAsVarchar")
+ .doc("When true, Spark replaces CHAR type with VARCHAR type in CREATE/REPLACE/ALTER TABLE " +
+ "commands, so that newly created/updated tables will not have CHAR type columns/fields. " +
+ "Existing tables with CHAR type columns/fields are not affected by this config.")
+ .booleanConf
Review comment:
added
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954559644
cc @yaooqinn @viirya @gengliangwang @allisonwang-db
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-955945497
thanks for the review, merging to master!
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954585788
**[Test build #144746 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144746/testReport)** for PR 34436 at commit [`9db8f6f`](https://github.com/apache/spark/commit/9db8f6fe2496f7f952341c93430dddcfdedd734b).
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954660069
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/49215/
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954585788
**[Test build #144746 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144746/testReport)** for PR 34436 at commit [`9db8f6f`](https://github.com/apache/spark/commit/9db8f6fe2496f7f952341c93430dddcfdedd734b).
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739957477
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/CharVarcharUtils.scala
##########
@@ -138,6 +154,21 @@ object CharVarcharUtils extends Logging {
StructType(fields)
}
+ def getRawSchema(schema: StructType, conf: SQLConf): StructType = {
+ val fields = schema.map { field =>
+ getRawType(field.metadata).map { dt =>
+ if (conf.getConf(SQLConf.CHAR_AS_VARCHAR)) {
+ val metadata = new MetadataBuilder().withMetadata(field.metadata)
+ .remove(CHAR_VARCHAR_TYPE_STRING_METADATA_KEY).build()
Review comment:
Okay, then I think it is fine.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954619863
Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/49215/
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
yaooqinn commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739065623
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ReplaceCharWithVarchar.scala
##########
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.analysis
+
+import org.apache.spark.sql.catalyst.catalog.CatalogTable
+import org.apache.spark.sql.catalyst.plans.logical.{AddColumns, AlterColumn, CreateV2Table, LogicalPlan, ReplaceColumns, ReplaceTable}
+import org.apache.spark.sql.catalyst.rules.Rule
+import org.apache.spark.sql.catalyst.util.CharVarcharUtils
+import org.apache.spark.sql.execution.command.{AlterTableAddColumnsCommand, AlterTableChangeColumnCommand, CreateDataSourceTableCommand, CreateTableCommand}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.types.StructType
+
+object ReplaceCharWithVarchar extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ if (!conf.getConf(SQLConf.CHAR_AS_VARCHAR)) return plan
+
+ plan.resolveOperators {
+ // V2 commands
+ case cmd: CreateV2Table =>
+ cmd.copy(tableSchema = replaceCharWithVarcharInSchema(cmd.tableSchema))
+ case cmd: ReplaceTable =>
+ cmd.copy(tableSchema = replaceCharWithVarcharInSchema(cmd.tableSchema))
+ case cmd: AddColumns =>
+ cmd.copy(columnsToAdd = cmd.columnsToAdd.map { col =>
+ col.copy(dataType = CharVarcharUtils.replaceCharWithVarchar(col.dataType))
+ })
+ case cmd: AlterColumn =>
+ cmd.copy(dataType = cmd.dataType.map(CharVarcharUtils.replaceCharWithVarchar))
+ case cmd: ReplaceColumns =>
+ cmd.copy(columnsToAdd = cmd.columnsToAdd.map { col =>
+ col.copy(dataType = CharVarcharUtils.replaceCharWithVarchar(col.dataType))
+ })
+
+ // V1 commands
Review comment:
CreateTableLike need to follow this?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739492378
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/CharVarcharUtils.scala
##########
@@ -138,6 +154,21 @@ object CharVarcharUtils extends Logging {
StructType(fields)
}
+ def getRawSchema(schema: StructType, conf: SQLConf): StructType = {
+ val fields = schema.map { field =>
+ getRawType(field.metadata).map { dt =>
+ if (conf.getConf(SQLConf.CHAR_AS_VARCHAR)) {
+ val metadata = new MetadataBuilder().withMetadata(field.metadata)
+ .remove(CHAR_VARCHAR_TYPE_STRING_METADATA_KEY).build()
Review comment:
Isn't the metadata used for both char and varchar to string conversion? If `CHAR_AS_VARCHAR` is enabled, it means that we also need drop the metadata even the raw type is varchar?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
yaooqinn commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739065623
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ReplaceCharWithVarchar.scala
##########
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.analysis
+
+import org.apache.spark.sql.catalyst.catalog.CatalogTable
+import org.apache.spark.sql.catalyst.plans.logical.{AddColumns, AlterColumn, CreateV2Table, LogicalPlan, ReplaceColumns, ReplaceTable}
+import org.apache.spark.sql.catalyst.rules.Rule
+import org.apache.spark.sql.catalyst.util.CharVarcharUtils
+import org.apache.spark.sql.execution.command.{AlterTableAddColumnsCommand, AlterTableChangeColumnCommand, CreateDataSourceTableCommand, CreateTableCommand}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.types.StructType
+
+object ReplaceCharWithVarchar extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = {
+ if (!conf.getConf(SQLConf.CHAR_AS_VARCHAR)) return plan
+
+ plan.resolveOperators {
+ // V2 commands
+ case cmd: CreateV2Table =>
+ cmd.copy(tableSchema = replaceCharWithVarcharInSchema(cmd.tableSchema))
+ case cmd: ReplaceTable =>
+ cmd.copy(tableSchema = replaceCharWithVarcharInSchema(cmd.tableSchema))
+ case cmd: AddColumns =>
+ cmd.copy(columnsToAdd = cmd.columnsToAdd.map { col =>
+ col.copy(dataType = CharVarcharUtils.replaceCharWithVarchar(col.dataType))
+ })
+ case cmd: AlterColumn =>
+ cmd.copy(dataType = cmd.dataType.map(CharVarcharUtils.replaceCharWithVarchar))
+ case cmd: ReplaceColumns =>
+ cmd.copy(columnsToAdd = cmd.columnsToAdd.map { col =>
+ col.copy(dataType = CharVarcharUtils.replaceCharWithVarchar(col.dataType))
+ })
+
+ // V1 commands
Review comment:
CreateTableLike
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954789568
**[Test build #144746 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/144746/testReport)** for PR 34436 at commit [`9db8f6f`](https://github.com/apache/spark/commit/9db8f6fe2496f7f952341c93430dddcfdedd734b).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #34436:
URL: https://github.com/apache/spark/pull/34436#issuecomment-954791264
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/144746/
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a change in pull request #34436: [SPARK-37160][SQL] Add a config to optionally disable padding for char type
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #34436:
URL: https://github.com/apache/spark/pull/34436#discussion_r739955103
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/CharVarcharUtils.scala
##########
@@ -138,6 +154,21 @@ object CharVarcharUtils extends Logging {
StructType(fields)
}
+ def getRawSchema(schema: StructType, conf: SQLConf): StructType = {
+ val fields = schema.map { field =>
+ getRawType(field.metadata).map { dt =>
+ if (conf.getConf(SQLConf.CHAR_AS_VARCHAR)) {
+ val metadata = new MetadataBuilder().withMetadata(field.metadata)
+ .remove(CHAR_VARCHAR_TYPE_STRING_METADATA_KEY).build()
Review comment:
Here we are getting the raw schema, which is restored from this special metadata, and we don't need this special metadata anymore.
It's usually no harm to still keep this special metadata, but in this case, it's inconsistent with the returned raw schema, and it's safer to remove it. I can do the same in the old `getRawSchema` as well if you think it's clearer.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org