You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "cloud-fan (via GitHub)" <gi...@apache.org> on 2023/12/16 01:24:31 UTC
[PR] [WIP] DS v2 createTable should not load the table [spark]
cloud-fan opened a new pull request, #44377:
URL: https://github.com/apache/spark/pull/44377
<!--
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.
-->
### 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.
-->
### 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'.
-->
### 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.
-->
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
--
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
Re: [PR] [WIP] DS v2 createTable should not load the table [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #44377:
URL: https://github.com/apache/spark/pull/44377#issuecomment-1858666137
LGTM pending 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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #44377: [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table
URL: https://github.com/apache/spark/pull/44377
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on PR #44377:
URL: https://github.com/apache/spark/pull/44377#issuecomment-1861532478
For external table, maybe we can take the specified location (`storage.locationUri`). For managed table, it seems to be `defaultTablePath(table.identifier)`.
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #44377:
URL: https://github.com/apache/spark/pull/44377#discussion_r1435100769
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala:
##########
@@ -198,10 +198,21 @@ class V2SessionCatalog(catalog: SessionCatalog)
s"Partitions should be empty when the schema is empty: ${partitions.mkString(", ")}")
// Infer the schema and partitions and store them in the catalog.
(tableProvider.inferSchema(dsOptions), tableProvider.inferPartitioning(dsOptions))
- } else if (partitions.isEmpty) {
- (schema, tableProvider.inferPartitioning(dsOptions))
} else {
- (schema, partitions)
+ val partitioning = if (partitions.isEmpty) {
+ tableProvider.inferPartitioning(dsOptions)
+ } else {
+ partitions
+ }
+ val table = tableProvider.getTable(schema, partitions, dsOptions)
+ // Check if the schema of the created table matches the given schema.
+ val tableSchema = CharVarcharUtils.replaceCharVarcharWithStringInSchema(
+ table.columns().asSchema)
+ if (!DataType.equalsIgnoreNullability(tableSchema, schema)) {
+ throw QueryCompilationErrors.dataSourceTableSchemaMismatchError(
Review Comment:
Since I touched it, I improved the error message a little bit to make it more clear.
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "huaxingao (via GitHub)" <gi...@apache.org>.
huaxingao commented on PR #44377:
URL: https://github.com/apache/spark/pull/44377#issuecomment-1861486615
A few tests in `V2SessionCatalogTableSuite` failed after the change. Seems without the extra table lookup, we don't have table `location` value any more.
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #44377:
URL: https://github.com/apache/spark/pull/44377#issuecomment-1869321189
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #44377:
URL: https://github.com/apache/spark/pull/44377#discussion_r1435332953
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala:
##########
@@ -233,21 +244,7 @@ class V2SessionCatalog(catalog: SessionCatalog)
throw QueryCompilationErrors.tableAlreadyExistsError(ident)
}
- val table = loadTable(ident)
-
- // Check if the schema of the created table matches the given schema.
- // TODO: move this check in loadTable to match the behavior with
- // existing file data sources.
- if (schema.nonEmpty) {
- val tableSchema = CharVarcharUtils.replaceCharVarcharWithStringInSchema(
- table.columns().asSchema)
- if (!DataType.equalsIgnoreNullability(tableSchema, schema)) {
- throw QueryCompilationErrors.dataSourceTableSchemaMismatchError(
- table.columns().asSchema, schema)
- }
- }
-
- table
+ null // Return null to save the `loadTable` call for CREATE TABLE without AS SELECT.
Review Comment:
Hmm, `TableCatalog` is still `Evolving` API. So it might be okay then.
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #44377:
URL: https://github.com/apache/spark/pull/44377#issuecomment-1860003261
cc @viirya @huaxingao
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #44377:
URL: https://github.com/apache/spark/pull/44377#discussion_r1429852693
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala:
##########
@@ -83,39 +83,42 @@ class V2SessionCatalog(catalog: SessionCatalog)
override def loadTable(ident: Identifier): Table = {
try {
- val table = catalog.getTableMetadata(ident.asTableIdentifier)
- if (table.provider.isDefined) {
- DataSourceV2Utils.getTableProvider(table.provider.get, conf) match {
- case Some(provider) =>
- // Get the table properties during creation and append the path option
- // to the properties.
- val dsOptions = getDataSourceOptions(table.properties, table.storage)
- // If the source accepts external table metadata, we can pass the schema and
- // partitioning information stored in Hive to `getTable` to avoid expensive
- // schema/partitioning inference.
- if (provider.supportsExternalMetadata()) {
- provider.getTable(
- table.schema,
- getV2Partitioning(table),
- dsOptions.asCaseSensitiveMap())
- } else {
- provider.getTable(
- provider.inferSchema(dsOptions),
- provider.inferPartitioning(dsOptions),
- dsOptions.asCaseSensitiveMap())
- }
- case _ =>
- V1Table(table)
- }
- } else {
- V1Table(table)
- }
+ toV2Table(catalog.getTableMetadata(ident.asTableIdentifier))
} catch {
case _: NoSuchDatabaseException =>
throw QueryCompilationErrors.noSuchTableError(ident)
}
}
+ private def toV2Table(v1Table: CatalogTable): Table = {
+ if (v1Table.provider.isDefined) {
Review Comment:
no change, just code move around.
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #44377:
URL: https://github.com/apache/spark/pull/44377#discussion_r1435331756
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala:
##########
@@ -233,21 +244,7 @@ class V2SessionCatalog(catalog: SessionCatalog)
throw QueryCompilationErrors.tableAlreadyExistsError(ident)
}
- val table = loadTable(ident)
-
- // Check if the schema of the created table matches the given schema.
- // TODO: move this check in loadTable to match the behavior with
- // existing file data sources.
- if (schema.nonEmpty) {
- val tableSchema = CharVarcharUtils.replaceCharVarcharWithStringInSchema(
- table.columns().asSchema)
- if (!DataType.equalsIgnoreNullability(tableSchema, schema)) {
- throw QueryCompilationErrors.dataSourceTableSchemaMismatchError(
- table.columns().asSchema, schema)
- }
- }
-
- table
+ null // Return null to save the `loadTable` call for CREATE TABLE without AS SELECT.
Review Comment:
Is this worth noting in migration guide?
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #44377:
URL: https://github.com/apache/spark/pull/44377#discussion_r1435982927
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala:
##########
@@ -233,21 +244,7 @@ class V2SessionCatalog(catalog: SessionCatalog)
throw QueryCompilationErrors.tableAlreadyExistsError(ident)
}
- val table = loadTable(ident)
-
- // Check if the schema of the created table matches the given schema.
- // TODO: move this check in loadTable to match the behavior with
- // existing file data sources.
- if (schema.nonEmpty) {
- val tableSchema = CharVarcharUtils.replaceCharVarcharWithStringInSchema(
- table.columns().asSchema)
- if (!DataType.equalsIgnoreNullability(tableSchema, schema)) {
- throw QueryCompilationErrors.dataSourceTableSchemaMismatchError(
- table.columns().asSchema, schema)
- }
- }
-
- table
+ null // Return null to save the `loadTable` call for CREATE TABLE without AS SELECT.
Review Comment:
This is a developer API that we expect users to implement, not to invoke. There is no way people can access an instance of `TableCatalog` unless they use private APIs (e.g. `SessionState#catalogManager`) or they instantiate their own `TableCatalog` implementations.
--
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
Re: [PR] [SPARK-46444][SQL] V2SessionCatalog#createTable should not load the table [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #44377:
URL: https://github.com/apache/spark/pull/44377#discussion_r1435331398
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala:
##########
@@ -233,21 +244,7 @@ class V2SessionCatalog(catalog: SessionCatalog)
throw QueryCompilationErrors.tableAlreadyExistsError(ident)
}
- val table = loadTable(ident)
-
- // Check if the schema of the created table matches the given schema.
- // TODO: move this check in loadTable to match the behavior with
- // existing file data sources.
- if (schema.nonEmpty) {
- val tableSchema = CharVarcharUtils.replaceCharVarcharWithStringInSchema(
- table.columns().asSchema)
- if (!DataType.equalsIgnoreNullability(tableSchema, schema)) {
- throw QueryCompilationErrors.dataSourceTableSchemaMismatchError(
- table.columns().asSchema, schema)
- }
- }
-
- table
+ null // Return null to save the `loadTable` call for CREATE TABLE without AS SELECT.
Review Comment:
Hmm, internally we can catch callers of this and add `Option` like this does. A concern is it might break some usages externally? The API return type is not changed, so users might need to dig into this change and find that this API could return null.
--
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