(spark) branch master updated: [MINOR][PYTHON] Fix type hint for `from_utc_timestamp` and `to_utc_timestamp`

[gurwls223]

This is an automated email from the ASF dual-hosted git repository.

gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 6508b1f5e187 [MINOR][PYTHON] Fix type hint for `from_utc_timestamp` 
and `to_utc_timestamp`
6508b1f5e187 is described below

commit 6508b1f5e18731359354af0a7bcc1382bc4f356b
Author: Ruifeng Zheng <ruife...@apache.org>
AuthorDate: Mon Jul 22 08:53:31 2024 +0900

    [MINOR][PYTHON] Fix type hint for `from_utc_timestamp` and 
`to_utc_timestamp`
    
    ### What changes were proposed in this pull request?
    Fix type hint for `from_utc_timestamp` and `to_utc_timestamp`
    
    ### Why are the changes needed?
    the str type input should be treated as literal string, instead of column 
name
    
    ### Does this PR introduce _any_ user-facing change?
    doc change
    
    ### How was this patch tested?
    CI
    
    ### Was this patch authored or co-authored using generative AI tooling?
    No
    
    Closes #47429 from zhengruifeng/py_fix_hint_202407.
    
    Authored-by: Ruifeng Zheng <ruife...@apache.org>
    Signed-off-by: Hyukjin Kwon <gurwls...@apache.org>
---
 python/pyspark/sql/connect/functions/builtin.py | 12 ++++--------
 python/pyspark/sql/functions/builtin.py         | 14 +++-----------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/python/pyspark/sql/connect/functions/builtin.py 
b/python/pyspark/sql/connect/functions/builtin.py
index 37398ca9ccf3..2ccf360ed972 100644
--- a/python/pyspark/sql/connect/functions/builtin.py
+++ b/python/pyspark/sql/connect/functions/builtin.py
@@ -3349,19 +3349,15 @@ def unix_timestamp(
 unix_timestamp.__doc__ = pysparkfuncs.unix_timestamp.__doc__
 
 
-def from_utc_timestamp(timestamp: "ColumnOrName", tz: "ColumnOrName") -> 
Column:
-    if isinstance(tz, str):
-        tz = lit(tz)
-    return _invoke_function_over_columns("from_utc_timestamp", timestamp, tz)
+def from_utc_timestamp(timestamp: "ColumnOrName", tz: Union[Column, str]) -> 
Column:
+    return _invoke_function_over_columns("from_utc_timestamp", timestamp, 
lit(tz))
 
 
 from_utc_timestamp.__doc__ = pysparkfuncs.from_utc_timestamp.__doc__
 
 
-def to_utc_timestamp(timestamp: "ColumnOrName", tz: "ColumnOrName") -> Column:
-    if isinstance(tz, str):
-        tz = lit(tz)
-    return _invoke_function_over_columns("to_utc_timestamp", timestamp, tz)
+def to_utc_timestamp(timestamp: "ColumnOrName", tz: Union[Column, str]) -> 
Column:
+    return _invoke_function_over_columns("to_utc_timestamp", timestamp, 
lit(tz))
 
 
 to_utc_timestamp.__doc__ = pysparkfuncs.to_utc_timestamp.__doc__
diff --git a/python/pyspark/sql/functions/builtin.py 
b/python/pyspark/sql/functions/builtin.py
index 6ee311780520..5b9d0dd87002 100644
--- a/python/pyspark/sql/functions/builtin.py
+++ b/python/pyspark/sql/functions/builtin.py
@@ -9144,7 +9144,7 @@ def unix_timestamp(
 
 
 @_try_remote_functions
-def from_utc_timestamp(timestamp: "ColumnOrName", tz: "ColumnOrName") -> 
Column:
+def from_utc_timestamp(timestamp: "ColumnOrName", tz: Union[Column, str]) -> 
Column:
     """
     This is a common function for databases supporting TIMESTAMP WITHOUT 
TIMEZONE. This function
     takes a timestamp which is timezone-agnostic, and interprets it as a 
timestamp in UTC, and
@@ -9192,11 +9192,7 @@ def from_utc_timestamp(timestamp: "ColumnOrName", tz: 
"ColumnOrName") -> Column:
     >>> df.select(from_utc_timestamp(df.ts, 
df.tz).alias('local_time')).collect()
     [Row(local_time=datetime.datetime(1997, 2, 28, 19, 30))]
     """
-    from pyspark.sql.classic.column import _to_java_column
-
-    if isinstance(tz, Column):
-        tz = _to_java_column(tz)
-    return _invoke_function("from_utc_timestamp", _to_java_column(timestamp), 
tz)
+    return _invoke_function_over_columns("from_utc_timestamp", timestamp, 
lit(tz))
 
 
 @_try_remote_functions
@@ -9248,11 +9244,7 @@ def to_utc_timestamp(timestamp: "ColumnOrName", tz: 
"ColumnOrName") -> Column:
     >>> df.select(to_utc_timestamp(df.ts, df.tz).alias('utc_time')).collect()
     [Row(utc_time=datetime.datetime(1997, 2, 28, 1, 30))]
     """
-    from pyspark.sql.classic.column import _to_java_column
-
-    if isinstance(tz, Column):
-        tz = _to_java_column(tz)
-    return _invoke_function("to_utc_timestamp", _to_java_column(timestamp), tz)
+    return _invoke_function_over_columns("to_utc_timestamp", timestamp, 
lit(tz))
 
 
 @_try_remote_functions


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org