Skip to content

[FLINK-38418][python] Support pickling Instants when collecting TIMESTAMP_LTZ types in PyFlink #27048

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FLINK-38418][python] Support pickling Instants when collecting TIMESTAMP_LTZ types in PyFlink #27048

Show file tree
Hide file tree
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
15 changes: 9 additions & 6 deletions flink-python/pyflink/table/tests/test_table_environment_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,7 @@ def test_collect_for_all_data_types(self):
1.98932, bytearray(b'pyflink'), 'pyflink',
datetime.date(2014, 9, 13), datetime.time(12, 0, 0, 123000),
datetime.datetime(2018, 3, 11, 3, 0, 0, 123000),
datetime.datetime(2025, 9, 26, 1, 2, 3, 123000),
[['a', 'b'], ['c', 'd'], ['e', 'f']],
[Row('pyflink'), Row('pyflink'), Row('pyflink')],
{1: Row('flink'), 2: Row('pyflink')},
Expand All @@ -712,6 +713,7 @@ def test_collect_for_all_data_types(self):
datetime.date(2014, 9, 13), datetime.time(hour=12, minute=0, second=0,
microsecond=123000),
datetime.datetime(2018, 3, 11, 3, 0, 0, 123000),
datetime.datetime(2025, 9, 26, 1, 2, 3, 123000),
[['a', 'b'], ['c', 'd'], ['e', 'f']],
[Row('pyflink'), Row('pyflink'), Row('pyflink')],
{1: Row('flink'), 2: Row('pyflink')},
Expand All @@ -733,20 +735,21 @@ def test_collect_for_all_data_types(self):
DataTypes.FIELD("k", DataTypes.DATE()),
DataTypes.FIELD("l", DataTypes.TIME()),
DataTypes.FIELD("m", DataTypes.TIMESTAMP(3)),
DataTypes.FIELD("n", DataTypes.ARRAY(DataTypes.ARRAY(DataTypes.STRING()))),
DataTypes.FIELD("n", DataTypes.TIMESTAMP_LTZ(3)),
DataTypes.FIELD("o", DataTypes.ARRAY(DataTypes.ARRAY(DataTypes.STRING()))),
DataTypes.FIELD(
"o",
"p",
DataTypes.ARRAY(
DataTypes.ROW([DataTypes.FIELD("ss2", DataTypes.STRING())])
)),
DataTypes.FIELD(
"p",
"q",
DataTypes.MAP(
DataTypes.BIGINT(),
DataTypes.ROW([DataTypes.FIELD("ss", DataTypes.STRING())]),
)),
DataTypes.FIELD(
"q",
"r",
DataTypes.ARRAY(
DataTypes.ROW(
[
Expand Down Expand Up @@ -774,8 +777,8 @@ def test_collect_for_all_data_types(self):
]
)
)),
DataTypes.FIELD("r", DataTypes.DECIMAL(38, 18)),
DataTypes.FIELD("s", DataTypes.DECIMAL(38, 18))
DataTypes.FIELD("s", DataTypes.DECIMAL(38, 18)),
DataTypes.FIELD("t", DataTypes.DECIMAL(38, 18))
]
)
)
Expand Down
2 changes: 2 additions & 0 deletions flink-python/pyflink/table/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ def pickled_bytes_to_python_converter(data, field_type: DataType):
return field_type.from_sql_type(data)
elif isinstance(field_type, TimestampType):
return field_type.from_sql_type(int(data.timestamp() * 10**6))
elif isinstance(field_type, LocalZonedTimestampType):
return field_type.from_sql_type(int(data.timestamp() * 10**6))
elif isinstance(field_type, MapType):
key_type = field_type.key_type
value_type = field_type.value_type
Expand Down
8 changes: 8 additions & 0 deletions flink-python/src/main/java/org/apache/flink/api/common/python/PythonBridgeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.flink.table.types.logical.ArrayType;
import org.apache.flink.table.types.logical.DateType;
import org.apache.flink.table.types.logical.FloatType;
import org.apache.flink.table.types.logical.LocalZonedTimestampType;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.MapType;
import org.apache.flink.table.types.logical.RowType;
Expand All @@ -58,6 +59,7 @@
import java.sql.Date;
import java.sql.Time;
import java.sql.Timestamp;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
Expand Down Expand Up @@ -193,6 +195,12 @@ private static Object getPickledBytesFromJavaObject(Object obj, LogicalType data
} else {
return pickler.dumps(obj);
}
} else if (dataType instanceof LocalZonedTimestampType) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple of thoughts:

  • l can we add a test at the Java level
  • is it possible to test with different local zones to make sure this works as expected - as Instant is based on seconds since epoche.

if (obj instanceof Instant) {
return pickler.dumps(Timestamp.from((Instant) obj));
} else {
return pickler.dumps(obj);
}
} else if (dataType instanceof RowType) {
Row tmpRow = (Row) obj;
LogicalType[] tmpRowFieldTypes =
Expand Down