You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "vinodkc (via GitHub)" <gi...@apache.org> on 2026/08/23 19:44:42 UTC
[PR] [SPARK-48701][SQL] Make PandasMode collation-aware [spark]
vinodkc opened a new pull request, #58233:
URL: https://github.com/apache/spark/pull/58233
<!--
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
'common/utils/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.
-->
Make the internal `PandasMode` aggregate (`pandas_mode`) collation-aware.
This PR extracts the folding logic into a shared `ModeCollationAware` trait mixed into both `Mode` and `PandasMode`, and calls `getCollationAwareBuffer` in `PandasMode.eval` (with a null-key guard, since `PandasMode` stores a null key when `ignoreNA = false`). Eval-only change; `Mode`'s behavior is unchanged.
### 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.
-->
`pandas_mode` (behind Pandas API on Spark `Series.mode()` / `DataFrame.mode()`) silently returns wrong results on non-binary collated strings: collation-equal values (e.g. `'b'` and `'B'` under `UTF8_LCASE`) are counted as separate keys.
Example : a `UTF8_LCASE` column with values `a, a, b, B, B` (so `'b'` and `'B'` are equal: counts `a`=2, `b/B`=3, mode should be the single `b/B` group):
```python
sdf = spark.sql("""
SELECT CAST(c AS STRING COLLATE UTF8_LCASE) AS s
FROM VALUES ('a'), ('a'), ('b'), ('B'), ('B') AS t(c)
""")
print(sorted(sdf.pandas_api()["s"].mode().to_numpy().tolist()))
```
Before: ['B', 'a'] # wrong: a=2 ties B=2, b counted separately (2 modes)
After: ['b'] # correct: b/B fold to one group of count 3, winning (1 mode)
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as new features, bug fixes, or other behavior changes. Documentation-only updates are not considered user-facing changes.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
Yes. pandas_mode (Pandas API on Spark Series.mode() / DataFrame.mode()) now returns the correct mode(s) on columns with a non-binary collation, instead of counting collation-equal strings as distinct values. Results on default (UTF8_BINARY) collation and non-string types are unchanged.
### 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 tests in `CollationAggregationSuite`
### 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.
-->
Yes. Generated-by: Claude code.
--
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-48701][SQL] Make PandasMode collation-aware [spark]
Posted by "zhengruifeng (via GitHub)" <gi...@apache.org>.
zhengruifeng commented on code in PR #58233:
URL: https://github.com/apache/spark/pull/58233#discussion_r3848850875
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/Mode.scala:
##########
Review Comment:
and do we need a new test in PS side to check the code change?
--
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-48701][SQL] Make PandasMode collation-aware [spark]
Posted by "uros-b (via GitHub)" <gi...@apache.org>.
uros-b commented on PR #58233:
URL: https://github.com/apache/spark/pull/58233#issuecomment-5392859127
Thank you @vinodkc! cc @HyukjinKwon for Pandas
--
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-48701][SQL] Make PandasMode collation-aware [spark]
Posted by "zhengruifeng (via GitHub)" <gi...@apache.org>.
zhengruifeng commented on code in PR #58233:
URL: https://github.com/apache/spark/pull/58233#discussion_r3848845330
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/Mode.scala:
##########
Review Comment:
just curious how the collation affect the `PandasMode` which is only used in Pandas API on spark?
--
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-48701][SQL][PS] Make PandasMode collation-aware [spark]
Posted by "vinodkc (via GitHub)" <gi...@apache.org>.
vinodkc commented on code in PR #58233:
URL: https://github.com/apache/spark/pull/58233#discussion_r3849032233
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/Mode.scala:
##########
Review Comment:
> just curious how the collation affect the PandasMode which is only used in Pandas API on spark?
`PandasMode` keys its count map on the original value, so under a non-binary collation 'b' and 'B' are counted separately and the mode can be wrong.
The fix folds collation-equal entries at eval time (shared with `Mode`); binary types are unaffected. Collation reaches it when a ps object wraps a collated Spark DataFrame .
pandas-on-Spark has no collation concept of its own.
> and do we need a new test in PS side to check the code change?
Not really, pandas-on-Spark has no collation support, and PS tests compare against pandas, which also has none.
I tested it at the expression level in `CollationAggregationSuite`, calling it the same way SF.mode does.
Can add a Python smoke test if you'd prefer.
--
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-48701][SQL][PS] Make PandasMode collation-aware [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #58233:
URL: https://github.com/apache/spark/pull/58233#issuecomment-5558183113
**Merge Summary:**
- merged into master https://github.com/apache/spark/commit/f37971cd0add244fcc2a6debd456b8cf85ae67f6
- merged into branch-4.x https://github.com/apache/spark/commit/47a34bb9ccb78cc2ecdf4536e47e23b8bd83dbb3
*Posted by `merge_spark_pr.py`*
--
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-48701][SQL][PS] Make PandasMode collation-aware [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon closed pull request #58233: [SPARK-48701][SQL][PS] Make PandasMode collation-aware
URL: https://github.com/apache/spark/pull/58233
--
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