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 2022/12/28 10:07:49 UTC
[GitHub] [spark] ulysses-you opened a new pull request, #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
ulysses-you opened a new pull request, #39263:
URL: https://github.com/apache/spark/pull/39263
<!--
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.
-->
This pr removes `OptimizedCreateHiveTableAsSelectCommand` and move the code that tune `InsertIntoHiveTable` to `InsertIntoHadoopFsRelationCommand` into `RelationConversions`.
### 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.
-->
CTAS use a nested execution to do data writing, so it is unnecessary to have `OptimizedCreateHiveTableAsSelectCommand`. The inside `InsertIntoHiveTable` would be converted to `InsertIntoHadoopFsRelationCommand` if possible.
### 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.
-->
fix test
--
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] ulysses-you commented on a diff in pull request #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #39263:
URL: https://github.com/apache/spark/pull/39263#discussion_r1058714055
##########
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveStrategies.scala:
##########
@@ -232,15 +233,35 @@ case class RelationConversions(
if DDLUtils.isHiveTable(relation.tableMeta) && isConvertible(relation) =>
metastoreCatalog.convert(relation, isWrite = false)
- // CTAS
- case CreateTable(tableDesc, mode, Some(query))
+ // CTAS path
+ // `InsertIntoHiveTable` is derived from `CreateHiveTableAsSelectCommand`.
+ // This pattern would not cause conflicts because this rule is always applied before
+ // `HiveAnalysis` and both of these rules are running once.
+ case InsertIntoHiveTable(tableDesc, _, query, overwrite, ifPartitionNotExists, _)
Review Comment:
updated comment
--
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] ulysses-you commented on a diff in pull request #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #39263:
URL: https://github.com/apache/spark/pull/39263#discussion_r1058703839
##########
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveStrategies.scala:
##########
@@ -232,15 +233,35 @@ case class RelationConversions(
if DDLUtils.isHiveTable(relation.tableMeta) && isConvertible(relation) =>
metastoreCatalog.convert(relation, isWrite = false)
- // CTAS
- case CreateTable(tableDesc, mode, Some(query))
+ // CTAS path
+ // `InsertIntoHiveTable` is derived from `CreateHiveTableAsSelectCommand`.
+ // This pattern would not cause conflicts because this rule is always applied before
+ // `HiveAnalysis` and both of these rules are running once.
+ case InsertIntoHiveTable(tableDesc, _, query, overwrite, ifPartitionNotExists, _)
Review Comment:
Before we match `InsertIntoStatement` and covert hive relation to HadoopFsRelation then datasource can tune it to `InsertIntoHadoopFsRelationCommand`. see line 223
That said, we can make `CreateHiveTableAsSelectCommand` use `InsertIntoStatement` instead of `InsertIntoHiveTable` but one issue is we can not aware of if the `InsertIntoStatement` is from CTAS. So here I use `InsertIntoHiveTable`.
--
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] dongjoon-hyun closed pull request #39263: [SPARK-41726][SQL] Remove `OptimizedCreateHiveTableAsSelectCommand`
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun closed pull request #39263: [SPARK-41726][SQL] Remove `OptimizedCreateHiveTableAsSelectCommand`
URL: https://github.com/apache/spark/pull/39263
--
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 diff in pull request #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #39263:
URL: https://github.com/apache/spark/pull/39263#discussion_r1058702056
##########
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveStrategies.scala:
##########
@@ -232,15 +233,35 @@ case class RelationConversions(
if DDLUtils.isHiveTable(relation.tableMeta) && isConvertible(relation) =>
metastoreCatalog.convert(relation, isWrite = false)
- // CTAS
- case CreateTable(tableDesc, mode, Some(query))
+ // CTAS path
+ // `InsertIntoHiveTable` is derived from `CreateHiveTableAsSelectCommand`.
+ // This pattern would not cause conflicts because this rule is always applied before
+ // `HiveAnalysis` and both of these rules are running once.
+ case InsertIntoHiveTable(tableDesc, _, query, overwrite, ifPartitionNotExists, _)
Review Comment:
I mean normal table insertion, not table insertion inside CTAS.
--
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] ulysses-you commented on a diff in pull request #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #39263:
URL: https://github.com/apache/spark/pull/39263#discussion_r1058676758
##########
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveStrategies.scala:
##########
@@ -232,15 +233,35 @@ case class RelationConversions(
if DDLUtils.isHiveTable(relation.tableMeta) && isConvertible(relation) =>
metastoreCatalog.convert(relation, isWrite = false)
- // CTAS
- case CreateTable(tableDesc, mode, Some(query))
+ // CTAS path
+ // `InsertIntoHiveTable` is derived from `CreateHiveTableAsSelectCommand`.
+ // This pattern would not cause conflicts because this rule is always applied before
+ // `HiveAnalysis` and both of these rules are running once.
+ case InsertIntoHiveTable(tableDesc, _, query, overwrite, ifPartitionNotExists, _)
Review Comment:
Before, we optimize hive table insertion inside `OptimizedCreateHiveTableAsSelectCommand`. It returns `InsertIntoHadoopFsRelationCommand` in `getWritingCommand`. Now, `CreateHiveTableAsSelectCommand` always use `InsertIntoHiveTable` for data writing and we match this pattern to do optimize.
--
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] ulysses-you commented on a diff in pull request #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on code in PR #39263:
URL: https://github.com/apache/spark/pull/39263#discussion_r1058235116
##########
sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala:
##########
@@ -2310,23 +2312,33 @@ abstract class SQLQuerySuiteBase extends QueryTest with SQLTestUtils with TestHi
val targetTable = "targetTable"
withTable(targetTable) {
- val df = sql(s"CREATE TABLE $targetTable STORED AS $format AS SELECT id FROM p")
- checkAnswer(sql(s"SELECT id FROM $targetTable"),
- Row(1) :: Row(2) :: Row(3) :: Nil)
-
- val ctasDSCommand = df.queryExecution.analyzed.collect {
- case _: OptimizedCreateHiveTableAsSelectCommand => true
- }.headOption
- val ctasCommand = df.queryExecution.analyzed.collect {
- case _: CreateHiveTableAsSelectCommand => true
- }.headOption
-
- if (isConverted && isConvertedCtas) {
- assert(ctasDSCommand.nonEmpty)
- assert(ctasCommand.isEmpty)
- } else {
- assert(ctasDSCommand.isEmpty)
- assert(ctasCommand.nonEmpty)
+ var commands: Seq[SparkPlanInfo] = Seq.empty
+ val listener = new SparkListener {
+ override def onOtherEvent(event: SparkListenerEvent): Unit = {
+ event match {
+ case start: SparkListenerSQLExecutionStart =>
+ commands = commands ++ Seq(start.sparkPlanInfo)
+ case _ => // ignore other events
+ }
+ }
+ }
+ spark.sparkContext.addSparkListener(listener)
+ try {
+ val df = sql(s"CREATE TABLE $targetTable STORED AS $format AS SELECT id FROM p")
+ checkAnswer(sql(s"SELECT id FROM $targetTable"),
+ Row(1) :: Row(2) :: Row(3) :: Nil)
+ spark.sparkContext.listenerBus.waitUntilEmpty()
+ assert(commands.size == 3)
+ assert(commands.head.nodeName == "Execute CreateHiveTableAsSelectCommand")
+
+ val v1WriteCommand = commands(1)
+ if (isConverted && isConvertedCtas) {
Review Comment:
the removed test in [HiveExplainSuite.scala](https://github.com/apache/spark/pull/39263/files#diff-844c30ceddbb9b60013bef1e6b30dc8f65128779fa89e93733c537d392907f75) has been covered in this test.
--
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] ulysses-you commented on pull request #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on PR #39263:
URL: https://github.com/apache/spark/pull/39263#issuecomment-1366529716
cc @cloud-fan
--
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 diff in pull request #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #39263:
URL: https://github.com/apache/spark/pull/39263#discussion_r1058706279
##########
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveStrategies.scala:
##########
@@ -232,15 +233,35 @@ case class RelationConversions(
if DDLUtils.isHiveTable(relation.tableMeta) && isConvertible(relation) =>
metastoreCatalog.convert(relation, isWrite = false)
- // CTAS
- case CreateTable(tableDesc, mode, Some(query))
+ // CTAS path
+ // `InsertIntoHiveTable` is derived from `CreateHiveTableAsSelectCommand`.
+ // This pattern would not cause conflicts because this rule is always applied before
+ // `HiveAnalysis` and both of these rules are running once.
+ case InsertIntoHiveTable(tableDesc, _, query, overwrite, ifPartitionNotExists, _)
Review Comment:
I see, can we make the code comments clearer? This only matches table insertion inside Hive CTAS.
--
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 diff in pull request #39263: [SPARK-41726][SQL] Remove OptimizedCreateHiveTableAsSelectCommand
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #39263:
URL: https://github.com/apache/spark/pull/39263#discussion_r1058319340
##########
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveStrategies.scala:
##########
@@ -232,15 +233,35 @@ case class RelationConversions(
if DDLUtils.isHiveTable(relation.tableMeta) && isConvertible(relation) =>
metastoreCatalog.convert(relation, isWrite = false)
- // CTAS
- case CreateTable(tableDesc, mode, Some(query))
+ // CTAS path
+ // `InsertIntoHiveTable` is derived from `CreateHiveTableAsSelectCommand`.
+ // This pattern would not cause conflicts because this rule is always applied before
+ // `HiveAnalysis` and both of these rules are running once.
+ case InsertIntoHiveTable(tableDesc, _, query, overwrite, ifPartitionNotExists, _)
Review Comment:
wait, how do we optimize hive table insertion before? Given there is no case for `InsertIntoHiveTable` before.
--
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] ulysses-you commented on pull request #39263: [SPARK-41726][SQL] Remove `OptimizedCreateHiveTableAsSelectCommand`
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on PR #39263:
URL: https://github.com/apache/spark/pull/39263#issuecomment-1367672150
thank you @dongjoon-hyun and @cloud-fan !
--
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