*: replace exp/maps with std/maps (#49315)

ref #45933
pingcap · Dec 11, 2023 · bcbccaf · bcbccaf
1 parent e62699c
commit bcbccaf
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 11 deletions.
diff --git a/br/pkg/lightning/importer/tidb.go b/br/pkg/lightning/importer/tidb.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"maps"
 	"math"
 	"strconv"
 	"strings"
@@ -37,7 +38,6 @@ import (
 	"github.com/pingcap/tidb/pkg/sessionctx/variable"
 	"github.com/tikv/client-go/v2/util"
 	"go.uber.org/zap"
-	"golang.org/x/exp/maps"
 )
 
 // TiDBManager is a wrapper of *sql.DB which provides some helper methods for

diff --git a/pkg/bindinfo/BUILD.bazel b/pkg/bindinfo/BUILD.bazel
@@ -40,7 +40,6 @@ go_library(
         "//pkg/util/table-filter",
         "@com_github_ngaut_pools//:pools",
         "@com_github_pingcap_errors//:errors",
-        "@org_golang_x_exp//maps",
         "@org_uber_go_zap//:zap",
     ],
 )

diff --git a/pkg/bindinfo/global_handle.go b/pkg/bindinfo/global_handle.go
@@ -17,6 +17,7 @@ package bindinfo
 import (
 	"context"
 	"fmt"
+	"maps"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -39,7 +40,6 @@ import (
 	utilparser "github.com/pingcap/tidb/pkg/util/parser"
 	"github.com/pingcap/tidb/pkg/util/sqlescape"
 	"go.uber.org/zap"
-	"golang.org/x/exp/maps"
 )
 
 // GlobalBindingHandle is used to handle all global sql bind operations.

diff --git a/pkg/domain/BUILD.bazel b/pkg/domain/BUILD.bazel
@@ -105,7 +105,6 @@ go_library(
         "@org_golang_google_grpc//:grpc",
         "@org_golang_google_grpc//backoff",
         "@org_golang_google_grpc//keepalive",
-        "@org_golang_x_exp//maps",
         "@org_uber_go_atomic//:atomic",
         "@org_uber_go_zap//:zap",
     ],

diff --git a/pkg/domain/sysvar_cache.go b/pkg/domain/sysvar_cache.go
@@ -17,6 +17,7 @@ package domain
 import (
 	"context"
 	"fmt"
+	"maps"
 
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/sessionctx"
@@ -25,7 +26,6 @@ import (
 	"github.com/pingcap/tidb/pkg/util/sqlexec"
 	"github.com/pingcap/tidb/pkg/util/syncutil"
 	"go.uber.org/zap"
-	"golang.org/x/exp/maps"
 )
 
 // The sysvar cache replaces the GlobalVariableCache.

diff --git a/pkg/executor/asyncloaddata/BUILD.bazel b/pkg/executor/asyncloaddata/BUILD.bazel
@@ -19,7 +19,6 @@ go_library(
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_tikv_client_go_v2//util",
-        "@org_golang_x_exp//maps",
         "@org_uber_go_atomic//:atomic",
         "@org_uber_go_zap//:zap",
     ],

diff --git a/pkg/executor/asyncloaddata/progress.go b/pkg/executor/asyncloaddata/progress.go
@@ -16,10 +16,10 @@ package asyncloaddata
 
 import (
 	"encoding/json"
+	"maps"
 	"sync"
 
 	"go.uber.org/atomic"
-	"golang.org/x/exp/maps"
 )
 
 // LogicalImportProgress is the progress info of the logical import mode.

diff --git a/pkg/table/temptable/BUILD.bazel b/pkg/table/temptable/BUILD.bazel
@@ -24,7 +24,6 @@ go_library(
         "//pkg/tablecodec",
         "@com_github_pingcap_errors//:errors",
         "@com_github_tikv_client_go_v2//tikv",
-        "@org_golang_x_exp//maps",
     ],
 )
 

diff --git a/pkg/table/temptable/interceptor.go b/pkg/table/temptable/interceptor.go
@@ -17,6 +17,7 @@ package temptable
 import (
 	"bytes"
 	"context"
+	"maps"
 	"math"
 
 	"github.com/pingcap/errors"
@@ -26,7 +27,6 @@ import (
 	"github.com/pingcap/tidb/pkg/sessionctx"
 	"github.com/pingcap/tidb/pkg/store/driver/txn"
 	"github.com/pingcap/tidb/pkg/tablecodec"
-	"golang.org/x/exp/maps"
 )
 
 var (

diff --git a/pkg/timer/runtime/BUILD.bazel b/pkg/timer/runtime/BUILD.bazel
@@ -18,7 +18,6 @@ go_library(
         "@com_github_google_uuid//:uuid",
         "@com_github_pingcap_errors//:errors",
         "@com_github_prometheus_client_golang//prometheus",
-        "@org_golang_x_exp//maps",
         "@org_uber_go_zap//:zap",
     ],
 )

diff --git a/pkg/timer/runtime/runtime.go b/pkg/timer/runtime/runtime.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
+	"maps"
 	"sync"
 	"time"
 
@@ -28,7 +29,6 @@ import (
 	"github.com/pingcap/tidb/pkg/util/logutil"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
-	"golang.org/x/exp/maps"
 )
 
 var (