*: move util into pkg/util

.github/licenserc.yml

@@ -49,5 +49,5 @@ header:
     - "**/OWNERS"
     - "OWNERS_ALIASES"
     - "disttask/**/mock/**/*_mock.go"
-    - "util/sqlexec/mock/*_mock.go"
+    - "pkg/util/sqlexec/mock/*_mock.go"
   comment: on-failure

Makefile

@@ -298,10 +298,10 @@ bench-daily:
 	go test -tags intest github.com/pingcap/tidb/executor/test/splittest -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test -tags intest github.com/pingcap/tidb/tablecodec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test -tags intest github.com/pingcap/tidb/expression -run TestBenchDaily -bench Ignore --outfile bench_daily.json
-	go test -tags intest github.com/pingcap/tidb/util/rowcodec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
-	go test -tags intest github.com/pingcap/tidb/util/codec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
+	go test -tags intest github.com/pingcap/tidb/pkg/util/rowcodec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
+	go test -tags intest github.com/pingcap/tidb/pkg/util/codec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test -tags intest github.com/pingcap/tidb/distsql -run TestBenchDaily -bench Ignore --outfile bench_daily.json
-	go test -tags intest github.com/pingcap/tidb/util/benchdaily -run TestBenchDaily -bench Ignore \
+	go test -tags intest github.com/pingcap/tidb/pkg/util/benchdaily -run TestBenchDaily -bench Ignore \
 		-date `git log -n1 --date=unix --pretty=format:%cd` \
 		-commit `git log -n1 --pretty=format:%h` \
 		-outfile $(TO)
@@ -389,7 +389,7 @@ gen_mock: tools/bin/mockgen
 	tools/bin/mockgen -package execute github.com/pingcap/tidb/disttask/framework/scheduler/execute SubtaskExecutor > disttask/framework/mock/execute/execute_mock.go
 	tools/bin/mockgen -package mock github.com/pingcap/tidb/disttask/importinto MiniTaskExecutor > disttask/importinto/mock/import_mock.go
 	tools/bin/mockgen -package mock github.com/pingcap/tidb/disttask/framework/planner LogicalPlan,PipelineSpec > disttask/framework/mock/plan_mock.go
-	tools/bin/mockgen -package mock github.com/pingcap/tidb/util/sqlexec RestrictedSQLExecutor > util/sqlexec/mock/restricted_sql_executor_mock.go
+	tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/util/sqlexec RestrictedSQLExecutor > pkg/util/sqlexec/mock/restricted_sql_executor_mock.go
 
 # There is no FreeBSD environment for GitHub actions. So cross-compile on Linux
 # but that doesn't work with CGO_ENABLED=1, so disable cgo. The reason to have

autoid_service/BUILD.bazel

@@ -14,9 +14,9 @@ go_library(
         "//metrics",
         "//owner",
         "//parser/model",
-        "//util/etcd",
-        "//util/logutil",
-        "//util/mathutil",
+        "//pkg/util/etcd",
+        "//pkg/util/logutil",
+        "//pkg/util/mathutil",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_pingcap_kvproto//pkg/autoid",

autoid_service/autoid.go

@@ -32,9 +32,9 @@ import (
 	"github.com/pingcap/tidb/metrics"
 	"github.com/pingcap/tidb/owner"
 	"github.com/pingcap/tidb/parser/model"
-	"github.com/pingcap/tidb/util/etcd"
-	"github.com/pingcap/tidb/util/logutil"
-	"github.com/pingcap/tidb/util/mathutil"
+	"github.com/pingcap/tidb/pkg/util/etcd"
+	"github.com/pingcap/tidb/pkg/util/logutil"
+	"github.com/pingcap/tidb/pkg/util/mathutil"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

bindinfo/BUILD.bazel

@@ -19,24 +19,24 @@ go_library(
         "//parser/format",
         "//parser/mysql",
         "//parser/terror",
+        "//pkg/util/chunk",
+        "//pkg/util/hack",
+        "//pkg/util/hint",
+        "//pkg/util/kvcache",
+        "//pkg/util/logutil",
+        "//pkg/util/mathutil",
+        "//pkg/util/memory",
+        "//pkg/util/parser",
+        "//pkg/util/sqlexec",
+        "//pkg/util/stmtsummary/v2:stmtsummary",
+        "//pkg/util/table-filter",
+        "//pkg/util/timeutil",
         "//sessionctx",
         "//sessionctx/sessionstates",
         "//sessionctx/stmtctx",
         "//sessionctx/variable",
         "//types",
         "//types/parser_driver",
-        "//util/chunk",
-        "//util/hack",
-        "//util/hint",
-        "//util/kvcache",
-        "//util/logutil",
-        "//util/mathutil",
-        "//util/memory",
-        "//util/parser",
-        "//util/sqlexec",
-        "//util/stmtsummary/v2:stmtsummary",
-        "//util/table-filter",
-        "//util/timeutil",
         "@org_golang_x_exp//maps",
         "@org_uber_go_zap//:zap",
     ],
@@ -67,13 +67,13 @@ go_test(
         "//parser",
         "//parser/auth",
         "//parser/model",
+        "//pkg/util/hack",
+        "//pkg/util/parser",
+        "//pkg/util/stmtsummary",
         "//server",
         "//sessionctx/variable",
         "//testkit",
         "//testkit/testsetup",
-        "//util/hack",
-        "//util/parser",
-        "//util/stmtsummary",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_prometheus_client_model//go",
         "@com_github_stretchr_testify//require",

bindinfo/bind_cache.go

@@ -18,11 +18,11 @@ import (
 	"errors"
 	"sync"
 
+	"github.com/pingcap/tidb/pkg/util/hack"
+	"github.com/pingcap/tidb/pkg/util/kvcache"
+	"github.com/pingcap/tidb/pkg/util/mathutil"
+	"github.com/pingcap/tidb/pkg/util/memory"
 	"github.com/pingcap/tidb/sessionctx/variable"
-	"github.com/pingcap/tidb/util/hack"
-	"github.com/pingcap/tidb/util/kvcache"
-	"github.com/pingcap/tidb/util/mathutil"
-	"github.com/pingcap/tidb/util/memory"
 )
 
 // bindCache uses the LRU cache to store the bindRecord.

bindinfo/bind_cache_test.go

@@ -19,8 +19,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/pingcap/tidb/pkg/util/hack"
 	"github.com/pingcap/tidb/sessionctx/variable"
-	"github.com/pingcap/tidb/util/hack"
 	"github.com/stretchr/testify/require"
 )
 

bindinfo/bind_record.go

@@ -20,10 +20,10 @@ import (
 
 	"github.com/pingcap/tidb/metrics"
 	"github.com/pingcap/tidb/parser"
+	"github.com/pingcap/tidb/pkg/util/hack"
+	"github.com/pingcap/tidb/pkg/util/hint"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/types"
-	"github.com/pingcap/tidb/util/hack"
-	"github.com/pingcap/tidb/util/hint"
 )
 
 const (

bindinfo/capture_test.go

@@ -27,9 +27,9 @@ import (
 	"github.com/pingcap/tidb/parser"
 	"github.com/pingcap/tidb/parser/auth"
 	"github.com/pingcap/tidb/parser/model"
+	utilparser "github.com/pingcap/tidb/pkg/util/parser"
+	"github.com/pingcap/tidb/pkg/util/stmtsummary"
 	"github.com/pingcap/tidb/testkit"
-	utilparser "github.com/pingcap/tidb/util/parser"
-	"github.com/pingcap/tidb/util/stmtsummary"
 	"github.com/stretchr/testify/require"
 	"go.opencensus.io/stats/view"
 )

bindinfo/handle.go

@@ -31,19 +31,19 @@ import (
 	"github.com/pingcap/tidb/parser/format"
 	"github.com/pingcap/tidb/parser/mysql"
 	"github.com/pingcap/tidb/parser/terror"
+	"github.com/pingcap/tidb/pkg/util/chunk"
+	"github.com/pingcap/tidb/pkg/util/hint"
+	"github.com/pingcap/tidb/pkg/util/logutil"
+	utilparser "github.com/pingcap/tidb/pkg/util/parser"
+	"github.com/pingcap/tidb/pkg/util/sqlexec"
+	stmtsummaryv2 "github.com/pingcap/tidb/pkg/util/stmtsummary/v2"
+	tablefilter "github.com/pingcap/tidb/pkg/util/table-filter"
+	"github.com/pingcap/tidb/pkg/util/timeutil"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/types"
 	driver "github.com/pingcap/tidb/types/parser_driver"
-	"github.com/pingcap/tidb/util/chunk"
-	"github.com/pingcap/tidb/util/hint"
-	"github.com/pingcap/tidb/util/logutil"
-	utilparser "github.com/pingcap/tidb/util/parser"
-	"github.com/pingcap/tidb/util/sqlexec"
-	stmtsummaryv2 "github.com/pingcap/tidb/util/stmtsummary/v2"
-	tablefilter "github.com/pingcap/tidb/util/table-filter"
-	"github.com/pingcap/tidb/util/timeutil"
 	"go.uber.org/zap"
 	"golang.org/x/exp/maps"
 )

bindinfo/internal/BUILD.bazel

@@ -8,8 +8,8 @@ go_library(
     deps = [
         "//domain",
         "//parser",
+        "//pkg/util/parser",
         "//testkit",
-        "//util/parser",
         "@com_github_stretchr_testify//require",
     ],
 )

bindinfo/internal/testutil.go

@@ -19,8 +19,8 @@ import (
 
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/parser"
+	utilparser "github.com/pingcap/tidb/pkg/util/parser"
 	"github.com/pingcap/tidb/testkit"
-	utilparser "github.com/pingcap/tidb/util/parser"
 	"github.com/stretchr/testify/require"
 )
 

bindinfo/session_handle.go

@@ -23,11 +23,11 @@ import (
 	"github.com/pingcap/tidb/metrics"
 	"github.com/pingcap/tidb/parser"
 	"github.com/pingcap/tidb/parser/mysql"
+	"github.com/pingcap/tidb/pkg/util/hack"
+	"github.com/pingcap/tidb/pkg/util/logutil"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/sessionstates"
 	"github.com/pingcap/tidb/types"
-	"github.com/pingcap/tidb/util/hack"
-	"github.com/pingcap/tidb/util/logutil"
 	"go.uber.org/zap"
 )
 

bindinfo/session_handle_test.go

@@ -26,9 +26,9 @@ import (
 	"github.com/pingcap/tidb/metrics"
 	"github.com/pingcap/tidb/parser"
 	"github.com/pingcap/tidb/parser/auth"
+	"github.com/pingcap/tidb/pkg/util/stmtsummary"
 	"github.com/pingcap/tidb/server"
 	"github.com/pingcap/tidb/testkit"
-	"github.com/pingcap/tidb/util/stmtsummary"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/stretchr/testify/require"
 )

bindinfo/tests/BUILD.bazel

@@ -19,11 +19,11 @@ go_test(
         "//parser/auth",
         "//parser/model",
         "//parser/terror",
+        "//pkg/util",
+        "//pkg/util/parser",
+        "//pkg/util/stmtsummary",
         "//testkit",
         "//testkit/testsetup",
-        "//util",
-        "//util/parser",
-        "//util/stmtsummary",
         "@com_github_stretchr_testify//require",
         "@org_uber_go_goleak//:goleak",
     ],

bindinfo/tests/bind_test.go

@@ -28,10 +28,10 @@ import (
 	"github.com/pingcap/tidb/parser/auth"
 	"github.com/pingcap/tidb/parser/model"
 	"github.com/pingcap/tidb/parser/terror"
+	"github.com/pingcap/tidb/pkg/util"
+	utilparser "github.com/pingcap/tidb/pkg/util/parser"
+	"github.com/pingcap/tidb/pkg/util/stmtsummary"
 	"github.com/pingcap/tidb/testkit"
-	"github.com/pingcap/tidb/util"
-	utilparser "github.com/pingcap/tidb/util/parser"
-	"github.com/pingcap/tidb/util/stmtsummary"
 	"github.com/stretchr/testify/require"
 )
 

br/cmd/br/BUILD.bazel

@@ -33,10 +33,10 @@ go_library(
         "//br/pkg/version/build",
         "//config",
         "//parser/model",
+        "//pkg/util",
+        "//pkg/util/logutil",
+        "//pkg/util/metricsutil",
         "//session",
-        "//util",
-        "//util/logutil",
-        "//util/metricsutil",
         "@com_github_gogo_protobuf//proto",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_kvproto//pkg/brpb",

br/cmd/br/backup.go

@@ -12,8 +12,8 @@ import (
 	"github.com/pingcap/tidb/br/pkg/utils"
 	"github.com/pingcap/tidb/br/pkg/version/build"
 	"github.com/pingcap/tidb/config"
+	"github.com/pingcap/tidb/pkg/util/metricsutil"
 	"github.com/pingcap/tidb/session"
-	"github.com/pingcap/tidb/util/metricsutil"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"sourcegraph.com/sourcegraph/appdash"

br/cmd/br/cmd.go

@@ -20,8 +20,8 @@ import (
 	"github.com/pingcap/tidb/br/pkg/utils"
 	"github.com/pingcap/tidb/br/pkg/version/build"
 	"github.com/pingcap/tidb/config"
-	tidbutils "github.com/pingcap/tidb/util"
-	"github.com/pingcap/tidb/util/logutil"
+	tidbutils "github.com/pingcap/tidb/pkg/util"
+	"github.com/pingcap/tidb/pkg/util/logutil"
 	"github.com/spf13/cobra"
 )
 

br/cmd/br/restore.go

@@ -14,8 +14,8 @@ import (
 	"github.com/pingcap/tidb/br/pkg/trace"
 	"github.com/pingcap/tidb/br/pkg/utils"
 	"github.com/pingcap/tidb/br/pkg/version/build"
+	"github.com/pingcap/tidb/pkg/util/metricsutil"
 	"github.com/pingcap/tidb/session"
-	"github.com/pingcap/tidb/util/metricsutil"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"sourcegraph.com/sourcegraph/appdash"

br/pkg/backup/BUILD.bazel

@@ -31,11 +31,11 @@ go_library(
         "//kv",
         "//meta",
         "//parser/model",
+        "//pkg/util",
+        "//pkg/util/codec",
+        "//pkg/util/ranger",
+        "//pkg/util/table-filter",
         "//statistics/handle",
-        "//util",
-        "//util/codec",
-        "//util/ranger",
-        "//util/table-filter",
         "@com_github_google_btree//:btree",
         "@com_github_opentracing_opentracing_go//:opentracing-go",
         "@com_github_pingcap_errors//:errors",
@@ -80,13 +80,13 @@ go_test(
         "//br/pkg/utils",
         "//kv",
         "//parser/model",
+        "//pkg/util/codec",
+        "//pkg/util/table-filter",
         "//sessionctx/variable",
         "//tablecodec",
         "//testkit",
         "//testkit/testsetup",
         "//types",
-        "//util/codec",
-        "//util/table-filter",
         "@com_github_golang_protobuf//proto",
         "@com_github_pingcap_kvproto//pkg/brpb",
         "@com_github_pingcap_kvproto//pkg/encryptionpb",

br/pkg/backup/client.go

@@ -42,10 +42,10 @@ import (
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/parser/model"
-	"github.com/pingcap/tidb/util"
-	"github.com/pingcap/tidb/util/codec"
-	"github.com/pingcap/tidb/util/ranger"
-	filter "github.com/pingcap/tidb/util/table-filter"
+	"github.com/pingcap/tidb/pkg/util"
+	"github.com/pingcap/tidb/pkg/util/codec"
+	"github.com/pingcap/tidb/pkg/util/ranger"
+	filter "github.com/pingcap/tidb/pkg/util/table-filter"
 	"github.com/tikv/client-go/v2/oracle"
 	"github.com/tikv/client-go/v2/tikv"
 	"github.com/tikv/client-go/v2/txnkv/txnlock"

br/pkg/backup/client_test.go

@@ -22,10 +22,10 @@ import (
 	"github.com/pingcap/tidb/br/pkg/storage"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/parser/model"
+	"github.com/pingcap/tidb/pkg/util/codec"
 	"github.com/pingcap/tidb/tablecodec"
 	"github.com/pingcap/tidb/testkit"
 	"github.com/pingcap/tidb/types"
-	"github.com/pingcap/tidb/util/codec"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/client-go/v2/oracle"
 	"github.com/tikv/client-go/v2/testutils"

br/pkg/backup/schema_test.go

@@ -18,9 +18,9 @@ import (
 	"github.com/pingcap/tidb/br/pkg/mock"
 	"github.com/pingcap/tidb/br/pkg/storage"
 	"github.com/pingcap/tidb/br/pkg/utils"
+	filter "github.com/pingcap/tidb/pkg/util/table-filter"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/testkit"
-	filter "github.com/pingcap/tidb/util/table-filter"
 	"github.com/stretchr/testify/require"
 	"go.opencensus.io/stats/view"
 )

br/pkg/checksum/BUILD.bazel

@@ -17,9 +17,9 @@ go_library(
         "//distsql",
         "//kv",
         "//parser/model",
+        "//pkg/util/ranger",
         "//sessionctx/variable",
         "//tablecodec",
-        "//util/ranger",
         "@com_github_gogo_protobuf//proto",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",

br/pkg/checksum/executor.go

@@ -14,9 +14,9 @@ import (
 	"github.com/pingcap/tidb/distsql"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/parser/model"
+	"github.com/pingcap/tidb/pkg/util/ranger"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/tablecodec"
-	"github.com/pingcap/tidb/util/ranger"
 	"github.com/pingcap/tipb/go-tipb"
 	"go.uber.org/zap"
 )