executor: fix issue that query slow_query table return wrong result (#56356)

executor/cluster_table_test.go

@@ -131,15 +131,23 @@ select 7;`
 		},
 		{
 			sql:    "select count(*),min(time),max(time) from %s",
-			result: []string{"1|2020-05-14 19:03:54.314615|2020-05-14 19:03:54.314615"},
+			result: []string{"7|2020-02-15 18:00:01.000000|2020-05-14 19:03:54.314615"},
 		},
 		{
-			sql:    "select count(*),min(time) from %s where time > '2020-02-16 20:00:00'",
-			result: []string{"1|2020-02-17 18:00:05.000000"},
+			sql:    "select count(*),min(time),max(time) from %s where time > '2020-02-16 20:00:00'",
+			result: []string{"2|2020-02-17 18:00:05.000000|2020-05-14 19:03:54.314615"},
 		},
 		{
 			sql:    "select count(*) from %s where time > '2020-02-17 20:00:00'",
-			result: []string{"0"},
+			result: []string{"1"},
+		},
+		{
+			sql:    "select count(*) from %s where time > '1980-01-11 00:00:00'",
+			result: []string{"7"},
+		},
+		{
+			sql:    "select count(*) from %s where time < '2024-01-01 00:00:00'",
+			result: []string{"7"},
 		},
 		{
 			sql:    "select query from %s where time > '2019-01-26 21:51:00' and time < now()",

executor/slow_query.go

@@ -923,18 +923,6 @@ func (e *slowQueryRetriever) getAllFiles(ctx context.Context, sctx sessionctx.Co
 			e.stats.totalFileNum = totalFileNum
 		}()
 	}
-	if e.extractor == nil || !e.extractor.Enable {
-		totalFileNum = 1
-		//nolint: gosec
-		file, err := os.Open(logFilePath)
-		if err != nil {
-			if os.IsNotExist(err) {
-				return nil, nil
-			}
-			return nil, err
-		}
-		return []logFile{{file: file}}, nil
-	}
 	var logFiles []logFile
 	logDir := filepath.Dir(logFilePath)
 	ext := filepath.Ext(logFilePath)
@@ -978,32 +966,36 @@ func (e *slowQueryRetriever) getAllFiles(ctx context.Context, sctx sessionctx.Co
 			return handleErr(err)
 		}
 		start := types.NewTime(types.FromGoTime(fileStartTime), mysql.TypeDatetime, types.MaxFsp)
-		notInAllTimeRanges := true
-		for _, tr := range e.checker.timeRanges {
-			if start.Compare(tr.endTime) <= 0 {
-				notInAllTimeRanges = false
-				break
+		if e.checker.enableTimeCheck {
+			notInAllTimeRanges := true
+			for _, tr := range e.checker.timeRanges {
+				if start.Compare(tr.endTime) <= 0 {
+					notInAllTimeRanges = false
+					break
+				}
+			}
+			if notInAllTimeRanges {
+				return nil
 			}
-		}
-		if notInAllTimeRanges {
-			return nil
 		}
 
 		// Get the file end time.
 		fileEndTime, err := e.getFileEndTime(ctx, file)
 		if err != nil {
 			return handleErr(err)
 		}
-		end := types.NewTime(types.FromGoTime(fileEndTime), mysql.TypeDatetime, types.MaxFsp)
-		inTimeRanges := false
-		for _, tr := range e.checker.timeRanges {
-			if !(start.Compare(tr.endTime) > 0 || end.Compare(tr.startTime) < 0) {
-				inTimeRanges = true
-				break
+		if e.checker.enableTimeCheck {
+			end := types.NewTime(types.FromGoTime(fileEndTime), mysql.TypeDatetime, types.MaxFsp)
+			inTimeRanges := false
+			for _, tr := range e.checker.timeRanges {
+				if !(start.Compare(tr.endTime) > 0 || end.Compare(tr.startTime) < 0) {
+					inTimeRanges = true
+					break
+				}
+			}
+			if !inTimeRanges {
+				return nil
 			}
-		}
-		if !inTimeRanges {
-			return nil
 		}
 		_, err = file.Seek(0, io.SeekStart)
 		if err != nil {

executor/slow_query_test.go

@@ -434,8 +434,12 @@ select 7;`
 		{
 			startTime: "",
 			endTime:   "",
-			files:     []string{fileName3},
+			files:     []string{fileName1, fileName2, fileName3},
 			querys: []string{
+				"select 1;",
+				"select 2;",
+				"select 3;",
+				"select 4;",
 				"select 5;",
 				"select 6;",
 				"select 7;",

infoschema/cluster_tables_test.go

@@ -245,7 +245,7 @@ func TestSelectClusterTable(t *testing.T) {
 	tk.MustQuery("select query_time, conn_id from `CLUSTER_SLOW_QUERY` order by time limit 1").Check(testkit.Rows("4.895492 6"))
 	tk.MustQuery("select count(*) from `CLUSTER_SLOW_QUERY` group by digest").Check(testkit.Rows("1", "1"))
 	tk.MustQuery("select digest, count(*) from `CLUSTER_SLOW_QUERY` group by digest order by digest").Check(testkit.Rows("124acb3a0bec903176baca5f9da00b4e7512a41c93b417923f26502edeb324cc 1", "42a1c8aae6f133e934d4bf0147491709a8812ea05ff8819ec522780fe657b772 1"))
-	tk.MustQuery(`select length(query) as l,time from information_schema.cluster_slow_query where time > "2019-02-12 19:33:56" order by abs(l) desc limit 10;`).Check(testkit.Rows("21 2019-02-12 19:33:56.571953"))
+	tk.MustQuery(`select length(query) as l,time from information_schema.cluster_slow_query where time > "2019-02-12 19:33:56" order by abs(l) desc limit 10;`).Check(testkit.Rows("21 2019-02-12 19:33:56.571953", "16 2021-09-08 14:39:54.506967"))
 	tk.MustQuery("select count(*) from `CLUSTER_SLOW_QUERY` where time > now() group by digest").Check(testkit.Rows())
 	re := tk.MustQuery("select * from `CLUSTER_statements_summary`")
 	require.NotNil(t, re)

planner/core/memtable_predicate_extractor.go

@@ -1192,22 +1192,19 @@ func (e *SlowQueryExtractor) Extract(
 }
 
 func (e *SlowQueryExtractor) setTimeRange(start, end int64) {
-	const defaultSlowQueryDuration = 24 * time.Hour
-	var startTime, endTime time.Time
 	if start == 0 && end == 0 {
 		return
 	}
+	var startTime, endTime time.Time
 	if start != 0 {
 		startTime = e.convertToTime(start)
+	} else {
+		startTime, _ = types.MinDatetime.GoTime(time.UTC)
 	}
 	if end != 0 {
 		endTime = e.convertToTime(end)
-	}
-	if start == 0 {
-		startTime = endTime.Add(-defaultSlowQueryDuration)
-	}
-	if end == 0 {
-		endTime = startTime.Add(defaultSlowQueryDuration)
+	} else {
+		endTime, _ = types.MaxDatetime.GoTime(time.UTC)
 	}
 	timeRange := &TimeRange{
 		StartTime: startTime,