*: use std/slices to replace exp/slices

domain/BUILD.bazel

@@ -99,7 +99,6 @@ go_library(
         "@org_golang_google_grpc//backoff",
         "@org_golang_google_grpc//keepalive",
         "@org_golang_x_exp//maps",
-        "@org_golang_x_exp//slices",
         "@org_uber_go_atomic//:atomic",
         "@org_uber_go_zap//:zap",
     ],

domain/schema_validator.go

@@ -15,6 +15,7 @@
 package domain
 
 import (
+	"slices"
 	"sync"
 	"time"
 
@@ -26,7 +27,6 @@ import (
 	"github.com/tikv/client-go/v2/oracle"
 	"github.com/tikv/client-go/v2/txnkv/transaction"
 	"go.uber.org/zap"
-	"golang.org/x/exp/slices"
 )
 
 type checkResult int

executor/mem_reader.go

@@ -16,6 +16,7 @@ package executor
 
 import (
 	"context"
+	"slices"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/distsql"
@@ -33,7 +34,6 @@ import (
 	"github.com/pingcap/tidb/util/codec"
 	"github.com/pingcap/tidb/util/rowcodec"
 	"github.com/pingcap/tidb/util/tracing"
-	"golang.org/x/exp/slices"
 )
 
 type memReader interface {
@@ -143,7 +143,7 @@ func (m *memIndexReader) getMemRows(ctx context.Context) ([][]types.Datum, error
 	}
 
 	if m.keepOrder && m.table.GetPartitionInfo() != nil {
-		slices.SortFunc(m.addedRows, func(a, b []types.Datum) bool {
+		slices.SortFunc(m.addedRows, func(a, b []types.Datum) int {
 			ret, err1 := m.compare(m.ctx.GetSessionVars().StmtCtx, a, b)
 			if err1 != nil {
 				err = err1
@@ -421,7 +421,7 @@ func (m *memTableReader) getMemRows(ctx context.Context) ([][]types.Datum, error
 	}
 
 	if m.keepOrder && m.table.GetPartitionInfo() != nil {
-		slices.SortFunc(m.addedRows, func(a, b []types.Datum) bool {
+		slices.SortFunc(m.addedRows, func(a, b []types.Datum) int {
 			ret, err1 := m.compare(m.ctx.GetSessionVars().StmtCtx, a, b)
 			if err1 != nil {
 				err = err1
@@ -935,7 +935,7 @@ func (m *memIndexMergeReader) getMemRows(ctx context.Context) ([][]types.Datum,
 	// Didn't set keepOrder = true for memTblReader,
 	// In indexMerge, non-partitioned tables are also need reordered.
 	if m.keepOrder {
-		slices.SortFunc(rows, func(a, b []types.Datum) bool {
+		slices.SortFunc(rows, func(a, b []types.Datum) int {
 			ret, err1 := m.compare(m.ctx.GetSessionVars().StmtCtx, a, b)
 			if err1 != nil {
 				err = err1

executor/show_stats.go

@@ -15,8 +15,10 @@
 package executor
 
 import (
+	"cmp"
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/pingcap/errors"
@@ -28,7 +30,6 @@ import (
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/collate"
 	"github.com/tikv/client-go/v2/oracle"
-	"golang.org/x/exp/slices"
 )
 
 func (e *ShowExec) fetchShowStatsExtended() error {
@@ -384,15 +385,15 @@ func stableColsStats(colStats map[int64]*statistics.Column) (cols []*statistics.
 	for _, col := range colStats {
 		cols = append(cols, col)
 	}
-	slices.SortFunc(cols, func(i, j *statistics.Column) bool { return i.ID < j.ID })
+	slices.SortFunc(cols, func(i, j *statistics.Column) int { return cmp.Compare(i.ID, j.ID) })
 	return
 }
 
 func stableIdxsStats(idxStats map[int64]*statistics.Index) (idxs []*statistics.Index) {
 	for _, idx := range idxStats {
 		idxs = append(idxs, idx)
 	}
-	slices.SortFunc(idxs, func(i, j *statistics.Index) bool { return i.ID < j.ID })
+	slices.SortFunc(idxs, func(i, j *statistics.Index) int { return cmp.Compare(i.ID, j.ID) })
 	return
 }
 

executor/union_scan.go

@@ -209,7 +209,8 @@ func (us *UnionScanExec) getOneRow(ctx context.Context) ([]types.Datum, error) {
 	} else if snapshotRow == nil {
 		row = addedRow
 	} else {
-		isSnapshotRow, err = us.compare(us.Ctx().GetSessionVars().StmtCtx, snapshotRow, addedRow)
+		isSnapshotRowInt, err := us.compare(us.Ctx().GetSessionVars().StmtCtx, snapshotRow, addedRow)
+		isSnapshotRow = isSnapshotRowInt > 0
 		if err != nil {
 			return nil, err
 		}
@@ -292,26 +293,26 @@ type compareExec struct {
 	handleCols plannercore.HandleCols
 }
 
-func (ce compareExec) compare(sctx *stmtctx.StatementContext, a, b []types.Datum) (ret bool, err error) {
+func (ce compareExec) compare(sctx *stmtctx.StatementContext, a, b []types.Datum) (ret int, err error) {
 	var cmp int
 	for _, colOff := range ce.usedIndex {
 		aColumn := a[colOff]
 		bColumn := b[colOff]
 		cmp, err = aColumn.Compare(sctx, &bColumn, ce.collators[colOff])
 		if err != nil {
-			return false, err
+			return -1, err
 		}
 		if cmp == 0 {
 			continue
 		}
 		if cmp > 0 && !ce.desc || cmp < 0 && ce.desc {
-			return false, nil
+			return -1, nil
 		}
-		return true, nil
+		return 1, nil
 	}
 	cmp, err = ce.handleCols.Compare(a, b, ce.collators)
 	if cmp > 0 && !ce.desc || cmp < 0 && ce.desc {
-		return false, err
+		return -1, err
 	}
-	return true, err
+	return 1, err
 }