[release-18.0] evalengine: Fix week overflow (#14859) (#14861)

Signed-off-by: Manan Gupta <[email protected]> Co-authored-by: Dirkjan Bussink <[email protected]> Co-authored-by: Manan Gupta <[email protected]>
vitessio · Dec 27, 2023 · 770f16e · 770f16e
1 parent 142a074
commit 770f16e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/go/mysql/datetime/datetime.go b/go/mysql/datetime/datetime.go
@@ -315,12 +315,16 @@ func (d Date) Week(mode int) int {
 		year, week := d.SundayWeek()
 		if year < d.Year() {
 			return 0
+		} else if year > d.Year() {
+			return 53
 		}
 		return week
 	case 1:
 		year, week := d.ISOWeek()
 		if year < d.Year() {
 			return 0
+		} else if year > d.Year() {
+			return 53
 		}
 		return week
 	case 2:
@@ -333,12 +337,16 @@ func (d Date) Week(mode int) int {
 		year, week := d.Sunday4DayWeek()
 		if year < d.Year() {
 			return 0
+		} else if year > d.Year() {
+			return 53
 		}
 		return week
 	case 5:
 		year, week := d.MondayWeek()
 		if year < d.Year() {
 			return 0
+		} else if year > d.Year() {
+			return 53
 		}
 		return week
 	case 6:

diff --git a/go/test/endtoend/reparent/plannedreparent/reparent_test.go b/go/test/endtoend/reparent/plannedreparent/reparent_test.go
@@ -295,7 +295,7 @@ func TestReparentWithDownReplica(t *testing.T) {
 		// insert data into the new primary, check the connected replica work
 		insertVal = utils.ConfirmReplication(t, tablets[1], []*cluster.Vttablet{tablets[0], tablets[3]})
 	} else {
-		assert.Contains(t, out, fmt.Sprintf("TabletManager.PrimaryStatus on %s error", tablets[2].Alias))
+		assert.Contains(t, out, fmt.Sprintf("TabletManager.PrimaryStatus on %s", tablets[2].Alias))
 		// insert data into the old primary, check the connected replica works. The primary tablet shouldn't have changed.
 		insertVal = utils.ConfirmReplication(t, tablets[0], []*cluster.Vttablet{tablets[1], tablets[3]})
 	}

diff --git a/go/vt/vtgate/evalengine/compiler_test.go b/go/vt/vtgate/evalengine/compiler_test.go
@@ -487,6 +487,22 @@ func TestCompilerSingle(t *testing.T) {
 			expression: `case when null is null then 23 else null end`,
 			result:     `INT64(23)`,
 		},
+		{
+			expression: `week('2023-12-31', 4)`,
+			result:     `INT64(53)`,
+		},
+		{
+			expression: `week('2023-12-31', 2)`,
+			result:     `INT64(53)`,
+		},
+		{
+			expression: `week('2024-12-31', 1)`,
+			result:     `INT64(53)`,
+		},
+		{
+			expression: `week('2024-12-31', 5)`,
+			result:     `INT64(53)`,
+		},
 	}
 
 	for _, tc := range testCases {