This is an automated email from the ASF dual-hosted git repository.
hello-stephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d983219f5bb [fix](regression) Restore time zone after test_tz_load
(#65412)
d983219f5bb is described below
commit d983219f5bbcf49bf46f214ae71ef42af57bbb42
Author: shuke <[email protected]>
AuthorDate: Thu Jul 16 18:12:17 2026 +0800
[fix](regression) Restore time zone after test_tz_load (#65412)
## Summary
- restore the original global time_zone after test_tz_load changes it
during the suite
- clean up the temporary global_timezone_test table in the finally block
- prevent later nonConcurrent suites from inheriting UTC global time
zone
## Evidence
- master has the same test_tz_load pattern: it sets GLOBAL time_zone to
UTC and previously did not restore it before suite exit
- test_json_load contains a timezone-sensitive from_unixtime assertion
that can be affected by the leaked global time zone
- same branch-4.1 fix was submitted in #65385
---
.../suites/datatype_p0/datetimev2/test_tz_load.groovy | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/regression-test/suites/datatype_p0/datetimev2/test_tz_load.groovy
b/regression-test/suites/datatype_p0/datetimev2/test_tz_load.groovy
index 49ec18b6541..8a00dae736f 100644
--- a/regression-test/suites/datatype_p0/datetimev2/test_tz_load.groovy
+++ b/regression-test/suites/datatype_p0/datetimev2/test_tz_load.groovy
@@ -22,6 +22,9 @@ suite("test_tz_load", "nonConcurrent") {
def s3Region = getS3Region()
def ak = getS3AK()
def sk = getS3SK()
+ def originGlobalTimeZone = sql("select @@global.time_zone")[0][0]
+
+ try {
sql "drop table if exists ${table1}"
@@ -226,4 +229,8 @@ suite("test_tz_load", "nonConcurrent") {
}
sql "sync"
qt_global_offset "select * from ${table1} order by id"
-}
\ No newline at end of file
+ } finally {
+ sql "SET GLOBAL time_zone = '${originGlobalTimeZone}'"
+ try_sql("drop table if exists ${table1}")
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
