You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "wForget (via GitHub)" <gi...@apache.org> on 2024/03/19 10:51:35 UTC
[PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
wForget opened a new pull request, #45589:
URL: https://github.com/apache/spark/pull/45589
<!--
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
'common/utils/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.
-->
Use V2Predicate to wrap If expr when building v2 expressions.
### 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'.
-->
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.
-->
added unit test
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560961710
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -187,8 +187,9 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
assert(v.isInstanceOf[V2Predicate])
new V2Not(v.asInstanceOf[V2Predicate])
}
- case UnaryMinus(child, true) => generateExpressionWithName("-", Seq(child))
- case BitwiseNot(child) => generateExpressionWithName("~", Seq(child))
+ case unaryMinus @ UnaryMinus(_, true) =>
+ generateExpressionWithName("-", unaryMinus, isPredicate)
+ case _: BitwiseNot => generateExpressionWithName("~", expr, isPredicate)
case CaseWhen(branches, elseValue) =>
Review Comment:
I don't think so, but this probably doesn't hurt as `V2Predicate` extends `GeneralScalarExpression`. We should still fix it to make code clearer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45589:
URL: https://github.com/apache/spark/pull/45589#issuecomment-2048842691
With hindsight, we shouldn't create the v2 `Predicate` API in the first place, and should just use the v2 `Expression` API. The `Predicate` trait in catalyst is not useful as well. Some expressions can return different data types, including boolean type, it's hard to classify them.
It's too late to change the API now. One suggestion is to follow how we handle CASE WHEN: always use v2 `Predicate` if this expression may return boolean type. v2 `Predicate` extends `GeneralScalarExpression`, so this is 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
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #45589: [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean
URL: https://github.com/apache/spark/pull/45589
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560376615
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -209,7 +209,12 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
} else {
None
}
- case iff: If => generateExpressionWithName("CASE_WHEN", iff.children)
+ case iff: If =>
Review Comment:
> can you check other expressions matched here and see if they may return boolean type?
there is also `Coalesce`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562203377
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,44 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when / nvl) expression") {
+ withTempView("t1") {
+ withSQLConf(SQLConf.ANSI_ENABLED.key -> "true") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result1 = df1.collect()
+ assert(result1.length == 1)
+
+ val df2 = sql(
+ s"""
+ |select * from
+ |(select case when i = 1 then i else 0 end as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result2 = df2.collect()
+ assert(result2.length == 1)
+
+ val df3 = sql(
+ s"""
+ |select * from
+ |(select nvl(cast(i as boolean), false) c from t1) t
Review Comment:
`nvl` is a `RuntimeReplaceable` as well, no need to test
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1566701178
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,22 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with if expression") {
+ withTempView("t1") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
Review Comment:
> I think `where if(i = 1, i, 0) > 0` is a valid SQL? BTW, please upper case the SQL keywords in the SQL statement.
Indeed, thank you. I have changed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45589:
URL: https://github.com/apache/spark/pull/45589#issuecomment-2058271672
@wForget can you help to create a 3.5 backport PR? thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1561934026
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -187,8 +187,9 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
assert(v.isInstanceOf[V2Predicate])
new V2Not(v.asInstanceOf[V2Predicate])
}
- case UnaryMinus(child, true) => generateExpressionWithName("-", Seq(child))
- case BitwiseNot(child) => generateExpressionWithName("~", Seq(child))
+ case unaryMinus @ UnaryMinus(_, true) =>
+ generateExpressionWithName("-", unaryMinus, isPredicate)
+ case _: BitwiseNot => generateExpressionWithName("~", expr, isPredicate)
case CaseWhen(branches, elseValue) =>
Review Comment:
Thanks, I made fix.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560377503
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -389,6 +394,16 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
}
}
+ private def generatePredicateWithName(
Review Comment:
sounds good, I will try that.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on PR #45589:
URL: https://github.com/apache/spark/pull/45589#issuecomment-2048841083
The `org.apache.spark.sql.catalyst.optimizer.SimplifyBinaryComparison` optimizer may also fold predicate.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562098979
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -98,45 +98,45 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
generateExpression(child).map(v => new V2Cast(v, dataType))
case AggregateExpression(aggregateFunction, Complete, isDistinct, None, _) =>
generateAggregateFunc(aggregateFunction, isDistinct)
- case Abs(child, true) => generateExpressionWithName("ABS", Seq(child))
- case Coalesce(children) => generateExpressionWithName("COALESCE", children)
- case Greatest(children) => generateExpressionWithName("GREATEST", children)
- case Least(children) => generateExpressionWithName("LEAST", children)
- case Rand(child, hideSeed) =>
+ case abs @ Abs(_, true) => generateExpressionWithName("ABS", abs, isPredicate)
Review Comment:
We don't need to pass the `isPredicate` parameter, as it's a class member variable.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562099550
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -98,45 +98,45 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
generateExpression(child).map(v => new V2Cast(v, dataType))
case AggregateExpression(aggregateFunction, Complete, isDistinct, None, _) =>
generateAggregateFunc(aggregateFunction, isDistinct)
- case Abs(child, true) => generateExpressionWithName("ABS", Seq(child))
- case Coalesce(children) => generateExpressionWithName("COALESCE", children)
- case Greatest(children) => generateExpressionWithName("GREATEST", children)
- case Least(children) => generateExpressionWithName("LEAST", children)
- case Rand(child, hideSeed) =>
+ case abs @ Abs(_, true) => generateExpressionWithName("ABS", abs, isPredicate)
Review Comment:
```suggestion
case Abs(_, true) => generateExpressionWithName("ABS", expr, isPredicate)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on PR #45589:
URL: https://github.com/apache/spark/pull/45589#issuecomment-2058275927
> @wForget can you help to create a 3.5 backport PR? thanks!
Sure, I will create it as soon as possible, and thanks for your review.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1561935953
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -187,57 +187,57 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
assert(v.isInstanceOf[V2Predicate])
new V2Not(v.asInstanceOf[V2Predicate])
}
- case UnaryMinus(child, true) => generateExpressionWithName("-", Seq(child))
- case BitwiseNot(child) => generateExpressionWithName("~", Seq(child))
- case CaseWhen(branches, elseValue) =>
+ case unaryMinus @ UnaryMinus(_, true) =>
+ generateExpressionWithName("-", unaryMinus, isPredicate)
+ case _: BitwiseNot => generateExpressionWithName("~", expr, isPredicate)
+ case caseWhen @ CaseWhen(branches, elseValue) =>
val conditions = branches.map(_._1).flatMap(generateExpression(_, true))
Review Comment:
I reserved `isPredicate=true` for conditions of casewhen
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560375469
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,41 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when/ nullif) expression") {
+ withTempView("t1") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result1 = df1.collect()
+ assert(result1.length == 1)
+
+ val df2 = sql(
+ s"""
+ |select * from
+ |(select case when i = 1 then i else 0 end as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result2 = df2.collect()
+ assert(result2.length == 1)
+
+ val df3 = sql(
+ s"""
+ |select * from t1
+ |where nullif(i, 1) is null
Review Comment:
`nullif` is not a real function and will be replaced by binary comparisons, we don't need to test 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
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562123240
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -98,45 +98,45 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
generateExpression(child).map(v => new V2Cast(v, dataType))
case AggregateExpression(aggregateFunction, Complete, isDistinct, None, _) =>
generateAggregateFunc(aggregateFunction, isDistinct)
- case Abs(child, true) => generateExpressionWithName("ABS", Seq(child))
- case Coalesce(children) => generateExpressionWithName("COALESCE", children)
- case Greatest(children) => generateExpressionWithName("GREATEST", children)
- case Least(children) => generateExpressionWithName("LEAST", children)
- case Rand(child, hideSeed) =>
+ case abs @ Abs(_, true) => generateExpressionWithName("ABS", abs, isPredicate)
Review Comment:
thanks, changed
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -187,57 +187,57 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
assert(v.isInstanceOf[V2Predicate])
new V2Not(v.asInstanceOf[V2Predicate])
}
- case UnaryMinus(child, true) => generateExpressionWithName("-", Seq(child))
- case BitwiseNot(child) => generateExpressionWithName("~", Seq(child))
- case CaseWhen(branches, elseValue) =>
+ case unaryMinus @ UnaryMinus(_, true) =>
+ generateExpressionWithName("-", unaryMinus, isPredicate)
+ case _: BitwiseNot => generateExpressionWithName("~", expr, isPredicate)
+ case caseWhen @ CaseWhen(branches, elseValue) =>
val conditions = branches.map(_._1).flatMap(generateExpression(_, true))
- val values = branches.map(_._2).flatMap(generateExpression(_, true))
- if (conditions.length == branches.length && values.length == branches.length) {
+ val values = branches.map(_._2).flatMap(generateExpression(_))
+ val elseExprOpt = elseValue.flatMap(generateExpression(_))
+ if (conditions.length == branches.length && values.length == branches.length &&
+ elseExprOpt.size == elseValue.size) {
val branchExpressions = conditions.zip(values).flatMap { case (c, v) =>
Seq[V2Expression](c, v)
}
- if (elseValue.isDefined) {
- elseValue.flatMap(generateExpression(_)).map { v =>
- val children = (branchExpressions :+ v).toArray[V2Expression]
- // The children looks like [condition1, value1, ..., conditionN, valueN, elseValue]
- new V2Predicate("CASE_WHEN", children)
- }
+ val children = (branchExpressions ++ elseExprOpt).toArray[V2Expression]
+ // The children looks like [condition1, value1, ..., conditionN, valueN (, elseValue)]
+ if (isPredicate && caseWhen.dataType.isInstanceOf[BooleanType]) {
+ Some(new V2Predicate("CASE_WHEN", children))
} else {
- // The children looks like [condition1, value1, ..., conditionN, valueN]
- Some(new V2Predicate("CASE_WHEN", branchExpressions.toArray[V2Expression]))
+ Some(new GeneralScalarExpression("CASE_WHEN", children))
}
} else {
None
}
- case iff: If => generateExpressionWithName("CASE_WHEN", iff.children)
+ case _: If => generateExpressionWithName("CASE_WHEN", expr, isPredicate)
case substring: Substring =>
val children = if (substring.len == Literal(Integer.MAX_VALUE)) {
Seq(substring.str, substring.pos)
} else {
substring.children
}
- generateExpressionWithName("SUBSTRING", children)
- case Upper(child) => generateExpressionWithName("UPPER", Seq(child))
- case Lower(child) => generateExpressionWithName("LOWER", Seq(child))
- case BitLength(child) if child.dataType.isInstanceOf[StringType] =>
- generateExpressionWithName("BIT_LENGTH", Seq(child))
- case Length(child) if child.dataType.isInstanceOf[StringType] =>
- generateExpressionWithName("CHAR_LENGTH", Seq(child))
- case concat: Concat => generateExpressionWithName("CONCAT", concat.children)
- case translate: StringTranslate => generateExpressionWithName("TRANSLATE", translate.children)
- case trim: StringTrim => generateExpressionWithName("TRIM", trim.children)
- case trim: StringTrimLeft => generateExpressionWithName("LTRIM", trim.children)
- case trim: StringTrimRight => generateExpressionWithName("RTRIM", trim.children)
+ generateExpressionWithNameByChildren("SUBSTRING", children, substring.dataType, isPredicate)
+ case _: Upper => generateExpressionWithName("UPPER", expr, isPredicate)
+ case _: Lower => generateExpressionWithName("LOWER", expr, isPredicate)
+ case bitLength @ BitLength(child) if child.dataType.isInstanceOf[StringType] =>
Review Comment:
thanks, changed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560376969
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -389,6 +394,16 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
}
}
+ private def generatePredicateWithName(
Review Comment:
one idea: can we update `generateExpressionWithName` to take the target expression instead of the children? Then we can simply do
```
val children = e.children
...
if (d.dataType == BooleanType && isPredicate) {
new V2Predicate ...
} else {
new GeneralScalarExpression
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560375211
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,41 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when/ nullif) expression") {
+ withTempView("t1") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result1 = df1.collect()
+ assert(result1.length == 1)
+
+ val df2 = sql(
+ s"""
+ |select * from
+ |(select case when i = 1 then i else 0 end as c from t1) t
Review Comment:
This test can pass without this PR, 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
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562206106
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,44 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when / nvl) expression") {
+ withTempView("t1") {
+ withSQLConf(SQLConf.ANSI_ENABLED.key -> "true") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
Review Comment:
> I think this test is sufficient. `If` can be a pedicate and before this PR we don't return V2Predicate which causes errors.
makes sense to me
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,44 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when / nvl) expression") {
+ withTempView("t1") {
+ withSQLConf(SQLConf.ANSI_ENABLED.key -> "true") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result1 = df1.collect()
+ assert(result1.length == 1)
+
+ val df2 = sql(
+ s"""
+ |select * from
+ |(select case when i = 1 then i else 0 end as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result2 = df2.collect()
+ assert(result2.length == 1)
+
+ val df3 = sql(
+ s"""
+ |select * from
+ |(select nvl(cast(i as boolean), false) c from t1) t
Review Comment:
> `nvl` is a `RuntimeReplaceable` as well, no need to test
~~Change to `Coalesce`?~~
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560458632
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -187,8 +187,9 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
assert(v.isInstanceOf[V2Predicate])
new V2Not(v.asInstanceOf[V2Predicate])
}
- case UnaryMinus(child, true) => generateExpressionWithName("-", Seq(child))
- case BitwiseNot(child) => generateExpressionWithName("~", Seq(child))
+ case unaryMinus @ UnaryMinus(_, true) =>
+ generateExpressionWithName("-", unaryMinus, isPredicate)
+ case _: BitwiseNot => generateExpressionWithName("~", expr, isPredicate)
case CaseWhen(branches, elseValue) =>
Review Comment:
`CaseWhen` always seems to return `V2Predicate`, is this correct?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on PR #45589:
URL: https://github.com/apache/spark/pull/45589#issuecomment-2007084645
@beliefer @cloud-fan could you please 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
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560375676
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -209,7 +209,12 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
} else {
None
}
- case iff: If => generateExpressionWithName("CASE_WHEN", iff.children)
+ case iff: If =>
Review Comment:
can you check other expressions matched here and see if they may return boolean type?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562101862
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -187,57 +187,57 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
assert(v.isInstanceOf[V2Predicate])
new V2Not(v.asInstanceOf[V2Predicate])
}
- case UnaryMinus(child, true) => generateExpressionWithName("-", Seq(child))
- case BitwiseNot(child) => generateExpressionWithName("~", Seq(child))
- case CaseWhen(branches, elseValue) =>
+ case unaryMinus @ UnaryMinus(_, true) =>
+ generateExpressionWithName("-", unaryMinus, isPredicate)
+ case _: BitwiseNot => generateExpressionWithName("~", expr, isPredicate)
+ case caseWhen @ CaseWhen(branches, elseValue) =>
val conditions = branches.map(_._1).flatMap(generateExpression(_, true))
- val values = branches.map(_._2).flatMap(generateExpression(_, true))
- if (conditions.length == branches.length && values.length == branches.length) {
+ val values = branches.map(_._2).flatMap(generateExpression(_))
+ val elseExprOpt = elseValue.flatMap(generateExpression(_))
+ if (conditions.length == branches.length && values.length == branches.length &&
+ elseExprOpt.size == elseValue.size) {
val branchExpressions = conditions.zip(values).flatMap { case (c, v) =>
Seq[V2Expression](c, v)
}
- if (elseValue.isDefined) {
- elseValue.flatMap(generateExpression(_)).map { v =>
- val children = (branchExpressions :+ v).toArray[V2Expression]
- // The children looks like [condition1, value1, ..., conditionN, valueN, elseValue]
- new V2Predicate("CASE_WHEN", children)
- }
+ val children = (branchExpressions ++ elseExprOpt).toArray[V2Expression]
+ // The children looks like [condition1, value1, ..., conditionN, valueN (, elseValue)]
+ if (isPredicate && caseWhen.dataType.isInstanceOf[BooleanType]) {
+ Some(new V2Predicate("CASE_WHEN", children))
} else {
- // The children looks like [condition1, value1, ..., conditionN, valueN]
- Some(new V2Predicate("CASE_WHEN", branchExpressions.toArray[V2Expression]))
+ Some(new GeneralScalarExpression("CASE_WHEN", children))
}
} else {
None
}
- case iff: If => generateExpressionWithName("CASE_WHEN", iff.children)
+ case _: If => generateExpressionWithName("CASE_WHEN", expr, isPredicate)
case substring: Substring =>
val children = if (substring.len == Literal(Integer.MAX_VALUE)) {
Seq(substring.str, substring.pos)
} else {
substring.children
}
- generateExpressionWithName("SUBSTRING", children)
- case Upper(child) => generateExpressionWithName("UPPER", Seq(child))
- case Lower(child) => generateExpressionWithName("LOWER", Seq(child))
- case BitLength(child) if child.dataType.isInstanceOf[StringType] =>
- generateExpressionWithName("BIT_LENGTH", Seq(child))
- case Length(child) if child.dataType.isInstanceOf[StringType] =>
- generateExpressionWithName("CHAR_LENGTH", Seq(child))
- case concat: Concat => generateExpressionWithName("CONCAT", concat.children)
- case translate: StringTranslate => generateExpressionWithName("TRANSLATE", translate.children)
- case trim: StringTrim => generateExpressionWithName("TRIM", trim.children)
- case trim: StringTrimLeft => generateExpressionWithName("LTRIM", trim.children)
- case trim: StringTrimRight => generateExpressionWithName("RTRIM", trim.children)
+ generateExpressionWithNameByChildren("SUBSTRING", children, substring.dataType, isPredicate)
+ case _: Upper => generateExpressionWithName("UPPER", expr, isPredicate)
+ case _: Lower => generateExpressionWithName("LOWER", expr, isPredicate)
+ case bitLength @ BitLength(child) if child.dataType.isInstanceOf[StringType] =>
Review Comment:
```suggestion
case BitLength(child) if child.dataType.isInstanceOf[StringType] =>
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562098979
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -98,45 +98,45 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
generateExpression(child).map(v => new V2Cast(v, dataType))
case AggregateExpression(aggregateFunction, Complete, isDistinct, None, _) =>
generateAggregateFunc(aggregateFunction, isDistinct)
- case Abs(child, true) => generateExpressionWithName("ABS", Seq(child))
- case Coalesce(children) => generateExpressionWithName("COALESCE", children)
- case Greatest(children) => generateExpressionWithName("GREATEST", children)
- case Least(children) => generateExpressionWithName("LEAST", children)
- case Rand(child, hideSeed) =>
+ case abs @ Abs(_, true) => generateExpressionWithName("ABS", abs, isPredicate)
Review Comment:
We don't need to pass the `isPredicate` parameter, as it's a class member variable.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562204830
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,44 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when / nvl) expression") {
+ withTempView("t1") {
+ withSQLConf(SQLConf.ANSI_ENABLED.key -> "true") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result1 = df1.collect()
+ assert(result1.length == 1)
+
+ val df2 = sql(
+ s"""
+ |select * from
+ |(select case when i = 1 then i else 0 end as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result2 = df2.collect()
+ assert(result2.length == 1)
+
+ val df3 = sql(
+ s"""
+ |select * from
+ |(select nvl(cast(i as boolean), false) c from t1) t
Review Comment:
> `nvl` is a `RuntimeReplaceable` as well, no need to test
Change to `Coalesce`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on PR #45589:
URL: https://github.com/apache/spark/pull/45589#issuecomment-2044290575
@beliefer @cloud-fan sorry to bother you again, could you please take a look if you have 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
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560376882
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,41 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when/ nullif) expression") {
+ withTempView("t1") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result1 = df1.collect()
+ assert(result1.length == 1)
+
+ val df2 = sql(
+ s"""
+ |select * from
+ |(select case when i = 1 then i else 0 end as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result2 = df2.collect()
+ assert(result2.length == 1)
+
+ val df3 = sql(
+ s"""
+ |select * from t1
+ |where nullif(i, 1) is null
Review Comment:
> `nullif` is not a real function and will be replaced by binary comparisons, we don't need to test it.
got it, I will remove this case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap If expr when building v2 expressions [spark]
Posted by "wForget (via GitHub)" <gi...@apache.org>.
wForget commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1560375353
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,41 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when/ nullif) expression") {
+ withTempView("t1") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
+ |""".stripMargin
+ )
+ val result1 = df1.collect()
+ assert(result1.length == 1)
+
+ val df2 = sql(
+ s"""
+ |select * from
+ |(select case when i = 1 then i else 0 end as c from t1) t
Review Comment:
> This test can pass without this PR, right?
yes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1562204296
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,44 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with (if / case when / nvl) expression") {
+ withTempView("t1") {
+ withSQLConf(SQLConf.ANSI_ENABLED.key -> "true") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
Review Comment:
I think this test is sufficient. `If` can be a pedicate and before this PR we don't return V2Predicate which causes errors.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45589:
URL: https://github.com/apache/spark/pull/45589#discussion_r1565631145
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala:
##########
@@ -966,6 +966,22 @@ class DataSourceV2Suite extends QueryTest with SharedSparkSession with AdaptiveS
)
}
}
+
+ test("SPARK-47463: Pushed down v2 filter with if expression") {
+ withTempView("t1") {
+ spark.read.format(classOf[AdvancedDataSourceV2WithV2Filter].getName).load()
+ .createTempView("t1")
+ val df1 = sql(
+ s"""
+ |select * from
+ |(select if(i = 1, i, 0) as c from t1) t
+ |where t.c > 0
Review Comment:
I think `where if(i = 1, i, 0) > 0` is a valid SQL? BTW, please upper case the SQL keywords in the SQL statement.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47463][SQL] Use V2Predicate to wrap expression with return type of boolean [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45589:
URL: https://github.com/apache/spark/pull/45589#issuecomment-2058270805
thanks, merging to master!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org