Skip to content

Commit d7e827e

Browse files
itholiczhengruifeng
authored andcommitted
[SPARK-43241][PS] MultiIndex.append not checking names for equality
### What changes were proposed in this pull request? This PR proposes to fix the behavior of `MultiIndex.append` to do not checking names. ### Why are the changes needed? To match the behavior with pandas according to pandas-dev/pandas#48288 ### 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'. --> Yes, the behavior is changed to match with pandas: **Testing data** ```python >>> psmidx1 MultiIndex([('a', 'x', 1), ('b', 'y', 2), ('c', 'z', 3)], names=['x', 'y', 'z']) >>> psmidx2 MultiIndex([('a', 'x', 1), ('b', 'y', 2), ('c', 'z', 3)], names=['p', 'q', 'r']) ``` **Before** ```python >>> psmidx1.append(psmidx2) MultiIndex([('a', 'x', 1), ('b', 'y', 2), ('c', 'z', 3), ('a', 'x', 1), ('b', 'y', 2), ('c', 'z', 3)], names=['x', 'y', 'z']) ``` **After** ```python >>> psmidx1.append(psmidx2) MultiIndex([('a', 'x', 1), ('b', 'y', 2), ('c', 'z', 3), ('a', 'x', 1), ('b', 'y', 2), ('c', 'z', 3)], ) ``` ### 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. --> Fix the existing UTs. ### 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. Closes #42787 from itholic/SPARK-43241. Authored-by: Haejoon Lee <[email protected]> Signed-off-by: Ruifeng Zheng <[email protected]>
1 parent 4686c27 commit d7e827e

File tree

2 files changed

+4
-30
lines changed

2 files changed

+4
-30
lines changed

python/pyspark/pandas/indexes/base.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -1917,18 +1917,12 @@ def append(self, other: "Index") -> "Index":
19171917
sdf_other = other._internal.spark_frame.select(other._internal.index_spark_columns)
19181918
sdf_appended = sdf_self.union(sdf_other)
19191919

1920-
# names should be kept when MultiIndex, but Index wouldn't keep its name.
1921-
if isinstance(self, MultiIndex):
1922-
index_names = self._internal.index_names
1923-
else:
1924-
index_names = None
1925-
19261920
internal = InternalFrame(
19271921
spark_frame=sdf_appended,
19281922
index_spark_columns=[
19291923
scol_for(sdf_appended, col) for col in self._internal.index_spark_column_names
19301924
],
1931-
index_names=index_names,
1925+
index_names=None,
19321926
index_fields=index_fields,
19331927
)
19341928

python/pyspark/pandas/tests/indexes/test_base_slow.py

+3-23
Original file line numberDiff line numberDiff line change
@@ -107,29 +107,9 @@ def test_append(self):
107107
psmidx1 = ps.from_pandas(pmidx1)
108108
psmidx2 = ps.from_pandas(pmidx2)
109109

110-
# TODO(SPARK-43241): MultiIndex.append not checking names for equality.
111-
# Also refer to https://github.com/pandas-dev/pandas/pull/48288.
112-
if LooseVersion(pd.__version__) >= LooseVersion("2.0.0"):
113-
self.assert_eq(
114-
pmidx1.append(pmidx2), psmidx1.append(psmidx2).rename([None, None, None])
115-
)
116-
else:
117-
self.assert_eq(pmidx1.append(pmidx2), psmidx1.append(psmidx2))
118-
119-
if LooseVersion(pd.__version__) >= LooseVersion("2.0.0"):
120-
self.assert_eq(
121-
pmidx2.append(pmidx1), psmidx2.append(psmidx1).rename([None, None, None])
122-
)
123-
else:
124-
self.assert_eq(pmidx2.append(pmidx1), psmidx2.append(psmidx1))
125-
126-
if LooseVersion(pd.__version__) >= LooseVersion("2.0.0"):
127-
self.assert_eq(
128-
pmidx1.append(pmidx2).names,
129-
psmidx1.append(psmidx2).rename([None, None, None]).names,
130-
)
131-
else:
132-
self.assert_eq(pmidx1.append(pmidx2).names, psmidx1.append(psmidx2).names)
110+
self.assert_eq(pmidx1.append(pmidx2), psmidx1.append(psmidx2))
111+
self.assert_eq(pmidx2.append(pmidx1), psmidx2.append(psmidx1))
112+
self.assert_eq(pmidx1.append(pmidx2).names, psmidx1.append(psmidx2).names)
133113

134114
# Index & MultiIndex is currently not supported
135115
expected_error_message = r"append\(\) between Index & MultiIndex is currently not supported"

0 commit comments

Comments
 (0)