Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Dec 11, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
394b05b
*: replace exp/maps with std/maps
hawkingrei Dec 10, 2023
a990356
*: replace exp/maps with std/maps
hawkingrei Dec 10, 2023
a59b3ee
*: replace exp/maps with std/maps
hawkingrei Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion br/pkg/lightning/importer/tidb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"context"
"database/sql"
"fmt"
"maps"
"math"
"strconv"
"strings"
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion pkg/bindinfo/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/bindinfo/global_handle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package bindinfo
import (
"context"
"fmt"
"maps"
"strings"
"sync"
"sync/atomic"
Expand All @@ -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.
Expand Down
1 change: 0 additions & 1 deletion pkg/domain/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/domain/sysvar_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package domain
import (
"context"
"fmt"
"maps"

"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/sessionctx"
Expand All @@ -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.
Expand Down
1 change: 0 additions & 1 deletion pkg/executor/asyncloaddata/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/executor/asyncloaddata/progress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion pkg/table/temptable/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/table/temptable/interceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package temptable
import (
"bytes"
"context"
"maps"
"math"

"github.com/pingcap/errors"
Expand All @@ -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 (
Expand Down
1 change: 0 additions & 1 deletion pkg/timer/runtime/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/timer/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"context"
"encoding/hex"
"fmt"
"maps"
"sync"
"time"

Expand All @@ -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 (
Expand Down
Loading