You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by "yihua (via GitHub)" <gi...@apache.org> on 2025/01/15 03:35:07 UTC
[PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
yihua opened a new pull request, #12640:
URL: https://github.com/apache/hudi/pull/12640
### Change Logs
_Describe context and summary for this change. Highlight if any code was copied._
### Impact
_Describe any public API or user-facing feature change or any performance impact._
### Risk level (write none, low medium or high below)
_If medium or high, explain what verification was done to mitigate the risks._
### Documentation Update
_Describe any necessary documentation update if there is any new feature, config, or user-facing change. If not, put "none"._
- _The config description must be updated if new configs are added or the default value of the configs are changed_
- _Any new feature or user-facing change requires updating the Hudi website. Please create a Jira ticket, attach the
ticket number here and follow the [instruction](https://hudi.apache.org/contribute/developer-setup#website) to make
changes to the website._
### Contributor's checklist
- [ ] Read through [contributor's guide](https://hudi.apache.org/contribute/how-to-contribute)
- [ ] Change Logs and Impact were stated clearly
- [ ] Adequate tests were added if applicable
- [ ] CI passed
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "nsivabalan (via GitHub)" <gi...@apache.org>.
nsivabalan commented on PR #12640:
URL: https://github.com/apache/hudi/pull/12640#issuecomment-2591636744
@yihua : can you check CI failures
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #12640:
URL: https://github.com/apache/hudi/pull/12640#issuecomment-2591573474
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* d53807e867076162dd9025f03ae461aa0b6a50ec UNKNOWN
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "yihua (via GitHub)" <gi...@apache.org>.
yihua commented on code in PR #12640:
URL: https://github.com/apache/hudi/pull/12640#discussion_r1917505128
##########
hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/dml/TestMergeIntoTable.scala:
##########
@@ -1445,4 +1443,91 @@ class TestMergeIntoTable extends HoodieSparkSqlTestBase with ScalaAssertionSuppo
})
}
}
+
+ test("Test unresolved columns in Merge Into statement") {
+ Seq("cow", "mor").foreach { tableType =>
+ withTempDir { tmp =>
+ val tableName = generateTableName
+ // Create a partitioned table
+ spark.sql(
+ s"""
+ |create table $tableName (
+ | id int,
+ | dt string,
+ | name string,
+ | price double,
+ | ts long
+ |) using hudi
+ | tblproperties (primaryKey = 'id', type = '$tableType')
+ | partitioned by (dt)
+ | location '${tmp.getCanonicalPath}'
+ | """.stripMargin)
+
+ spark.sql(
+ s"""
+ | insert into $tableName partition(dt = '2024-01-14')
+ | select 1 as id, 'a1' as name, 10 as price, 1000 as ts
+ | union
+ | select 2 as id, 'a2' as name, 20 as price, 1002 as ts
+ | """.stripMargin)
+ checkAnswer(s"select id, name, price, ts, dt from $tableName")(
+ Seq(1, "a1", 10.0, 1000, "2024-01-14"),
+ Seq(2, "a2", 20.0, 1002, "2024-01-14")
+ )
+
+ val targetTableFields = spark.sql(s"select * from $tableName").schema.fields
+ .map(e => (e.name, tableName, s"spark_catalog.default.$tableName.${e.name}"))
+ val sourceTableFields = Seq("s0._id", "s0._price", "s0._ts", "s0.dt", "s0.name")
+ .map(e => {
+ val splits = e.split('.')
+ (splits(1), splits(0), e)
+ })
+ // Target table column cannot be found
+ val sqlStatement1 =
+ s"""
+ | merge into $tableName
+ | using (
+ | select 2 as _id, '2024-01-14' as dt, 'a2_new' as name, 25 as _price, 1005 as _ts
+ | union
+ | select 3 as _id, '2024-01-14' as dt, 'a3' as name, 30 as _price, 1003 as _ts
+ | ) s0
+ | on s0._id = $tableName.id
+ | when matched then update set
+ | id = s0._id, dt = s0.dt, new_col = s0.name, price = s0._price + $tableName.price,
+ | ts = s0._ts
+ | """.stripMargin
+ // Source table column cannot be found
+ val sqlStatement2 =
+ s"""
+ | merge into $tableName
+ | using (
+ | select 2 as _id, '2024-01-14' as dt, 'a2_new' as name, 25 as _price, 1005 as _ts
+ | union
+ | select 3 as _id, '2024-01-14' as dt, 'a3' as name, 30 as _price, 1003 as _ts
+ | ) s0
+ | on s0._id = $tableName.id
+ | when matched then update set
+ | id = s0._id, dt = s0.dt, name = s0.new_col, price = s0._price + $tableName.price,
+ | ts = s0._ts
+ | """.stripMargin
+
+ checkExceptionContain(sqlStatement1)(
+ getExpectedExceptionMessage("new_col", targetTableFields))
+ checkExceptionContain(sqlStatement2)(
+ getExpectedExceptionMessage("s0.new_col", sourceTableFields ++ targetTableFields))
+ }
+ }
+ }
+
+ private def getExpectedExceptionMessage(columnName: String,
+ fieldNameTuples: Seq[(String, String, String)]): String = {
+ val fieldNames = fieldNameTuples.sortBy(e => (e._1, e._2))
+ .map(e => e._3).mkString("[", ", ", "]")
+ if (HoodieSparkUtils.gteqSpark3_5) {
+ "[UNRESOLVED_COLUMN.WITH_SUGGESTION] A column or function parameter with name " +
+ s"$columnName cannot be resolved. Did you mean one of the following? $fieldNames."
+ } else {
+ s"cannot resolve $columnName in MERGE command given columns $fieldNames."
Review Comment:
Thanks! I'll fix it.
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "CTTY (via GitHub)" <gi...@apache.org>.
CTTY commented on code in PR #12640:
URL: https://github.com/apache/hudi/pull/12640#discussion_r1917183593
##########
hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/dml/TestMergeIntoTable.scala:
##########
@@ -1445,4 +1443,91 @@ class TestMergeIntoTable extends HoodieSparkSqlTestBase with ScalaAssertionSuppo
})
}
}
+
+ test("Test unresolved columns in Merge Into statement") {
+ Seq("cow", "mor").foreach { tableType =>
+ withTempDir { tmp =>
+ val tableName = generateTableName
+ // Create a partitioned table
+ spark.sql(
+ s"""
+ |create table $tableName (
+ | id int,
+ | dt string,
+ | name string,
+ | price double,
+ | ts long
+ |) using hudi
+ | tblproperties (primaryKey = 'id', type = '$tableType')
+ | partitioned by (dt)
+ | location '${tmp.getCanonicalPath}'
+ | """.stripMargin)
+
+ spark.sql(
+ s"""
+ | insert into $tableName partition(dt = '2024-01-14')
+ | select 1 as id, 'a1' as name, 10 as price, 1000 as ts
+ | union
+ | select 2 as id, 'a2' as name, 20 as price, 1002 as ts
+ | """.stripMargin)
+ checkAnswer(s"select id, name, price, ts, dt from $tableName")(
+ Seq(1, "a1", 10.0, 1000, "2024-01-14"),
+ Seq(2, "a2", 20.0, 1002, "2024-01-14")
+ )
+
+ val targetTableFields = spark.sql(s"select * from $tableName").schema.fields
+ .map(e => (e.name, tableName, s"spark_catalog.default.$tableName.${e.name}"))
+ val sourceTableFields = Seq("s0._id", "s0._price", "s0._ts", "s0.dt", "s0.name")
+ .map(e => {
+ val splits = e.split('.')
+ (splits(1), splits(0), e)
+ })
+ // Target table column cannot be found
+ val sqlStatement1 =
+ s"""
+ | merge into $tableName
+ | using (
+ | select 2 as _id, '2024-01-14' as dt, 'a2_new' as name, 25 as _price, 1005 as _ts
+ | union
+ | select 3 as _id, '2024-01-14' as dt, 'a3' as name, 30 as _price, 1003 as _ts
+ | ) s0
+ | on s0._id = $tableName.id
+ | when matched then update set
+ | id = s0._id, dt = s0.dt, new_col = s0.name, price = s0._price + $tableName.price,
+ | ts = s0._ts
+ | """.stripMargin
+ // Source table column cannot be found
+ val sqlStatement2 =
+ s"""
+ | merge into $tableName
+ | using (
+ | select 2 as _id, '2024-01-14' as dt, 'a2_new' as name, 25 as _price, 1005 as _ts
+ | union
+ | select 3 as _id, '2024-01-14' as dt, 'a3' as name, 30 as _price, 1003 as _ts
+ | ) s0
+ | on s0._id = $tableName.id
+ | when matched then update set
+ | id = s0._id, dt = s0.dt, name = s0.new_col, price = s0._price + $tableName.price,
+ | ts = s0._ts
+ | """.stripMargin
+
+ checkExceptionContain(sqlStatement1)(
+ getExpectedExceptionMessage("new_col", targetTableFields))
+ checkExceptionContain(sqlStatement2)(
+ getExpectedExceptionMessage("s0.new_col", sourceTableFields ++ targetTableFields))
+ }
+ }
+ }
+
+ private def getExpectedExceptionMessage(columnName: String,
+ fieldNameTuples: Seq[(String, String, String)]): String = {
+ val fieldNames = fieldNameTuples.sortBy(e => (e._1, e._2))
+ .map(e => e._3).mkString("[", ", ", "]")
+ if (HoodieSparkUtils.gteqSpark3_5) {
+ "[UNRESOLVED_COLUMN.WITH_SUGGESTION] A column or function parameter with name " +
+ s"$columnName cannot be resolved. Did you mean one of the following? $fieldNames."
+ } else {
+ s"cannot resolve $columnName in MERGE command given columns $fieldNames."
Review Comment:
Seems like the CI is just complaining about the extra "." by the end
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #12640:
URL: https://github.com/apache/hudi/pull/12640#issuecomment-2594229671
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"status" : "SUCCESS",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854",
"triggerID" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"triggerType" : "PUSH"
}, {
"hash" : "9449eca5a96ccf03963d083d44eab5a2a35fcbd5",
"status" : "PENDING",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2879",
"triggerID" : "9449eca5a96ccf03963d083d44eab5a2a35fcbd5",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* d53807e867076162dd9025f03ae461aa0b6a50ec Azure: [SUCCESS](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854)
* 9449eca5a96ccf03963d083d44eab5a2a35fcbd5 Azure: [PENDING](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2879)
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "yihua (via GitHub)" <gi...@apache.org>.
yihua commented on PR #12640:
URL: https://github.com/apache/hudi/pull/12640#issuecomment-2594226354
The validation in the test is fixed now.
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #12640:
URL: https://github.com/apache/hudi/pull/12640#issuecomment-2591574637
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"status" : "PENDING",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854",
"triggerID" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* d53807e867076162dd9025f03ae461aa0b6a50ec Azure: [PENDING](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854)
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #12640:
URL: https://github.com/apache/hudi/pull/12640#issuecomment-2591649000
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"status" : "SUCCESS",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854",
"triggerID" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* d53807e867076162dd9025f03ae461aa0b6a50ec Azure: [SUCCESS](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854)
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "yihua (via GitHub)" <gi...@apache.org>.
yihua merged PR #12640:
URL: https://github.com/apache/hudi/pull/12640
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #12640:
URL: https://github.com/apache/hudi/pull/12640#issuecomment-2594336716
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"status" : "DELETED",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854",
"triggerID" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"triggerType" : "PUSH"
}, {
"hash" : "9449eca5a96ccf03963d083d44eab5a2a35fcbd5",
"status" : "SUCCESS",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2879",
"triggerID" : "9449eca5a96ccf03963d083d44eab5a2a35fcbd5",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* 9449eca5a96ccf03963d083d44eab5a2a35fcbd5 Azure: [SUCCESS](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2879)
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [HUDI-8865] Fix error message of unresolved columns in MERGE INTO on Spark 3.5 [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #12640:
URL: https://github.com/apache/hudi/pull/12640#issuecomment-2594227720
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"status" : "SUCCESS",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854",
"triggerID" : "d53807e867076162dd9025f03ae461aa0b6a50ec",
"triggerType" : "PUSH"
}, {
"hash" : "9449eca5a96ccf03963d083d44eab5a2a35fcbd5",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "9449eca5a96ccf03963d083d44eab5a2a35fcbd5",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* d53807e867076162dd9025f03ae461aa0b6a50ec Azure: [SUCCESS](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=2854)
* 9449eca5a96ccf03963d083d44eab5a2a35fcbd5 UNKNOWN
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org