Skip to content

Fix temporal issue #806

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 5 commits into
base: v5.x
Choose a base branch
from
Open

Fix temporal issue #806

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c09dd51
fix temporal 1 - 3
lipanpan03 Dec 5, 2024
e54d41b
Merge branch 'v5.x' into fix_temporal_tck
lipanpan03 Dec 5, 2024
fdb306d
fix null
lipanpan03 Dec 5, 2024
9f22ac4
fix time compare
lipanpan03 Dec 6, 2024
30412a8
Merge branch 'v5.x' into fix_temporal_issue
lipanpan03 Dec 6, 2024
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
12 changes: 6 additions & 6 deletions src/common/temporal/time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,27 +372,27 @@ Value Time::GetUnit(std::string unit) const {
}

bool Time::operator<(const Time& rhs) const noexcept {
return nanoseconds_since_today_with_of_ < rhs.nanoseconds_since_today_with_of_;
return nanoseconds_since_today_with_of_ - tz_offset_seconds_ * NANOS_PER_SECOND < rhs.nanoseconds_since_today_with_of_ - rhs.tz_offset_seconds_ * NANOS_PER_SECOND;
}

bool Time::operator<=(const Time& rhs) const noexcept {
return nanoseconds_since_today_with_of_ <= rhs.nanoseconds_since_today_with_of_;
return nanoseconds_since_today_with_of_ - tz_offset_seconds_ * NANOS_PER_SECOND <= rhs.nanoseconds_since_today_with_of_ - rhs.tz_offset_seconds_ * NANOS_PER_SECOND;
}

bool Time::operator>(const Time& rhs) const noexcept {
return nanoseconds_since_today_with_of_ > rhs.nanoseconds_since_today_with_of_;
return nanoseconds_since_today_with_of_ - tz_offset_seconds_ * NANOS_PER_SECOND > rhs.nanoseconds_since_today_with_of_ - rhs.tz_offset_seconds_ * NANOS_PER_SECOND;
}

bool Time::operator>=(const Time& rhs) const noexcept {
return nanoseconds_since_today_with_of_ >= rhs.nanoseconds_since_today_with_of_;
return nanoseconds_since_today_with_of_ - tz_offset_seconds_ * NANOS_PER_SECOND >= rhs.nanoseconds_since_today_with_of_ - rhs.tz_offset_seconds_ * NANOS_PER_SECOND;
}

bool Time::operator==(const Time& rhs) const noexcept {
return nanoseconds_since_today_with_of_ == rhs.nanoseconds_since_today_with_of_;
return nanoseconds_since_today_with_of_ - tz_offset_seconds_ * NANOS_PER_SECOND == rhs.nanoseconds_since_today_with_of_ - rhs.tz_offset_seconds_ * NANOS_PER_SECOND;
}

bool Time::operator!=(const Time& rhs) const noexcept {
return nanoseconds_since_today_with_of_ != rhs.nanoseconds_since_today_with_of_;
return nanoseconds_since_today_with_of_ - tz_offset_seconds_ * NANOS_PER_SECOND != rhs.nanoseconds_since_today_with_of_ - rhs.tz_offset_seconds_ * NANOS_PER_SECOND;
}

Time Time::operator-(const Duration& duration) const {
Expand Down