This is an automated email from the ASF dual-hosted git repository.
jt2594838 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new b92ca10c792 Fix out-of-range Python timestamps with pandas 3.1 (#19248)
b92ca10c792 is described below
commit b92ca10c7920a35086fc138d07847580316a83c2
Author: Hongzhi Gao <[email protected]>
AuthorDate: Fri Nov 13 14:41:37 2026 +0800
Fix out-of-range Python timestamps with pandas 3.1 (#19248)
* Fix out-of-range Python timestamps with pandas 3.1
* Remove added timestamp regression tests
* Add focused extreme millisecond timestamp regression coverage
---
iotdb-client/client-py/iotdb/utils/rpc_utils.py | 17 ++++++++----
.../client-py/tests/unit/test_rpc_utils.py | 32 ++++++++++++++++++++++
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/iotdb-client/client-py/iotdb/utils/rpc_utils.py
b/iotdb-client/client-py/iotdb/utils/rpc_utils.py
index 0912fd14d95..e6aec4080c0 100644
--- a/iotdb-client/client-py/iotdb/utils/rpc_utils.py
+++ b/iotdb-client/client-py/iotdb/utils/rpc_utils.py
@@ -17,6 +17,7 @@
#
import logging
+import numpy as np
import pandas as pd
from pandas._libs import OutOfBoundsDatetime
from tzlocal import get_localzone_name
@@ -81,10 +82,16 @@ def convert_to_timestamp(time: int, precision: str,
timezone: str):
try:
ts = pd.Timestamp(time, unit=precision, tz=timezone)
except OutOfBoundsDatetime:
+ # A datetime64 scalar keeps the input unit; pandas 3.1 otherwise
rescales
+ # numeric input to microseconds, which can overflow millisecond values.
try:
- ts = pd.Timestamp(time, unit=precision).tz_localize(timezone)
- except NotImplementedError:
- return pd.Timestamp(time, unit=precision)
+ ts = (
+ pd.Timestamp(np.datetime64(int(time), precision))
+ .tz_localize("UTC")
+ .tz_convert(timezone)
+ )
+ except (OutOfBoundsDatetime, NotImplementedError):
+ return pd.Timestamp(np.datetime64(int(time), precision))
except ValueError:
logger.warning(
f"Timezone string '{timezone}' cannot be recognized by pandas. "
@@ -95,7 +102,7 @@ def convert_to_timestamp(time: int, precision: str,
timezone: str):
# Timestamp falls outside Python's stdlib datetime range (year < 1 or
# > 9999). pandas >= 3.0 cannot attach a timezone to such Timestamps
# because tz conversion relies on toordinal(). Return naive instead.
- return pd.Timestamp(time, unit=precision)
+ return pd.Timestamp(np.datetime64(int(time), precision))
# Construction succeeded but utcoffset() may still fail downstream (e.g.
# in pd.DataFrame's tz alignment) when the Timestamp's year is outside
# 1..9999 and tz is not the canonical UTC. Probe early and fall back to
@@ -105,7 +112,7 @@ def convert_to_timestamp(time: int, precision: str,
timezone: str):
try:
ts.utcoffset()
except NotImplementedError:
- return pd.Timestamp(time, unit=precision)
+ return pd.Timestamp(np.datetime64(int(time), precision))
return ts
diff --git a/iotdb-client/client-py/tests/unit/test_rpc_utils.py
b/iotdb-client/client-py/tests/unit/test_rpc_utils.py
new file mode 100644
index 00000000000..f68b294f80a
--- /dev/null
+++ b/iotdb-client/client-py/tests/unit/test_rpc_utils.py
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+import numpy as np
+import pandas as pd
+import pytest
+
+from iotdb.utils.rpc_utils import convert_to_timestamp
+
+
[email protected]("value", [-(2**63) + 1, 2**63 - 1])
[email protected]("timezone", ["UTC", "Asia/Shanghai"])
+def test_convert_timestamp_preserves_extreme_milliseconds(value, timezone):
+ timestamp = convert_to_timestamp(value, "ms", timezone)
+ assert isinstance(timestamp, pd.Timestamp)
+ assert not pd.isna(timestamp)
+ assert timestamp.asm8.astype("datetime64[ms]").astype(np.int64) == value