diff options
author | shashkin <shashkin@yandex-team.ru> | 2022-02-10 16:52:17 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:52:17 +0300 |
commit | 6e3e35e7e4bf69eb74657a6e82708895b6f9249d (patch) | |
tree | ab7fbbf3253d4c0e2793218f09378908beb025fb | |
parent | c06082089c10cddb012a3a8e34edeee679ec504a (diff) | |
download | ydb-6e3e35e7e4bf69eb74657a6e82708895b6f9249d.tar.gz |
Restoring authorship annotation for <shashkin@yandex-team.ru>. Commit 2 of 2.
-rw-r--r-- | ydb/library/yql/minikql/computation/mkql_value_builder.cpp | 40 | ||||
-rw-r--r-- | ydb/library/yql/minikql/computation/mkql_value_builder.h | 12 | ||||
-rw-r--r-- | ydb/library/yql/minikql/mkql_type_ops.cpp | 36 | ||||
-rw-r--r-- | ydb/library/yql/minikql/mkql_type_ops.h | 6 | ||||
-rw-r--r-- | ydb/library/yql/public/udf/udf_value_builder.h | 30 | ||||
-rw-r--r-- | ydb/library/yql/public/udf/udf_version.h | 2 | ||||
-rw-r--r-- | ydb/library/yql/udfs/common/datetime2/datetime_udf.cpp | 26 | ||||
-rw-r--r-- | ydb/library/yql/udfs/common/datetime2/ya.make | 2 |
8 files changed, 77 insertions, 77 deletions
diff --git a/ydb/library/yql/minikql/computation/mkql_value_builder.cpp b/ydb/library/yql/minikql/computation/mkql_value_builder.cpp index 2a21d1cf5c6..ad476617158 100644 --- a/ydb/library/yql/minikql/computation/mkql_value_builder.cpp +++ b/ydb/library/yql/minikql/computation/mkql_value_builder.cpp @@ -151,35 +151,35 @@ bool TDefaultValueBuilder::SplitDatetime(ui32 value, ui32& year, ui32& month, ui bool TDefaultValueBuilder::FullSplitDate(ui16 value, ui32& year, ui32& month, ui32& day, ui32& dayOfYear, ui32& weekOfYear, ui32& dayOfWeek, ui16 tzId) const { - ui32 unusedWeekOfYearIso8601 = 0; - return ::NKikimr::NMiniKQL::SplitTzDate(value, year, month, day, dayOfYear, weekOfYear, unusedWeekOfYearIso8601, dayOfWeek, tzId); + ui32 unusedWeekOfYearIso8601 = 0; + return ::NKikimr::NMiniKQL::SplitTzDate(value, year, month, day, dayOfYear, weekOfYear, unusedWeekOfYearIso8601, dayOfWeek, tzId); +} + +bool TDefaultValueBuilder::FullSplitDate2(ui16 value, ui32& year, ui32& month, ui32& day, + ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId) const { + return ::NKikimr::NMiniKQL::SplitTzDate(value, year, month, day, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, tzId); } -bool TDefaultValueBuilder::FullSplitDate2(ui16 value, ui32& year, ui32& month, ui32& day, - ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId) const { - return ::NKikimr::NMiniKQL::SplitTzDate(value, year, month, day, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, tzId); -} - bool TDefaultValueBuilder::FullSplitDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& minute, ui32& second, ui32& dayOfYear, ui32& weekOfYear, ui32& dayOfWeek, ui16 tzId) const { - ui32 unusedWeekOfYearIso8601 = 0; - return ::NKikimr::NMiniKQL::SplitTzDatetime(value, year, month, day, hour, minute, second, dayOfYear, weekOfYear, unusedWeekOfYearIso8601, dayOfWeek, tzId); + ui32 unusedWeekOfYearIso8601 = 0; + return ::NKikimr::NMiniKQL::SplitTzDatetime(value, year, month, day, hour, minute, second, dayOfYear, weekOfYear, unusedWeekOfYearIso8601, dayOfWeek, tzId); +} + +bool TDefaultValueBuilder::FullSplitDatetime2(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& minute, ui32& second, + ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId) const { + return ::NKikimr::NMiniKQL::SplitTzDatetime(value, year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, tzId); } -bool TDefaultValueBuilder::FullSplitDatetime2(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& minute, ui32& second, - ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId) const { - return ::NKikimr::NMiniKQL::SplitTzDatetime(value, year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, tzId); -} - bool TDefaultValueBuilder::EnrichDate(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& dayOfWeek) const { - ui32 unusedWeekOfYearIso8601 = 0; - return ::NKikimr::NMiniKQL::EnrichDate(date, dayOfYear, weekOfYear, unusedWeekOfYearIso8601, dayOfWeek); + ui32 unusedWeekOfYearIso8601 = 0; + return ::NKikimr::NMiniKQL::EnrichDate(date, dayOfYear, weekOfYear, unusedWeekOfYearIso8601, dayOfWeek); +} + +bool TDefaultValueBuilder::EnrichDate2(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const { + return ::NKikimr::NMiniKQL::EnrichDate(date, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); } -bool TDefaultValueBuilder::EnrichDate2(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const { - return ::NKikimr::NMiniKQL::EnrichDate(date, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); -} - bool TDefaultValueBuilder::GetTimezoneShift(ui32 year, ui32 month, ui32 day, ui32 hour, ui32 minute, ui32 second, ui16 tzId, i32& value) const { return ::NKikimr::NMiniKQL::GetTimezoneShift(year, month, day, hour, minute, second, tzId, value); diff --git a/ydb/library/yql/minikql/computation/mkql_value_builder.h b/ydb/library/yql/minikql/computation/mkql_value_builder.h index 39cfa8fd1ed..b293b263a3d 100644 --- a/ydb/library/yql/minikql/computation/mkql_value_builder.h +++ b/ydb/library/yql/minikql/computation/mkql_value_builder.h @@ -80,12 +80,12 @@ public: bool FindTimezoneName(ui32 id, NUdf::TStringRef& name) const final; bool FindTimezoneId(const NUdf::TStringRef& name, ui32& id) const final; - bool EnrichDate2(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const final; - bool FullSplitDate2(ui16 value, ui32& year, ui32& month, ui32& day, - ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 timezoneId = 0) const final; - bool FullSplitDatetime2(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& minute, ui32& second, - ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 timezoneId = 0) const final; - + bool EnrichDate2(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const final; + bool FullSplitDate2(ui16 value, ui32& year, ui32& month, ui32& day, + ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 timezoneId = 0) const final; + bool FullSplitDatetime2(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& minute, ui32& second, + ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 timezoneId = 0) const final; + private: const THolderFactory& HolderFactory_; NUdf::EValidatePolicy Policy_; diff --git a/ydb/library/yql/minikql/mkql_type_ops.cpp b/ydb/library/yql/minikql/mkql_type_ops.cpp index 5c6eba041c0..d559bb108ce 100644 --- a/ydb/library/yql/minikql/mkql_type_ops.cpp +++ b/ydb/library/yql/minikql/mkql_type_ops.cpp @@ -671,7 +671,7 @@ public: ui32 dayOfYear = 365; ui32 dayOfWeek = 2; ui32 weekOfYear = 52; - ui32 weekOfYearIso8601 = 1; + ui32 weekOfYearIso8601 = 1; for (ui16 date = 0; date < Days_.size(); ++date) { ui32 year, month, day; @@ -681,11 +681,11 @@ public: if (++dayOfWeek > 7) { dayOfWeek = 1; ++weekOfYear; - if ((month == 12 && day >= 29) || (month == 1 && day <= 4)) { - weekOfYearIso8601 = 1; - } else { - ++weekOfYearIso8601; - } + if ((month == 12 && day >= 29) || (month == 1 && day <= 4)) { + weekOfYearIso8601 = 1; + } else { + ++weekOfYearIso8601; + } } if (year > prevYear) { @@ -695,7 +695,7 @@ public: weekOfYear = 1; } - Days_[date] = TDayInfo{month, day, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek}; + Days_[date] = TDayInfo{month, day, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek}; } } @@ -755,7 +755,7 @@ public: return true; } - bool EnrichByOffset(ui16 value, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const { + bool EnrichByOffset(ui16 value, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const { if (Y_UNLIKELY(value >= Days_.size())) { return false; } @@ -763,13 +763,13 @@ public: auto& info = Days_[value]; dayOfYear = info.DayOfYear; weekOfYear = info.WeekOfYear; - weekOfYearIso8601 = info.WeekOfYearIso8601; + weekOfYearIso8601 = info.WeekOfYearIso8601; dayOfWeek = info.DayOfWeek; return true; } - bool EnrichDate(ui16 value, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const { - return EnrichByOffset(++value, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); + bool EnrichDate(ui16 value, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const { + return EnrichByOffset(++value, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); } static const TDateTable& Instance() { @@ -786,7 +786,7 @@ private: ui32 Day : 5; ui32 DayOfYear : 9; ui32 WeekOfYear : 6; - ui32 WeekOfYearIso8601: 6; + ui32 WeekOfYearIso8601: 6; ui32 DayOfWeek : 3; }; @@ -891,7 +891,7 @@ bool SplitTzDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, } } -bool SplitTzDate(ui16 value, ui32& year, ui32& month, ui32& day, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId) { +bool SplitTzDate(ui16 value, ui32& year, ui32& month, ui32& day, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId) { if (tzId) { if (value >= NUdf::MAX_DATE) { return false; @@ -907,10 +907,10 @@ bool SplitTzDate(ui16 value, ui32& year, ui32& month, ui32& day, ui32& dayOfYear } else { return false; } - return TDateTable::Instance().EnrichByOffset(value, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); + return TDateTable::Instance().EnrichByOffset(value, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); } -bool SplitTzDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& min, ui32& sec, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId) { +bool SplitTzDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& min, ui32& sec, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId) { ui16 offset; if (tzId) { if (value >= NUdf::MAX_DATETIME) { @@ -926,11 +926,11 @@ bool SplitTzDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, return false; } - return TDateTable::Instance().EnrichByOffset(offset, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); + return TDateTable::Instance().EnrichByOffset(offset, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); } -bool EnrichDate(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) { - return TDateTable::Instance().EnrichDate(date, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); +bool EnrichDate(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) { + return TDateTable::Instance().EnrichDate(date, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek); } bool GetTimezoneShift(ui32 year, ui32 month, ui32 day, ui32 hour, ui32 min, ui32 sec, ui16 tzId, i32& value) { diff --git a/ydb/library/yql/minikql/mkql_type_ops.h b/ydb/library/yql/minikql/mkql_type_ops.h index 5317bdac948..8ff9b258ddf 100644 --- a/ydb/library/yql/minikql/mkql_type_ops.h +++ b/ydb/library/yql/minikql/mkql_type_ops.h @@ -40,12 +40,12 @@ bool SplitDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, u bool SplitTimestamp(ui64 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& min, ui32& sec, ui32& usec); bool SplitInterval(i64 value, bool& sign, ui32& day, ui32& hour, ui32& min, ui32& sec, ui32& usec); -bool SplitTzDate(ui16 value, ui32& year, ui32& month, ui32& day, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId); -bool SplitTzDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& min, ui32& sec, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId); +bool SplitTzDate(ui16 value, ui32& year, ui32& month, ui32& day, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId); +bool SplitTzDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& min, ui32& sec, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 tzId); bool MakeTzDatetime(ui32 year, ui32 month, ui32 day, ui32 hour, ui32 min, ui32 sec, ui32& value, ui16 tzId); bool SplitTzDatetime(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& min, ui32& sec, ui16 tzId); -bool EnrichDate(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek); +bool EnrichDate(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek); bool GetTimezoneShift(ui32 year, ui32 month, ui32 day, ui32 hour, ui32 min, ui32 sec, ui16 tzId, i32& value); ui16 InitTimezones(); diff --git a/ydb/library/yql/public/udf/udf_value_builder.h b/ydb/library/yql/public/udf/udf_value_builder.h index 11e5087e5d2..096f735a2b1 100644 --- a/ydb/library/yql/public/udf/udf_value_builder.h +++ b/ydb/library/yql/public/udf/udf_value_builder.h @@ -80,21 +80,21 @@ public: }; #endif -#if UDF_ABI_COMPATIBILITY_VERSION_CURRENT >= UDF_ABI_COMPATIBILITY_VERSION(2, 24) -class IDateBuilder3: public IDateBuilder2 -{ -public: - virtual bool EnrichDate2(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const = 0; - virtual bool FullSplitDate2(ui16 value, ui32& year, ui32& month, ui32& day, - ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 timezoneId = 0) const = 0; - virtual bool FullSplitDatetime2(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& minute, ui32& second, - ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 timezoneId = 0) const = 0; -}; -#endif - -#if UDF_ABI_COMPATIBILITY_VERSION_CURRENT >= UDF_ABI_COMPATIBILITY_VERSION(2, 24) -class IDateBuilder: public IDateBuilder3 {}; -#elif UDF_ABI_COMPATIBILITY_VERSION_CURRENT >= UDF_ABI_COMPATIBILITY_VERSION(2, 7) +#if UDF_ABI_COMPATIBILITY_VERSION_CURRENT >= UDF_ABI_COMPATIBILITY_VERSION(2, 24) +class IDateBuilder3: public IDateBuilder2 +{ +public: + virtual bool EnrichDate2(ui16 date, ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek) const = 0; + virtual bool FullSplitDate2(ui16 value, ui32& year, ui32& month, ui32& day, + ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 timezoneId = 0) const = 0; + virtual bool FullSplitDatetime2(ui32 value, ui32& year, ui32& month, ui32& day, ui32& hour, ui32& minute, ui32& second, + ui32& dayOfYear, ui32& weekOfYear, ui32& weekOfYearIso8601, ui32& dayOfWeek, ui16 timezoneId = 0) const = 0; +}; +#endif + +#if UDF_ABI_COMPATIBILITY_VERSION_CURRENT >= UDF_ABI_COMPATIBILITY_VERSION(2, 24) +class IDateBuilder: public IDateBuilder3 {}; +#elif UDF_ABI_COMPATIBILITY_VERSION_CURRENT >= UDF_ABI_COMPATIBILITY_VERSION(2, 7) class IDateBuilder: public IDateBuilder2 {}; #else class IDateBuilder: public IDateBuilder1 {}; diff --git a/ydb/library/yql/public/udf/udf_version.h b/ydb/library/yql/public/udf/udf_version.h index ba36779aeef..e31e518d44f 100644 --- a/ydb/library/yql/public/udf/udf_version.h +++ b/ydb/library/yql/public/udf/udf_version.h @@ -7,7 +7,7 @@ namespace NYql { namespace NUdf { #define CURRENT_UDF_ABI_VERSION_MAJOR 2 -#define CURRENT_UDF_ABI_VERSION_MINOR 24 +#define CURRENT_UDF_ABI_VERSION_MINOR 24 #define CURRENT_UDF_ABI_VERSION_PATCH 0 #ifdef USE_CURRENT_UDF_ABI_VERSION diff --git a/ydb/library/yql/udfs/common/datetime2/datetime_udf.cpp b/ydb/library/yql/udfs/common/datetime2/datetime_udf.cpp index ad40842e4c1..763fea8024f 100644 --- a/ydb/library/yql/udfs/common/datetime2/datetime_udf.cpp +++ b/ydb/library/yql/udfs/common/datetime2/datetime_udf.cpp @@ -22,7 +22,7 @@ namespace { unsigned int Year : 12; unsigned int DayOfYear : 9; unsigned int WeekOfYear : 6; - unsigned int WeekOfYearIso8601 : 6; + unsigned int WeekOfYearIso8601 : 6; unsigned int DayOfWeek : 3; unsigned int Month : 4; unsigned int Day : 5; @@ -48,9 +48,9 @@ namespace { } inline void FromDate(const IDateBuilder& builder, ui16 value, ui16 timezoneId = 0) { - ui32 year, month, day, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek; + ui32 year, month, day, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek; - if (!builder.FullSplitDate2(value, year, month, day, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, timezoneId)) { + if (!builder.FullSplitDate2(value, year, month, day, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, timezoneId)) { ythrow yexception() << "Error in FullSplitDate"; } @@ -62,7 +62,7 @@ namespace { DayOfYear = dayOfYear; WeekOfYear = weekOfYear; - WeekOfYearIso8601 = weekOfYearIso8601; + WeekOfYearIso8601 = weekOfYearIso8601; DayOfWeek = dayOfWeek; } @@ -83,9 +83,9 @@ namespace { } inline void FromDatetime(const IDateBuilder& builder, ui32 value, ui16 timezoneId = 0) { - ui32 year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek; + ui32 year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek; - if (!builder.FullSplitDatetime2(value, year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, timezoneId)) { + if (!builder.FullSplitDatetime2(value, year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, timezoneId)) { ythrow yexception() << "Error in FullSplitDatetime"; } @@ -99,7 +99,7 @@ namespace { DayOfYear = dayOfYear; WeekOfYear = weekOfYear; - WeekOfYearIso8601 = weekOfYearIso8601; + WeekOfYearIso8601 = weekOfYearIso8601; DayOfWeek = dayOfWeek; } @@ -127,14 +127,14 @@ namespace { return false; } - ui32 year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek; - if (!builder.FullSplitDatetime2(datetime, year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, TimezoneId)) { + ui32 year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek; + if (!builder.FullSplitDatetime2(datetime, year, month, day, hour, minute, second, dayOfYear, weekOfYear, weekOfYearIso8601, dayOfWeek, TimezoneId)) { ythrow yexception() << "Error in FullSplitDatetime."; } DayOfYear = dayOfYear; WeekOfYear = weekOfYear; - WeekOfYearIso8601 = weekOfYearIso8601; + WeekOfYearIso8601 = weekOfYearIso8601; DayOfWeek = dayOfWeek; return true; @@ -175,7 +175,7 @@ namespace { ACCESSORS(Year, ui16) ACCESSORS(DayOfYear, ui16) ACCESSORS(WeekOfYear, ui8) - ACCESSORS(WeekOfYearIso8601, ui8) + ACCESSORS(WeekOfYearIso8601, ui8) ACCESSORS(DayOfWeek, ui8) ACCESSORS(Month, ui8) ACCESSORS(Day, ui8) @@ -504,7 +504,7 @@ namespace { } GET_METHOD(WeekOfYear, ui8) - GET_METHOD(WeekOfYearIso8601, ui8) + GET_METHOD(WeekOfYearIso8601, ui8) SIMPLE_UDF(TGetDayOfMonth, ui8(TAutoMap<TResource<TMResourceName>>)) { Y_UNUSED(valueBuilder); @@ -1660,7 +1660,7 @@ namespace { TGetMonth, TGetMonthName, TGetWeekOfYear, - TGetWeekOfYearIso8601, + TGetWeekOfYearIso8601, TGetDayOfMonth, TGetDayOfWeek, TGetDayOfWeekName, diff --git a/ydb/library/yql/udfs/common/datetime2/ya.make b/ydb/library/yql/udfs/common/datetime2/ya.make index 1e5cd7080f0..3d0db781edc 100644 --- a/ydb/library/yql/udfs/common/datetime2/ya.make +++ b/ydb/library/yql/udfs/common/datetime2/ya.make @@ -2,7 +2,7 @@ YQL_UDF(datetime2_udf) YQL_ABI_VERSION( 2 - 24 + 24 0 ) |