This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new d0c59faf74 GH-49952: [C++][Gandiva] Use timegm in date_time_test
utilities (#49953)
d0c59faf74 is described below
commit d0c59faf748004872cd3c8d50bea4907d5861c03
Author: Aaditya Srinivasan <[email protected]>
AuthorDate: Fri Jun 5 05:40:58 2026 +0530
GH-49952: [C++][Gandiva] Use timegm in date_time_test utilities (#49953)
### Rationale for this change
As discussed in PR #49887, the Gandiva datetime test utilities currently
use `mktime()`, which interprets timestamps as local time and can behave
differently across platforms and DST boundaries.
This PR switches the test utilities to `timegm()` so timestamps are
interpreted consistently as UTC. This also removes the existing workaround
logic in `Epoch()` that was previously needed for `mktime()` behavior on
Windows/MSVC.
### What changes are included in this PR?
* replaced `mktime()` with `timegm()` in `date_time_test.cc`
* added a small Windows compatibility mapping for `_mkgmtime`
* removed the existing DST/localtime workaround logic in `Epoch()`
### Are these changes tested?
* Re-ran `DateTimeTestProjector.TestFromUtcTimestamp` repeatedly locally
* Re-ran the full `gandiva-projector-test` suite successfully
### Are there any user-facing changes?
No.
* GitHub Issue: #49952
Authored-by: Aaditya Srinivasan <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
cpp/src/gandiva/tests/date_time_test.cc | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/cpp/src/gandiva/tests/date_time_test.cc
b/cpp/src/gandiva/tests/date_time_test.cc
index 6208f1ecba..2f1d876af8 100644
--- a/cpp/src/gandiva/tests/date_time_test.cc
+++ b/cpp/src/gandiva/tests/date_time_test.cc
@@ -20,6 +20,11 @@
#include <cmath>
#include <ctime>
+#ifdef _WIN32
+// Windows provides _mkgmtime instead of timegm.
+# define timegm _mkgmtime
+#endif
+
#include "arrow/memory_pool.h"
#include "gandiva/precompiled/time_constants.h"
#include "gandiva/projector.h"
@@ -45,23 +50,21 @@ class DateTimeTestProjector : public ::testing::Test {
};
time_t Epoch() {
- // HACK: MSVC mktime() fails on UTC times before 1970-01-01 00:00:00.
- // But it first converts its argument from local time to UTC time,
- // so we ask for 1970-01-02 to avoid failing in timezones ahead of UTC.
struct tm y1970;
memset(&y1970, 0, sizeof(struct tm));
y1970.tm_year = 70;
y1970.tm_mon = 0;
- y1970.tm_mday = 2;
+ y1970.tm_mday = 1;
y1970.tm_hour = 0;
y1970.tm_min = 0;
y1970.tm_sec = 0;
- time_t epoch = mktime(&y1970);
+
+ time_t epoch = timegm(&y1970);
if (epoch == static_cast<time_t>(-1)) {
- ARROW_LOG(FATAL) << "mktime() failed";
+ ARROW_LOG(FATAL) << "timegm() failed";
}
- // Adjust for the 24h offset above.
- return epoch - 24 * 3600;
+
+ return epoch;
}
int32_t MillisInDay(int32_t hh, int32_t mm, int32_t ss, int32_t millis) {
@@ -82,9 +85,9 @@ int64_t MillisSince(time_t base_line, int32_t yy, int32_t mm,
int32_t dd, int32_
given_ts.tm_min = min;
given_ts.tm_sec = sec;
- time_t ts = mktime(&given_ts);
+ time_t ts = timegm(&given_ts);
if (ts == static_cast<time_t>(-1)) {
- ARROW_LOG(FATAL) << "mktime() failed";
+ ARROW_LOG(FATAL) << "timegm() failed";
}
// time_t is an arithmetic type on both POSIX and Windows, we can simply
// subtract to get a duration in seconds.
