Skip to content

[SPARK-40907][PS][SQL] PandasMode should copy keys before inserting into Map #38385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhengruifeng wants to merge 1 commit into from
Closed

[SPARK-40907][PS][SQL] PandasMode should copy keys before inserting into Map #38385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions python/pyspark/pandas/tests/test_dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6044,6 +6044,19 @@ def test_mode(self):
with self.assertRaises(ValueError):
psdf.mode(axis=2)

def f(index, iterator):
return ["3", "3", "3", "3", "4"] if index == 3 else ["0", "1", "2", "3", "4"]

rdd = self.spark.sparkContext.parallelize(
[
1,
],
4,
Comment on lines +6050 to +6054
Copy link
Contributor

@itholic itholic Oct 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can we just is one or two line some thing like:

rdd = self.spark.sparkContext.parallelize([1], 4)
    .mapPartitionsWithIndex(f)

?? I suspect it's maybe adjusted by black script tho, 😂

Copy link
Contributor Author

@zhengruifeng zhengruifeng Oct 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was just reformated by the script😅

).mapPartitionsWithIndex(f)
df = self.spark.createDataFrame(rdd, schema="string")
psdf = df.pandas_api()
self.assert_eq(psdf.mode(), psdf._to_pandas().mode())

def test_abs(self):
pdf = pd.DataFrame({"a": [-2, -1, 0, 1]})
psdf = ps.from_pandas(pdf)
Expand Down
8 changes: 5 additions & 3 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/Mode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,12 @@ case class PandasMode(
override def update(
buffer: OpenHashMap[AnyRef, Long],
input: InternalRow): OpenHashMap[AnyRef, Long] = {
val key = child.eval(input).asInstanceOf[AnyRef]
val key = child.eval(input)

if (key != null || !ignoreNA) {
buffer.changeValue(key, 1L, _ + 1L)
if (key != null) {
buffer.changeValue(InternalRow.copyValue(key).asInstanceOf[AnyRef], 1L, _ + 1L)
} else if (!ignoreNA) {
buffer.changeValue(null, 1L, _ + 1L)
}
buffer
}
Expand Down