You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "ulysses-you (via GitHub)" <gi...@apache.org> on 2023/02/03 06:37:10 UTC
[GitHub] [spark] ulysses-you opened a new pull request, #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
ulysses-you opened a new pull request, #39870:
URL: https://github.com/apache/spark/pull/39870
<!--
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 makes metadata output consistent during analysis. Due to `metadataOutput` is not in constructor, so introduce a new tag `CACHED_META_OUTPUT_TAG` to cache the generated metadata output, and update `newInstance` method to cpoy tags.
This pr also deduplicates the metadata output when merging into the output.
### 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.
-->
Let's say a process of resolving metadata:
```
Project (_metadata.file_size)
File (_metadata.file_size > 0)
Relation
```
1. `ResolveReferences` resolves _metadata.file_size for `Filter`
2. `ResolveReferences` can not resolve _metadata.file_size for `Project`, due to Filter is not resolved (data type does not match)
3. then `AddMetadataColumns` will merge metadata output into output
4. the next round of `ResolveReferences` can not resolve _metadata.file_size for `Project` since we filter not the confict names(output already contains the metadata output), see code:
```
def isOutputColumn(col: MetadataColumn): Boolean = {
outputNames.exists(name => resolve(col.name, name))
}
// filter out metadata columns that have names conflicting with output columns. if the table
// has a column "line" and the table can produce a metadata column called "line", then the
// data column should be returned, not the metadata column.
hasMeta.metadataColumns.filterNot(isOutputColumn).toAttributes
```
And we also can not skip metadata column during filter confict name, otherwise the new generated metadata attribute will have different expr with previous.
One failed example:
```scala
SELECT _metadata.row_index FROM t WHERE _metadata.row_index >= 0;
```
### 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'.
-->
yes, bug fix
### 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.
-->
add test for v1, v2 and streaming relation
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098126440
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ getTagValue(CACHED_META_OUTPUT_TAG).getOrElse {
Review Comment:
I'm not sure it's safe to add a project for root node. One issue is we do not know the output of root node because it's not 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] ulysses-you commented on a diff in pull request #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098098734
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ getTagValue(CACHED_META_OUTPUT_TAG).getOrElse {
Review Comment:
It's acutally the different issue, my test cases still fail with your pr.
After `addMetadataCol`, the newNode is always different with original node(metadata output merges into output), so an extra project can not be avoid. (Your pr fixs a special case of `hiddenOutputTag` with NaturalJoin)
Then, the only way to resolve rest metadata columns is using metadata output. But before this pr, the metadata output is lost once call `addMetadataCol`.
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098612190
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -52,19 +52,27 @@ case class DataSourceV2Relation(
case c: FunctionCatalog => c
}
- override lazy val metadataOutput: Seq[AttributeReference] = table match {
- case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ override lazy val metadataOutput: Seq[AttributeReference] = {
+ val metadataColFromOutput = output.filter(_.isMetadataCol)
Review Comment:
to be safe, let's only do it under `case hasMeta: SupportsMetadataColumns`
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098609379
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
Review Comment:
looks good
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1096871625
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ getTagValue(CACHED_META_OUTPUT_TAG).getOrElse {
Review Comment:
yes, but there is a conflict in `AddMetadataColumns`. We will add a new project(original output), see
https://github.com/apache/spark/blob/6bb68b5f75ac883423a68583750258656f381c33/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala#L995-L1002
then with this case, it will be:
```scala
Project (_metadata.file_size)
Project(c)
File (_metadata.file_size > 0)
Relation c, metadataoutput
```
I guess the original idea is we should always use children.metadataoutputs to do resolving to prevent exposing unnecessary metadata columns, isn't 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: 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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098616207
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -52,19 +52,27 @@ case class DataSourceV2Relation(
case c: FunctionCatalog => c
}
- override lazy val metadataOutput: Seq[AttributeReference] = table match {
- case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ override lazy val metadataOutput: Seq[AttributeReference] = {
+ val metadataColFromOutput = output.filter(_.isMetadataCol)
Review Comment:
addressed
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098633160
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamingRelation.scala:
##########
@@ -59,26 +60,34 @@ case class StreamingRelation(dataSource: DataSource, sourceName: String, output:
override def newInstance(): LogicalPlan = this.copy(output = output.map(_.newInstance()))
override lazy val metadataOutput: Seq[AttributeReference] = {
- dataSource.providingClass match {
- // If the dataSource provided class is a same or subclass of FileFormat class
- case f if classOf[FileFormat].isAssignableFrom(f) =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: AttributeReference): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
- }
- // filter out the metadata struct column if it has the name conflicting with output columns.
- // if the file has a column "_metadata",
- // then the data column should be returned not the metadata struct column
- Seq(FileFormat.createFileMetadataCol(
- dataSource.providingInstance().asInstanceOf[FileFormat])).filterNot(isOutputColumn)
- case _ => Nil
+ val metadataColFromOutput = output.filter(_.isMetadataCol)
Review Comment:
ditto, and add comments as well
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098114726
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ getTagValue(CACHED_META_OUTPUT_TAG).getOrElse {
Review Comment:
I see, the problem here is we reference metadata col twice in two different nodes. I think the problem here is we add the extra project too early. We should only do it once for the root node.
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098584999
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
Review Comment:
how about this:
```
val metadataColFromOutput = output.filter(_.isMetadataCol)
if (metadataColFromOutput.isEmpty) {
original code
} else {
metadataColFromOutput
}
```
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098612490
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -52,19 +52,27 @@ case class DataSourceV2Relation(
case c: FunctionCatalog => c
}
- override lazy val metadataOutput: Seq[AttributeReference] = table match {
- case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ override lazy val metadataOutput: Seq[AttributeReference] = {
+ val metadataColFromOutput = output.filter(_.isMetadataCol)
Review Comment:
also add some comments to explain when it happens
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098098734
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ getTagValue(CACHED_META_OUTPUT_TAG).getOrElse {
Review Comment:
It's acutally the different issue, my test cases still fail with your pr.
After `addMetadataCol`, the output of newNode is always different with original node(metadata output merges into output), so an extra project can not be avoid. (Your pr fixs a special case of `hiddenOutputTag` with NaturalJoin)
Then, the only way to resolve rest metadata columns is using metadata output. But before this pr, the metadata output is lost once call `addMetadataCol`.
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #39870:
URL: https://github.com/apache/spark/pull/39870#issuecomment-1427775538
thank you @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 closed pull request #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
URL: https://github.com/apache/spark/pull/39870
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098633719
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamingRelation.scala:
##########
@@ -59,26 +60,34 @@ case class StreamingRelation(dataSource: DataSource, sourceName: String, output:
override def newInstance(): LogicalPlan = this.copy(output = output.map(_.newInstance()))
override lazy val metadataOutput: Seq[AttributeReference] = {
- dataSource.providingClass match {
- // If the dataSource provided class is a same or subclass of FileFormat class
- case f if classOf[FileFormat].isAssignableFrom(f) =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: AttributeReference): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
- }
- // filter out the metadata struct column if it has the name conflicting with output columns.
- // if the file has a column "_metadata",
- // then the data column should be returned not the metadata struct column
- Seq(FileFormat.createFileMetadataCol(
- dataSource.providingInstance().asInstanceOf[FileFormat])).filterNot(isOutputColumn)
- case _ => Nil
+ val metadataColFromOutput = output.filter(_.isMetadataCol)
Review Comment:
Maybe we can add a util method in `object FileFormat` to reduce code duplication
--
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] allisonwang-db commented on a diff in pull request #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "allisonwang-db (via GitHub)" <gi...@apache.org>.
allisonwang-db commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1097816600
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ getTagValue(CACHED_META_OUTPUT_TAG).getOrElse {
Review Comment:
Fixed in #39895
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098293782
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
Review Comment:
if the goal is to let these relations report metadata cols consistently, how about we make a change here? `val outputNames = output.filterNot(_.isMetadataCol).map(_.name).toSet`.
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098714237
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,7 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
- }
- // filter out metadata columns that have names conflicting with output columns. if the table
- // has a column "line" and the table can produce a metadata column called "line", then the
- // data column should be returned, not the metadata column.
- hasMeta.metadataColumns.filterNot(isOutputColumn).toAttributes
+ metadataOutputWithOutConflicts(hasMeta.metadataColumns.toAttributes)
Review Comment:
One small difference is we call `toAttributes` before filter out conflicts. Seems fine.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098312526
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
Review Comment:
this is my first try, but have other issue.. see the pr description:
> And we also can not skip metadata column during filter confict name, otherwise the new generated metadata attribute will have different expr id with previous.
e.g., each call with `FileFormat.createFileMetadataCol` will generate different attribute expr id.
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #39870:
URL: https://github.com/apache/spark/pull/39870#issuecomment-1415403384
cc @Yaohua628 @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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1095772960
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ getTagValue(CACHED_META_OUTPUT_TAG).getOrElse {
Review Comment:
I'm a bit confused, why do we care about metadata output anymore if it has been added to the output? The column in project will just be resolved as a normal attribute, right?
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098114726
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Relation.scala:
##########
@@ -54,15 +54,18 @@ case class DataSourceV2Relation(
override lazy val metadataOutput: Seq[AttributeReference] = table match {
case hasMeta: SupportsMetadataColumns =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: MetadataColumn): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ getTagValue(CACHED_META_OUTPUT_TAG).getOrElse {
Review Comment:
I see, the problem here is we reference metadata col twice in two different nodes. I think the issue is we add the extra project too early. We should only do it once for the root node.
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098632864
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/LogicalRelation.scala:
##########
@@ -68,23 +68,36 @@ case class LogicalRelation(
s"[${truncatedString(output, ",", maxFields)}] $relation"
}
- override lazy val metadataOutput: Seq[AttributeReference] = relation match {
- case relation: HadoopFsRelation =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: AttributeReference): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
+ override lazy val metadataOutput: Seq[AttributeReference] = {
+ // If `metadataColFromOutput` is not empty that means `AddMetadataColumns` merged
+ // metadata output into output. We should still return an available metadata output
+ // so that the rule `ResolveReferences` can resolve metadata column correctly.
+ val metadataColFromOutput = output.filter(_.isMetadataCol)
Review Comment:
ditto, move it under `case relation: HadoopFsRelation =>`
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #39870:
URL: https://github.com/apache/spark/pull/39870#discussion_r1098738889
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamingRelation.scala:
##########
@@ -59,26 +60,34 @@ case class StreamingRelation(dataSource: DataSource, sourceName: String, output:
override def newInstance(): LogicalPlan = this.copy(output = output.map(_.newInstance()))
override lazy val metadataOutput: Seq[AttributeReference] = {
- dataSource.providingClass match {
- // If the dataSource provided class is a same or subclass of FileFormat class
- case f if classOf[FileFormat].isAssignableFrom(f) =>
- val resolve = conf.resolver
- val outputNames = outputSet.map(_.name)
- def isOutputColumn(col: AttributeReference): Boolean = {
- outputNames.exists(name => resolve(col.name, name))
- }
- // filter out the metadata struct column if it has the name conflicting with output columns.
- // if the file has a column "_metadata",
- // then the data column should be returned not the metadata struct column
- Seq(FileFormat.createFileMetadataCol(
- dataSource.providingInstance().asInstanceOf[FileFormat])).filterNot(isOutputColumn)
- case _ => Nil
+ val metadataColFromOutput = output.filter(_.isMetadataCol)
Review Comment:
addressed
--
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 #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #39870:
URL: https://github.com/apache/spark/pull/39870#issuecomment-1425180665
@cloud-fan any comments ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #39870: [SPARK-42331][SQL] Fix metadata col can not been resolved
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #39870:
URL: https://github.com/apache/spark/pull/39870#issuecomment-1427335259
thanks, merging to master/3.4!
--
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