Skip to content

Fix #7854 - Performance issue with time zones. #7859

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

Merged
merged 1 commit into from
Nov 21, 2023
Merged

Fix #7854 - Performance issue with time zones. #7859

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
67 changes: 28 additions & 39 deletions src/common/TimeZoneUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,20 @@ namespace
public:
TimeZoneDesc(MemoryPool& pool)
: asciiName(pool),
unicodeName(pool)
unicodeName(pool),
icuCachedCalendar(nullptr)
{
}

~TimeZoneDesc()
{
if (const auto calendar = icuCachedCalendar.exchange(nullptr))
{
auto& icuLib = Jrd::UnicodeUtil::getConversionICU();
icuLib.ucalClose(calendar);
}
}

public:
void setName(const char* name)
{
Expand All @@ -70,9 +80,21 @@ namespace
return unicodeName.begin();
}

IcuCalendarWrapper getCalendar(const Jrd::UnicodeUtil::ConversionICU& icuLib, UErrorCode* err = nullptr) const
{
auto calendar = icuCachedCalendar.exchange(nullptr);
UErrorCode internalErr = U_ZERO_ERROR;

if (!calendar)
calendar = icuLib.ucalOpen(getUnicodeName(), -1, nullptr, UCAL_GREGORIAN, (err ? err : &internalErr));

return IcuCalendarWrapper(calendar, &icuCachedCalendar);
}

private:
string asciiName;
Array<UChar> unicodeName;
mutable std::atomic<UCalendar*> icuCachedCalendar;
};
}

Expand Down Expand Up @@ -593,30 +615,21 @@ void TimeZoneUtil::extractOffset(const ISC_TIMESTAMP_TZ& timeStampTz, SSHORT* of

Jrd::UnicodeUtil::ConversionICU& icuLib = Jrd::UnicodeUtil::getConversionICU();

UCalendar* icuCalendar = icuLib.ucalOpen(
getDesc(timeStampTz.time_zone)->getUnicodeName(), -1, NULL, UCAL_GREGORIAN, &icuErrorCode);
auto icuCalendar = getDesc(timeStampTz.time_zone)->getCalendar(icuLib, &icuErrorCode);

if (!icuCalendar)
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_open.");

icuLib.ucalSetMillis(icuCalendar, timeStampToIcuDate(timeStampTz.utc_timestamp), &icuErrorCode);

if (U_FAILURE(icuErrorCode))
{
icuLib.ucalClose(icuCalendar);
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_setMillis.");
}

displacement = (icuLib.ucalGet(icuCalendar, UCAL_ZONE_OFFSET, &icuErrorCode) +
icuLib.ucalGet(icuCalendar, UCAL_DST_OFFSET, &icuErrorCode)) / U_MILLIS_PER_MINUTE;

if (U_FAILURE(icuErrorCode))
{
icuLib.ucalClose(icuCalendar);
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_get.");
}

icuLib.ucalClose(icuCalendar);
}

*offset = displacement;
Expand Down Expand Up @@ -702,8 +715,7 @@ void TimeZoneUtil::localTimeStampToUtc(ISC_TIMESTAMP_TZ& timeStampTz)

Jrd::UnicodeUtil::ConversionICU& icuLib = Jrd::UnicodeUtil::getConversionICU();

UCalendar* icuCalendar = icuLib.ucalOpen(
getDesc(timeStampTz.time_zone)->getUnicodeName(), -1, NULL, UCAL_GREGORIAN, &icuErrorCode);
auto icuCalendar = getDesc(timeStampTz.time_zone)->getCalendar(icuLib, &icuErrorCode);

if (!icuCalendar)
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_open.");
Expand All @@ -715,21 +727,13 @@ void TimeZoneUtil::localTimeStampToUtc(ISC_TIMESTAMP_TZ& timeStampTz)
times.tm_hour, times.tm_min, times.tm_sec, &icuErrorCode);

if (U_FAILURE(icuErrorCode))
{
icuLib.ucalClose(icuCalendar);
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_setDateTime.");
}

displacement = (icuLib.ucalGet(icuCalendar, UCAL_ZONE_OFFSET, &icuErrorCode) +
icuLib.ucalGet(icuCalendar, UCAL_DST_OFFSET, &icuErrorCode)) / U_MILLIS_PER_MINUTE;

if (U_FAILURE(icuErrorCode))
{
icuLib.ucalClose(icuCalendar);
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_get.");
}

icuLib.ucalClose(icuCalendar);
}

const auto ticks = TimeStamp::timeStampToTicks(timeStampTz.utc_timestamp) -
Expand Down Expand Up @@ -771,30 +775,21 @@ bool TimeZoneUtil::decodeTimeStamp(const ISC_TIMESTAMP_TZ& timeStampTz, bool gmt
#endif
Jrd::UnicodeUtil::ConversionICU& icuLib = Jrd::UnicodeUtil::getConversionICU();

UCalendar* icuCalendar = icuLib.ucalOpen(
getDesc(timeStampTz.time_zone)->getUnicodeName(), -1, NULL, UCAL_GREGORIAN, &icuErrorCode);
auto icuCalendar = getDesc(timeStampTz.time_zone)->getCalendar(icuLib, &icuErrorCode);

if (!icuCalendar)
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_open.");

icuLib.ucalSetMillis(icuCalendar, timeStampToIcuDate(timeStampTz.utc_timestamp), &icuErrorCode);

if (U_FAILURE(icuErrorCode))
{
icuLib.ucalClose(icuCalendar);
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_setMillis.");
}

displacement = (icuLib.ucalGet(icuCalendar, UCAL_ZONE_OFFSET, &icuErrorCode) +
icuLib.ucalGet(icuCalendar, UCAL_DST_OFFSET, &icuErrorCode)) / U_MILLIS_PER_MINUTE;

if (U_FAILURE(icuErrorCode))
{
icuLib.ucalClose(icuCalendar);
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_get.");
}

icuLib.ucalClose(icuCalendar);
}
catch (const Exception&)
{
Expand Down Expand Up @@ -1063,12 +1058,11 @@ ISC_TIMESTAMP_TZ TimeZoneUtil::dateToTimeStampTz(const ISC_DATE& date, Callbacks
TimeZoneRuleIterator::TimeZoneRuleIterator(USHORT aId, const ISC_TIMESTAMP_TZ& aFrom, const ISC_TIMESTAMP_TZ& aTo)
: id(aId),
icuLib(Jrd::UnicodeUtil::getConversionICU()),
toTicks(TimeStamp::timeStampToTicks(aTo.utc_timestamp))
toTicks(TimeStamp::timeStampToTicks(aTo.utc_timestamp)),
icuCalendar(getDesc(aId)->getCalendar(icuLib))
{
UErrorCode icuErrorCode = U_ZERO_ERROR;

icuCalendar = icuLib.ucalOpen(getDesc(id)->getUnicodeName(), -1, NULL, UCAL_GREGORIAN, &icuErrorCode);

if (!icuCalendar)
status_exception::raise(Arg::Gds(isc_random) << "Error calling ICU's ucal_open.");

Expand Down Expand Up @@ -1105,11 +1099,6 @@ TimeZoneRuleIterator::TimeZoneRuleIterator(USHORT aId, const ISC_TIMESTAMP_TZ& a
startTicks = TimeStamp::timeStampToTicks(TimeZoneUtil::icuDateToTimeStamp(icuDate));
}

TimeZoneRuleIterator::~TimeZoneRuleIterator()
{
icuLib.ucalClose(icuCalendar);
}

bool TimeZoneRuleIterator::next()
{
if (startTicks > toTicks)
Expand Down
50 changes: 48 additions & 2 deletions src/common/TimeZoneUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#ifndef COMMON_TIME_ZONE_UTIL_H
#define COMMON_TIME_ZONE_UTIL_H

#include <atomic>
#include <functional>
#include "../common/classes/fb_string.h"
#include "../common/classes/timestamp.h"
Expand Down Expand Up @@ -142,11 +143,56 @@ class TimeZoneUtil
static ISC_TIMESTAMP_TZ dateToTimeStampTz(const ISC_DATE& date, Callbacks* cb);
};

class IcuCalendarWrapper
{
public:
IcuCalendarWrapper(UCalendar* aWrapped, std::atomic<UCalendar*>* aCachePtr)
: wrapped(aWrapped),
cachePtr(aCachePtr)
{}

~IcuCalendarWrapper()
{
if (wrapped)
{
auto newCached = cachePtr->exchange(wrapped);

if (newCached)
{
auto& icuLib = Jrd::UnicodeUtil::getConversionICU();
icuLib.ucalClose(newCached);
}
}
}

IcuCalendarWrapper(const IcuCalendarWrapper&) = delete;
IcuCalendarWrapper& operator=(const IcuCalendarWrapper&) = delete;

public:
UCalendar* operator->()
{
return wrapped;
}

operator UCalendar*()
{
return wrapped;
}

bool operator!() const
{
return !wrapped;
}

private:
UCalendar* wrapped;
std::atomic<UCalendar*>* cachePtr;
};

class TimeZoneRuleIterator
{
public:
TimeZoneRuleIterator(USHORT aId, const ISC_TIMESTAMP_TZ& aFrom, const ISC_TIMESTAMP_TZ& aTo);
~TimeZoneRuleIterator();

public:
bool next();
Expand All @@ -162,7 +208,7 @@ class TimeZoneRuleIterator
Jrd::UnicodeUtil::ConversionICU& icuLib;
SINT64 startTicks;
SINT64 toTicks;
UCalendar* icuCalendar;
IcuCalendarWrapper icuCalendar;
UDate icuDate;
};

Expand Down