[SPARK-41222][CONNECT][PYTHON] Unify the typing definitions #38757
Conversation
This file contains 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
HyukjinKwon
approved these changes
Nov 22, 2022
zhengruifeng
force-pushed
the
connect_typing
branch
from
d16476b
to
84ff08b
Compare
zhengruifeng
commented
Nov 23, 2022
python/pyspark/sql/connect/column.py
Outdated
|
|
||
| import json | ||
| import decimal | ||
| import datetime | ||
|
|
||
| import pyspark.sql.connect.proto as proto | ||
| from pyspark.sql.connect._typing import PrimitiveType | ||
|
|
||
| primitive_types = (bool, float, int, str) |
There was a problem hiding this comment.
list the types here to avoid a circular import, since _typing also import column
There was a problem hiding this comment.
You can import this in the function in that case. e.g.)
def _bin_op(
name: str, doc: str = "binary function", reverse: bool = False
) -> Callable[["Column", Any], "Expression"]:
+ from pyspark.sql.connect._typing import PrimitiveType
def _(self: "Column", other: Any) -> "Expression":There was a problem hiding this comment.
thanks, let me update
|
merged into master |
beliefer
pushed a commit
to beliefer/spark
that referenced
this pull request
Dec 15, 2022
### What changes were proposed in this pull request? 1, remove `__init__.py` 2, rename `ColumnOrString ` as `ColumnOrName` to be the same as pyspark ### Why are the changes needed? 1, there are two typing files now: `_typing.py` and `__init__.py`, they are used in different files, which is very confusing; 2, the definitions of `LiteralType` are different, the old one in `_typing.py` was never used 3, both `ColumnOrString ` and `ColumnOrName` are used now; ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? existing UTs Closes apache#38757 from zhengruifeng/connect_typing. Authored-by: Ruifeng Zheng <ruifengz@apache.org> Signed-off-by: Ruifeng Zheng <ruifengz@apache.org>
beliefer
pushed a commit
to beliefer/spark
that referenced
this pull request
Dec 18, 2022
### What changes were proposed in this pull request? 1, remove `__init__.py` 2, rename `ColumnOrString ` as `ColumnOrName` to be the same as pyspark ### Why are the changes needed? 1, there are two typing files now: `_typing.py` and `__init__.py`, they are used in different files, which is very confusing; 2, the definitions of `LiteralType` are different, the old one in `_typing.py` was never used 3, both `ColumnOrString ` and `ColumnOrName` are used now; ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? existing UTs Closes apache#38757 from zhengruifeng/connect_typing. Authored-by: Ruifeng Zheng <ruifengz@apache.org> Signed-off-by: Ruifeng Zheng <ruifengz@apache.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What changes were proposed in this pull request?
1, remove
__init__.py2, rename
ColumnOrStringasColumnOrNameto be the same as pysparkWhy are the changes needed?
1, there are two typing files now:
_typing.pyand__init__.py, they are used in different files, which is very confusing;2, the definitions of
LiteralTypeare different, the old one in_typing.pywas never used3, both
ColumnOrStringandColumnOrNameare used now;Does this PR introduce any user-facing change?
No
How was this patch tested?
existing UTs