You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "nikolamand-db (via GitHub)" <gi...@apache.org> on 2024/07/29 21:50:40 UTC
[PR] [SPARK-49000][SQL][WIP] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
nikolamand-db opened a new pull request, #47525:
URL: https://github.com/apache/spark/pull/47525
<!--
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.
-->
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
### 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.
-->
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698160909
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -197,6 +197,15 @@ import org.apache.spark.util.collection.Utils
* techniques.
*/
object RewriteDistinctAggregates extends Rule[LogicalPlan] {
+ private def getRewriteCondition(
Review Comment:
fixed
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -197,6 +197,15 @@ import org.apache.spark.util.collection.Utils
* techniques.
*/
object RewriteDistinctAggregates extends Rule[LogicalPlan] {
+ private def getRewriteCondition(
+ aggregateExpressions: Seq[AggregateExpression],
+ groupingExpressions: Seq[Expression]): Boolean = {
+ // If there are any AggregateExpressions with filter, we need to rewrite the query.
+ // Also, if there are no grouping expressions and all aggregate expressions are foldable,
+ // we can rewrite the query, e.g. SELECT COUNT(DISTINCT 1).
Review Comment:
fixed
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2260677802
thanks, merging to master/3.5!
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698736109
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -205,7 +214,7 @@ object RewriteDistinctAggregates extends Rule[LogicalPlan] {
// clause for this rule because aggregation strategy can handle a single distinct aggregate
// group without filter clause.
// This check can produce false-positives, e.g., SUM(DISTINCT a) & COUNT(DISTINCT a).
Review Comment:
It is better to update the comment.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698739188
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -197,6 +197,15 @@ import org.apache.spark.util.collection.Utils
* techniques.
*/
object RewriteDistinctAggregates extends Rule[LogicalPlan] {
+ private def mustRewrite(
+ aggregateExpressions: Seq[AggregateExpression],
+ groupingExpressions: Seq[Expression]): Boolean = {
+ // If there are any AggregateExpressions with filter, we need to rewrite the query.
+ // Also, if there are no grouping expressions and all aggregate expressions are foldable,
+ // we need to rewrite the query, e.g. SELECT COUNT(DISTINCT 1).
Review Comment:
Compared to the comment in `mayNeedtoRewrite` which explains why rewriting is necessary. This comment doesn't do any explanation but just claims it needs to rewrite the query.
It would be better to explain why the rewriting is needed for the 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-49000][SQL][WIP] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2259619624
Please fill the PR description
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1699556648
##########
sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala:
##########
@@ -2339,6 +2340,119 @@ class DataFrameAggregateSuite extends QueryTest
test("SPARK-32761: aggregating multiple distinct CONSTANT columns") {
checkAnswer(sql("select count(distinct 2), count(distinct 2,3)"), Row(1, 1))
}
+
+ test("aggregating with various distinct expressions") {
+ abstract class AggregateTestCaseBase(
+ val query: String,
+ val resultSeq: Seq[Seq[Row]],
+ val hasExpandNodeInPlan: Boolean)
+ case class AggregateTestCase(
+ override val query: String,
+ override val resultSeq: Seq[Seq[Row]],
+ override val hasExpandNodeInPlan: Boolean)
+ extends AggregateTestCaseBase(query, resultSeq, hasExpandNodeInPlan)
+ case class AggregateTestCaseDefault(
+ override val query: String)
+ extends AggregateTestCaseBase(
+ query,
+ Seq(Seq(Row(0)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = true)
+
+ val t = "t"
+ val testCases: Seq[AggregateTestCaseBase] = Seq(
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1 + 2) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1, 2, 1 + 2) FROM $t"
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(1), COUNT(DISTINCT 1) FROM $t",
+ Seq(Seq(Row(0, 0)), Seq(Row(1, 1)), Seq(Row(2, 1))),
+ hasExpandNodeInPlan = true
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT 1, "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT collation("abc")) FROM $t"""
Review Comment:
yes, collation doesn't exist in older version - so this test will need to be excluded
I can take care of that in a follow-up
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2262218731
@cloud-fan I'll be creating the follow-up: https://github.com/apache/spark/pull/47565
let's first merge this into master, and we can backport later
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "LuciferYang (via GitHub)" <gi...@apache.org>.
LuciferYang commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1699464826
##########
sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala:
##########
@@ -2339,6 +2340,119 @@ class DataFrameAggregateSuite extends QueryTest
test("SPARK-32761: aggregating multiple distinct CONSTANT columns") {
checkAnswer(sql("select count(distinct 2), count(distinct 2,3)"), Row(1, 1))
}
+
+ test("aggregating with various distinct expressions") {
+ abstract class AggregateTestCaseBase(
+ val query: String,
+ val resultSeq: Seq[Seq[Row]],
+ val hasExpandNodeInPlan: Boolean)
+ case class AggregateTestCase(
+ override val query: String,
+ override val resultSeq: Seq[Seq[Row]],
+ override val hasExpandNodeInPlan: Boolean)
+ extends AggregateTestCaseBase(query, resultSeq, hasExpandNodeInPlan)
+ case class AggregateTestCaseDefault(
+ override val query: String)
+ extends AggregateTestCaseBase(
+ query,
+ Seq(Seq(Row(0)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = true)
+
+ val t = "t"
+ val testCases: Seq[AggregateTestCaseBase] = Seq(
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1 + 2) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1, 2, 1 + 2) FROM $t"
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(1), COUNT(DISTINCT 1) FROM $t",
+ Seq(Seq(Row(0, 0)), Seq(Row(1, 1)), Seq(Row(2, 1))),
+ hasExpandNodeInPlan = true
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT 1, "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT collation("abc")) FROM $t"""
Review Comment:
This test case cannot be merged into branch-3.5, as collation is a new function added in Spark 4.0.
cc @nikolamand-db @cloud-fan
also cc @yaooqinn
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698516327
##########
sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala:
##########
@@ -2339,6 +2340,119 @@ class DataFrameAggregateSuite extends QueryTest
test("SPARK-32761: aggregating multiple distinct CONSTANT columns") {
checkAnswer(sql("select count(distinct 2), count(distinct 2,3)"), Row(1, 1))
}
+
+ test("aggregating with various distinct expressions") {
+ abstract class AggregateTestCaseBase(
+ val query: String,
+ val resultSeq: Seq[Seq[Row]],
+ val hasExpandNodeInPlan: Boolean)
+ case class AggregateTestCase(
+ override val query: String,
+ override val resultSeq: Seq[Seq[Row]],
+ override val hasExpandNodeInPlan: Boolean)
+ extends AggregateTestCaseBase(query, resultSeq, hasExpandNodeInPlan)
+ case class AggregateTestCaseDefault(
+ override val query: String)
+ extends AggregateTestCaseBase(
+ query,
+ Seq(Seq(Row(0)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = true)
+
+ val t = "t"
+ val testCases: Seq[AggregateTestCaseBase] = Seq(
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT "col") FROM $t"""
Review Comment:
does `"col"` mean a string literal here?
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698521410
##########
sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala:
##########
@@ -2339,6 +2340,119 @@ class DataFrameAggregateSuite extends QueryTest
test("SPARK-32761: aggregating multiple distinct CONSTANT columns") {
checkAnswer(sql("select count(distinct 2), count(distinct 2,3)"), Row(1, 1))
}
+
+ test("aggregating with various distinct expressions") {
+ abstract class AggregateTestCaseBase(
+ val query: String,
+ val resultSeq: Seq[Seq[Row]],
+ val hasExpandNodeInPlan: Boolean)
+ case class AggregateTestCase(
+ override val query: String,
+ override val resultSeq: Seq[Seq[Row]],
+ override val hasExpandNodeInPlan: Boolean)
+ extends AggregateTestCaseBase(query, resultSeq, hasExpandNodeInPlan)
+ case class AggregateTestCaseDefault(
+ override val query: String)
+ extends AggregateTestCaseBase(
+ query,
+ Seq(Seq(Row(0)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = true)
+
+ val t = "t"
+ val testCases: Seq[AggregateTestCaseBase] = Seq(
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT "col") FROM $t"""
Review Comment:
yes, "col" is string literal (on purpose)
--
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-49000][SQL][WIP] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2259225874
@cloud-fan we've updated the tests quite a bit to try and limit the impact of e2e sql testing, but we believe it's best to keep it like this instead of using golden files - we're using loops and test cases to verify expected results with a table that has various number of rows, while also verifying whether `Expand` was injected
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698732240
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -197,6 +197,15 @@ import org.apache.spark.util.collection.Utils
* techniques.
*/
object RewriteDistinctAggregates extends Rule[LogicalPlan] {
+ private def mustRewrite(
+ aggregateExpressions: Seq[AggregateExpression],
Review Comment:
s/aggregateExpressions/distinctAggs/
--
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-49000][SQL][WIP] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2259656739
I think @nikolamand-db will have to do that because it's his PR, I don't have access to edit PR description
```
### What changes were proposed in this pull request?
Fix `RewriteDistinctAggregates` rule to deal properly with aggregation on DISTINCT literals.
### Why are the changes needed?
Aggregation with DISTINCT literal gives wrong results. For example:
`select count(distinct 1) from t` returns 1, while the correct result should be 0.
For reference:
`select count(1) from t` returns 0, which is the correct and expected result.
### Does this PR introduce _any_ user-facing change?
Yes, this fixes a critical bug in Spark.
### How was this patch tested?
New e2e SQL tests for aggregates with DISTINCT literals.
### Was this patch authored or co-authored using generative AI tooling?
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2260750671
@dongjoon-hyun please try this:
```
test("minimal test") {
withTable("tbl") {
sql("create table tbl (col string) using parquet")
checkAnswer(sql("select count(distinct 1) from tbl"), Row(1)) // wrong
}
}
```
--
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-49000][SQL][WIP] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2259660311
also, I think it's worth noting (at least in this comment) that the optimizer rule `RewriteDistinctAggregates` is in `nonExcludableRules` - this is important because the changes are related to a correctness issue
--
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-49000][SQL][WIP] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2257600312
can we move the tests to SQL golden files?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2262269202
Backport out for:
- 3.5 https://github.com/apache/spark/pull/47566
- 3.4 https://github.com/apache/spark/pull/47567
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698520802
##########
sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala:
##########
@@ -2339,6 +2340,119 @@ class DataFrameAggregateSuite extends QueryTest
test("SPARK-32761: aggregating multiple distinct CONSTANT columns") {
checkAnswer(sql("select count(distinct 2), count(distinct 2,3)"), Row(1, 1))
}
+
+ test("aggregating with various distinct expressions") {
+ abstract class AggregateTestCaseBase(
+ val query: String,
+ val resultSeq: Seq[Seq[Row]],
+ val hasExpandNodeInPlan: Boolean)
+ case class AggregateTestCase(
+ override val query: String,
+ override val resultSeq: Seq[Seq[Row]],
+ override val hasExpandNodeInPlan: Boolean)
+ extends AggregateTestCaseBase(query, resultSeq, hasExpandNodeInPlan)
+ case class AggregateTestCaseDefault(
+ override val query: String)
+ extends AggregateTestCaseBase(
+ query,
+ Seq(Seq(Row(0)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = true)
+
+ val t = "t"
+ val testCases: Seq[AggregateTestCaseBase] = Seq(
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1 + 2) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1, 2, 1 + 2) FROM $t"
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(1), COUNT(DISTINCT 1) FROM $t",
+ Seq(Seq(Row(0, 0)), Seq(Row(1, 1)), Seq(Row(2, 1))),
+ hasExpandNodeInPlan = true
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT 1, "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT collation("abc")) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT current_date()) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT array(1, 2)[1]) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT map(1, 2)[1]) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT struct(1, 2).col1) FROM $t"""
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(DISTINCT 1) FROM $t GROUP BY col",
+ Seq(Seq(), Seq(Row(1)), Seq(Row(1), Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1) FROM $t WHERE 1 = 1"
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(DISTINCT 1) FROM $t WHERE 1 = 0",
+ Seq(Seq(Row(0)), Seq(Row(0)), Seq(Row(0))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(DISTINCT 1) FROM (SELECT COUNT(DISTINCT 1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(DISTINCT 1) FROM (SELECT COUNT(1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(1) FROM (SELECT COUNT(DISTINCT 1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT SUM(x) FROM (SELECT COUNT(DISTINCT 1) AS x FROM $t)"),
+ AggregateTestCase(
+ s"""SELECT COUNT(DISTINCT 1), COUNT(DISTINCT "col") FROM $t""",
+ Seq(Seq(Row(0, 0)), Seq(Row(1, 1)), Seq(Row(1, 1))),
+ hasExpandNodeInPlan = true
+ ),
+ AggregateTestCase(
+ s"""SELECT COUNT(DISTINCT 1), COUNT(DISTINCT col) FROM $t""",
Review Comment:
yes, we have this test already (line 2376 I think)
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698135785
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -197,6 +197,15 @@ import org.apache.spark.util.collection.Utils
* techniques.
*/
object RewriteDistinctAggregates extends Rule[LogicalPlan] {
+ private def getRewriteCondition(
+ aggregateExpressions: Seq[AggregateExpression],
+ groupingExpressions: Seq[Expression]): Boolean = {
+ // If there are any AggregateExpressions with filter, we need to rewrite the query.
+ // Also, if there are no grouping expressions and all aggregate expressions are foldable,
+ // we can rewrite the query, e.g. SELECT COUNT(DISTINCT 1).
Review Comment:
```suggestion
// we need to rewrite the query, e.g. SELECT COUNT(DISTINCT 1).
```
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2260787784
Thank you, @uros-db . I confirmed.
--
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-49000][SQL][WIP] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1696408793
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -205,7 +205,8 @@ object RewriteDistinctAggregates extends Rule[LogicalPlan] {
// clause for this rule because aggregation strategy can handle a single distinct aggregate
// group without filter clause.
// This check can produce false-positives, e.g., SUM(DISTINCT a) & COUNT(DISTINCT a).
- distinctAggs.size > 1 || distinctAggs.exists(_.filter.isDefined)
+ distinctAggs.size > 1 || distinctAggs.exists(_.filter.isDefined) ||
+ distinctAggs.exists(_.aggregateFunction.children.forall(_.foldable))
Review Comment:
can we narrow down the condition further? I think it's only a problem with global aggregate (no group by)
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "nikolamand-db (via GitHub)" <gi...@apache.org>.
nikolamand-db commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698576113
##########
sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala:
##########
@@ -2339,6 +2340,119 @@ class DataFrameAggregateSuite extends QueryTest
test("SPARK-32761: aggregating multiple distinct CONSTANT columns") {
checkAnswer(sql("select count(distinct 2), count(distinct 2,3)"), Row(1, 1))
}
+
+ test("aggregating with various distinct expressions") {
+ abstract class AggregateTestCaseBase(
+ val query: String,
+ val resultSeq: Seq[Seq[Row]],
+ val hasExpandNodeInPlan: Boolean)
+ case class AggregateTestCase(
+ override val query: String,
+ override val resultSeq: Seq[Seq[Row]],
+ override val hasExpandNodeInPlan: Boolean)
+ extends AggregateTestCaseBase(query, resultSeq, hasExpandNodeInPlan)
+ case class AggregateTestCaseDefault(
+ override val query: String)
+ extends AggregateTestCaseBase(
+ query,
+ Seq(Seq(Row(0)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = true)
+
+ val t = "t"
+ val testCases: Seq[AggregateTestCaseBase] = Seq(
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1 + 2) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1, 2, 1 + 2) FROM $t"
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(1), COUNT(DISTINCT 1) FROM $t",
+ Seq(Seq(Row(0, 0)), Seq(Row(1, 1)), Seq(Row(2, 1))),
+ hasExpandNodeInPlan = true
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT 1, "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT collation("abc")) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT current_date()) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT array(1, 2)[1]) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT map(1, 2)[1]) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT struct(1, 2).col1) FROM $t"""
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(DISTINCT 1) FROM $t GROUP BY col",
+ Seq(Seq(), Seq(Row(1)), Seq(Row(1), Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1) FROM $t WHERE 1 = 1"
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(DISTINCT 1) FROM $t WHERE 1 = 0",
+ Seq(Seq(Row(0)), Seq(Row(0)), Seq(Row(0))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(DISTINCT 1) FROM (SELECT COUNT(DISTINCT 1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(DISTINCT 1) FROM (SELECT COUNT(1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(1) FROM (SELECT COUNT(DISTINCT 1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT SUM(x) FROM (SELECT COUNT(DISTINCT 1) AS x FROM $t)"),
+ AggregateTestCase(
+ s"""SELECT COUNT(DISTINCT 1), COUNT(DISTINCT "col") FROM $t""",
+ Seq(Seq(Row(0, 0)), Seq(Row(1, 1)), Seq(Row(1, 1))),
+ hasExpandNodeInPlan = true
+ ),
+ AggregateTestCase(
+ s"""SELECT COUNT(DISTINCT 1), COUNT(DISTINCT col) FROM $t""",
Review Comment:
That's right: https://github.com/apache/spark/pull/47525/files#diff-bd3d5c79ede5675f4bf10d2efb313db893d57443d6d6d67b1f8766e6ce741271R2376.
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2260735808
cc @yaooqinn and @viirya , too
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "nikolamand-db (via GitHub)" <gi...@apache.org>.
nikolamand-db commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2260613487
@cloud-fan resolved all threads, should we merge now? 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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn closed pull request #47525: [SPARK-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates
URL: https://github.com/apache/spark/pull/47525
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2262264612
Close this first as a new PR is appropriate for branch-3.5 and/or branch-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
Re: [PR] [SPARK-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698517016
##########
sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala:
##########
@@ -2339,6 +2340,119 @@ class DataFrameAggregateSuite extends QueryTest
test("SPARK-32761: aggregating multiple distinct CONSTANT columns") {
checkAnswer(sql("select count(distinct 2), count(distinct 2,3)"), Row(1, 1))
}
+
+ test("aggregating with various distinct expressions") {
+ abstract class AggregateTestCaseBase(
+ val query: String,
+ val resultSeq: Seq[Seq[Row]],
+ val hasExpandNodeInPlan: Boolean)
+ case class AggregateTestCase(
+ override val query: String,
+ override val resultSeq: Seq[Seq[Row]],
+ override val hasExpandNodeInPlan: Boolean)
+ extends AggregateTestCaseBase(query, resultSeq, hasExpandNodeInPlan)
+ case class AggregateTestCaseDefault(
+ override val query: String)
+ extends AggregateTestCaseBase(
+ query,
+ Seq(Seq(Row(0)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = true)
+
+ val t = "t"
+ val testCases: Seq[AggregateTestCaseBase] = Seq(
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1 + 2) FROM $t"
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1, 2, 1 + 2) FROM $t"
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(1), COUNT(DISTINCT 1) FROM $t",
+ Seq(Seq(Row(0, 0)), Seq(Row(1, 1)), Seq(Row(2, 1))),
+ hasExpandNodeInPlan = true
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT 1, "col") FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT collation("abc")) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT current_date()) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT array(1, 2)[1]) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT map(1, 2)[1]) FROM $t"""
+ ),
+ AggregateTestCaseDefault(
+ s"""SELECT COUNT(DISTINCT struct(1, 2).col1) FROM $t"""
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(DISTINCT 1) FROM $t GROUP BY col",
+ Seq(Seq(), Seq(Row(1)), Seq(Row(1), Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT COUNT(DISTINCT 1) FROM $t WHERE 1 = 1"
+ ),
+ AggregateTestCase(
+ s"SELECT COUNT(DISTINCT 1) FROM $t WHERE 1 = 0",
+ Seq(Seq(Row(0)), Seq(Row(0)), Seq(Row(0))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(DISTINCT 1) FROM (SELECT COUNT(DISTINCT 1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(DISTINCT 1) FROM (SELECT COUNT(1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCase(
+ s"SELECT SUM(1) FROM (SELECT COUNT(DISTINCT 1) FROM $t)",
+ Seq(Seq(Row(1)), Seq(Row(1)), Seq(Row(1))),
+ hasExpandNodeInPlan = false
+ ),
+ AggregateTestCaseDefault(
+ s"SELECT SUM(x) FROM (SELECT COUNT(DISTINCT 1) AS x FROM $t)"),
+ AggregateTestCase(
+ s"""SELECT COUNT(DISTINCT 1), COUNT(DISTINCT "col") FROM $t""",
+ Seq(Seq(Row(0, 0)), Seq(Row(1, 1)), Seq(Row(1, 1))),
+ hasExpandNodeInPlan = true
+ ),
+ AggregateTestCase(
+ s"""SELECT COUNT(DISTINCT 1), COUNT(DISTINCT col) FROM $t""",
Review Comment:
can we test `count(1), count(distinct 1)`?
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698135166
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -197,6 +197,15 @@ import org.apache.spark.util.collection.Utils
* techniques.
*/
object RewriteDistinctAggregates extends Rule[LogicalPlan] {
+ private def getRewriteCondition(
Review Comment:
```suggestion
private def mustRewrite(
```
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698739188
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -197,6 +197,15 @@ import org.apache.spark.util.collection.Utils
* techniques.
*/
object RewriteDistinctAggregates extends Rule[LogicalPlan] {
+ private def mustRewrite(
+ aggregateExpressions: Seq[AggregateExpression],
+ groupingExpressions: Seq[Expression]): Boolean = {
+ // If there are any AggregateExpressions with filter, we need to rewrite the query.
+ // Also, if there are no grouping expressions and all aggregate expressions are foldable,
+ // we need to rewrite the query, e.g. SELECT COUNT(DISTINCT 1).
Review Comment:
Compared to the comment in `mayNeedtoRewrite` which explains why rewriting is necessary. This comment doesn't do any explanation but just claims it needs to rewrite the query. This comment simply describes what the code does and it is obvious.
To better improve the code readability, it would be better to explain why the rewriting is needed for the 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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2262090636
Removed this from branch-3.5
--
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-49000][SQL][WIP] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "uros-db (via GitHub)" <gi...@apache.org>.
uros-db commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1697604316
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -205,7 +205,8 @@ object RewriteDistinctAggregates extends Rule[LogicalPlan] {
// clause for this rule because aggregation strategy can handle a single distinct aggregate
// group without filter clause.
// This check can produce false-positives, e.g., SUM(DISTINCT a) & COUNT(DISTINCT a).
- distinctAggs.size > 1 || distinctAggs.exists(_.filter.isDefined)
+ distinctAggs.size > 1 || distinctAggs.exists(_.filter.isDefined) ||
+ distinctAggs.exists(_.aggregateFunction.children.forall(_.foldable))
Review Comment:
yes, this is the problem only for non-grouping aggregates - fixed in latest commit
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #47525:
URL: https://github.com/apache/spark/pull/47525#issuecomment-2262106045
@nikolamand-db please send a followup PR to address post-hoc review comments and then create backport PRs for 3.5 and 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
Re: [PR] [SPARK-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #47525: [SPARK-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates
URL: https://github.com/apache/spark/pull/47525
--
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-49000][SQL] Fix "select count(distinct 1) from t" where t is empty table by expanding RewriteDistinctAggregates [spark]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #47525:
URL: https://github.com/apache/spark/pull/47525#discussion_r1698734750
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala:
##########
@@ -197,6 +197,15 @@ import org.apache.spark.util.collection.Utils
* techniques.
*/
object RewriteDistinctAggregates extends Rule[LogicalPlan] {
+ private def mustRewrite(
+ aggregateExpressions: Seq[AggregateExpression],
+ groupingExpressions: Seq[Expression]): Boolean = {
+ // If there are any AggregateExpressions with filter, we need to rewrite the query.
Review Comment:
s/any/any distinct/
--
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