Skip to content

[SPARK-40724][PS] Simplify corr with method inline #38184

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-40724][PS] Simplify corr with method inline #38184

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
23 changes: 7 additions & 16 deletions python/pyspark/pandas/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,6 @@ def corr(self, method: str = "pearson", min_periods: Optional[int] = None) -> "D
sdf = internal.spark_frame
index_1_col_name = verify_temp_column_name(sdf, "__corr_index_1_temp_column__")
index_2_col_name = verify_temp_column_name(sdf, "__corr_index_2_temp_column__")
tuple_col_name = verify_temp_column_name(sdf, "__corr_tuple_temp_column__")

# simple dataset
# +---+---+----+
Expand Down Expand Up @@ -1539,16 +1538,7 @@ def corr(self, method: str = "pearson", min_periods: Optional[int] = None) -> "D
# | 1| 2| null| null|
# | 2| 2| null| null|
# +-------------------+-------------------+-------------------+-------------------+
sdf = sdf.select(F.explode(F.array(*pair_scols)).alias(tuple_col_name)).select(
F.col(f"{tuple_col_name}.{index_1_col_name}").alias(index_1_col_name),
F.col(f"{tuple_col_name}.{index_2_col_name}").alias(index_2_col_name),
F.col(f"{tuple_col_name}.{CORRELATION_VALUE_1_COLUMN}").alias(
CORRELATION_VALUE_1_COLUMN
),
F.col(f"{tuple_col_name}.{CORRELATION_VALUE_2_COLUMN}").alias(
CORRELATION_VALUE_2_COLUMN
),
)
sdf = sdf.select(F.inline(F.array(*pair_scols)))

sdf = compute(sdf=sdf, groupKeys=[index_1_col_name, index_2_col_name], method=method)
if method == "kendall":
Expand Down Expand Up @@ -1580,19 +1570,20 @@ def corr(self, method: str = "pearson", min_periods: Optional[int] = None) -> "D
# | 2| 0| null|
# +-------------------+-------------------+----------------+

auxiliary_col_name = verify_temp_column_name(sdf, "__corr_auxiliary_temp_column__")
sdf = sdf.withColumn(
tuple_col_name,
auxiliary_col_name,
F.explode(
F.when(
F.col(index_1_col_name) == F.col(index_2_col_name),
F.lit([0]),
).otherwise(F.lit([0, 1]))
),
).select(
F.when(F.col(tuple_col_name) == 0, F.col(index_1_col_name))
F.when(F.col(auxiliary_col_name) == 0, F.col(index_1_col_name))
.otherwise(F.col(index_2_col_name))
.alias(index_1_col_name),
F.when(F.col(tuple_col_name) == 0, F.col(index_2_col_name))
F.when(F.col(auxiliary_col_name) == 0, F.col(index_2_col_name))
.otherwise(F.col(index_1_col_name))
.alias(index_2_col_name),
F.col(CORRELATION_CORR_OUTPUT_COLUMN),
Expand All @@ -1619,9 +1610,9 @@ def corr(self, method: str = "pearson", min_periods: Optional[int] = None) -> "D
)

for i in range(0, num_scols):
sdf = sdf.withColumn(tuple_col_name, F.get(F.col(array_col_name), i)).withColumn(
sdf = sdf.withColumn(auxiliary_col_name, F.get(F.col(array_col_name), i)).withColumn(
numeric_col_names[i],
F.col(f"{tuple_col_name}.{CORRELATION_CORR_OUTPUT_COLUMN}"),
F.col(f"{auxiliary_col_name}.{CORRELATION_CORR_OUTPUT_COLUMN}"),
)

index_col_names: List[str] = []
Expand Down