Skip to content

Commit 318e82b

Browse files
bb7133bb7133
authored
*: move most of the packages to 'pkg' (pingcap#47123)
ref pingcap#41241
1 parent 93a834a commit 318e82b

File tree

4,495 files changed

+349293
-349278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,495 files changed

+349293
-349278
lines changed

‎.github/licenserc.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ header:
3636
- "**/go.sum"
3737
- "LICENSE"
3838
- ".github/"
39-
- "parser/"
39+
- "pkg/parser/"
4040
- "dumpling/"
41-
- "tidb-binlog/driver/example"
42-
- "tidb-binlog/proto/go-binlog/secondary_binlog.pb.go"
41+
- "pkg/tidb-binlog/driver/example"
42+
- "pkg/tidb-binlog/proto/go-binlog/secondary_binlog.pb.go"
4343
- "**/*.sql"
4444
- "**/*.csv"
4545
- "**/*.parquet"
@@ -48,6 +48,6 @@ header:
4848
- "build/image/.ci_bazel"
4949
- "**/OWNERS"
5050
- "OWNERS_ALIASES"
51-
- "disttask/**/mock/**/*_mock.go"
52-
- "util/sqlexec/mock/*_mock.go"
51+
- "pkg/disttask/**/mock/**/*_mock.go"
52+
- "pkg/util/sqlexec/mock/*_mock.go"
5353
comment: on-failure

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "extension/enterprise"]
2-
path = extension/enterprise
2+
path = pkg/extension/enterprise
33
url = [email protected]:pingcap-inc/enterprise-extensions.git

‎Makefile

+22-22
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@ test_part_parser: parser_yacc test_part_parser_dev
103103
test_part_parser_dev: parser_fmt parser_unit_test
104104

105105
parser:
106-
@cd parser && make parser
106+
@cd pkg/parser && make parser
107107

108108
parser_yacc:
109-
@cd parser && mv parser.go parser.go.committed && make parser && diff -u parser.go.committed parser.go && rm parser.go.committed
109+
@cd pkg/parser && mv parser.go parser.go.committed && make parser && diff -u parser.go.committed parser.go && rm parser.go.committed
110110

111111
parser_fmt:
112-
@cd parser && make fmt
112+
@cd pkg/parser && make fmt
113113

114114
parser_unit_test:
115-
@cd parser && make test
115+
@cd pkg/parser && make test
116116

117117
test_part_br: br_unit_test br_integration_test
118118

@@ -158,36 +158,36 @@ race: failpoint-enable
158158

159159
server:
160160
ifeq ($(TARGET), "")
161-
CGO_ENABLED=1 $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o bin/tidb-server ./tidb-server
161+
CGO_ENABLED=1 $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o bin/tidb-server ./cmd/tidb-server
162162
else
163-
CGO_ENABLED=1 $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o '$(TARGET)' ./tidb-server
163+
CGO_ENABLED=1 $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o '$(TARGET)' ./cmd/tidb-server
164164
endif
165165

166166
server_debug:
167167
ifeq ($(TARGET), "")
168-
CGO_ENABLED=1 $(GOBUILD) -gcflags="all=-N -l" $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o bin/tidb-server-debug ./tidb-server
168+
CGO_ENABLED=1 $(GOBUILD) -gcflags="all=-N -l" $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o bin/tidb-server-debug ./cmd/tidb-server
169169
else
170-
CGO_ENABLED=1 $(GOBUILD) -gcflags="all=-N -l" $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o '$(TARGET)' ./tidb-server
170+
CGO_ENABLED=1 $(GOBUILD) -gcflags="all=-N -l" $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o '$(TARGET)' ./cmd/tidb-server
171171
endif
172172

173173
init-submodule:
174-
git submodule init && git submodule update --force
174+
# git submodule init && git submodule update --force
175175

176176
enterprise-prepare:
177-
cd extension/enterprise/generate && $(GO) generate -run genfile main.go
177+
cd pkg/extension/enterprise/generate && $(GO) generate -run genfile main.go
178178

179179
enterprise-clear:
180-
cd extension/enterprise/generate && $(GO) generate -run clear main.go
180+
cd pkg/extension/enterprise/generate && $(GO) generate -run clear main.go
181181

182182
enterprise-docker: init-submodule enterprise-prepare
183183
docker build -t "$(DOCKERPREFIX)tidb:latest" --build-arg 'GOPROXY=$(shell go env GOPROXY),' -f Dockerfile.enterprise .
184184

185185
enterprise-server-build: TIDB_EDITION=Enterprise
186186
enterprise-server-build:
187187
ifeq ($(TARGET), "")
188-
CGO_ENABLED=1 $(GOBUILD) -tags enterprise $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG) $(EXTENSION_FLAG)' -o bin/tidb-server tidb-server/main.go
188+
CGO_ENABLED=1 $(GOBUILD) -tags enterprise $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG) $(EXTENSION_FLAG)' -o bin/tidb-server cmd/tidb-server/main.go
189189
else
190-
CGO_ENABLED=1 $(GOBUILD) -tags enterprise $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG) $(EXTENSION_FLAG)' -o '$(TARGET)' tidb-server/main.go
190+
CGO_ENABLED=1 $(GOBUILD) -tags enterprise $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG) $(EXTENSION_FLAG)' -o '$(TARGET)' cmd/tidb-server/main.go
191191
endif
192192

193193
enterprise-server:
@@ -197,16 +197,16 @@ enterprise-server:
197197

198198
server_check:
199199
ifeq ($(TARGET), "")
200-
$(GOBUILD) -cover $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o bin/tidb-server ./tidb-server
200+
$(GOBUILD) -cover $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o bin/tidb-server ./cmd/tidb-server
201201
else
202-
$(GOBUILD) -cover $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o '$(TARGET)' ./tidb-server
202+
$(GOBUILD) -cover $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o '$(TARGET)' ./cmd/tidb-server
203203
endif
204204

205205
linux:
206206
ifeq ($(TARGET), "")
207-
GOOS=linux $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o bin/tidb-server-linux ./tidb-server
207+
GOOS=linux $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o bin/tidb-server-linux ./cmd/tidb-server
208208
else
209-
GOOS=linux $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o '$(TARGET)' ./tidb-server
209+
GOOS=linux $(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o '$(TARGET)' ./cmd/tidb-server
210210
endif
211211

212212
server_coverage:
@@ -506,13 +506,13 @@ bazel_build:
506506
bazel $(BAZEL_GLOBAL_CONFIG) build $(BAZEL_CMD_CONFIG) \
507507
//... --//build:with_nogo_flag=true
508508
bazel $(BAZEL_GLOBAL_CONFIG) build $(BAZEL_CMD_CONFIG) \
509-
//cmd/importer:importer //tidb-server:tidb-server //tidb-server:tidb-server-check --//build:with_nogo_flag=true
510-
cp bazel-out/k8-fastbuild/bin/tidb-server/tidb-server_/tidb-server ./bin
509+
//cmd/importer:importer //cmd/tidb-server:tidb-server //cmd/tidb-server:tidb-server-check --//build:with_nogo_flag=true
510+
cp bazel-out/k8-fastbuild/bin/cmd/tidb-server/tidb-server_/tidb-server ./bin
511511
cp bazel-out/k8-fastbuild/bin/cmd/importer/importer_/importer ./bin
512-
cp bazel-out/k8-fastbuild/bin/tidb-server/tidb-server-check_/tidb-server-check ./bin
512+
cp bazel-out/k8-fastbuild/bin/cmd/tidb-server/tidb-server-check_/tidb-server-check ./bin
513513
bazel $(BAZEL_GLOBAL_CONFIG) build $(BAZEL_CMD_CONFIG) \
514-
//tidb-server:tidb-server --stamp --workspace_status_command=./build/print-enterprise-workspace-status.sh --define gotags=enterprise
515-
./bazel-out/k8-fastbuild/bin/tidb-server/tidb-server_/tidb-server -V
514+
//cmd/tidb-server:tidb-server --stamp --workspace_status_command=./build/print-enterprise-workspace-status.sh --define gotags=enterprise
515+
./bazel-out/k8-fastbuild/bin/cmd/tidb-server/tidb-server_/tidb-server -V
516516

517517
bazel_fail_build: failpoint-enable bazel_ci_prepare
518518
bazel $(BAZEL_GLOBAL_CONFIG) build $(BAZEL_CMD_CONFIG) \

‎Makefile.common

+8-8
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@ UNCONVERT_PACKAGES := $$($(UNCONVERT_PACKAGES_LIST))
6060
FAILPOINT_ENABLE := find $$PWD/ -type d | grep -vE "(\.git|tools)" | xargs tools/bin/failpoint-ctl enable
6161
FAILPOINT_DISABLE := find $$PWD/ -type d | grep -vE "(\.git|tools)" | xargs tools/bin/failpoint-ctl disable
6262

63-
LDFLAGS += -X "github.com/pingcap/tidb/parser/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty --always)"
64-
LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBBuildTS=$(shell date -u '+%Y-%m-%d %H:%M:%S')"
65-
LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBGitHash=$(shell git rev-parse HEAD)"
66-
LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBGitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
67-
LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBEdition=$(TIDB_EDITION)"
63+
LDFLAGS += -X "github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty --always)"
64+
LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBBuildTS=$(shell date -u '+%Y-%m-%d %H:%M:%S')"
65+
LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitHash=$(shell git rev-parse HEAD)"
66+
LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
67+
LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEdition=$(TIDB_EDITION)"
6868

6969
EXTENSION_FLAG =
7070
ifeq ($(shell if [ -d extension/enterprise/.git ]; then echo "true"; fi),true)
71-
EXTENSION_FLAG += -X "github.com/pingcap/tidb/util/versioninfo.TiDBEnterpriseExtensionGitHash=$(shell cd extension/enterprise && git rev-parse HEAD)"
71+
EXTENSION_FLAG += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEnterpriseExtensionGitHash=$(shell cd extension/enterprise && git rev-parse HEAD)"
7272
endif
7373

74-
TEST_LDFLAGS = -X "github.com/pingcap/tidb/config.checkBeforeDropLDFlag=1"
75-
COVERAGE_SERVER_LDFLAGS = -X "github.com/pingcap/tidb/tidb-server.isCoverageServer=1"
74+
TEST_LDFLAGS = -X "github.com/pingcap/tidb/pkg/config.checkBeforeDropLDFlag=1"
75+
COVERAGE_SERVER_LDFLAGS = -X "github.com/pingcap/tidb/cmd/tidb-server.isCoverageServer=1"
7676

7777
CHECK_LDFLAGS += $(LDFLAGS) ${TEST_LDFLAGS}
7878

‎autoid_service/BUILD.bazel

-46
This file was deleted.

0 commit comments

Comments
 (0)