Skip to content

Commit

Permalink
[fix](months_diff) fix wrong result of months_diff (apache#25577)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jacktengg
jacktengg authored Oct 19, 2023
1 parent 3d1206d commit e77b98b
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 10 deletions.
26 changes: 16 additions & 10 deletions be/src/vec/runtime/vdatetime_value.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ static constexpr uint32_t MIN_YEAR = 0;

static constexpr uint32_t DATEV2_YEAR_WIDTH = 23;
static constexpr uint32_t DATETIMEV2_YEAR_WIDTH = 18;
static constexpr uint32_t DATETIMEV2_MONTH_WIDTH = 4;

static RE2 time_zone_offset_format_reg("^[+-]{1}\\d{2}\\:\\d{2}$");

Expand Down Expand Up @@ -1336,8 +1337,9 @@ int64_t datetime_diff(const DateV2Value<T0>& ts_value1, const DateV2Value<T1>& t
int month = (ts_value2.year() - ts_value1.year()) * 12 +
(ts_value2.month() - ts_value1.month());
if constexpr (std::is_same_v<T0, T1>) {
int shift_bits = DateV2Value<T0>::is_datetime ? DATETIMEV2_YEAR_WIDTH + 5
: DATEV2_YEAR_WIDTH + 5;
int shift_bits = DateV2Value<T0>::is_datetime
? DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH
: DATEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH;
decltype(ts_value2.to_date_int_val()) minus_one = -1;
if (month > 0) {
month -= ((ts_value2.to_date_int_val() & (minus_one >> shift_bits)) <
Expand All @@ -1350,23 +1352,27 @@ int64_t datetime_diff(const DateV2Value<T0>& ts_value1, const DateV2Value<T1>& t
auto ts1_int_value = ((uint64_t)ts_value1.to_date_int_val()) << TIME_PART_LENGTH;
if (month > 0) {
month -= ((ts_value2.to_date_int_val() &
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + 5))) <
(ts1_int_value & (uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + 5))));
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH))) <
(ts1_int_value &
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH))));
} else if (month < 0) {
month += ((ts_value2.to_date_int_val() &
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + 5))) >
(ts1_int_value & (uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + 5))));
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH))) >
(ts1_int_value &
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH))));
}
} else {
auto ts2_int_value = ((uint64_t)ts_value2.to_date_int_val()) << TIME_PART_LENGTH;
if (month > 0) {
month -= ((ts2_int_value & (uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + 5))) <
month -= ((ts2_int_value &
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH))) <
(ts_value1.to_date_int_val() &
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + 5))));
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH))));
} else if (month < 0) {
month += ((ts2_int_value & (uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + 5))) >
month += ((ts2_int_value &
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH))) >
(ts_value1.to_date_int_val() &
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + 5))));
(uint64_minus_one >> (DATETIMEV2_YEAR_WIDTH + DATETIMEV2_MONTH_WIDTH))));
}
}
return month;
Expand Down
48 changes: 48 additions & 0 deletions regression-test/data/nereids_function_p0/scalar_function/M.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2957,3 +2957,51 @@ March
-2588750725983543588
-2588750725983543588

-- !bugfix_months_diff_1 --
575

-- !bugfix_months_diff_2 --
575

-- !bugfix_months_diff_3 --
575

-- !bugfix_months_diff_4 --
1

-- !bugfix_months_diff_5 --
1

-- !bugfix_months_diff_6 --
0

-- !bugfix_months_diff_7 --
0

-- !bugfix_months_diff_8 --
0

-- !bugfix_months_diff_9 --
1

-- !bugfix_months_diff_10 --
1

-- !bugfix_months_diff_11 --
1

-- !bugfix_months_diff_12 --
0

-- !bugfix_months_diff_13 --
1

-- !bugfix_months_diff_14 --
1

-- !bugfix_months_diff_16 --
1

-- !bugfix_months_diff_17 --
1

27 changes: 27 additions & 0 deletions regression-test/suites/nereids_function_p0/scalar_function/M.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,31 @@ suite("nereids_scalar_fn_M") {
qt_sql_murmur_hash3_64_Varchar_notnull "select murmur_hash3_64(kvchrs1) from fn_test_not_nullable order by kvchrs1"
qt_sql_murmur_hash3_64_String "select murmur_hash3_64(kstr) from fn_test order by kstr"
qt_sql_murmur_hash3_64_String_notnull "select murmur_hash3_64(kstr) from fn_test_not_nullable order by kstr"

// bugfix
qt_bugfix_months_diff_1 "select months_diff('2023-10-14 00:00:00', '1975-10-18 00:00:00');"
qt_bugfix_months_diff_2 "select months_diff(cast('2023-10-14' as datev2), cast('1975-10-18 00:00:00' as datetimev2));"
qt_bugfix_months_diff_3 "select months_diff(cast('2023-10-14 00:00:00' as datetimev2), cast('1975-10-18' as datev2));"

// 2023.2, max day is 28
qt_bugfix_months_diff_4 "select months_diff('2023-02-28 00:00:00', '2023-01-27 00:00:00');"
qt_bugfix_months_diff_5 "select months_diff('2023-02-28 00:00:00', '2023-01-28 00:00:00');"
qt_bugfix_months_diff_6 "select months_diff('2023-02-28 00:00:00', '2023-01-29 00:00:00');"
qt_bugfix_months_diff_7 "select months_diff('2023-02-28 00:00:00', '2023-01-31 00:00:00');"

qt_bugfix_months_diff_8 "select months_diff('2023-03-27 00:00:00', '2023-02-28 00:00:00');"
qt_bugfix_months_diff_9 "select months_diff('2023-03-28 00:00:00', '2023-02-28 00:00:00');"

// 2023.3, max day is 31
// 2023.4, max day is 30
// 2023.5, max day is 31
qt_bugfix_months_diff_10 "select months_diff('2023-04-30 00:00:00', '2023-03-29 00:00:00');"
qt_bugfix_months_diff_11 "select months_diff('2023-04-30 00:00:00', '2023-03-30 00:00:00');"
qt_bugfix_months_diff_12 "select months_diff('2023-04-30 00:00:00', '2023-03-31 00:00:00');"

qt_bugfix_months_diff_13 "select months_diff('2023-05-30 00:00:00', '2023-04-29 00:00:00');"
qt_bugfix_months_diff_14 "select months_diff('2023-05-30 00:00:00', '2023-04-30 00:00:00');"

qt_bugfix_months_diff_16 "select months_diff('2023-05-31 00:00:00', '2023-04-29 00:00:00');"
qt_bugfix_months_diff_17 "select months_diff('2023-05-31 00:00:00', '2023-04-30 00:00:00');"
}

0 comments on commit e77b98b

Please sign in to comment.