From 212af875d2aab457cdabb7a63168861472559eb8 Mon Sep 17 00:00:00 2001
From: Rohit Satardekar <rohitrs1983@gmail.com>
Date: Mon, 16 Sep 2024 13:04:21 +0530
Subject: [PATCH 1/2] [BugFix] fix incorrect result of yearweek

---
 be/src/exprs/time_functions.cpp        | 11 -----------
 test/sql/test_datetime/R/test_yearweek |  5 +++++
 test/sql/test_datetime/T/test_yearweek |  2 ++
 3 files changed, 7 insertions(+), 11 deletions(-)
 create mode 100644 test/sql/test_datetime/R/test_yearweek
 create mode 100644 test/sql/test_datetime/T/test_yearweek

diff --git a/be/src/exprs/time_functions.cpp b/be/src/exprs/time_functions.cpp
index adc1c2fcae4ff..f1db812afd81b 100644
--- a/be/src/exprs/time_functions.cpp
+++ b/be/src/exprs/time_functions.cpp
@@ -571,17 +571,6 @@ DEFINE_BINARY_FUNCTION_WITH_IMPL(year_week_with_modeImpl, t, m) {
     date_value.to_date(&year, &month, &day);
     uint to_year = 0;
     int week = TimeFunctions::compute_week(year, month, day, TimeFunctions::week_mode(m | 2), &to_year);
-
-    if (week == 53 && day >= 29 && !(m & 4)) {
-        int monday_first = m & WEEK_MONDAY_FIRST;
-        int daynr_of_last_day = TimeFunctions::compute_daynr(year, 12, 31);
-        int weekday_of_last_day = TimeFunctions::compute_weekday(daynr_of_last_day, !monday_first);
-
-        if (weekday_of_last_day - monday_first < 2) {
-            ++to_year;
-            week = 1;
-        }
-    }
     return to_year * 100 + week;
 }
 DEFINE_TIME_BINARY_FN(year_week_with_mode, TYPE_DATETIME, TYPE_INT, TYPE_INT);
diff --git a/test/sql/test_datetime/R/test_yearweek b/test/sql/test_datetime/R/test_yearweek
new file mode 100644
index 0000000000000..35613cc7a766c
--- /dev/null
+++ b/test/sql/test_datetime/R/test_yearweek
@@ -0,0 +1,5 @@
+-- name: test_yearweek
+select yearweek('2023-12-31', 2), yearweek('2024-01-01', 2);
+-- result:
+202353	202353
+-- !result
diff --git a/test/sql/test_datetime/T/test_yearweek b/test/sql/test_datetime/T/test_yearweek
new file mode 100644
index 0000000000000..d37e600df0b2f
--- /dev/null
+++ b/test/sql/test_datetime/T/test_yearweek
@@ -0,0 +1,2 @@
+-- name: test_yearweek
+select yearweek('2023-12-31', 2), yearweek('2024-01-01', 2);

From 3eaf635af6c659ece05868fcc9dc2d721ed39804 Mon Sep 17 00:00:00 2001
From: Rohit Satardekar <rohitrs1983@gmail.com>
Date: Fri, 20 Sep 2024 19:57:44 +0530
Subject: [PATCH 2/2] [BugFix] fix incorrect result of yearweek

Signed-off-by: Rohit Satardekar <rohitrs1983@gmail.com>
---
 test/sql/test_datetime/R/test_yearweek | 96 ++++++++++++++++++++++++++
 test/sql/test_datetime/T/test_yearweek | 24 +++++++
 2 files changed, 120 insertions(+)

diff --git a/test/sql/test_datetime/R/test_yearweek b/test/sql/test_datetime/R/test_yearweek
index 35613cc7a766c..08162f1088b84 100644
--- a/test/sql/test_datetime/R/test_yearweek
+++ b/test/sql/test_datetime/R/test_yearweek
@@ -3,3 +3,99 @@ select yearweek('2023-12-31', 2), yearweek('2024-01-01', 2);
 -- result:
 202353	202353
 -- !result
+select yearweek('1900-01-01', 0), yearweek('1900-12-31', 0), yearweek('2000-01-01', 0), yearweek('2000-12-31', 0);
+-- result:
+189953	190052	199952	200053
+-- !result
+select yearweek('1900-01-01', 1), yearweek('1900-12-31', 1), yearweek('2000-01-01', 1), yearweek('2000-12-31', 1);
+-- result:
+190001	190101	199952	200052
+-- !result
+select yearweek('1900-01-01', 2), yearweek('1900-12-31', 2), yearweek('2000-01-01', 2), yearweek('2000-12-31', 2);
+-- result:
+189953	190052	199952	200053
+-- !result
+select yearweek('1900-01-01', 3), yearweek('1900-12-31', 3), yearweek('2000-01-01', 3), yearweek('2000-12-31', 3);
+-- result:
+190001	190101	199952	200052
+-- !result
+select yearweek('1900-01-01', 4), yearweek('1900-12-31', 4), yearweek('2000-01-01', 4), yearweek('2000-12-31', 4);
+-- result:
+190001	190101	199952	200101
+-- !result
+select yearweek('1900-01-01', 5), yearweek('1900-12-31', 5), yearweek('2000-01-01', 5), yearweek('2000-12-31', 5);
+-- result:
+190001	190053	199952	200052
+-- !result
+select yearweek('1900-01-01', 6), yearweek('1900-12-31', 6), yearweek('2000-01-01', 6), yearweek('2000-12-31', 6);
+-- result:
+190001	190101	199952	200101
+-- !result
+select yearweek('1900-01-01', 7), yearweek('1900-12-31', 7), yearweek('2000-01-01', 7), yearweek('2000-12-31', 7);
+-- result:
+190001	190053	199952	200052
+-- !result
+select yearweek('1910-01-05', 0), yearweek('1910-12-27', 0), yearweek('2010-01-05', 0), yearweek('2010-12-27', 0);
+-- result:
+191001	191052	201001	201052
+-- !result
+select yearweek('1910-01-05', 1), yearweek('1910-12-27', 1), yearweek('2010-01-05', 1), yearweek('2010-12-27', 1);
+-- result:
+191001	191052	201001	201052
+-- !result
+select yearweek('1910-01-05', 2), yearweek('1910-12-27', 2), yearweek('2010-01-05', 2), yearweek('2010-12-27', 2);
+-- result:
+191001	191052	201001	201052
+-- !result
+select yearweek('1910-01-05', 3), yearweek('1910-12-27', 3), yearweek('2010-01-05', 3), yearweek('2010-12-27', 3);
+-- result:
+191001	191052	201001	201052
+-- !result
+select yearweek('1910-01-05', 4), yearweek('1910-12-27', 4), yearweek('2010-01-05', 4), yearweek('2010-12-27', 4);
+-- result:
+191001	191052	201001	201052
+-- !result
+select yearweek('1910-01-05', 5), yearweek('1910-12-27', 5), yearweek('2010-01-05', 5), yearweek('2010-12-27', 5);
+-- result:
+191001	191052	201001	201052
+-- !result
+select yearweek('1910-01-05', 6), yearweek('1910-12-27', 6), yearweek('2010-01-05', 6), yearweek('2010-12-27', 6);
+-- result:
+191001	191052	201001	201052
+-- !result
+select yearweek('1910-01-05', 7), yearweek('1910-12-27', 7), yearweek('2010-01-05', 7), yearweek('2010-12-27', 7);
+-- result:
+191001	191052	201001	201052
+-- !result
+select yearweek('1940-01-11', 0), yearweek('1940-12-21', 0), yearweek('2040-01-11', 0), yearweek('2040-12-21', 0);
+-- result:
+194001	194050	204002	204051
+-- !result
+select yearweek('1940-01-11', 1), yearweek('1940-12-21', 1), yearweek('2040-01-11', 1), yearweek('2040-12-21', 1);
+-- result:
+194002	194051	204002	204051
+-- !result
+select yearweek('1940-01-11', 2), yearweek('1940-12-21', 2), yearweek('2040-01-11', 2), yearweek('2040-12-21', 2);
+-- result:
+194001	194050	204002	204051
+-- !result
+select yearweek('1940-01-11', 3), yearweek('1940-12-21', 3), yearweek('2040-01-11', 3), yearweek('2040-12-21', 3);
+-- result:
+194002	194051	204002	204051
+-- !result
+select yearweek('1940-01-11', 4), yearweek('1940-12-21', 4), yearweek('2040-01-11', 4), yearweek('2040-12-21', 4);
+-- result:
+194002	194051	204002	204051
+-- !result
+select yearweek('1940-01-11', 5), yearweek('1940-12-21', 5), yearweek('2040-01-11', 5), yearweek('2040-12-21', 5);
+-- result:
+194002	194051	204002	204051
+-- !result
+select yearweek('1940-01-11', 6), yearweek('1940-12-21', 6), yearweek('2040-01-11', 6), yearweek('2040-12-21', 6);
+-- result:
+194002	194051	204002	204051
+-- !result
+select yearweek('1940-01-11', 7), yearweek('1940-12-21', 7), yearweek('2040-01-11', 7), yearweek('2040-12-21', 7);
+-- result:
+194002	194051	204002	204051
+-- !result
diff --git a/test/sql/test_datetime/T/test_yearweek b/test/sql/test_datetime/T/test_yearweek
index d37e600df0b2f..8d3d8a4634b3f 100644
--- a/test/sql/test_datetime/T/test_yearweek
+++ b/test/sql/test_datetime/T/test_yearweek
@@ -1,2 +1,26 @@
 -- name: test_yearweek
 select yearweek('2023-12-31', 2), yearweek('2024-01-01', 2);
+select yearweek('1900-01-01', 0), yearweek('1900-12-31', 0), yearweek('2000-01-01', 0), yearweek('2000-12-31', 0);
+select yearweek('1900-01-01', 1), yearweek('1900-12-31', 1), yearweek('2000-01-01', 1), yearweek('2000-12-31', 1);
+select yearweek('1900-01-01', 2), yearweek('1900-12-31', 2), yearweek('2000-01-01', 2), yearweek('2000-12-31', 2);
+select yearweek('1900-01-01', 3), yearweek('1900-12-31', 3), yearweek('2000-01-01', 3), yearweek('2000-12-31', 3);
+select yearweek('1900-01-01', 4), yearweek('1900-12-31', 4), yearweek('2000-01-01', 4), yearweek('2000-12-31', 4);
+select yearweek('1900-01-01', 5), yearweek('1900-12-31', 5), yearweek('2000-01-01', 5), yearweek('2000-12-31', 5);
+select yearweek('1900-01-01', 6), yearweek('1900-12-31', 6), yearweek('2000-01-01', 6), yearweek('2000-12-31', 6);
+select yearweek('1900-01-01', 7), yearweek('1900-12-31', 7), yearweek('2000-01-01', 7), yearweek('2000-12-31', 7);
+select yearweek('1910-01-05', 0), yearweek('1910-12-27', 0), yearweek('2010-01-05', 0), yearweek('2010-12-27', 0);
+select yearweek('1910-01-05', 1), yearweek('1910-12-27', 1), yearweek('2010-01-05', 1), yearweek('2010-12-27', 1);
+select yearweek('1910-01-05', 2), yearweek('1910-12-27', 2), yearweek('2010-01-05', 2), yearweek('2010-12-27', 2);
+select yearweek('1910-01-05', 3), yearweek('1910-12-27', 3), yearweek('2010-01-05', 3), yearweek('2010-12-27', 3);
+select yearweek('1910-01-05', 4), yearweek('1910-12-27', 4), yearweek('2010-01-05', 4), yearweek('2010-12-27', 4);
+select yearweek('1910-01-05', 5), yearweek('1910-12-27', 5), yearweek('2010-01-05', 5), yearweek('2010-12-27', 5);
+select yearweek('1910-01-05', 6), yearweek('1910-12-27', 6), yearweek('2010-01-05', 6), yearweek('2010-12-27', 6);
+select yearweek('1910-01-05', 7), yearweek('1910-12-27', 7), yearweek('2010-01-05', 7), yearweek('2010-12-27', 7);
+select yearweek('1940-01-11', 0), yearweek('1940-12-21', 0), yearweek('2040-01-11', 0), yearweek('2040-12-21', 0);
+select yearweek('1940-01-11', 1), yearweek('1940-12-21', 1), yearweek('2040-01-11', 1), yearweek('2040-12-21', 1);
+select yearweek('1940-01-11', 2), yearweek('1940-12-21', 2), yearweek('2040-01-11', 2), yearweek('2040-12-21', 2);
+select yearweek('1940-01-11', 3), yearweek('1940-12-21', 3), yearweek('2040-01-11', 3), yearweek('2040-12-21', 3);
+select yearweek('1940-01-11', 4), yearweek('1940-12-21', 4), yearweek('2040-01-11', 4), yearweek('2040-12-21', 4);
+select yearweek('1940-01-11', 5), yearweek('1940-12-21', 5), yearweek('2040-01-11', 5), yearweek('2040-12-21', 5);
+select yearweek('1940-01-11', 6), yearweek('1940-12-21', 6), yearweek('2040-01-11', 6), yearweek('2040-12-21', 6);
+select yearweek('1940-01-11', 7), yearweek('1940-12-21', 7), yearweek('2040-01-11', 7), yearweek('2040-12-21', 7);