Skip to content

stable-25-2-1: Fixed wrong output for large DT64* values in UI #29617

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 27, 2025
Merged

stable-25-2-1: Fixed wrong output for large DT64* values in UI #29617

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
90 changes: 65 additions & 25 deletions ydb/core/viewer/viewer_query.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,32 +645,72 @@ class TJsonQuery : public TViewerPipeClient {
}

private:
template <class Duration>
std::string FormatDatetime(const std::chrono::sys_time<Duration>& tp) {
auto timeT = std::chrono::system_clock::to_time_t(tp);
std::tm* tm = std::gmtime(&timeT);
std::string WriteTime(ui32 value) {
ui32 hour, min, sec;

std::stringstream ss;
ss << std::put_time(tm, "%FT%TZ");
Y_ASSERT(value < 86400);
hour = value / 3600;
value -= hour * 3600;
min = value / 60;
sec = value - min * 60;

return ss.str();
return TStringBuilder() << LeftPad(hour, 2, '0') << ':' << LeftPad(min, 2, '0') << ':' << LeftPad(sec, 2, '0');
}

std::string FormatTimestamp(const std::chrono::sys_time<NYdb::TWideMicroseconds>& tp) {
auto timeT = std::chrono::system_clock::to_time_t(tp);
std::tm* tm = std::gmtime(&timeT);

std::stringstream ss;
ss << std::put_time(tm, "%FT%T");

auto micros = tp.time_since_epoch() % NYdb::TWideSeconds(1);
if (micros.count() < 0) {
micros += NYdb::TWideSeconds(1);
}

ss << '.' << std::setfill('0') << std::setw(6) << micros.count() << 'Z';

return ss.str();
std::string FormatDate32(const std::chrono::sys_time<NYdb::TWideDays>& tp) {
auto value = tp.time_since_epoch().count();

i32 year;
ui32 month;
ui32 day;
if (!NKikimr::NMiniKQL::SplitDate32(value, year, month, day)) {
return TStringBuilder() << "Error: failed to split Date32: " << value;
}

return TStringBuilder() << year << "-" << LeftPad(month, 2, '0') << '-' << LeftPad(day, 2, '0');
}

std::string FormatDatetime64(const std::chrono::sys_time<NYdb::TWideSeconds>& tp) {
auto value = tp.time_since_epoch().count();

if (Y_UNLIKELY(NUdf::MIN_DATETIME64 > value || value > NUdf::MAX_DATETIME64)) {
return TStringBuilder() << "Error: value out of range for Datetime64: " << value << " (min: " << NUdf::MIN_DATETIME64 << ", max: " << NUdf::MAX_DATETIME64 << ")";
}

auto date = value / 86400;
value -= date * 86400;
if (value < 0) {
date -= 1;
value += 86400;
}

return TStringBuilder() << FormatDate32(std::chrono::sys_time<NYdb::TWideDays>(NYdb::TWideDays(date))) << 'T' << WriteTime(value) << 'Z';
}

std::string FormatTimestamp64(const std::chrono::sys_time<NYdb::TWideMicroseconds>& tp) {
auto value = tp.time_since_epoch().count();

if (Y_UNLIKELY(NUdf::MIN_TIMESTAMP64 > value || value > NUdf::MAX_TIMESTAMP64)) {
return TStringBuilder() << "Error: value out of range for Timestamp64: " << value << " (min: " << NUdf::MIN_TIMESTAMP64 << ", max: " << NUdf::MAX_TIMESTAMP64 << ")";
}
auto date = value / 86400000000ll;
value -= date * 86400000000ll;
if (value < 0) {
date -= 1;
value += 86400000000ll;
}

TStringBuilder out;
out << FormatDate32(std::chrono::sys_time<NYdb::TWideDays>(NYdb::TWideDays(date)));
out << 'T';

const ui32 time = static_cast<ui32>(value / 1000000ull);
value -= time * 1000000ull;
out << WriteTime(time);
if (value) {
out << '.' << LeftPad(value, 6, '0');
}
return out << 'Z';
}

NJson::TJsonValue ColumnPrimitiveValueToJsonValue(NYdb::TValueParser& valueParser) {
Expand Down Expand Up @@ -708,11 +748,11 @@ class TJsonQuery : public TViewerPipeClient {
case NYdb::EPrimitiveType::Interval:
return TStringBuilder() << valueParser.GetInterval();
case NYdb::EPrimitiveType::Date32:
return FormatDatetime(valueParser.GetDate32());
return FormatDate32(valueParser.GetDate32());
case NYdb::EPrimitiveType::Datetime64:
return FormatDatetime(valueParser.GetDatetime64());
return FormatDatetime64(valueParser.GetDatetime64());
case NYdb::EPrimitiveType::Timestamp64:
return FormatTimestamp(valueParser.GetTimestamp64());
return FormatTimestamp64(valueParser.GetTimestamp64());
case NYdb::EPrimitiveType::Interval64:
return valueParser.GetInterval64().count();
case NYdb::EPrimitiveType::TzDate:
Expand Down
Loading