[GH-2129] Geopandas: Refactor to use self.name instead of first_geom column #2130
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
petern48
commented
Jul 21, 2025
Comment on lines
+4075
to
+4088
| def _get_series_col_name(ps_series: pspd.Series) -> str: | ||
| series_name = ps_series.name if ps_series.name else SPARK_DEFAULT_SERIES_NAME | ||
| spark_col_names = set(ps_series._internal.spark_frame.columns) | ||
|
|
||
| if series_name in spark_col_names: | ||
| return series_name | ||
| # Combining different frames (e.g in the GeoDataFrame.setitem method adds these prefixes | ||
| # It's easier to check for them at read time than rename them at write time | ||
| # For GeoDataFrame.setitem, the left ("this") side if not overridden, so we always prefer the right ("that") side | ||
| # which is why it needs to come first in the if/elif/else sequence | ||
| elif f"__that_{series_name}" in spark_col_names: | ||
| return f"__that_{series_name}" | ||
| elif f"__this_{series_name}" in spark_col_names: | ||
| return f"__this_{series_name}" |
Contributor
Author
There was a problem hiding this comment.
I've decided to take a different approach that will allow us to avoid ugly code like this in #2131
Contributor
Author
|
Another reason the spark sql approach just isn't working well is that even with my workarounds, the CI tests fail on different versions: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Did you read the Contributor Guide?
Is this PR related to a ticket?
[GH-XXX] my subject. Closes Geopandas: Refactor to use proper column name instead of first geomcolumn #2129What changes were proposed in this PR?
Refactor to use self.name instead of first_geom column
How was this patch tested?
Added new test
test_complex_dfto ensure that we are performing the operation on the correct column.Did this PR include necessary documentation updates?