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/04/04 03:43:34 UTC
[GitHub] [spark] AngersZhuuuu opened a new pull request, #36056: [WIP][SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
AngersZhuuuu opened a new pull request, #36056:
URL: https://github.com/apache/spark/pull/36056
…
<!--
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.
-->
--
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] AngersZhuuuu commented on pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on PR #36056:
URL: https://github.com/apache/spark/pull/36056#issuecomment-1223482828
> It seems that there is no concurrent query tests in this PR which is mentioned the main problem in the PR description? Did I understand correctly?
It's hard to control two concurrent test commit files at the same time.
--
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] AngersZhuuuu commented on a diff in pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on code in PR #36056:
URL: https://github.com/apache/spark/pull/36056#discussion_r953384417
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/SQLOverwriteHadoopMapReduceCommitProtocolSuite.scala:
##########
@@ -0,0 +1,208 @@
+/*
+ * 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.execution.datasources
+
+import org.apache.hadoop.fs.Path
+
+import org.apache.spark.sql.{QueryTest, Row}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.internal.SQLConf.PartitionOverwriteMode._
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.util.Utils
+
+class SQLOverwriteHadoopMapReduceCommitProtocolSuite extends QueryTest with SharedSparkSession {
+
+ import testImplicits._
+
+ test("SPARK-36571: Check staging dir") {
+ val path = new Path(Utils.createTempDir().toString)
+ val commitProtocol =
+ new SQLOverwriteHadoopMapReduceCommitProtocol("000001", path.toString, true)
+ assert(commitProtocol.stagingDir.getParent == path.getParent)
+ assert(commitProtocol.stagingDir.getName == s".${path.getName}-spark-staging-000001")
+ }
+
+ test("SPARK-36571: None-partitioned table insert overwrite") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 int) USING PARQUET
+ """.stripMargin)
+
+ val df = Seq((1, 2), (1, 2))
+ .toDF("c1", "p1").repartition(1)
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+
+ // test can delete data correctly
+ sql("INSERT INTO TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"),
+ Row(1, 2) :: Row(1, 2) :: Row(1, 2) :: Row(1, 2) :: Nil)
+
+ // test can delete data correctly
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+
+ }
+ }
+ }
+ }
+
+ test("SPARK-36571: Partitioned table insert single partition") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 string, p2 string)
+ | USING PARQUET
+ | PARTITIONED BY (p1, p2)
+ """.stripMargin)
+
+ val df = Seq(1, 2, 3).toDF("c1")
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t PARTITION (p1 = 1, p2 = 1) SELECT * FROM temp")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"), df)
+
+ // test won't delete other partitions data
+ sql("INSERT OVERWRITE TABLE t PARTITION (p1 = 2, p2 = 2) SELECT * FROM temp")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 2 AND p2 = 2"), df)
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"), df)
+
+ // test can delete data correctly
+ sql("INSERT OVERWRITE TABLE t PARTITION (p1 = 1, p2 = 1) SELECT * FROM temp")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"), df)
+
+ // test can delete data correctly
+ sql("INSERT INTO TABLE t PARTITION (p1 = 1, p2 = 1) SELECT * FROM temp")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"),
+ Row(1) :: Row(2) :: Row(3) :: Row(1) :: Row(2) :: Row(3) :: Nil)
+
+ // customized partition location
+ withTempPath { path =>
+ sql(
+ s"""
+ |ALTER TABLE t ADD PARTITION (p1=3, p2=3)
+ |LOCATION '$path'
+ |""".stripMargin)
+ sql("INSERT OVERWRITE TABLE t PARTITION (p1 = 3, p2 = 3) SELECT 3")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 3 AND p2 = 3"), Row(3) :: Nil)
+ sql("INSERT INTO TABLE t PARTITION (p1 = 3, p2 = 3) SELECT 3")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 3 AND p2 = 3"), Row(3) :: Row(3) :: Nil)
+ }
+ }
+ }
+ }
+ }
+
+ test("SPARK-36571: Dynamic partition overwrite - DYNAMIC mode") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName,
+ SQLConf.PARTITION_OVERWRITE_MODE.key -> DYNAMIC.toString) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 string, p2 string)
+ | USING PARQUET
+ | PARTITIONED BY (p1, p2)
+ """.stripMargin)
+
+ val df = Seq((1, "1", "1"), (2, "2", "2"), (3, "3", "3")).toDF("c1", "p1", "p2")
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"), Row(1) :: Nil)
+
+ Seq((3, 3, 3), (4, 4, 4), (5, 5, 5))
+ .toDF("c1", "p1", "p2").createOrReplaceTempView("temp")
+ // test won't delete other partitions data
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"),
+ Row(1, "1", "1") :: Row(2, "2", "2") :: Row(3, "3", "3") ::
+ Row(4, "4", "4") :: Row(5, "5", "5") :: Nil)
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 5 AND p2 = 5"), Row(5) :: Nil)
+
+ // customized partition location
+ withTempPath { path =>
+ sql(
+ s"""
+ |ALTER TABLE t ADD PARTITION (p1=6, p2=6)
+ |LOCATION '$path'
+ |""".stripMargin)
+ Seq((5, 5, 5), (6, 6, 6))
+ .toDF("c1", "p1", "p2").createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"),
+ Row(1, "1", "1") :: Row(2, "2", "2") :: Row(3, "3", "3") ::
+ Row(4, "4", "4") :: Row(5, "5", "5") :: Row(6, "6", "6") :: Nil)
+ }
+ }
+ }
+ }
+ }
+
+ test("SPARK-36571: Dynamic partition overwrite - STATIC mode") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName,
+ SQLConf.PARTITION_OVERWRITE_MODE.key -> STATIC.toString) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 string, p2 string)
+ | USING PARQUET
+ | PARTITIONED BY (p1, p2)
+ """.stripMargin)
+
+ val df = Seq((1, "1", "1"), (2, "2", "2"), (3, "3", "3")).toDF("c1", "p1", "p2")
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"), Row(1) :: Nil)
Review Comment:
Before move to target path, the file in staging dir
```
/Users/yi.zhu/Documents/project/Angerszhuuuu/spark/sql/core/spark-warehouse/org.apache.spark.sql.execution.datasources.SQLOverwriteHadoopMapReduceCommitProtocolSuite/.t-spark-staging-669ea1c6-5eaa-4ae7-a670-0261cbde3318/
├── _SUCCESS
├── p1=1
│ └── p2=1
│ └── part-00000-669ea1c6-5eaa-4ae7-a670-0261cbde3318.c000.snappy.parquet
├── p1=2
│ └── p2=2
│ └── part-00001-669ea1c6-5eaa-4ae7-a670-0261cbde3318.c000.snappy.parquet
└── p1=3
└── p2=3
└── part-00001-669ea1c6-5eaa-4ae7-a670-0261cbde3318.c000.snappy.parquet
```
--
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] AngersZhuuuu commented on a diff in pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on code in PR #36056:
URL: https://github.com/apache/spark/pull/36056#discussion_r953381606
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/SQLOverwriteHadoopMapReduceCommitProtocolSuite.scala:
##########
@@ -0,0 +1,208 @@
+/*
+ * 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.execution.datasources
+
+import org.apache.hadoop.fs.Path
+
+import org.apache.spark.sql.{QueryTest, Row}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.internal.SQLConf.PartitionOverwriteMode._
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.util.Utils
+
+class SQLOverwriteHadoopMapReduceCommitProtocolSuite extends QueryTest with SharedSparkSession {
+
+ import testImplicits._
+
+ test("SPARK-36571: Check staging dir") {
+ val path = new Path(Utils.createTempDir().toString)
+ val commitProtocol =
+ new SQLOverwriteHadoopMapReduceCommitProtocol("000001", path.toString, true)
+ assert(commitProtocol.stagingDir.getParent == path.getParent)
+ assert(commitProtocol.stagingDir.getName == s".${path.getName}-spark-staging-000001")
+ }
+
+ test("SPARK-36571: None-partitioned table insert overwrite") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 int) USING PARQUET
+ """.stripMargin)
+
+ val df = Seq((1, 2), (1, 2))
+ .toDF("c1", "p1").repartition(1)
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+
+ // test can delete data correctly
+ sql("INSERT INTO TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"),
+ Row(1, 2) :: Row(1, 2) :: Row(1, 2) :: Row(1, 2) :: Nil)
+
+ // test can delete data correctly
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+
+ }
+ }
+ }
+ }
+
+ test("SPARK-36571: Partitioned table insert single partition") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 string, p2 string)
+ | USING PARQUET
+ | PARTITIONED BY (p1, p2)
+ """.stripMargin)
+
+ val df = Seq(1, 2, 3).toDF("c1")
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t PARTITION (p1 = 1, p2 = 1) SELECT * FROM temp")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"), df)
Review Comment:
```
/Users/yi.zhu/Documents/project/Angerszhuuuu/spark/sql/core/spark-warehouse/org.apache.spark.sql.execution.datasources.SQLOverwriteHadoopMapReduceCommitProtocolSuite/.t-spark-staging-4800632c-fd44-4dd4-964c-be1aca8a939d/
├── _SUCCESS
└── p1=1
└── p2=1
├── part-00000-4800632c-fd44-4dd4-964c-be1aca8a939d.c000.snappy.parquet
└── part-00001-4800632c-fd44-4dd4-964c-be1aca8a939d.c000.snappy.parquet
2 directories, 3 files
```
--
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] AngersZhuuuu commented on pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on PR #36056:
URL: https://github.com/apache/spark/pull/36056#issuecomment-1127179471
Gentle ping @cloud-fan Could you take a look?
--
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] AngersZhuuuu commented on a diff in pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on code in PR #36056:
URL: https://github.com/apache/spark/pull/36056#discussion_r954533145
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/SQLOverwriteHadoopMapReduceCommitProtocolSuite.scala:
##########
@@ -0,0 +1,208 @@
+/*
+ * 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.execution.datasources
+
+import org.apache.hadoop.fs.Path
+
+import org.apache.spark.sql.{QueryTest, Row}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.internal.SQLConf.PartitionOverwriteMode._
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.util.Utils
+
+class SQLOverwriteHadoopMapReduceCommitProtocolSuite extends QueryTest with SharedSparkSession {
+
+ import testImplicits._
+
+ test("SPARK-36571: Check staging dir") {
+ val path = new Path(Utils.createTempDir().toString)
+ val commitProtocol =
+ new SQLOverwriteHadoopMapReduceCommitProtocol("000001", path.toString, true)
+ assert(commitProtocol.stagingDir.getParent == path.getParent)
+ assert(commitProtocol.stagingDir.getName == s".${path.getName}-spark-staging-000001")
+ }
+
+ test("SPARK-36571: None-partitioned table insert overwrite") {
Review Comment:
Done
--
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 commented on pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on PR #36056:
URL: https://github.com/apache/spark/pull/36056#issuecomment-1226758074
Thank you, @AngersZhuuuu .
--
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] AngersZhuuuu commented on a diff in pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on code in PR #36056:
URL: https://github.com/apache/spark/pull/36056#discussion_r953381163
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/SQLOverwriteHadoopMapReduceCommitProtocolSuite.scala:
##########
@@ -0,0 +1,208 @@
+/*
+ * 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.execution.datasources
+
+import org.apache.hadoop.fs.Path
+
+import org.apache.spark.sql.{QueryTest, Row}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.internal.SQLConf.PartitionOverwriteMode._
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.util.Utils
+
+class SQLOverwriteHadoopMapReduceCommitProtocolSuite extends QueryTest with SharedSparkSession {
+
+ import testImplicits._
+
+ test("SPARK-36571: Check staging dir") {
+ val path = new Path(Utils.createTempDir().toString)
+ val commitProtocol =
+ new SQLOverwriteHadoopMapReduceCommitProtocol("000001", path.toString, true)
+ assert(commitProtocol.stagingDir.getParent == path.getParent)
+ assert(commitProtocol.stagingDir.getName == s".${path.getName}-spark-staging-000001")
+ }
+
+ test("SPARK-36571: None-partitioned table insert overwrite") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 int) USING PARQUET
+ """.stripMargin)
+
+ val df = Seq((1, 2), (1, 2))
+ .toDF("c1", "p1").repartition(1)
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
Review Comment:
Before rename to the target output the file is
```
/Users/yi.zhu/Documents/project/Angerszhuuuu/spark/sql/core/spark-warehouse/org.apache.spark.sql.execution.datasources.SQLOverwriteHadoopMapReduceCommitProtocolSuite/.t-spark-staging-2f9f8d83-118a-45f4-86d3-d3b3f68e03fa/
├── _SUCCESS
└── part-00000-2f9f8d83-118a-45f4-86d3-d3b3f68e03fa-c000.snappy.parquet
```
--
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 commented on a diff in pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on code in PR #36056:
URL: https://github.com/apache/spark/pull/36056#discussion_r954488764
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/SQLOverwriteHadoopMapReduceCommitProtocolSuite.scala:
##########
@@ -0,0 +1,208 @@
+/*
+ * 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.execution.datasources
+
+import org.apache.hadoop.fs.Path
+
+import org.apache.spark.sql.{QueryTest, Row}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.internal.SQLConf.PartitionOverwriteMode._
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.util.Utils
+
+class SQLOverwriteHadoopMapReduceCommitProtocolSuite extends QueryTest with SharedSparkSession {
+
+ import testImplicits._
+
+ test("SPARK-36571: Check staging dir") {
+ val path = new Path(Utils.createTempDir().toString)
+ val commitProtocol =
+ new SQLOverwriteHadoopMapReduceCommitProtocol("000001", path.toString, true)
+ assert(commitProtocol.stagingDir.getParent == path.getParent)
+ assert(commitProtocol.stagingDir.getName == s".${path.getName}-spark-staging-000001")
+ }
+
+ test("SPARK-36571: None-partitioned table insert overwrite") {
Review Comment:
`None-partitioned` -> `Non-partitioned`
--
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] AngersZhuuuu commented on pull request #36056: [WIP][SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on PR #36056:
URL: https://github.com/apache/spark/pull/36056#issuecomment-1087649418
ping @cloud-fan In order to realize the target that can support all overwrite, spark can't delete matching partitions before computing. But we support custom partition path and this part is handled in commit protocol, and spark must delete matching partitions before commit job. But
1. In committer side, we don't know the information about jobs (such as if it's a overwriting? or is it's a non-partition table overwriting)
2. Also in committer side, it don't know how to handle deleting matching partitions
3. Custom partition path overwrite is handled in commit protocol's `commitJob`
So the best processing steps is:
1. Not delete matching partitions
2. Executing data and write temp path
3. Delete matching partitions
4. commitJob, in this step, custom partition path is written and commit data to staging dir
5. rename staging dir to target location
--
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] AngersZhuuuu commented on a diff in pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on code in PR #36056:
URL: https://github.com/apache/spark/pull/36056#discussion_r953380860
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/SQLOverwriteHadoopMapReduceCommitProtocolSuite.scala:
##########
@@ -0,0 +1,208 @@
+/*
+ * 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.execution.datasources
+
+import org.apache.hadoop.fs.Path
+
+import org.apache.spark.sql.{QueryTest, Row}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.internal.SQLConf.PartitionOverwriteMode._
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.util.Utils
+
+class SQLOverwriteHadoopMapReduceCommitProtocolSuite extends QueryTest with SharedSparkSession {
+
+ import testImplicits._
+
+ test("SPARK-36571: Check staging dir") {
+ val path = new Path(Utils.createTempDir().toString)
+ val commitProtocol =
+ new SQLOverwriteHadoopMapReduceCommitProtocol("000001", path.toString, true)
+ assert(commitProtocol.stagingDir.getParent == path.getParent)
+ assert(commitProtocol.stagingDir.getName == s".${path.getName}-spark-staging-000001")
+ }
+
+ test("SPARK-36571: None-partitioned table insert overwrite") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 int) USING PARQUET
+ """.stripMargin)
+
+ val df = Seq((1, 2), (1, 2))
+ .toDF("c1", "p1").repartition(1)
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+
+ // test can delete data correctly
+ sql("INSERT INTO TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"),
+ Row(1, 2) :: Row(1, 2) :: Row(1, 2) :: Row(1, 2) :: Nil)
+
+ // test can delete data correctly
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+
+ }
+ }
+ }
+ }
+
+ test("SPARK-36571: Partitioned table insert single partition") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 string, p2 string)
+ | USING PARQUET
+ | PARTITIONED BY (p1, p2)
+ """.stripMargin)
+
+ val df = Seq(1, 2, 3).toDF("c1")
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t PARTITION (p1 = 1, p2 = 1) SELECT * FROM temp")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"), df)
Review Comment:
Before rename to the target output the file is
```
/Users/yi.zhu/Documents/project/Angerszhuuuu/spark/sql/core/spark-warehouse/org.apache.spark.sql.execution.datasources.SQLOverwriteHadoopMapReduceCommitProtocolSuite/.t-spark-staging-2f9f8d83-118a-45f4-86d3-d3b3f68e03fa/
├── _SUCCESS
└── part-00000-2f9f8d83-118a-45f4-86d3-d3b3f68e03fa-c000.snappy.parquet
```
--
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] AngersZhuuuu commented on pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on PR #36056:
URL: https://github.com/apache/spark/pull/36056#issuecomment-1223482396
> Could you rebase this PR once more? I'll review this PR, @AngersZhuuuu .
Yea!
--
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] AngersZhuuuu commented on pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on PR #36056:
URL: https://github.com/apache/spark/pull/36056#issuecomment-1225216261
> Could you rebase this PR once more? I'll review this PR, @AngersZhuuuu .
Conflict resolved
--
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] AngersZhuuuu commented on a diff in pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
AngersZhuuuu commented on code in PR #36056:
URL: https://github.com/apache/spark/pull/36056#discussion_r953381606
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/SQLOverwriteHadoopMapReduceCommitProtocolSuite.scala:
##########
@@ -0,0 +1,208 @@
+/*
+ * 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.execution.datasources
+
+import org.apache.hadoop.fs.Path
+
+import org.apache.spark.sql.{QueryTest, Row}
+import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.internal.SQLConf.PartitionOverwriteMode._
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.util.Utils
+
+class SQLOverwriteHadoopMapReduceCommitProtocolSuite extends QueryTest with SharedSparkSession {
+
+ import testImplicits._
+
+ test("SPARK-36571: Check staging dir") {
+ val path = new Path(Utils.createTempDir().toString)
+ val commitProtocol =
+ new SQLOverwriteHadoopMapReduceCommitProtocol("000001", path.toString, true)
+ assert(commitProtocol.stagingDir.getParent == path.getParent)
+ assert(commitProtocol.stagingDir.getName == s".${path.getName}-spark-staging-000001")
+ }
+
+ test("SPARK-36571: None-partitioned table insert overwrite") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 int) USING PARQUET
+ """.stripMargin)
+
+ val df = Seq((1, 2), (1, 2))
+ .toDF("c1", "p1").repartition(1)
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+
+ // test can delete data correctly
+ sql("INSERT INTO TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"),
+ Row(1, 2) :: Row(1, 2) :: Row(1, 2) :: Row(1, 2) :: Nil)
+
+ // test can delete data correctly
+ sql("INSERT OVERWRITE TABLE t SELECT * FROM temp")
+ checkAnswer(sql("SELECT * FROM t"), df)
+
+ }
+ }
+ }
+ }
+
+ test("SPARK-36571: Partitioned table insert single partition") {
+ withSQLConf(SQLConf.FILE_COMMIT_PROTOCOL_CLASS.key ->
+ classOf[SQLOverwriteHadoopMapReduceCommitProtocol].getName) {
+ withTable("t") {
+ withTempView("temp") {
+ sql(
+ s"""
+ | CREATE TABLE t(c1 int, p1 string, p2 string)
+ | USING PARQUET
+ | PARTITIONED BY (p1, p2)
+ """.stripMargin)
+
+ val df = Seq(1, 2, 3).toDF("c1")
+ df.createOrReplaceTempView("temp")
+ sql("INSERT OVERWRITE TABLE t PARTITION (p1 = 1, p2 = 1) SELECT * FROM temp")
+ checkAnswer(sql("SELECT c1 FROM t WHERE p1 = 1 AND p2 = 1"), df)
Review Comment:
Before rename to partition's target path
```
/Users/yi.zhu/Documents/project/Angerszhuuuu/spark/sql/core/spark-warehouse/org.apache.spark.sql.execution.datasources.SQLOverwriteHadoopMapReduceCommitProtocolSuite/.t-spark-staging-4800632c-fd44-4dd4-964c-be1aca8a939d/
├── _SUCCESS
└── p1=1
└── p2=1
├── part-00000-4800632c-fd44-4dd4-964c-be1aca8a939d.c000.snappy.parquet
└── part-00001-4800632c-fd44-4dd4-964c-be1aca8a939d.c000.snappy.parquet
2 directories, 3 files
```
--
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] github-actions[bot] commented on pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #36056:
URL: https://github.com/apache/spark/pull/36056#issuecomment-1336285268
We're closing this PR because it hasn't been updated in a while. This isn't a judgement on the merit of the PR in any way. It's just a way of keeping the PR queue manageable.
If you'd like to revive this PR, please reopen it and ask a committer to remove the Stale tag!
--
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] github-actions[bot] closed pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
github-actions[bot] closed pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
URL: https://github.com/apache/spark/pull/36056
--
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 commented on pull request #36056: [SPARK-36571][SQL] Add an SQLOverwriteHadoopMapReduceCommitProtocol to support all SQL overwrite write data to staging dir
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on PR #36056:
URL: https://github.com/apache/spark/pull/36056#issuecomment-1222859827
Could you rebase this PR once more? I'll review this PR, @AngersZhuuuu .
--
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