diff --git a/br/cmd/tidb-lightning-ctl/BUILD.bazel b/br/cmd/tidb-lightning-ctl/BUILD.bazel index 212912821a27e..df997a8738d54 100644 --- a/br/cmd/tidb-lightning-ctl/BUILD.bazel +++ b/br/cmd/tidb-lightning-ctl/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "//br/pkg/lightning/checkpoints", "//br/pkg/lightning/common", "//br/pkg/lightning/config", - "//br/pkg/lightning/importer:restore", + "//br/pkg/lightning/importer", "//br/pkg/lightning/tikv", "@com_github_pingcap_errors//:errors", ], diff --git a/br/pkg/lightning/BUILD.bazel b/br/pkg/lightning/BUILD.bazel index 6ccb2a044edc9..0a417462555ec 100644 --- a/br/pkg/lightning/BUILD.bazel +++ b/br/pkg/lightning/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//br/pkg/lightning/common", "//br/pkg/lightning/config", "//br/pkg/lightning/glue", - "//br/pkg/lightning/importer:restore", + "//br/pkg/lightning/importer", "//br/pkg/lightning/log", "//br/pkg/lightning/metric", "//br/pkg/lightning/mydump", diff --git a/br/pkg/lightning/importer/BUILD.bazel b/br/pkg/lightning/importer/BUILD.bazel index 96db2ec01a291..98a906d7c3729 100644 --- a/br/pkg/lightning/importer/BUILD.bazel +++ b/br/pkg/lightning/importer/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( - name = "restore", + name = "importer", srcs = [ "check_info.go", "check_template.go", @@ -91,86 +91,6 @@ go_library( ], ) -go_test( - name = "restore_test", - timeout = "short", - srcs = [ - "check_info_test.go", - "checksum_test.go", - "chunk_restore_test.go", - "get_pre_info_test.go", - "meta_manager_test.go", - "precheck_impl_test.go", - "precheck_test.go", - "restore_schema_test.go", - "restore_test.go", - "table_restore_test.go", - "tidb_test.go", - ], - embed = [":restore"], - flaky = True, - deps = [ - "//br/pkg/lightning/backend", - "//br/pkg/lightning/backend/kv", - "//br/pkg/lightning/backend/noop", - "//br/pkg/lightning/backend/tidb", - "//br/pkg/lightning/checkpoints", - "//br/pkg/lightning/common", - "//br/pkg/lightning/config", - "//br/pkg/lightning/errormanager", - "//br/pkg/lightning/glue", - "//br/pkg/lightning/importer/mock", - "//br/pkg/lightning/importer/opts", - "//br/pkg/lightning/log", - "//br/pkg/lightning/metric", - "//br/pkg/lightning/mydump", - "//br/pkg/lightning/verification", - "//br/pkg/lightning/web", - "//br/pkg/lightning/worker", - "//br/pkg/mock", - "//br/pkg/storage", - "//br/pkg/streamhelper", - "//br/pkg/version/build", - "//ddl", - "//errno", - "//kv", - "//meta", - "//meta/autoid", - "//parser", - "//parser/ast", - "//parser/model", - "//parser/mysql", - "//store/mockstore", - "//store/pdtypes", - "//table/tables", - "//types", - "//util", - "//util/mock", - "//util/promutil", - "//util/table-filter", - "//util/table-router", - "@com_github_data_dog_go_sqlmock//:go-sqlmock", - "@com_github_docker_go_units//:go-units", - "@com_github_go_sql_driver_mysql//:mysql", - "@com_github_golang_mock//gomock", - "@com_github_google_uuid//:uuid", - "@com_github_pingcap_errors//:errors", - "@com_github_pingcap_failpoint//:failpoint", - "@com_github_pingcap_kvproto//pkg/metapb", - "@com_github_pingcap_tipb//go-tipb", - "@com_github_stretchr_testify//require", - "@com_github_stretchr_testify//suite", - "@com_github_tikv_client_go_v2//oracle", - "@com_github_tikv_pd_client//:client", - "@com_github_xitongsys_parquet_go//writer", - "@com_github_xitongsys_parquet_go_source//buffer", - "@io_etcd_go_etcd_client_v3//:client", - "@io_etcd_go_etcd_tests_v3//integration", - "@org_uber_go_atomic//:atomic", - "@org_uber_go_zap//:zap", - ], -) - go_test( name = "importer_test", srcs = [ diff --git a/br/pkg/lightning/importer/mock/BUILD.bazel b/br/pkg/lightning/importer/mock/BUILD.bazel index c4429b77c9317..f6a3335d23e80 100644 --- a/br/pkg/lightning/importer/mock/BUILD.bazel +++ b/br/pkg/lightning/importer/mock/BUILD.bazel @@ -26,7 +26,7 @@ go_test( embed = [":mock"], flaky = True, deps = [ - "//br/pkg/lightning/importer:restore", + "//br/pkg/lightning/importer", "//parser/model", "@com_github_stretchr_testify//require", ],