From 6acb5ab5a18a453d45231d51f14cc2e51d11b207 Mon Sep 17 00:00:00 2001 From: Yarik Briukhovetskyi <114298166+yariks5s@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:52:23 +0200 Subject: [PATCH] add Date32 support --- src/Functions/toStartOfInterval.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp index b2b0c2dbfed..77c72e5b5f2 100644 --- a/src/Functions/toStartOfInterval.cpp +++ b/src/Functions/toStartOfInterval.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include @@ -118,16 +117,18 @@ public: "A timezone argument of function {} with interval type {} is allowed only when the 1st argument has the type DateTime or DateTime64", getName(), interval_type->getKind().toString()); } - else if (isDate(type_arg3) || isDateTime(type_arg3) || isDateTime64(type_arg3)) + else if (isDateOrDate32OrDateTimeOrDateTime64(type_arg3)) { overload = Overload::Origin; const DataTypePtr & type_arg1 = arguments[0].type; - if (isDateTime64(type_arg1) && isDateTime64(type_arg3)) - result_type = ResultType::DateTime64; + if (isDate(type_arg1) && isDate(type_arg3)) + result_type = ResultType::Date; + else if (isDate32(type_arg1) && isDate32(type_arg3)) + result_type = ResultType::Date32; else if (isDateTime(type_arg1) && isDateTime(type_arg3)) result_type = ResultType::DateTime; - else if (isDate(type_arg1) && isDate(type_arg3)) - result_type = ResultType::Date; + else if (isDateTime64(type_arg1) && isDateTime64(type_arg3)) + result_type = ResultType::DateTime64; else throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Datetime argument and origin argument for function {} must have the same type", getName()); } @@ -230,6 +231,8 @@ public: ColumnPtr result_column; if (isDate(result_type)) result_column = dispatchForTimeColumn(time_column, interval_column, origin_column, result_type, time_zone); + else if (isDate32(result_type)) + result_column = dispatchForTimeColumn(time_column, interval_column, origin_column, result_type, time_zone); else if (isDateTime(result_type)) result_column = dispatchForTimeColumn(time_column, interval_column, origin_column, result_type, time_zone); else if (isDateTime64(result_type)) @@ -357,7 +360,7 @@ private: if (origin_column.column) // Overload: Origin { const bool is_small_interval = (unit == IntervalKind::Kind::Nanosecond || unit == IntervalKind::Kind::Microsecond || unit == IntervalKind::Kind::Millisecond); - const bool is_result_date = isDate(result_type); + const bool is_result_date = isDateOrDate32(result_type); Int64 result_scale = scale_multiplier; Int64 origin_scale = 1;