From c342953b2d3f52310593bd6cb2a13ea93ceed8fd Mon Sep 17 00:00:00 2001 From: D3Hunter Date: Mon, 5 Jan 2026 08:30:59 +0800 Subject: [PATCH] dxf: rename the pkg from "disttask" to "dxf" (#65396) ref pingcap/tidb#61702 --- CONTRIBUTING.md | 2 +- Makefile | 14 ++--- build/nogo_config.json | 4 +- pkg/ddl/BUILD.bazel | 30 +++++----- pkg/ddl/backfilling.go | 4 +- pkg/ddl/backfilling_clean_s3.go | 10 ++-- pkg/ddl/backfilling_dist_executor.go | 6 +- pkg/ddl/backfilling_dist_scheduler.go | 10 ++-- pkg/ddl/backfilling_dist_scheduler_test.go | 6 +- pkg/ddl/backfilling_import_cloud.go | 10 ++-- pkg/ddl/backfilling_merge_sort.go | 8 +-- pkg/ddl/backfilling_merge_temp.go | 8 +-- pkg/ddl/backfilling_operators.go | 6 +- pkg/ddl/backfilling_read_index.go | 12 ++-- pkg/ddl/ddl.go | 6 +- pkg/ddl/export_test.go | 4 +- pkg/ddl/index.go | 8 +-- pkg/ddl/index_nokit_test.go | 6 +- pkg/ddl/reorg_util.go | 4 +- pkg/ddl/testutil/BUILD.bazel | 2 +- pkg/ddl/testutil/operator.go | 2 +- .../framework/mock/execute/BUILD.bazel | 14 ----- pkg/domain/BUILD.bazel | 12 ++-- pkg/domain/crossks/BUILD.bazel | 2 +- pkg/domain/crossks/cross_ks_test.go | 2 +- pkg/domain/domain.go | 12 ++-- pkg/{disttask => dxf}/OWNERS | 0 pkg/{disttask => dxf}/example/BUILD.bazel | 20 +++---- pkg/{disttask => dxf}/example/app_test.go | 8 +-- pkg/{disttask => dxf}/example/doc.go | 0 pkg/{disttask => dxf}/example/proto.go | 0 pkg/{disttask => dxf}/example/scheduler.go | 6 +- .../example/task_executor.go | 6 +- pkg/{disttask => dxf}/framework/BUILD.bazel | 2 +- pkg/{disttask => dxf}/framework/doc.go | 0 .../framework/dxfmetric/BUILD.bazel | 4 +- .../framework/dxfmetric/collector.go | 2 +- .../framework/dxfmetric/metric.go | 0 .../framework/handle/BUILD.bazel | 16 +++--- .../framework/handle/handle.go | 8 +-- .../framework/handle/handle_test.go | 6 +- .../framework/handle/status.go | 6 +- .../framework/handle/status_test.go | 2 +- .../framework/handle/status_testkit_test.go | 8 +-- .../framework/integrationtests/BUILD.bazel | 18 +++--- .../framework/integrationtests/bench_test.go | 16 +++--- .../framework_err_handling_test.go | 10 ++-- .../integrationtests/framework_ha_test.go | 12 ++-- .../framework_pause_and_resume_test.go | 16 +++--- .../framework_rollback_test.go | 8 +-- .../integrationtests/framework_scope_test.go | 14 ++--- .../integrationtests/framework_test.go | 40 ++++++------- .../framework/integrationtests/main_test.go | 0 .../framework/integrationtests/modify_test.go | 28 +++++----- .../integrationtests/resource_control_test.go | 10 ++-- .../framework/metering/BUILD.bazel | 8 +-- .../framework/metering/data.go | 0 .../framework/metering/data_test.go | 0 .../framework/metering/metering.go | 4 +- .../framework/metering/metering_test.go | 2 +- .../framework/metering/recorder.go | 0 .../framework/metering/recorder_test.go | 0 .../framework/mock/BUILD.bazel | 10 ++-- pkg/dxf/framework/mock/execute/BUILD.bazel | 14 +++++ .../framework/mock/execute/execute_mock.go | 10 ++-- .../framework/mock/plan_mock.go | 8 +-- .../framework/mock/scheduler_mock.go | 10 ++-- .../framework/mock/storage_manager_mock.go | 6 +- .../framework/mock/task_executor_mock.go | 10 ++-- .../framework/planner/BUILD.bazel | 14 ++--- .../framework/planner/plan.go | 2 +- .../framework/planner/plan_test.go | 4 +- .../framework/planner/planner.go | 4 +- .../framework/planner/planner_test.go | 8 +-- .../framework/proto/BUILD.bazel | 2 +- .../framework/proto/modify.go | 0 pkg/{disttask => dxf}/framework/proto/node.go | 0 pkg/{disttask => dxf}/framework/proto/step.go | 0 .../framework/proto/step_test.go | 0 .../framework/proto/subtask.go | 0 .../framework/proto/subtask_test.go | 0 pkg/{disttask => dxf}/framework/proto/task.go | 0 .../framework/proto/task_test.go | 0 pkg/{disttask => dxf}/framework/proto/type.go | 0 .../framework/proto/type_test.go | 0 .../framework/scheduler/BUILD.bazel | 30 +++++----- .../framework/scheduler/autoscaler.go | 6 +- .../framework/scheduler/autoscaler_test.go | 2 +- .../framework/scheduler/balancer.go | 2 +- .../framework/scheduler/balancer_test.go | 4 +- .../framework/scheduler/interface.go | 6 +- .../framework/scheduler/main_test.go | 0 .../framework/scheduler/mock/BUILD.bazel | 6 +- .../scheduler/mock/scheduler_mock.go | 8 +-- .../framework/scheduler/nodes.go | 2 +- .../framework/scheduler/nodes_test.go | 8 +-- .../framework/scheduler/scheduler.go | 10 ++-- .../framework/scheduler/scheduler_manager.go | 8 +-- .../scheduler/scheduler_manager_nokit_test.go | 14 ++--- .../scheduler/scheduler_manager_test.go | 8 +-- .../scheduler/scheduler_nokit_test.go | 10 ++-- .../framework/scheduler/scheduler_test.go | 14 ++--- .../framework/scheduler/slots.go | 2 +- .../framework/scheduler/slots_test.go | 4 +- .../framework/scheduler/state_transform.go | 2 +- .../framework/schstatus/BUILD.bazel | 2 +- .../framework/schstatus/status.go | 0 .../framework/schstatus/status_test.go | 0 .../framework/schstatus/tune.go | 0 .../framework/storage/BUILD.bazel | 16 +++--- .../framework/storage/converter.go | 2 +- .../framework/storage/history.go | 2 +- .../framework/storage/nodes.go | 4 +- .../framework/storage/subtask_state.go | 2 +- .../framework/storage/table_test.go | 14 ++--- .../framework/storage/task_state.go | 2 +- .../framework/storage/task_state_test.go | 10 ++-- .../framework/storage/task_table.go | 4 +- .../framework/storage/task_table_test.go | 2 +- .../framework/taskexecutor/BUILD.bazel | 30 +++++----- .../taskexecutor/execute/BUILD.bazel | 6 +- .../taskexecutor/execute/interface.go | 4 +- .../taskexecutor/execute/interface_test.go | 0 .../framework/taskexecutor/interface.go | 6 +- .../framework/taskexecutor/main_test.go | 0 .../framework/taskexecutor/manager.go | 10 ++-- .../framework/taskexecutor/manager_test.go | 8 +-- .../framework/taskexecutor/register.go | 2 +- .../framework/taskexecutor/register_test.go | 2 +- .../framework/taskexecutor/slot.go | 2 +- .../framework/taskexecutor/slot_test.go | 2 +- .../framework/taskexecutor/task_executor.go | 14 ++--- .../taskexecutor/task_executor_test.go | 12 ++-- .../task_executor_testkit_test.go | 8 +-- .../framework/testutil/BUILD.bazel | 20 +++---- .../framework/testutil/context.go | 10 ++-- .../framework/testutil/disttest_util.go | 16 +++--- .../framework/testutil/executor_util.go | 6 +- .../framework/testutil/scheduler_util.go | 8 +-- .../framework/testutil/table_util.go | 4 +- .../framework/testutil/task_util.go | 6 +- pkg/{disttask => dxf}/importinto/BUILD.bazel | 44 +++++++-------- pkg/{disttask => dxf}/importinto/clean_up.go | 8 +-- .../importinto/collect_conflicts.go | 10 ++-- .../importinto/collect_conflicts_test.go | 4 +- .../importinto/conflict_resolution.go | 10 ++-- .../importinto/conflict_resolution_test.go | 10 ++-- .../importinto/conflictedkv/BUILD.bazel | 4 +- .../importinto/conflictedkv/collector.go | 0 .../importinto/conflictedkv/collector_test.go | 0 .../importinto/conflictedkv/deleter.go | 2 +- .../importinto/conflictedkv/deleter_test.go | 2 +- .../importinto/conflictedkv/doc.go | 0 .../importinto/conflictedkv/handler.go | 0 .../importinto/conflictedkv/handler_test.go | 2 +- .../importinto/conflictedkv/row_handle.go | 0 .../conflictedkv/row_handle_test.go | 0 .../importinto/encode_and_sort_operator.go | 6 +- .../encode_and_sort_operator_test.go | 8 +-- pkg/{disttask => dxf}/importinto/job.go | 10 ++-- .../importinto/job_testkit_test.go | 14 ++--- pkg/{disttask => dxf}/importinto/metrics.go | 2 +- .../importinto/metrics_test.go | 0 .../importinto/mock/BUILD.bazel | 4 +- .../importinto/mock/import_mock.go | 6 +- pkg/{disttask => dxf}/importinto/planner.go | 6 +- .../importinto/planner_test.go | 14 ++--- pkg/{disttask => dxf}/importinto/proto.go | 2 +- .../importinto/proto_test.go | 0 pkg/{disttask => dxf}/importinto/scheduler.go | 12 ++-- .../importinto/scheduler_test.go | 4 +- .../importinto/scheduler_testkit_test.go | 14 ++--- .../importinto/subtask_executor.go | 2 +- .../importinto/task_executor.go | 14 ++--- .../importinto/task_executor_test.go | 4 +- .../importinto/task_executor_testkit_test.go | 6 +- pkg/{disttask => dxf}/importinto/wrapper.go | 0 .../importinto/wrapper_test.go | 0 pkg/{disttask => dxf}/operator/BUILD.bazel | 2 +- pkg/{disttask => dxf}/operator/compose.go | 0 pkg/{disttask => dxf}/operator/operator.go | 0 pkg/{disttask => dxf}/operator/pipeline.go | 0 .../operator/pipeline_test.go | 0 pkg/{disttask => dxf}/operator/wrapper.go | 0 pkg/executor/BUILD.bazel | 12 ++-- pkg/executor/check_table_index.go | 2 +- pkg/executor/import_into.go | 8 +-- pkg/executor/importer/BUILD.bazel | 16 +++--- pkg/executor/importer/chunk_process.go | 2 +- .../importer/chunk_process_testkit_test.go | 4 +- pkg/executor/importer/engine_process.go | 2 +- pkg/executor/importer/import.go | 4 +- .../importer/importer_testkit_test.go | 4 +- pkg/executor/importer/table_import.go | 2 +- pkg/executor/set.go | 2 +- pkg/executor/show.go | 6 +- pkg/executor/show_test.go | 2 +- pkg/lightning/backend/external/BUILD.bazel | 6 +- pkg/lightning/backend/external/merge.go | 4 +- .../backend/external/onefile_writer_test.go | 2 +- pkg/lightning/backend/external/sort_test.go | 2 +- pkg/lightning/backend/local/BUILD.bazel | 2 +- pkg/lightning/backend/local/job_worker.go | 2 +- pkg/lightning/backend/local/local.go | 2 +- pkg/meta/BUILD.bazel | 4 +- pkg/meta/meta.go | 2 +- pkg/meta/meta_test.go | 2 +- pkg/metrics/BUILD.bazel | 2 +- pkg/metrics/metrics.go | 2 +- pkg/server/handler/tests/BUILD.bazel | 6 +- pkg/server/handler/tests/dxf_test.go | 6 +- pkg/server/handler/tikvhandler/BUILD.bazel | 10 ++-- pkg/server/handler/tikvhandler/dxf.go | 8 +-- pkg/server/handler/tikvhandler/dxf_test.go | 2 +- pkg/session/BUILD.bazel | 10 ++-- pkg/session/session.go | 8 +-- pkg/session/sync_upgrade.go | 2 +- pkg/store/mockstore/teststore/BUILD.bazel | 2 +- pkg/store/mockstore/teststore/store.go | 2 +- pkg/testkit/testenv/BUILD.bazel | 2 +- pkg/testkit/testenv/testenv.go | 2 +- tests/realtikvtest/BUILD.bazel | 2 +- tests/realtikvtest/addindextest/BUILD.bazel | 2 +- .../addindextest/add_index_test.go | 2 +- .../addindextest/concurrent_ddl_test.go | 2 +- tests/realtikvtest/addindextest1/BUILD.bazel | 10 ++-- .../addindextest1/disttask_test.go | 30 +++++----- tests/realtikvtest/addindextest2/BUILD.bazel | 16 +++--- .../addindextest2/alter_job_test.go | 8 +-- .../addindextest2/global_sort_test.go | 32 +++++------ tests/realtikvtest/addindextest3/BUILD.bazel | 6 +- .../addindextest3/functional_test.go | 2 +- .../realtikvtest/addindextest3/ingest_test.go | 2 +- .../addindextest3/operator_test.go | 4 +- tests/realtikvtest/addindextest4/BUILD.bazel | 2 +- .../addindextest4/integration_test.go | 4 +- tests/realtikvtest/importintotest/BUILD.bazel | 12 ++-- .../importintotest/detach_test.go | 2 +- .../importintotest/import_into_test.go | 56 +++++++++---------- tests/realtikvtest/importintotest/job_test.go | 32 +++++------ .../importintotest/one_parquet_test.go | 2 +- tests/realtikvtest/importintotest/sdk_test.go | 4 +- .../realtikvtest/importintotest/util_test.go | 2 +- .../realtikvtest/importintotest2/BUILD.bazel | 2 +- .../realtikvtest/importintotest2/main_test.go | 2 +- .../realtikvtest/importintotest3/BUILD.bazel | 10 ++-- .../importintotest3/cross_ks_test.go | 4 +- .../importintotest3/extra_param_test.go | 4 +- .../importintotest3/from_server_test.go | 4 +- .../realtikvtest/importintotest3/main_test.go | 2 +- .../realtikvtest/importintotest4/BUILD.bazel | 18 +++--- .../importintotest4/cloud_sdk_test.go | 4 +- .../conflict_resolution_test.go | 16 +++--- .../importintotest4/global_sort_test.go | 28 +++++----- .../importintotest4/import_summary_test.go | 14 ++--- .../realtikvtest/importintotest4/main_test.go | 4 +- .../importintotest4/manual_recovery_test.go | 8 +-- .../importintotest4/split_file_test.go | 6 +- tests/realtikvtest/testkit.go | 2 +- 259 files changed, 857 insertions(+), 857 deletions(-) delete mode 100644 pkg/disttask/framework/mock/execute/BUILD.bazel rename pkg/{disttask => dxf}/OWNERS (100%) rename pkg/{disttask => dxf}/example/BUILD.bazel (57%) rename pkg/{disttask => dxf}/example/app_test.go (88%) rename pkg/{disttask => dxf}/example/doc.go (100%) rename pkg/{disttask => dxf}/example/proto.go (100%) rename pkg/{disttask => dxf}/example/scheduler.go (94%) rename pkg/{disttask => dxf}/example/task_executor.go (90%) rename pkg/{disttask => dxf}/framework/BUILD.bazel (70%) rename pkg/{disttask => dxf}/framework/doc.go (100%) rename pkg/{disttask => dxf}/framework/dxfmetric/BUILD.bazel (76%) rename pkg/{disttask => dxf}/framework/dxfmetric/collector.go (98%) rename pkg/{disttask => dxf}/framework/dxfmetric/metric.go (100%) rename pkg/{disttask => dxf}/framework/handle/BUILD.bazel (82%) rename pkg/{disttask => dxf}/framework/handle/handle.go (98%) rename pkg/{disttask => dxf}/framework/handle/handle_test.go (97%) rename pkg/{disttask => dxf}/framework/handle/status.go (97%) rename pkg/{disttask => dxf}/framework/handle/status_test.go (98%) rename pkg/{disttask => dxf}/framework/handle/status_testkit_test.go (96%) rename pkg/{disttask => dxf}/framework/integrationtests/BUILD.bazel (73%) rename pkg/{disttask => dxf}/framework/integrationtests/bench_test.go (93%) rename pkg/{disttask => dxf}/framework/integrationtests/framework_err_handling_test.go (92%) rename pkg/{disttask => dxf}/framework/integrationtests/framework_ha_test.go (88%) rename pkg/{disttask => dxf}/framework/integrationtests/framework_pause_and_resume_test.go (85%) rename pkg/{disttask => dxf}/framework/integrationtests/framework_rollback_test.go (82%) rename pkg/{disttask => dxf}/framework/integrationtests/framework_scope_test.go (93%) rename pkg/{disttask => dxf}/framework/integrationtests/framework_test.go (86%) rename pkg/{disttask => dxf}/framework/integrationtests/main_test.go (100%) rename pkg/{disttask => dxf}/framework/integrationtests/modify_test.go (93%) rename pkg/{disttask => dxf}/framework/integrationtests/resource_control_test.go (97%) rename pkg/{disttask => dxf}/framework/metering/BUILD.bazel (88%) rename pkg/{disttask => dxf}/framework/metering/data.go (100%) rename pkg/{disttask => dxf}/framework/metering/data_test.go (100%) rename pkg/{disttask => dxf}/framework/metering/metering.go (99%) rename pkg/{disttask => dxf}/framework/metering/metering_test.go (99%) rename pkg/{disttask => dxf}/framework/metering/recorder.go (100%) rename pkg/{disttask => dxf}/framework/metering/recorder_test.go (100%) rename pkg/{disttask => dxf}/framework/mock/BUILD.bazel (57%) create mode 100644 pkg/dxf/framework/mock/execute/BUILD.bazel rename pkg/{disttask => dxf}/framework/mock/execute/execute_mock.go (95%) rename pkg/{disttask => dxf}/framework/mock/plan_mock.go (93%) rename pkg/{disttask => dxf}/framework/mock/scheduler_mock.go (98%) rename pkg/{disttask => dxf}/framework/mock/storage_manager_mock.go (91%) rename pkg/{disttask => dxf}/framework/mock/task_executor_mock.go (97%) rename pkg/{disttask => dxf}/framework/planner/BUILD.bazel (68%) rename pkg/{disttask => dxf}/framework/planner/plan.go (98%) rename pkg/{disttask => dxf}/framework/planner/plan_test.go (91%) rename pkg/{disttask => dxf}/framework/planner/planner.go (91%) rename pkg/{disttask => dxf}/framework/planner/planner_test.go (89%) rename pkg/{disttask => dxf}/framework/proto/BUILD.bazel (89%) rename pkg/{disttask => dxf}/framework/proto/modify.go (100%) rename pkg/{disttask => dxf}/framework/proto/node.go (100%) rename pkg/{disttask => dxf}/framework/proto/step.go (100%) rename pkg/{disttask => dxf}/framework/proto/step_test.go (100%) rename pkg/{disttask => dxf}/framework/proto/subtask.go (100%) rename pkg/{disttask => dxf}/framework/proto/subtask_test.go (100%) rename pkg/{disttask => dxf}/framework/proto/task.go (100%) rename pkg/{disttask => dxf}/framework/proto/task_test.go (100%) rename pkg/{disttask => dxf}/framework/proto/type.go (100%) rename pkg/{disttask => dxf}/framework/proto/type_test.go (100%) rename pkg/{disttask => dxf}/framework/scheduler/BUILD.bazel (78%) rename pkg/{disttask => dxf}/framework/scheduler/autoscaler.go (97%) rename pkg/{disttask => dxf}/framework/scheduler/autoscaler_test.go (98%) rename pkg/{disttask => dxf}/framework/scheduler/balancer.go (99%) rename pkg/{disttask => dxf}/framework/scheduler/balancer_test.go (99%) rename pkg/{disttask => dxf}/framework/scheduler/interface.go (98%) rename pkg/{disttask => dxf}/framework/scheduler/main_test.go (100%) rename pkg/{disttask => dxf}/framework/scheduler/mock/BUILD.bazel (56%) rename pkg/{disttask => dxf}/framework/scheduler/mock/scheduler_mock.go (92%) rename pkg/{disttask => dxf}/framework/scheduler/nodes.go (98%) rename pkg/{disttask => dxf}/framework/scheduler/nodes_test.go (96%) rename pkg/{disttask => dxf}/framework/scheduler/scheduler.go (98%) rename pkg/{disttask => dxf}/framework/scheduler/scheduler_manager.go (98%) rename pkg/{disttask => dxf}/framework/scheduler/scheduler_manager_nokit_test.go (94%) rename pkg/{disttask => dxf}/framework/scheduler/scheduler_manager_test.go (92%) rename pkg/{disttask => dxf}/framework/scheduler/scheduler_nokit_test.go (98%) rename pkg/{disttask => dxf}/framework/scheduler/scheduler_test.go (97%) rename pkg/{disttask => dxf}/framework/scheduler/slots.go (99%) rename pkg/{disttask => dxf}/framework/scheduler/slots_test.go (98%) rename pkg/{disttask => dxf}/framework/scheduler/state_transform.go (96%) rename pkg/{disttask => dxf}/framework/schstatus/BUILD.bazel (83%) rename pkg/{disttask => dxf}/framework/schstatus/status.go (100%) rename pkg/{disttask => dxf}/framework/schstatus/status_test.go (100%) rename pkg/{disttask => dxf}/framework/schstatus/tune.go (100%) rename pkg/{disttask => dxf}/framework/storage/BUILD.bazel (80%) rename pkg/{disttask => dxf}/framework/storage/converter.go (98%) rename pkg/{disttask => dxf}/framework/storage/history.go (98%) rename pkg/{disttask => dxf}/framework/storage/nodes.go (98%) rename pkg/{disttask => dxf}/framework/storage/subtask_state.go (98%) rename pkg/{disttask => dxf}/framework/storage/table_test.go (98%) rename pkg/{disttask => dxf}/framework/storage/task_state.go (99%) rename pkg/{disttask => dxf}/framework/storage/task_state_test.go (96%) rename pkg/{disttask => dxf}/framework/storage/task_table.go (99%) rename pkg/{disttask => dxf}/framework/storage/task_table_test.go (98%) rename pkg/{disttask => dxf}/framework/taskexecutor/BUILD.bazel (70%) rename pkg/{disttask => dxf}/framework/taskexecutor/execute/BUILD.bazel (72%) rename pkg/{disttask => dxf}/framework/taskexecutor/execute/interface.go (99%) rename pkg/{disttask => dxf}/framework/taskexecutor/execute/interface_test.go (100%) rename pkg/{disttask => dxf}/framework/taskexecutor/interface.go (97%) rename pkg/{disttask => dxf}/framework/taskexecutor/main_test.go (100%) rename pkg/{disttask => dxf}/framework/taskexecutor/manager.go (97%) rename pkg/{disttask => dxf}/framework/taskexecutor/manager_test.go (98%) rename pkg/{disttask => dxf}/framework/taskexecutor/register.go (95%) rename pkg/{disttask => dxf}/framework/taskexecutor/register_test.go (95%) rename pkg/{disttask => dxf}/framework/taskexecutor/slot.go (98%) rename pkg/{disttask => dxf}/framework/taskexecutor/slot_test.go (99%) rename pkg/{disttask => dxf}/framework/taskexecutor/task_executor.go (98%) rename pkg/{disttask => dxf}/framework/taskexecutor/task_executor_test.go (99%) rename pkg/{disttask => dxf}/framework/taskexecutor/task_executor_testkit_test.go (93%) rename pkg/{disttask => dxf}/framework/testutil/BUILD.bazel (62%) rename pkg/{disttask => dxf}/framework/testutil/context.go (97%) rename pkg/{disttask => dxf}/framework/testutil/disttest_util.go (91%) rename pkg/{disttask => dxf}/framework/testutil/executor_util.go (87%) rename pkg/{disttask => dxf}/framework/testutil/scheduler_util.go (96%) rename pkg/{disttask => dxf}/framework/testutil/table_util.go (98%) rename pkg/{disttask => dxf}/framework/testutil/task_util.go (95%) rename pkg/{disttask => dxf}/importinto/BUILD.bazel (83%) rename pkg/{disttask => dxf}/importinto/clean_up.go (95%) rename pkg/{disttask => dxf}/importinto/collect_conflicts.go (95%) rename pkg/{disttask => dxf}/importinto/collect_conflicts_test.go (94%) rename pkg/{disttask => dxf}/importinto/conflict_resolution.go (94%) rename pkg/{disttask => dxf}/importinto/conflict_resolution_test.go (94%) rename pkg/{disttask => dxf}/importinto/conflictedkv/BUILD.bazel (94%) rename pkg/{disttask => dxf}/importinto/conflictedkv/collector.go (100%) rename pkg/{disttask => dxf}/importinto/conflictedkv/collector_test.go (100%) rename pkg/{disttask => dxf}/importinto/conflictedkv/deleter.go (98%) rename pkg/{disttask => dxf}/importinto/conflictedkv/deleter_test.go (98%) rename pkg/{disttask => dxf}/importinto/conflictedkv/doc.go (100%) rename pkg/{disttask => dxf}/importinto/conflictedkv/handler.go (100%) rename pkg/{disttask => dxf}/importinto/conflictedkv/handler_test.go (99%) rename pkg/{disttask => dxf}/importinto/conflictedkv/row_handle.go (100%) rename pkg/{disttask => dxf}/importinto/conflictedkv/row_handle_test.go (100%) rename pkg/{disttask => dxf}/importinto/encode_and_sort_operator.go (97%) rename pkg/{disttask => dxf}/importinto/encode_and_sort_operator_test.go (97%) rename pkg/{disttask => dxf}/importinto/job.go (97%) rename pkg/{disttask => dxf}/importinto/job_testkit_test.go (96%) rename pkg/{disttask => dxf}/importinto/metrics.go (97%) rename pkg/{disttask => dxf}/importinto/metrics_test.go (100%) rename pkg/{disttask => dxf}/importinto/mock/BUILD.bazel (65%) rename pkg/{disttask => dxf}/importinto/mock/import_mock.go (87%) rename pkg/{disttask => dxf}/importinto/planner.go (99%) rename pkg/{disttask => dxf}/importinto/planner_test.go (97%) rename pkg/{disttask => dxf}/importinto/proto.go (99%) rename pkg/{disttask => dxf}/importinto/proto_test.go (100%) rename pkg/{disttask => dxf}/importinto/scheduler.go (98%) rename pkg/{disttask => dxf}/importinto/scheduler_test.go (98%) rename pkg/{disttask => dxf}/importinto/scheduler_testkit_test.go (96%) rename pkg/{disttask => dxf}/importinto/subtask_executor.go (98%) rename pkg/{disttask => dxf}/importinto/task_executor.go (98%) rename pkg/{disttask => dxf}/importinto/task_executor_test.go (94%) rename pkg/{disttask => dxf}/importinto/task_executor_testkit_test.go (95%) rename pkg/{disttask => dxf}/importinto/wrapper.go (100%) rename pkg/{disttask => dxf}/importinto/wrapper_test.go (100%) rename pkg/{disttask => dxf}/operator/BUILD.bazel (91%) rename pkg/{disttask => dxf}/operator/compose.go (100%) rename pkg/{disttask => dxf}/operator/operator.go (100%) rename pkg/{disttask => dxf}/operator/pipeline.go (100%) rename pkg/{disttask => dxf}/operator/pipeline_test.go (100%) rename pkg/{disttask => dxf}/operator/wrapper.go (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 24ccc1707d..ceec155ecb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,3 @@ # Contributing Guide -See the [Contributing Guide](https://github.com/pingcap/community/blob/master/contributors/README.md) in the [community](https://github.com/pingcap/community) repository. \ No newline at end of file +See the [Contributing Guide](https://github.com/pingcap/community/blob/master/contributors/README.md) in the [community](https://github.com/pingcap/community) repository. diff --git a/Makefile b/Makefile index 351abb1e07..7758d00545 100644 --- a/Makefile +++ b/Makefile @@ -550,13 +550,13 @@ mock_import: mockgen tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/lightning/backend/encode Encoder,EncodingBuilder,Rows,Row > br/pkg/mock/encode.go tools/bin/mockgen -package mocklocal github.com/pingcap/tidb/pkg/lightning/backend/local DiskUsage,TiKVModeSwitcher,StoreHelper > br/pkg/mock/mocklocal/local.go tools/bin/mockgen -package mock github.com/pingcap/tidb/br/pkg/utils TaskRegister > br/pkg/mock/task_register.go - tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor TaskTable,TaskExecutor,Extension > pkg/disttask/framework/mock/task_executor_mock.go - tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/scheduler Scheduler,CleanUpRoutine,TaskManager > pkg/disttask/framework/mock/scheduler_mock.go - tools/bin/mockgen -destination pkg/disttask/framework/scheduler/mock/scheduler_mock.go -package mock github.com/pingcap/tidb/pkg/disttask/framework/scheduler Extension - tools/bin/mockgen -embed -package mockexecute github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute StepExecutor > pkg/disttask/framework/mock/execute/execute_mock.go - tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/importinto MiniTaskExecutor > pkg/disttask/importinto/mock/import_mock.go - tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/planner LogicalPlan,PipelineSpec > pkg/disttask/framework/mock/plan_mock.go - tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/storage Manager > pkg/disttask/framework/mock/storage_manager_mock.go + tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor TaskTable,TaskExecutor,Extension > pkg/dxf/framework/mock/task_executor_mock.go + tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/scheduler Scheduler,CleanUpRoutine,TaskManager > pkg/dxf/framework/mock/scheduler_mock.go + tools/bin/mockgen -destination pkg/dxf/framework/scheduler/mock/scheduler_mock.go -package mock github.com/pingcap/tidb/pkg/dxf/framework/scheduler Extension + tools/bin/mockgen -embed -package mockexecute github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute StepExecutor > pkg/dxf/framework/mock/execute/execute_mock.go + tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/importinto MiniTaskExecutor > pkg/dxf/importinto/mock/import_mock.go + tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/planner LogicalPlan,PipelineSpec > pkg/dxf/framework/mock/plan_mock.go + tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/storage Manager > pkg/dxf/framework/mock/storage_manager_mock.go tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/ingestor/ingestcli Client,WriteClient > pkg/ingestor/ingestcli/mock/client_mock.go tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/importsdk FileScanner,JobManager,SQLGenerator,SDK > pkg/importsdk/mock/sdk_mock.go tools/bin/mockgen -package mock github.com/pingcap/tidb/lightning/pkg/importinto CheckpointManager > lightning/pkg/importinto/mock/import_mock.go diff --git a/build/nogo_config.json b/build/nogo_config.json index 21ec6d46e6..bdca598d60 100644 --- a/build/nogo_config.json +++ b/build/nogo_config.json @@ -573,7 +573,7 @@ "pkg/expression/builtin_cast.go": "expression/builtin_cast code", "pkg/server/": "server/ code", "pkg/distsql/": "distsql code", - "pkg/disttask": "disttask code", + "pkg/dxf": "DXF code", "dumpling/export": "dumpling/export code", "pkg/lock/": "lock file", "pkg/errno/": "errno code", @@ -690,7 +690,7 @@ "br/": "br code", "pkg/session/test": "session/test code", "pkg/ddl/tests": "ddl/tests code", - "pkg/disttask/": "disttask code", + "pkg/dxf/": "DXF code", "pkg/timer/": "timer code", "pkg/util/": "util code", "pkg/lightning/config/": "pkg/lightning/config code", diff --git a/pkg/ddl/BUILD.bazel b/pkg/ddl/BUILD.bazel index 2e8cc71b52..f01addf5fe 100644 --- a/pkg/ddl/BUILD.bazel +++ b/pkg/ddl/BUILD.bazel @@ -96,17 +96,17 @@ go_library( "//pkg/ddl/util", "//pkg/distsql", "//pkg/distsql/context", - "//pkg/disttask/framework/dxfmetric", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/operator", "//pkg/domain/affinity", "//pkg/domain/infosync", + "//pkg/dxf/framework/dxfmetric", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/operator", "//pkg/errctx", "//pkg/expression", "//pkg/expression/exprctx", @@ -321,16 +321,16 @@ go_test( "//pkg/ddl/testutil", "//pkg/ddl/util", "//pkg/distsql/context", - "//pkg/disttask/framework/mock", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/operator", "//pkg/domain", "//pkg/domain/affinity", "//pkg/domain/infosync", "//pkg/domain/serverinfo", + "//pkg/dxf/framework/mock", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/operator", "//pkg/errctx", "//pkg/errno", "//pkg/executor", diff --git a/pkg/ddl/backfilling.go b/pkg/ddl/backfilling.go index d2a740855a..b98e051d6d 100644 --- a/pkg/ddl/backfilling.go +++ b/pkg/ddl/backfilling.go @@ -31,8 +31,8 @@ import ( "github.com/pingcap/tidb/pkg/ddl/ingest" "github.com/pingcap/tidb/pkg/ddl/logutil" sess "github.com/pingcap/tidb/pkg/ddl/session" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/expression" "github.com/pingcap/tidb/pkg/expression/exprctx" "github.com/pingcap/tidb/pkg/expression/exprstatic" diff --git a/pkg/ddl/backfilling_clean_s3.go b/pkg/ddl/backfilling_clean_s3.go index db76d1b595..017b4d8075 100644 --- a/pkg/ddl/backfilling_clean_s3.go +++ b/pkg/ddl/backfilling_clean_s3.go @@ -22,11 +22,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - dxfstorage "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + dxfstorage "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/parser/ast" "github.com/pingcap/tidb/pkg/util/logutil" diff --git a/pkg/ddl/backfilling_dist_executor.go b/pkg/ddl/backfilling_dist_executor.go index c712d0c9cd..fc8bf46687 100644 --- a/pkg/ddl/backfilling_dist_executor.go +++ b/pkg/ddl/backfilling_dist_executor.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/pkg/ddl/logutil" sess "github.com/pingcap/tidb/pkg/ddl/session" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/lightning/common" "github.com/pingcap/tidb/pkg/meta/model" diff --git a/pkg/ddl/backfilling_dist_scheduler.go b/pkg/ddl/backfilling_dist_scheduler.go index 50f5ce6921..53b1de5ed8 100644 --- a/pkg/ddl/backfilling_dist_scheduler.go +++ b/pkg/ddl/backfilling_dist_scheduler.go @@ -31,11 +31,11 @@ import ( "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl/ingest" "github.com/pingcap/tidb/pkg/ddl/logutil" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - diststorage "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + diststorage "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/lightning/backend/local" diff --git a/pkg/ddl/backfilling_dist_scheduler_test.go b/pkg/ddl/backfilling_dist_scheduler_test.go index 343715141c..8030b1a209 100644 --- a/pkg/ddl/backfilling_dist_scheduler_test.go +++ b/pkg/ddl/backfilling_dist_scheduler_test.go @@ -26,10 +26,10 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" "github.com/pingcap/tidb/pkg/domain" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/meta" diff --git a/pkg/ddl/backfilling_import_cloud.go b/pkg/ddl/backfilling_import_cloud.go index d54190b748..057bc9b12f 100644 --- a/pkg/ddl/backfilling_import_cloud.go +++ b/pkg/ddl/backfilling_import_cloud.go @@ -23,11 +23,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/ddl/ingest" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/ingestor/engineapi" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend" diff --git a/pkg/ddl/backfilling_merge_sort.go b/pkg/ddl/backfilling_merge_sort.go index a313565c39..c55dcbb007 100644 --- a/pkg/ddl/backfilling_merge_sort.go +++ b/pkg/ddl/backfilling_merge_sort.go @@ -26,10 +26,10 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/pkg/ddl/ingest" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/ingestor/engineapi" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/external" diff --git a/pkg/ddl/backfilling_merge_temp.go b/pkg/ddl/backfilling_merge_temp.go index a000b397f7..6a90fec234 100644 --- a/pkg/ddl/backfilling_merge_temp.go +++ b/pkg/ddl/backfilling_merge_temp.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta/model" "github.com/pingcap/tidb/pkg/metrics" diff --git a/pkg/ddl/backfilling_operators.go b/pkg/ddl/backfilling_operators.go index a41d038658..96f19eb925 100644 --- a/pkg/ddl/backfilling_operators.go +++ b/pkg/ddl/backfilling_operators.go @@ -33,9 +33,9 @@ import ( "github.com/pingcap/tidb/pkg/ddl/ingest" "github.com/pingcap/tidb/pkg/ddl/session" distsqlctx "github.com/pingcap/tidb/pkg/distsql/context" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/ingestor/engineapi" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/external" diff --git a/pkg/ddl/backfilling_read_index.go b/pkg/ddl/backfilling_read_index.go index d6c25820ea..a979bba86c 100644 --- a/pkg/ddl/backfilling_read_index.go +++ b/pkg/ddl/backfilling_read_index.go @@ -31,12 +31,12 @@ import ( "github.com/pingcap/tidb/pkg/ddl/ingest" "github.com/pingcap/tidb/pkg/ddl/logutil" sess "github.com/pingcap/tidb/pkg/ddl/session" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/lightning/backend/local" diff --git a/pkg/ddl/ddl.go b/pkg/ddl/ddl.go index 3d37871376..cac8dd94e7 100644 --- a/pkg/ddl/ddl.go +++ b/pkg/ddl/ddl.go @@ -42,10 +42,10 @@ import ( "github.com/pingcap/tidb/pkg/ddl/systable" "github.com/pingcap/tidb/pkg/ddl/testargsv1" "github.com/pingcap/tidb/pkg/ddl/util" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" "github.com/pingcap/tidb/pkg/domain/infosync" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" "github.com/pingcap/tidb/pkg/infoschema" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta" diff --git a/pkg/ddl/export_test.go b/pkg/ddl/export_test.go index 8d45b5f078..40d13e07a1 100644 --- a/pkg/ddl/export_test.go +++ b/pkg/ddl/export_test.go @@ -24,8 +24,8 @@ import ( "github.com/pingcap/tidb/pkg/ddl/copr" "github.com/pingcap/tidb/pkg/ddl/session" "github.com/pingcap/tidb/pkg/ddl/testutil" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/errctx" "github.com/pingcap/tidb/pkg/expression" "github.com/pingcap/tidb/pkg/kv" diff --git a/pkg/ddl/index.go b/pkg/ddl/index.go index 1234fde012..bf51abc734 100644 --- a/pkg/ddl/index.go +++ b/pkg/ddl/index.go @@ -42,11 +42,11 @@ import ( sess "github.com/pingcap/tidb/pkg/ddl/session" "github.com/pingcap/tidb/pkg/ddl/systable" ddlutil "github.com/pingcap/tidb/pkg/ddl/util" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" "github.com/pingcap/tidb/pkg/domain/infosync" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/errctx" "github.com/pingcap/tidb/pkg/expression" "github.com/pingcap/tidb/pkg/expression/exprstatic" diff --git a/pkg/ddl/index_nokit_test.go b/pkg/ddl/index_nokit_test.go index 339507f181..4fa8856669 100644 --- a/pkg/ddl/index_nokit_test.go +++ b/pkg/ddl/index_nokit_test.go @@ -22,9 +22,9 @@ import ( "github.com/pingcap/errors" ddlmock "github.com/pingcap/tidb/pkg/ddl/mock" "github.com/pingcap/tidb/pkg/ddl/systable" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/meta/model" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/ddl/reorg_util.go b/pkg/ddl/reorg_util.go index e8df6b5ff5..3b165a5054 100644 --- a/pkg/ddl/reorg_util.go +++ b/pkg/ddl/reorg_util.go @@ -24,8 +24,8 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl/logutil" - dxfhandle "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" + dxfhandle "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta/model" "github.com/pingcap/tidb/pkg/sessionctx" diff --git a/pkg/ddl/testutil/BUILD.bazel b/pkg/ddl/testutil/BUILD.bazel index f77f871fa5..91db6ab9c8 100644 --- a/pkg/ddl/testutil/BUILD.bazel +++ b/pkg/ddl/testutil/BUILD.bazel @@ -11,8 +11,8 @@ go_library( deps = [ "//pkg/ddl", "//pkg/ddl/logutil", - "//pkg/disttask/operator", "//pkg/domain", + "//pkg/dxf/operator", "//pkg/kv", "//pkg/meta", "//pkg/meta/model", diff --git a/pkg/ddl/testutil/operator.go b/pkg/ddl/testutil/operator.go index 90ba745bc3..c24a06a179 100644 --- a/pkg/ddl/testutil/operator.go +++ b/pkg/ddl/testutil/operator.go @@ -15,7 +15,7 @@ package testutil import ( - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/operator" "golang.org/x/sync/errgroup" ) diff --git a/pkg/disttask/framework/mock/execute/BUILD.bazel b/pkg/disttask/framework/mock/execute/BUILD.bazel deleted file mode 100644 index f303c57a70..0000000000 --- a/pkg/disttask/framework/mock/execute/BUILD.bazel +++ /dev/null @@ -1,14 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "execute", - srcs = ["execute_mock.go"], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/mock/execute", - visibility = ["//visibility:public"], - deps = [ - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/taskexecutor/execute", - "@org_uber_go_mock//gomock", - ], -) diff --git a/pkg/domain/BUILD.bazel b/pkg/domain/BUILD.bazel index ce707eefd8..342edb4f6d 100644 --- a/pkg/domain/BUILD.bazel +++ b/pkg/domain/BUILD.bazel @@ -31,17 +31,17 @@ go_library( "//pkg/ddl/schematracker", "//pkg/ddl/systable", "//pkg/ddl/util", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", "//pkg/domain/crossks", "//pkg/domain/globalconfigsync", "//pkg/domain/infosync", "//pkg/domain/metrics", "//pkg/domain/sqlsvrapi", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", "//pkg/errno", "//pkg/infoschema", "//pkg/infoschema/issyncer", diff --git a/pkg/domain/crossks/BUILD.bazel b/pkg/domain/crossks/BUILD.bazel index cf06347a5a..7eed6ae1ad 100644 --- a/pkg/domain/crossks/BUILD.bazel +++ b/pkg/domain/crossks/BUILD.bazel @@ -49,7 +49,7 @@ go_test( deps = [ "//pkg/config", "//pkg/config/kerneltype", - "//pkg/disttask/framework/storage", + "//pkg/dxf/framework/storage", "//pkg/executor/importer", "//pkg/infoschema", "//pkg/keyspace", diff --git a/pkg/domain/crossks/cross_ks_test.go b/pkg/domain/crossks/cross_ks_test.go index 47e4c265e2..b01ef762f7 100644 --- a/pkg/domain/crossks/cross_ks_test.go +++ b/pkg/domain/crossks/cross_ks_test.go @@ -22,7 +22,7 @@ import ( "github.com/pingcap/kvproto/pkg/keyspacepb" "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/infoschema" "github.com/pingcap/tidb/pkg/keyspace" diff --git a/pkg/domain/domain.go b/pkg/domain/domain.go index c222bb03e6..6c8d29716d 100644 --- a/pkg/domain/domain.go +++ b/pkg/domain/domain.go @@ -46,16 +46,16 @@ import ( "github.com/pingcap/tidb/pkg/ddl/schematracker" "github.com/pingcap/tidb/pkg/ddl/systable" ddlutil "github.com/pingcap/tidb/pkg/ddl/util" - disthandle "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" "github.com/pingcap/tidb/pkg/domain/crossks" "github.com/pingcap/tidb/pkg/domain/globalconfigsync" "github.com/pingcap/tidb/pkg/domain/infosync" "github.com/pingcap/tidb/pkg/domain/sqlsvrapi" + disthandle "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" "github.com/pingcap/tidb/pkg/errno" "github.com/pingcap/tidb/pkg/infoschema" "github.com/pingcap/tidb/pkg/infoschema/issyncer" diff --git a/pkg/disttask/OWNERS b/pkg/dxf/OWNERS similarity index 100% rename from pkg/disttask/OWNERS rename to pkg/dxf/OWNERS diff --git a/pkg/disttask/example/BUILD.bazel b/pkg/dxf/example/BUILD.bazel similarity index 57% rename from pkg/disttask/example/BUILD.bazel rename to pkg/dxf/example/BUILD.bazel index f824a6d3de..4c1686fbb4 100644 --- a/pkg/disttask/example/BUILD.bazel +++ b/pkg/dxf/example/BUILD.bazel @@ -8,14 +8,14 @@ go_library( "scheduler.go", "task_executor.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/example", + importpath = "github.com/pingcap/tidb/pkg/dxf/example", visibility = ["//visibility:public"], deps = [ - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/util/logutil", "@com_github_pingcap_errors//:errors", "@org_uber_go_zap//:zap", @@ -29,10 +29,10 @@ go_test( embed = [":example"], flaky = True, deps = [ - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/taskexecutor", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/taskexecutor", "//pkg/testkit", "@com_github_stretchr_testify//require", "@com_github_tikv_client_go_v2//util", diff --git a/pkg/disttask/example/app_test.go b/pkg/dxf/example/app_test.go similarity index 88% rename from pkg/disttask/example/app_test.go rename to pkg/dxf/example/app_test.go index 5630ebf573..014f39548f 100644 --- a/pkg/disttask/example/app_test.go +++ b/pkg/dxf/example/app_test.go @@ -19,10 +19,10 @@ import ( "encoding/json" "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" "github.com/pingcap/tidb/pkg/testkit" "github.com/stretchr/testify/require" "github.com/tikv/client-go/v2/util" diff --git a/pkg/disttask/example/doc.go b/pkg/dxf/example/doc.go similarity index 100% rename from pkg/disttask/example/doc.go rename to pkg/dxf/example/doc.go diff --git a/pkg/disttask/example/proto.go b/pkg/dxf/example/proto.go similarity index 100% rename from pkg/disttask/example/proto.go rename to pkg/dxf/example/proto.go diff --git a/pkg/disttask/example/scheduler.go b/pkg/dxf/example/scheduler.go similarity index 94% rename from pkg/disttask/example/scheduler.go rename to pkg/dxf/example/scheduler.go index f3c7260da5..75bbbb6ae3 100644 --- a/pkg/disttask/example/scheduler.go +++ b/pkg/dxf/example/scheduler.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/util/logutil" "go.uber.org/zap" ) diff --git a/pkg/disttask/example/task_executor.go b/pkg/dxf/example/task_executor.go similarity index 90% rename from pkg/disttask/example/task_executor.go rename to pkg/dxf/example/task_executor.go index 2541ca873c..60ade4c4d5 100644 --- a/pkg/disttask/example/task_executor.go +++ b/pkg/dxf/example/task_executor.go @@ -18,9 +18,9 @@ import ( "context" "encoding/json" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/util/logutil" "go.uber.org/zap" ) diff --git a/pkg/disttask/framework/BUILD.bazel b/pkg/dxf/framework/BUILD.bazel similarity index 70% rename from pkg/disttask/framework/BUILD.bazel rename to pkg/dxf/framework/BUILD.bazel index 99698431a9..397bebfa2e 100644 --- a/pkg/disttask/framework/BUILD.bazel +++ b/pkg/dxf/framework/BUILD.bazel @@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "framework", srcs = ["doc.go"], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework", visibility = ["//visibility:public"], ) diff --git a/pkg/disttask/framework/doc.go b/pkg/dxf/framework/doc.go similarity index 100% rename from pkg/disttask/framework/doc.go rename to pkg/dxf/framework/doc.go diff --git a/pkg/disttask/framework/dxfmetric/BUILD.bazel b/pkg/dxf/framework/dxfmetric/BUILD.bazel similarity index 76% rename from pkg/disttask/framework/dxfmetric/BUILD.bazel rename to pkg/dxf/framework/dxfmetric/BUILD.bazel index 0365383a93..68f621478c 100644 --- a/pkg/disttask/framework/dxfmetric/BUILD.bazel +++ b/pkg/dxf/framework/dxfmetric/BUILD.bazel @@ -6,10 +6,10 @@ go_library( "collector.go", "metric.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric", visibility = ["//visibility:public"], deps = [ - "//pkg/disttask/framework/proto", + "//pkg/dxf/framework/proto", "//pkg/metrics/common", "//pkg/util/intest", "@com_github_google_uuid//:uuid", diff --git a/pkg/disttask/framework/dxfmetric/collector.go b/pkg/dxf/framework/dxfmetric/collector.go similarity index 98% rename from pkg/disttask/framework/dxfmetric/collector.go rename to pkg/dxf/framework/dxfmetric/collector.go index 9e15372107..6127d29c34 100644 --- a/pkg/disttask/framework/dxfmetric/collector.go +++ b/pkg/dxf/framework/dxfmetric/collector.go @@ -20,7 +20,7 @@ import ( "time" "github.com/google/uuid" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" metricscommon "github.com/pingcap/tidb/pkg/metrics/common" "github.com/pingcap/tidb/pkg/util/intest" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/disttask/framework/dxfmetric/metric.go b/pkg/dxf/framework/dxfmetric/metric.go similarity index 100% rename from pkg/disttask/framework/dxfmetric/metric.go rename to pkg/dxf/framework/dxfmetric/metric.go diff --git a/pkg/disttask/framework/handle/BUILD.bazel b/pkg/dxf/framework/handle/BUILD.bazel similarity index 82% rename from pkg/disttask/framework/handle/BUILD.bazel rename to pkg/dxf/framework/handle/BUILD.bazel index 97ece4f1af..fb091869fa 100644 --- a/pkg/disttask/framework/handle/BUILD.bazel +++ b/pkg/dxf/framework/handle/BUILD.bazel @@ -6,17 +6,17 @@ go_library( "handle.go", "status.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/handle", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/handle", visibility = ["//visibility:public"], deps = [ "//br/pkg/storage", "//br/pkg/storage/recording", "//pkg/config/kerneltype", - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/storage", "//pkg/domain/infosync", + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/storage", "//pkg/kv", "//pkg/lightning/log", "//pkg/meta", @@ -51,9 +51,9 @@ go_test( shard_count = 10, deps = [ "//pkg/config/kerneltype", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/storage", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/storage", "//pkg/kv", "//pkg/meta", "//pkg/sessionctx", diff --git a/pkg/disttask/framework/handle/handle.go b/pkg/dxf/framework/handle/handle.go similarity index 98% rename from pkg/disttask/framework/handle/handle.go rename to pkg/dxf/framework/handle/handle.go index 4d59e68769..bcb67c5157 100644 --- a/pkg/disttask/framework/handle/handle.go +++ b/pkg/dxf/framework/handle/handle.go @@ -29,10 +29,10 @@ import ( extstorage "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/br/pkg/storage/recording" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/log" "github.com/pingcap/tidb/pkg/meta" diff --git a/pkg/disttask/framework/handle/handle_test.go b/pkg/dxf/framework/handle/handle_test.go similarity index 97% rename from pkg/disttask/framework/handle/handle_test.go rename to pkg/dxf/framework/handle/handle_test.go index 205ccae031..9e4de0d384 100644 --- a/pkg/disttask/framework/handle/handle_test.go +++ b/pkg/dxf/framework/handle/handle_test.go @@ -26,9 +26,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/log" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/sessionctx/vardef" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" diff --git a/pkg/disttask/framework/handle/status.go b/pkg/dxf/framework/handle/status.go similarity index 97% rename from pkg/disttask/framework/handle/status.go rename to pkg/dxf/framework/handle/status.go index c2d80b4523..22d2c5d6d4 100644 --- a/pkg/disttask/framework/handle/status.go +++ b/pkg/dxf/framework/handle/status.go @@ -20,10 +20,10 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" "github.com/pingcap/tidb/pkg/domain/infosync" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta/tidbvar" "github.com/pingcap/tidb/pkg/sessionctx" diff --git a/pkg/disttask/framework/handle/status_test.go b/pkg/dxf/framework/handle/status_test.go similarity index 98% rename from pkg/disttask/framework/handle/status_test.go rename to pkg/dxf/framework/handle/status_test.go index 7f9e74d754..0441d94c00 100644 --- a/pkg/disttask/framework/handle/status_test.go +++ b/pkg/dxf/framework/handle/status_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/stretchr/testify/require" ) diff --git a/pkg/disttask/framework/handle/status_testkit_test.go b/pkg/dxf/framework/handle/status_testkit_test.go similarity index 96% rename from pkg/disttask/framework/handle/status_testkit_test.go rename to pkg/dxf/framework/handle/status_testkit_test.go index df991a72af..fa07756d18 100644 --- a/pkg/disttask/framework/handle/status_testkit_test.go +++ b/pkg/dxf/framework/handle/status_testkit_test.go @@ -22,10 +22,10 @@ import ( "time" "github.com/ngaut/pools" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta" "github.com/pingcap/tidb/pkg/sessionctx" diff --git a/pkg/disttask/framework/integrationtests/BUILD.bazel b/pkg/dxf/framework/integrationtests/BUILD.bazel similarity index 73% rename from pkg/disttask/framework/integrationtests/BUILD.bazel rename to pkg/dxf/framework/integrationtests/BUILD.bazel index 33c177f034..8aec1d2f69 100644 --- a/pkg/disttask/framework/integrationtests/BUILD.bazel +++ b/pkg/dxf/framework/integrationtests/BUILD.bazel @@ -22,16 +22,16 @@ go_test( "//pkg/config", "//pkg/config/kerneltype", "//pkg/ddl", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/mock/execute", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/scheduler/mock", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", "//pkg/domain", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/mock/execute", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/scheduler/mock", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", "//pkg/session", "//pkg/sessionctx", "//pkg/store/driver", diff --git a/pkg/disttask/framework/integrationtests/bench_test.go b/pkg/dxf/framework/integrationtests/bench_test.go similarity index 93% rename from pkg/disttask/framework/integrationtests/bench_test.go rename to pkg/dxf/framework/integrationtests/bench_test.go index 604a626c7c..dc87029dc7 100644 --- a/pkg/disttask/framework/integrationtests/bench_test.go +++ b/pkg/dxf/framework/integrationtests/bench_test.go @@ -23,14 +23,14 @@ import ( "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - mockDispatch "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" "github.com/pingcap/tidb/pkg/domain" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + mockDispatch "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/session" "github.com/pingcap/tidb/pkg/store/driver" "github.com/pingcap/tidb/pkg/testkit" @@ -52,7 +52,7 @@ var ( // test overhead when starting multiple schedulers // // make failpoint-enable -// GOOS=linux GOARCH=amd64 go test -tags intest -c -o bench.test ./pkg/disttask/framework/integrationtests +// GOOS=linux GOARCH=amd64 go test -tags intest -c -o bench.test ./pkg/dxf/framework/integrationtests // make failpoint-disable // // bench.test -test.v -run ^$ -test.bench=BenchmarkSchedulerOverhead --with-tikv "upstream-pd:2379?disableGC=true" diff --git a/pkg/disttask/framework/integrationtests/framework_err_handling_test.go b/pkg/dxf/framework/integrationtests/framework_err_handling_test.go similarity index 92% rename from pkg/disttask/framework/integrationtests/framework_err_handling_test.go rename to pkg/dxf/framework/integrationtests/framework_err_handling_test.go index b9cf51be90..b114a6bf95 100644 --- a/pkg/disttask/framework/integrationtests/framework_err_handling_test.go +++ b/pkg/dxf/framework/integrationtests/framework_err_handling_test.go @@ -22,11 +22,11 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/testkit" "github.com/stretchr/testify/require" ) diff --git a/pkg/disttask/framework/integrationtests/framework_ha_test.go b/pkg/dxf/framework/integrationtests/framework_ha_test.go similarity index 88% rename from pkg/disttask/framework/integrationtests/framework_ha_test.go rename to pkg/dxf/framework/integrationtests/framework_ha_test.go index 31c06422d8..d549298b71 100644 --- a/pkg/disttask/framework/integrationtests/framework_ha_test.go +++ b/pkg/dxf/framework/integrationtests/framework_ha_test.go @@ -20,10 +20,10 @@ import ( "math" "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/pingcap/tidb/pkg/util" "github.com/stretchr/testify/require" @@ -45,7 +45,7 @@ func TestHANodeRandomShutdown(t *testing.T) { keepCount := int(math.Min(float64(c.NodeCount()-1), float64(c.Rand.Intn(10)+1))) nodeNeedDown := c.GetRandNodeIDs(c.NodeCount() - keepCount) t.Logf("started %d nodes, and we keep %d nodes, nodes that need shutdown: %v", c.NodeCount(), keepCount, nodeNeedDown) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/mockTiDBShutdown", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/mockTiDBShutdown", func(e taskexecutor.TaskExecutor, execID string, _ *proto.TaskBase) { if _, ok := nodeNeedDown[execID]; ok { c.AsyncShutdown(execID) @@ -65,7 +65,7 @@ func TestHARandomShutdownInDifferentStep(t *testing.T) { nodeNeedDownAtStepTwo := c.GetRandNodeIDs(c.NodeCount()/2 - 1) t.Logf("started %d nodes, shutdown nodes at step 1: %v, shutdown nodes at step 2: %v", c.NodeCount(), nodeNeedDownAtStepOne, nodeNeedDownAtStepTwo) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/mockTiDBShutdown", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/mockTiDBShutdown", func(e taskexecutor.TaskExecutor, execID string, task *proto.TaskBase) { var targetNodes map[string]struct{} switch task.Step { diff --git a/pkg/disttask/framework/integrationtests/framework_pause_and_resume_test.go b/pkg/dxf/framework/integrationtests/framework_pause_and_resume_test.go similarity index 85% rename from pkg/disttask/framework/integrationtests/framework_pause_and_resume_test.go rename to pkg/dxf/framework/integrationtests/framework_pause_and_resume_test.go index c68eefc2e2..daf05eb857 100644 --- a/pkg/disttask/framework/integrationtests/framework_pause_and_resume_test.go +++ b/pkg/dxf/framework/integrationtests/framework_pause_and_resume_test.go @@ -20,10 +20,10 @@ import ( "testing" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/stretchr/testify/require" ) @@ -52,7 +52,7 @@ func TestFrameworkPauseAndResume(t *testing.T) { registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil) // 1. schedule and pause one running task. var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { if counter.Add(1) <= 2 { if task.State == proto.TaskStateRunning { _, err := c.TaskMgr.PauseTask(c.Ctx, task.Key) @@ -63,7 +63,7 @@ func TestFrameworkPauseAndResume(t *testing.T) { scope := handle.GetTargetScope() task1 := testutil.SubmitAndWaitTask(c.Ctx, t, "key1", scope, 1) require.Equal(t, proto.TaskStatePaused, task1.State) - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask")) // 4 subtask scheduled. require.NoError(t, handle.ResumeTask(c.Ctx, "key1")) task1Base := testutil.WaitTaskDone(c.Ctx, t, task1.Key) @@ -78,7 +78,7 @@ func TestFrameworkPauseAndResume(t *testing.T) { // 2. pause pending task. counter.Store(0) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { if counter.Add(1) <= 2 { if task.State == proto.TaskStatePending { _, err := mgr.PauseTask(c.Ctx, task.Key) @@ -88,7 +88,7 @@ func TestFrameworkPauseAndResume(t *testing.T) { }) task2 := testutil.SubmitAndWaitTask(c.Ctx, t, "key2", scope, 1) require.Equal(t, proto.TaskStatePaused, task2.State) - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask")) // 4 subtask scheduled. require.NoError(t, handle.ResumeTask(c.Ctx, "key2")) task2Base := testutil.WaitTaskDone(c.Ctx, t, task2.Key) diff --git a/pkg/disttask/framework/integrationtests/framework_rollback_test.go b/pkg/dxf/framework/integrationtests/framework_rollback_test.go similarity index 82% rename from pkg/disttask/framework/integrationtests/framework_rollback_test.go rename to pkg/dxf/framework/integrationtests/framework_rollback_test.go index d6be5e2761..e2a9d85a95 100644 --- a/pkg/disttask/framework/integrationtests/framework_rollback_test.go +++ b/pkg/dxf/framework/integrationtests/framework_rollback_test.go @@ -18,9 +18,9 @@ import ( "sync/atomic" "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/stretchr/testify/require" ) @@ -29,7 +29,7 @@ func TestFrameworkRollback(t *testing.T) { c := testutil.NewTestDXFContext(t, 2, 16, true) testutil.RegisterTaskTypeForRollback(t, c.MockCtrl, testutil.GetMockRollbackSchedulerExt(c.MockCtrl), c.TestContext) var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/afterRefreshTask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/afterRefreshTask", func(task *proto.Task) { if counter.Add(1) <= 2 { if task.State == proto.TaskStateRunning { diff --git a/pkg/disttask/framework/integrationtests/framework_scope_test.go b/pkg/dxf/framework/integrationtests/framework_scope_test.go similarity index 93% rename from pkg/disttask/framework/integrationtests/framework_scope_test.go rename to pkg/dxf/framework/integrationtests/framework_scope_test.go index 76e1978169..09d81932ad 100644 --- a/pkg/disttask/framework/integrationtests/framework_scope_test.go +++ b/pkg/dxf/framework/integrationtests/framework_scope_test.go @@ -24,10 +24,10 @@ import ( "time" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/stretchr/testify/require" @@ -90,7 +90,7 @@ func TestScopeBasic(t *testing.T) { ch := make(chan struct{}) var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/syncRefresh", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/syncRefresh", func() { if counter.Add(1) == 1 { ch <- struct{}{} } @@ -108,7 +108,7 @@ func TestScopeBasic(t *testing.T) { time.Sleep(5 * time.Second) ch2 := make(chan struct{}) var counter2 atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/syncRefresh", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/syncRefresh", func() { if counter2.Add(1) == 1 { ch2 <- struct{}{} } @@ -165,7 +165,7 @@ func runTargetScopeCase(t *testing.T, c *testutil.TestDXFContext, tk *testkit.Te } ch := make(chan struct{}) var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/syncRefresh", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/syncRefresh", func() { if counter.Add(1) <= 3 { ch <- struct{}{} } diff --git a/pkg/disttask/framework/integrationtests/framework_test.go b/pkg/dxf/framework/integrationtests/framework_test.go similarity index 86% rename from pkg/disttask/framework/integrationtests/framework_test.go rename to pkg/dxf/framework/integrationtests/framework_test.go index 1c499f1575..1f1aead2fa 100644 --- a/pkg/disttask/framework/integrationtests/framework_test.go +++ b/pkg/dxf/framework/integrationtests/framework_test.go @@ -25,14 +25,14 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - mockexecute "github.com/pingcap/tidb/pkg/disttask/framework/mock/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + mockexecute "github.com/pingcap/tidb/pkg/dxf/framework/mock/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/pingcap/tidb/pkg/util" @@ -163,7 +163,7 @@ func TestFrameworkCancelTask(t *testing.T) { registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil) var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask", func(e taskexecutor.TaskExecutor, _ *error, _ context.Context) { if counter.Add(1) == 1 { require.NoError(t, c.TaskMgr.CancelTask(c.Ctx, e.GetTaskBase().ID)) @@ -193,24 +193,24 @@ func TestOwnerChangeWhenSchedule(t *testing.T) { c := testutil.NewTestDXFContext(t, 3, 16, true) registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil) var counter atomic.Int32 - require.NoError(t, failpoint.EnableCall("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockOwnerChange", func() { + require.NoError(t, failpoint.EnableCall("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockOwnerChange", func() { if counter.Add(1) == 1 { c.AsyncChangeOwner() time.Sleep(time.Second) } })) t.Cleanup(func() { - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockOwnerChange")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockOwnerChange")) }) submitTaskAndCheckSuccessForBasic(c.Ctx, t, "😊", c.TestContext) } func TestGC(t *testing.T) { ch := make(chan struct{}) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/subtaskHistoryKeepSeconds", func(interval *int) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/subtaskHistoryKeepSeconds", func(interval *int) { *interval = 1 }) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/historySubtaskTableGcInterval", func(interval *time.Duration) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/historySubtaskTableGcInterval", func(interval *time.Duration) { *interval = 1 * time.Second <-ch }) @@ -249,7 +249,7 @@ func TestFrameworkRunSubtaskCancelOrFailed(t *testing.T) { registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil) t.Run("meet cancel on run subtask", func(t *testing.T) { var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask", func(e taskexecutor.TaskExecutor, errP *error, _ context.Context) { if counter.Add(1) == 1 { e.CancelRunningSubtask() @@ -263,7 +263,7 @@ func TestFrameworkRunSubtaskCancelOrFailed(t *testing.T) { t.Run("meet some error on run subtask", func(t *testing.T) { var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask", func(_ taskexecutor.TaskExecutor, errP *error, _ context.Context) { if counter.Add(1) == 1 { *errP = errors.New("MockExecutorRunErr") @@ -284,7 +284,7 @@ func TestFrameworkCleanUpRoutine(t *testing.T) { c := testutil.NewTestDXFContext(t, 3, 16, true) registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil) ch := make(chan struct{}, 1) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/WaitCleanUpFinished", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/WaitCleanUpFinished", func() { ch <- struct{}{} }) @@ -301,7 +301,7 @@ func TestFrameworkCleanUpRoutine(t *testing.T) { require.NotEmpty(t, subtasks) // transfer err - testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockTransferErr", "1*return()") + testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockTransferErr", "1*return()") submitTaskAndCheckSuccessForBasic(c.Ctx, t, "key2", c.TestContext) <-ch mgr, err = storage.GetTaskManager() @@ -319,7 +319,7 @@ func TestTaskCancelledBeforeUpdateTask(t *testing.T) { registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil) var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/cancelBeforeUpdateTask", func(taskID int64) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/cancelBeforeUpdateTask", func(taskID int64) { if counter.Add(1) == 1 { require.NoError(t, c.TaskMgr.CancelTask(c.Ctx, taskID)) } @@ -346,7 +346,7 @@ func TestMaxRuntimeSlots(t *testing.T) { registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil) var callCount atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/beforeSetFrameworkInfo", func(rc *proto.StepResource) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/beforeSetFrameworkInfo", func(rc *proto.StepResource) { val := callCount.Add(1) if val == 1 { require.Equal(t, 12, int(rc.CPU.Capacity())) @@ -354,7 +354,7 @@ func TestMaxRuntimeSlots(t *testing.T) { require.Equal(t, 16, int(rc.CPU.Capacity())) } }) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/beforeSubmitTask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/beforeSubmitTask", func(requiredSlots *int, params *proto.ExtraParams) { params.MaxRuntimeSlots = 12 params.TargetSteps = []proto.Step{proto.StepOne} diff --git a/pkg/disttask/framework/integrationtests/main_test.go b/pkg/dxf/framework/integrationtests/main_test.go similarity index 100% rename from pkg/disttask/framework/integrationtests/main_test.go rename to pkg/dxf/framework/integrationtests/main_test.go diff --git a/pkg/disttask/framework/integrationtests/modify_test.go b/pkg/dxf/framework/integrationtests/modify_test.go similarity index 93% rename from pkg/disttask/framework/integrationtests/modify_test.go rename to pkg/dxf/framework/integrationtests/modify_test.go index 7f92fb3850..b8de807460 100644 --- a/pkg/disttask/framework/integrationtests/modify_test.go +++ b/pkg/dxf/framework/integrationtests/modify_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - mockexecute "github.com/pingcap/tidb/pkg/disttask/framework/mock/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + mockexecute "github.com/pingcap/tidb/pkg/dxf/framework/mock/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/pingcap/tidb/pkg/util/sqlexec" @@ -119,7 +119,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) { var once sync.Once modifySyncCh := make(chan struct{}) var theTask *proto.Task - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeGetSchedulableTasks", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeGetSchedulableTasks", func() { once.Do(func() { task, err := handle.SubmitTask(c.Ctx, "k1", proto.TaskTypeExample, c.Store.GetKeyspace(), 3, scope, 0, []byte("init")) require.NoError(t, err) @@ -158,7 +158,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) { defer resetRuntimeInfoFn() var once sync.Once modifySyncCh := make(chan struct{}) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { if task.State != proto.TaskStateRunning && task.Step != proto.StepTwo { return } @@ -203,7 +203,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) { t.Run("modify running task concurrency at second subtask of step two", func(t *testing.T) { defer resetRuntimeInfoFn() - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/beforeGetTaskByIDInRun", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/beforeGetTaskByIDInRun", func(taskID int64) { if len(runtimeInfo.subtaskInfos) == 3 { require.NoError(t, c.TaskMgr.ModifyTaskByID(c.Ctx, taskID, &proto.ModifyParam{ @@ -243,7 +243,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) { var once sync.Once syncCh := make(chan struct{}) var theTask *proto.Task - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeGetSchedulableTasks", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeGetSchedulableTasks", func() { once.Do(func() { task, err := handle.SubmitTask(c.Ctx, "k3", proto.TaskTypeExample, c.Store.GetKeyspace(), 3, scope, 0, nil) require.NoError(t, err) @@ -289,7 +289,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) { var once sync.Once modifySyncCh := make(chan struct{}) var theTask *proto.Task - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeGetSchedulableTasks", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeGetSchedulableTasks", func() { once.Do(func() { task, err := handle.SubmitTask(c.Ctx, "k4", proto.TaskTypeExample, c.Store.GetKeyspace(), 3, scope, 0, nil) require.NoError(t, err) @@ -308,7 +308,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) { }) }) var onceForRefresh sync.Once - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/afterRefreshTask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/afterRefreshTask", func(task *proto.Task) { onceForRefresh.Do(func() { require.Equal(t, proto.TaskStateModifying, task.State) @@ -343,7 +343,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) { var once sync.Once modifySyncCh := make(chan struct{}) var theTask *proto.Task - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeGetSchedulableTasks", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeGetSchedulableTasks", func() { once.Do(func() { task, err := handle.SubmitTask(c.Ctx, "k5", proto.TaskTypeExample, c.Store.GetKeyspace(), 3, scope, 0, []byte("init")) require.NoError(t, err) @@ -441,7 +441,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) { defer resetRuntimeInfoFn() var once sync.Once modifySyncCh := make(chan struct{}) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { if task.State != proto.TaskStateRunning && task.Step != proto.StepOne { return } @@ -489,7 +489,7 @@ func TestModifyTaskMaxNodeCountForSubtaskBalance(t *testing.T) { defer resetRuntimeInfoFn() var once sync.Once modifySyncCh := make(chan struct{}) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { if task.State != proto.TaskStateRunning && task.Step != proto.StepOne { return } diff --git a/pkg/disttask/framework/integrationtests/resource_control_test.go b/pkg/dxf/framework/integrationtests/resource_control_test.go similarity index 97% rename from pkg/disttask/framework/integrationtests/resource_control_test.go rename to pkg/dxf/framework/integrationtests/resource_control_test.go index eeb7ac613a..e44a5119e6 100644 --- a/pkg/disttask/framework/integrationtests/resource_control_test.go +++ b/pkg/dxf/framework/integrationtests/resource_control_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - mockDispatch "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + mockDispatch "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/util" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/disttask/framework/metering/BUILD.bazel b/pkg/dxf/framework/metering/BUILD.bazel similarity index 88% rename from pkg/disttask/framework/metering/BUILD.bazel rename to pkg/dxf/framework/metering/BUILD.bazel index 84e6ed26a5..50f37621fb 100644 --- a/pkg/disttask/framework/metering/BUILD.bazel +++ b/pkg/dxf/framework/metering/BUILD.bazel @@ -7,13 +7,13 @@ go_library( "metering.go", "recorder.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/metering", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/metering", visibility = ["//visibility:public"], deps = [ "//br/pkg/storage/recording", "//pkg/config/kerneltype", - "//pkg/disttask/framework/dxfmetric", - "//pkg/disttask/framework/proto", + "//pkg/dxf/framework/dxfmetric", + "//pkg/dxf/framework/proto", "//pkg/util", "//pkg/util/logutil", "@com_github_docker_go_units//:go-units", @@ -42,7 +42,7 @@ go_test( shard_count = 12, deps = [ "//pkg/config/kerneltype", - "//pkg/disttask/framework/proto", + "//pkg/dxf/framework/proto", "//pkg/util", "@com_github_pingcap_metering_sdk//common", "@com_github_pingcap_metering_sdk//config", diff --git a/pkg/disttask/framework/metering/data.go b/pkg/dxf/framework/metering/data.go similarity index 100% rename from pkg/disttask/framework/metering/data.go rename to pkg/dxf/framework/metering/data.go diff --git a/pkg/disttask/framework/metering/data_test.go b/pkg/dxf/framework/metering/data_test.go similarity index 100% rename from pkg/disttask/framework/metering/data_test.go rename to pkg/dxf/framework/metering/data_test.go diff --git a/pkg/disttask/framework/metering/metering.go b/pkg/dxf/framework/metering/metering.go similarity index 99% rename from pkg/disttask/framework/metering/metering.go rename to pkg/dxf/framework/metering/metering.go index a6dd2355c1..4d70939b49 100644 --- a/pkg/disttask/framework/metering/metering.go +++ b/pkg/dxf/framework/metering/metering.go @@ -31,8 +31,8 @@ import ( meteringwriterapi "github.com/pingcap/metering_sdk/writer" meteringwriter "github.com/pingcap/metering_sdk/writer/metering" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/util" "github.com/pingcap/tidb/pkg/util/logutil" "go.uber.org/zap" diff --git a/pkg/disttask/framework/metering/metering_test.go b/pkg/dxf/framework/metering/metering_test.go similarity index 99% rename from pkg/disttask/framework/metering/metering_test.go rename to pkg/dxf/framework/metering/metering_test.go index 9abb913a92..9cff47b2ae 100644 --- a/pkg/disttask/framework/metering/metering_test.go +++ b/pkg/dxf/framework/metering/metering_test.go @@ -29,7 +29,7 @@ import ( meteringwriter "github.com/pingcap/metering_sdk/writer/metering" writermock "github.com/pingcap/metering_sdk/writer/mock" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/util" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/disttask/framework/metering/recorder.go b/pkg/dxf/framework/metering/recorder.go similarity index 100% rename from pkg/disttask/framework/metering/recorder.go rename to pkg/dxf/framework/metering/recorder.go diff --git a/pkg/disttask/framework/metering/recorder_test.go b/pkg/dxf/framework/metering/recorder_test.go similarity index 100% rename from pkg/disttask/framework/metering/recorder_test.go rename to pkg/dxf/framework/metering/recorder_test.go diff --git a/pkg/disttask/framework/mock/BUILD.bazel b/pkg/dxf/framework/mock/BUILD.bazel similarity index 57% rename from pkg/disttask/framework/mock/BUILD.bazel rename to pkg/dxf/framework/mock/BUILD.bazel index 0b72999603..94704f470f 100644 --- a/pkg/disttask/framework/mock/BUILD.bazel +++ b/pkg/dxf/framework/mock/BUILD.bazel @@ -8,13 +8,13 @@ go_library( "storage_manager_mock.go", "task_executor_mock.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/mock", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/mock", visibility = ["//visibility:public"], deps = [ - "//pkg/disttask/framework/planner", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/planner", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/sessionctx", "@org_uber_go_mock//gomock", ], diff --git a/pkg/dxf/framework/mock/execute/BUILD.bazel b/pkg/dxf/framework/mock/execute/BUILD.bazel new file mode 100644 index 0000000000..c6dfb439a5 --- /dev/null +++ b/pkg/dxf/framework/mock/execute/BUILD.bazel @@ -0,0 +1,14 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "execute", + srcs = ["execute_mock.go"], + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/mock/execute", + visibility = ["//visibility:public"], + deps = [ + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/taskexecutor/execute", + "@org_uber_go_mock//gomock", + ], +) diff --git a/pkg/disttask/framework/mock/execute/execute_mock.go b/pkg/dxf/framework/mock/execute/execute_mock.go similarity index 95% rename from pkg/disttask/framework/mock/execute/execute_mock.go rename to pkg/dxf/framework/mock/execute/execute_mock.go index 8a4b480882..f29afeeace 100644 --- a/pkg/disttask/framework/mock/execute/execute_mock.go +++ b/pkg/dxf/framework/mock/execute/execute_mock.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute (interfaces: StepExecutor) +// Source: github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute (interfaces: StepExecutor) // // Generated by this command: // -// mockgen -embed -package mockexecute github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute StepExecutor +// mockgen -embed -package mockexecute github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute StepExecutor // // Package mockexecute is a generated GoMock package. @@ -13,9 +13,9 @@ import ( context "context" reflect "reflect" - metering "github.com/pingcap/tidb/pkg/disttask/framework/metering" - proto "github.com/pingcap/tidb/pkg/disttask/framework/proto" - execute "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + metering "github.com/pingcap/tidb/pkg/dxf/framework/metering" + proto "github.com/pingcap/tidb/pkg/dxf/framework/proto" + execute "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/mock/plan_mock.go b/pkg/dxf/framework/mock/plan_mock.go similarity index 93% rename from pkg/disttask/framework/mock/plan_mock.go rename to pkg/dxf/framework/mock/plan_mock.go index 9b055657e0..5ea81cc63c 100644 --- a/pkg/disttask/framework/mock/plan_mock.go +++ b/pkg/dxf/framework/mock/plan_mock.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/tidb/pkg/disttask/framework/planner (interfaces: LogicalPlan,PipelineSpec) +// Source: github.com/pingcap/tidb/pkg/dxf/framework/planner (interfaces: LogicalPlan,PipelineSpec) // // Generated by this command: // -// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/planner LogicalPlan,PipelineSpec +// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/planner LogicalPlan,PipelineSpec // // Package mock is a generated GoMock package. @@ -12,8 +12,8 @@ package mock import ( reflect "reflect" - planner "github.com/pingcap/tidb/pkg/disttask/framework/planner" - proto "github.com/pingcap/tidb/pkg/disttask/framework/proto" + planner "github.com/pingcap/tidb/pkg/dxf/framework/planner" + proto "github.com/pingcap/tidb/pkg/dxf/framework/proto" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/mock/scheduler_mock.go b/pkg/dxf/framework/mock/scheduler_mock.go similarity index 98% rename from pkg/disttask/framework/mock/scheduler_mock.go rename to pkg/dxf/framework/mock/scheduler_mock.go index 2ff56ed0c4..cf09e7dadb 100644 --- a/pkg/disttask/framework/mock/scheduler_mock.go +++ b/pkg/dxf/framework/mock/scheduler_mock.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/tidb/pkg/disttask/framework/scheduler (interfaces: Scheduler,CleanUpRoutine,TaskManager) +// Source: github.com/pingcap/tidb/pkg/dxf/framework/scheduler (interfaces: Scheduler,CleanUpRoutine,TaskManager) // // Generated by this command: // -// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/scheduler Scheduler,CleanUpRoutine,TaskManager +// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/scheduler Scheduler,CleanUpRoutine,TaskManager // // Package mock is a generated GoMock package. @@ -13,9 +13,9 @@ import ( context "context" reflect "reflect" - proto "github.com/pingcap/tidb/pkg/disttask/framework/proto" - storage "github.com/pingcap/tidb/pkg/disttask/framework/storage" - execute "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + proto "github.com/pingcap/tidb/pkg/dxf/framework/proto" + storage "github.com/pingcap/tidb/pkg/dxf/framework/storage" + execute "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" sessionctx "github.com/pingcap/tidb/pkg/sessionctx" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/mock/storage_manager_mock.go b/pkg/dxf/framework/mock/storage_manager_mock.go similarity index 91% rename from pkg/disttask/framework/mock/storage_manager_mock.go rename to pkg/dxf/framework/mock/storage_manager_mock.go index 9240e0d86e..74ed36d475 100644 --- a/pkg/disttask/framework/mock/storage_manager_mock.go +++ b/pkg/dxf/framework/mock/storage_manager_mock.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/tidb/pkg/disttask/framework/storage (interfaces: Manager) +// Source: github.com/pingcap/tidb/pkg/dxf/framework/storage (interfaces: Manager) // // Generated by this command: // -// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/storage Manager +// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/storage Manager // // Package mock is a generated GoMock package. @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - proto "github.com/pingcap/tidb/pkg/disttask/framework/proto" + proto "github.com/pingcap/tidb/pkg/dxf/framework/proto" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/mock/task_executor_mock.go b/pkg/dxf/framework/mock/task_executor_mock.go similarity index 97% rename from pkg/disttask/framework/mock/task_executor_mock.go rename to pkg/dxf/framework/mock/task_executor_mock.go index c39b731309..225c2a9f10 100644 --- a/pkg/disttask/framework/mock/task_executor_mock.go +++ b/pkg/dxf/framework/mock/task_executor_mock.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor (interfaces: TaskTable,TaskExecutor,Extension) +// Source: github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor (interfaces: TaskTable,TaskExecutor,Extension) // // Generated by this command: // -// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor TaskTable,TaskExecutor,Extension +// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor TaskTable,TaskExecutor,Extension // // Package mock is a generated GoMock package. @@ -13,9 +13,9 @@ import ( context "context" reflect "reflect" - proto "github.com/pingcap/tidb/pkg/disttask/framework/proto" - storage "github.com/pingcap/tidb/pkg/disttask/framework/storage" - execute "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + proto "github.com/pingcap/tidb/pkg/dxf/framework/proto" + storage "github.com/pingcap/tidb/pkg/dxf/framework/storage" + execute "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" sessionctx "github.com/pingcap/tidb/pkg/sessionctx" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/planner/BUILD.bazel b/pkg/dxf/framework/planner/BUILD.bazel similarity index 68% rename from pkg/disttask/framework/planner/BUILD.bazel rename to pkg/dxf/framework/planner/BUILD.bazel index e8729877a2..6096e2c9cf 100644 --- a/pkg/disttask/framework/planner/BUILD.bazel +++ b/pkg/dxf/framework/planner/BUILD.bazel @@ -6,12 +6,12 @@ go_library( "plan.go", "planner.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/planner", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/planner", visibility = ["//visibility:public"], deps = [ - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/storage", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/storage", "//pkg/kv", "//pkg/sessionctx", ], @@ -28,9 +28,9 @@ go_test( shard_count = 2, deps = [ ":planner", - "//pkg/disttask/framework/mock", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/storage", + "//pkg/dxf/framework/mock", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/storage", "//pkg/kv", "//pkg/testkit", "@com_github_ngaut_pools//:pools", diff --git a/pkg/disttask/framework/planner/plan.go b/pkg/dxf/framework/planner/plan.go similarity index 98% rename from pkg/disttask/framework/planner/plan.go rename to pkg/dxf/framework/planner/plan.go index ccd4451750..d18de2a06f 100644 --- a/pkg/disttask/framework/planner/plan.go +++ b/pkg/dxf/framework/planner/plan.go @@ -17,7 +17,7 @@ package planner import ( "context" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx" ) diff --git a/pkg/disttask/framework/planner/plan_test.go b/pkg/dxf/framework/planner/plan_test.go similarity index 91% rename from pkg/disttask/framework/planner/plan_test.go rename to pkg/dxf/framework/planner/plan_test.go index dec837a9c7..2390e9e704 100644 --- a/pkg/disttask/framework/planner/plan_test.go +++ b/pkg/dxf/framework/planner/plan_test.go @@ -17,8 +17,8 @@ package planner_test import ( "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/planner" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/planner" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/planner/planner.go b/pkg/dxf/framework/planner/planner.go similarity index 91% rename from pkg/disttask/framework/planner/planner.go rename to pkg/dxf/framework/planner/planner.go index 1cf2db2e2c..dfcd7780b7 100644 --- a/pkg/disttask/framework/planner/planner.go +++ b/pkg/dxf/framework/planner/planner.go @@ -15,8 +15,8 @@ package planner import ( - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" ) // Planner represents a distribute plan planner. diff --git a/pkg/disttask/framework/planner/planner_test.go b/pkg/dxf/framework/planner/planner_test.go similarity index 89% rename from pkg/disttask/framework/planner/planner_test.go rename to pkg/dxf/framework/planner/planner_test.go index 8601f7574d..f763e0ec99 100644 --- a/pkg/disttask/framework/planner/planner_test.go +++ b/pkg/dxf/framework/planner/planner_test.go @@ -20,10 +20,10 @@ import ( "time" "github.com/ngaut/pools" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/planner" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/planner" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit" "github.com/stretchr/testify/require" diff --git a/pkg/disttask/framework/proto/BUILD.bazel b/pkg/dxf/framework/proto/BUILD.bazel similarity index 89% rename from pkg/disttask/framework/proto/BUILD.bazel rename to pkg/dxf/framework/proto/BUILD.bazel index c41f787762..857d7bd32e 100644 --- a/pkg/disttask/framework/proto/BUILD.bazel +++ b/pkg/dxf/framework/proto/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "task.go", "type.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/proto", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/proto", visibility = ["//visibility:public"], deps = ["@com_github_docker_go_units//:go-units"], ) diff --git a/pkg/disttask/framework/proto/modify.go b/pkg/dxf/framework/proto/modify.go similarity index 100% rename from pkg/disttask/framework/proto/modify.go rename to pkg/dxf/framework/proto/modify.go diff --git a/pkg/disttask/framework/proto/node.go b/pkg/dxf/framework/proto/node.go similarity index 100% rename from pkg/disttask/framework/proto/node.go rename to pkg/dxf/framework/proto/node.go diff --git a/pkg/disttask/framework/proto/step.go b/pkg/dxf/framework/proto/step.go similarity index 100% rename from pkg/disttask/framework/proto/step.go rename to pkg/dxf/framework/proto/step.go diff --git a/pkg/disttask/framework/proto/step_test.go b/pkg/dxf/framework/proto/step_test.go similarity index 100% rename from pkg/disttask/framework/proto/step_test.go rename to pkg/dxf/framework/proto/step_test.go diff --git a/pkg/disttask/framework/proto/subtask.go b/pkg/dxf/framework/proto/subtask.go similarity index 100% rename from pkg/disttask/framework/proto/subtask.go rename to pkg/dxf/framework/proto/subtask.go diff --git a/pkg/disttask/framework/proto/subtask_test.go b/pkg/dxf/framework/proto/subtask_test.go similarity index 100% rename from pkg/disttask/framework/proto/subtask_test.go rename to pkg/dxf/framework/proto/subtask_test.go diff --git a/pkg/disttask/framework/proto/task.go b/pkg/dxf/framework/proto/task.go similarity index 100% rename from pkg/disttask/framework/proto/task.go rename to pkg/dxf/framework/proto/task.go diff --git a/pkg/disttask/framework/proto/task_test.go b/pkg/dxf/framework/proto/task_test.go similarity index 100% rename from pkg/disttask/framework/proto/task_test.go rename to pkg/dxf/framework/proto/task_test.go diff --git a/pkg/disttask/framework/proto/type.go b/pkg/dxf/framework/proto/type.go similarity index 100% rename from pkg/disttask/framework/proto/type.go rename to pkg/dxf/framework/proto/type.go diff --git a/pkg/disttask/framework/proto/type_test.go b/pkg/dxf/framework/proto/type_test.go similarity index 100% rename from pkg/disttask/framework/proto/type_test.go rename to pkg/dxf/framework/proto/type_test.go diff --git a/pkg/disttask/framework/scheduler/BUILD.bazel b/pkg/dxf/framework/scheduler/BUILD.bazel similarity index 78% rename from pkg/disttask/framework/scheduler/BUILD.bazel rename to pkg/dxf/framework/scheduler/BUILD.bazel index 3b546f342a..062bf2953f 100644 --- a/pkg/disttask/framework/scheduler/BUILD.bazel +++ b/pkg/dxf/framework/scheduler/BUILD.bazel @@ -12,18 +12,18 @@ go_library( "slots.go", "state_transform.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/scheduler", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/scheduler", visibility = ["//visibility:public"], deps = [ "//pkg/config/kerneltype", - "//pkg/disttask/framework/dxfmetric", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor/execute", "//pkg/domain/infosync", "//pkg/domain/serverinfo", + "//pkg/dxf/framework/dxfmetric", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/kv", "//pkg/lightning/log", "//pkg/metrics", @@ -68,15 +68,15 @@ go_test( deps = [ "//pkg/config", "//pkg/config/kerneltype", - "//pkg/disttask/framework/dxfmetric", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/mock", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler/mock", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/testutil", "//pkg/domain/infosync", + "//pkg/dxf/framework/dxfmetric", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/mock", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler/mock", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/testutil", "//pkg/keyspace", "//pkg/kv", "//pkg/sessionctx", diff --git a/pkg/disttask/framework/scheduler/autoscaler.go b/pkg/dxf/framework/scheduler/autoscaler.go similarity index 97% rename from pkg/disttask/framework/scheduler/autoscaler.go rename to pkg/dxf/framework/scheduler/autoscaler.go index e326464632..6c8ca3c6ad 100644 --- a/pkg/disttask/framework/scheduler/autoscaler.go +++ b/pkg/dxf/framework/scheduler/autoscaler.go @@ -21,9 +21,9 @@ import ( "github.com/docker/go-units" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx/vardef" "github.com/pingcap/tidb/pkg/util/cpu" diff --git a/pkg/disttask/framework/scheduler/autoscaler_test.go b/pkg/dxf/framework/scheduler/autoscaler_test.go similarity index 98% rename from pkg/disttask/framework/scheduler/autoscaler_test.go rename to pkg/dxf/framework/scheduler/autoscaler_test.go index 0eac6f9a00..36ce313778 100644 --- a/pkg/disttask/framework/scheduler/autoscaler_test.go +++ b/pkg/dxf/framework/scheduler/autoscaler_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/docker/go-units" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" "github.com/stretchr/testify/require" ) diff --git a/pkg/disttask/framework/scheduler/balancer.go b/pkg/dxf/framework/scheduler/balancer.go similarity index 99% rename from pkg/disttask/framework/scheduler/balancer.go rename to pkg/dxf/framework/scheduler/balancer.go index 18f202bf8e..ebd2f75170 100644 --- a/pkg/disttask/framework/scheduler/balancer.go +++ b/pkg/dxf/framework/scheduler/balancer.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" llog "github.com/pingcap/tidb/pkg/lightning/log" "github.com/pingcap/tidb/pkg/util/intest" "github.com/pingcap/tidb/pkg/util/logutil" diff --git a/pkg/disttask/framework/scheduler/balancer_test.go b/pkg/dxf/framework/scheduler/balancer_test.go similarity index 99% rename from pkg/disttask/framework/scheduler/balancer_test.go rename to pkg/dxf/framework/scheduler/balancer_test.go index d1f2c1a891..ae941994b6 100644 --- a/pkg/disttask/framework/scheduler/balancer_test.go +++ b/pkg/dxf/framework/scheduler/balancer_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/disttask/framework/scheduler/interface.go b/pkg/dxf/framework/scheduler/interface.go similarity index 98% rename from pkg/disttask/framework/scheduler/interface.go rename to pkg/dxf/framework/scheduler/interface.go index 5e62f0c6a3..80ad11dc1a 100644 --- a/pkg/disttask/framework/scheduler/interface.go +++ b/pkg/dxf/framework/scheduler/interface.go @@ -17,9 +17,9 @@ package scheduler import ( "context" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/util/syncutil" diff --git a/pkg/disttask/framework/scheduler/main_test.go b/pkg/dxf/framework/scheduler/main_test.go similarity index 100% rename from pkg/disttask/framework/scheduler/main_test.go rename to pkg/dxf/framework/scheduler/main_test.go diff --git a/pkg/disttask/framework/scheduler/mock/BUILD.bazel b/pkg/dxf/framework/scheduler/mock/BUILD.bazel similarity index 56% rename from pkg/disttask/framework/scheduler/mock/BUILD.bazel rename to pkg/dxf/framework/scheduler/mock/BUILD.bazel index 76642e205e..4a51e2e542 100644 --- a/pkg/disttask/framework/scheduler/mock/BUILD.bazel +++ b/pkg/dxf/framework/scheduler/mock/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "mock", srcs = ["scheduler_mock.go"], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock", visibility = ["//visibility:public"], deps = [ - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/storage", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/storage", "@org_uber_go_mock//gomock", ], ) diff --git a/pkg/disttask/framework/scheduler/mock/scheduler_mock.go b/pkg/dxf/framework/scheduler/mock/scheduler_mock.go similarity index 92% rename from pkg/disttask/framework/scheduler/mock/scheduler_mock.go rename to pkg/dxf/framework/scheduler/mock/scheduler_mock.go index 016388349f..44f19fee97 100644 --- a/pkg/disttask/framework/scheduler/mock/scheduler_mock.go +++ b/pkg/dxf/framework/scheduler/mock/scheduler_mock.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/tidb/pkg/disttask/framework/scheduler (interfaces: Extension) +// Source: github.com/pingcap/tidb/pkg/dxf/framework/scheduler (interfaces: Extension) // // Generated by this command: // -// mockgen -destination pkg/disttask/framework/scheduler/mock/scheduler_mock.go -package mock github.com/pingcap/tidb/pkg/disttask/framework/scheduler Extension +// mockgen -destination pkg/dxf/framework/scheduler/mock/scheduler_mock.go -package mock github.com/pingcap/tidb/pkg/dxf/framework/scheduler Extension // // Package mock is a generated GoMock package. @@ -13,8 +13,8 @@ import ( context "context" reflect "reflect" - proto "github.com/pingcap/tidb/pkg/disttask/framework/proto" - storage "github.com/pingcap/tidb/pkg/disttask/framework/storage" + proto "github.com/pingcap/tidb/pkg/dxf/framework/proto" + storage "github.com/pingcap/tidb/pkg/dxf/framework/storage" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/scheduler/nodes.go b/pkg/dxf/framework/scheduler/nodes.go similarity index 98% rename from pkg/disttask/framework/scheduler/nodes.go rename to pkg/dxf/framework/scheduler/nodes.go index 9d8d98ad5d..5cb9113be6 100644 --- a/pkg/disttask/framework/scheduler/nodes.go +++ b/pkg/dxf/framework/scheduler/nodes.go @@ -21,7 +21,7 @@ import ( "time" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" llog "github.com/pingcap/tidb/pkg/lightning/log" "github.com/pingcap/tidb/pkg/util/intest" "github.com/pingcap/tidb/pkg/util/logutil" diff --git a/pkg/disttask/framework/scheduler/nodes_test.go b/pkg/dxf/framework/scheduler/nodes_test.go similarity index 96% rename from pkg/disttask/framework/scheduler/nodes_test.go rename to pkg/dxf/framework/scheduler/nodes_test.go index e136f44cac..bb2d84d70e 100644 --- a/pkg/disttask/framework/scheduler/nodes_test.go +++ b/pkg/dxf/framework/scheduler/nodes_test.go @@ -21,8 +21,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/util/cpu" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" @@ -33,9 +33,9 @@ func TestMaintainLiveNodes(t *testing.T) { defer ctrl.Finish() mockTaskMgr := mock.NewMockTaskManager(ctrl) - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockTaskExecutorNodes", "return()")) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockTaskExecutorNodes", "return()")) t.Cleanup(func() { - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockTaskExecutorNodes")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockTaskExecutorNodes")) }) MockServerInfo.Store(&[]string{":4000"}) diff --git a/pkg/disttask/framework/scheduler/scheduler.go b/pkg/dxf/framework/scheduler/scheduler.go similarity index 98% rename from pkg/disttask/framework/scheduler/scheduler.go rename to pkg/dxf/framework/scheduler/scheduler.go index 065d0cf591..3c4a61869b 100644 --- a/pkg/disttask/framework/scheduler/scheduler.go +++ b/pkg/dxf/framework/scheduler/scheduler.go @@ -25,13 +25,13 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/domain/infosync" "github.com/pingcap/tidb/pkg/domain/serverinfo" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/util/backoff" diff --git a/pkg/disttask/framework/scheduler/scheduler_manager.go b/pkg/dxf/framework/scheduler/scheduler_manager.go similarity index 98% rename from pkg/disttask/framework/scheduler/scheduler_manager.go rename to pkg/dxf/framework/scheduler/scheduler_manager.go index f3db081775..c4d5fbefe9 100644 --- a/pkg/disttask/framework/scheduler/scheduler_manager.go +++ b/pkg/dxf/framework/scheduler/scheduler_manager.go @@ -22,10 +22,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/metrics" "github.com/pingcap/tidb/pkg/sessionctx" diff --git a/pkg/disttask/framework/scheduler/scheduler_manager_nokit_test.go b/pkg/dxf/framework/scheduler/scheduler_manager_nokit_test.go similarity index 94% rename from pkg/disttask/framework/scheduler/scheduler_manager_nokit_test.go rename to pkg/dxf/framework/scheduler/scheduler_manager_nokit_test.go index e1c3ae5dea..1d5839bbb3 100644 --- a/pkg/disttask/framework/scheduler/scheduler_manager_nokit_test.go +++ b/pkg/dxf/framework/scheduler/scheduler_manager_nokit_test.go @@ -22,10 +22,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - mockScheduler "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + mockScheduler "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/stretchr/testify/require" @@ -151,7 +151,7 @@ func TestSchedulerCleanupTask(t *testing.T) { func TestManagerSchedulerNotAllocateSlots(t *testing.T) { // the tests make sure allocatedSlots correct. - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/exitScheduler", "return()")) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/exitScheduler", "return()")) ctrl := gomock.NewController(t) defer ctrl.Finish() @@ -197,7 +197,7 @@ func TestManagerSchedulerNotAllocateSlots(t *testing.T) { <-mgr.finishCh } mgr.schedulerWG.Wait() - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/exitScheduler")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/exitScheduler")) } func TestFastRespondNoNeedResourceTaskWhenSchedulersReachLimit(t *testing.T) { @@ -228,7 +228,7 @@ func TestFastRespondNoNeedResourceTaskWhenSchedulersReachLimit(t *testing.T) { } { t.Run(state.String(), func(t *testing.T) { ch := make(chan struct{}) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) { if task.ID == 1 { <-ch } diff --git a/pkg/disttask/framework/scheduler/scheduler_manager_test.go b/pkg/dxf/framework/scheduler/scheduler_manager_test.go similarity index 92% rename from pkg/disttask/framework/scheduler/scheduler_manager_test.go rename to pkg/dxf/framework/scheduler/scheduler_manager_test.go index 931664a1b0..fec94505ef 100644 --- a/pkg/disttask/framework/scheduler/scheduler_manager_test.go +++ b/pkg/dxf/framework/scheduler/scheduler_manager_test.go @@ -20,10 +20,10 @@ import ( "time" "github.com/ngaut/pools" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/stretchr/testify/require" diff --git a/pkg/disttask/framework/scheduler/scheduler_nokit_test.go b/pkg/dxf/framework/scheduler/scheduler_nokit_test.go similarity index 98% rename from pkg/disttask/framework/scheduler/scheduler_nokit_test.go rename to pkg/dxf/framework/scheduler/scheduler_nokit_test.go index 00ee0ddcf5..283acff3a4 100644 --- a/pkg/disttask/framework/scheduler/scheduler_nokit_test.go +++ b/pkg/dxf/framework/scheduler/scheduler_nokit_test.go @@ -22,11 +22,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/config" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - schmock "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + schmock "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" tidbutil "github.com/pingcap/tidb/pkg/util" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/disttask/framework/scheduler/scheduler_test.go b/pkg/dxf/framework/scheduler/scheduler_test.go similarity index 97% rename from pkg/disttask/framework/scheduler/scheduler_test.go rename to pkg/dxf/framework/scheduler/scheduler_test.go index 50136fd2ab..afafd48736 100644 --- a/pkg/disttask/framework/scheduler/scheduler_test.go +++ b/pkg/dxf/framework/scheduler/scheduler_test.go @@ -25,14 +25,14 @@ import ( "github.com/ngaut/pools" "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - mockscheduler "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" "github.com/pingcap/tidb/pkg/domain/infosync" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + mockscheduler "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx" diff --git a/pkg/disttask/framework/scheduler/slots.go b/pkg/dxf/framework/scheduler/slots.go similarity index 99% rename from pkg/disttask/framework/scheduler/slots.go rename to pkg/dxf/framework/scheduler/slots.go index 000b6d43c3..7362aa53de 100644 --- a/pkg/disttask/framework/scheduler/slots.go +++ b/pkg/dxf/framework/scheduler/slots.go @@ -21,7 +21,7 @@ import ( "sync/atomic" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/util/cpu" "github.com/pingcap/tidb/pkg/util/logutil" "go.uber.org/zap" diff --git a/pkg/disttask/framework/scheduler/slots_test.go b/pkg/dxf/framework/scheduler/slots_test.go similarity index 98% rename from pkg/disttask/framework/scheduler/slots_test.go rename to pkg/dxf/framework/scheduler/slots_test.go index d4501d5ffb..3bc5edae33 100644 --- a/pkg/disttask/framework/scheduler/slots_test.go +++ b/pkg/dxf/framework/scheduler/slots_test.go @@ -21,8 +21,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/scheduler/state_transform.go b/pkg/dxf/framework/scheduler/state_transform.go similarity index 96% rename from pkg/disttask/framework/scheduler/state_transform.go rename to pkg/dxf/framework/scheduler/state_transform.go index 003aedc3ac..762eeedb32 100644 --- a/pkg/disttask/framework/scheduler/state_transform.go +++ b/pkg/dxf/framework/scheduler/state_transform.go @@ -17,7 +17,7 @@ package scheduler import ( "slices" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" ) // VerifyTaskStateTransform verifies whether the task state transform is valid. diff --git a/pkg/disttask/framework/schstatus/BUILD.bazel b/pkg/dxf/framework/schstatus/BUILD.bazel similarity index 83% rename from pkg/disttask/framework/schstatus/BUILD.bazel rename to pkg/dxf/framework/schstatus/BUILD.bazel index 4e9c04f713..8e3f2810a5 100644 --- a/pkg/disttask/framework/schstatus/BUILD.bazel +++ b/pkg/dxf/framework/schstatus/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "status.go", "tune.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/schstatus", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/schstatus", visibility = ["//visibility:public"], ) diff --git a/pkg/disttask/framework/schstatus/status.go b/pkg/dxf/framework/schstatus/status.go similarity index 100% rename from pkg/disttask/framework/schstatus/status.go rename to pkg/dxf/framework/schstatus/status.go diff --git a/pkg/disttask/framework/schstatus/status_test.go b/pkg/dxf/framework/schstatus/status_test.go similarity index 100% rename from pkg/disttask/framework/schstatus/status_test.go rename to pkg/dxf/framework/schstatus/status_test.go diff --git a/pkg/disttask/framework/schstatus/tune.go b/pkg/dxf/framework/schstatus/tune.go similarity index 100% rename from pkg/disttask/framework/schstatus/tune.go rename to pkg/dxf/framework/schstatus/tune.go diff --git a/pkg/disttask/framework/storage/BUILD.bazel b/pkg/dxf/framework/storage/BUILD.bazel similarity index 80% rename from pkg/disttask/framework/storage/BUILD.bazel rename to pkg/dxf/framework/storage/BUILD.bazel index c7208f536c..3114fa33a2 100644 --- a/pkg/disttask/framework/storage/BUILD.bazel +++ b/pkg/dxf/framework/storage/BUILD.bazel @@ -10,14 +10,14 @@ go_library( "task_state.go", "task_table.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/storage", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/storage", visibility = ["//visibility:public"], deps = [ "//pkg/config", "//pkg/config/kerneltype", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/keyspace", "//pkg/kv", "//pkg/sessionctx", @@ -52,10 +52,10 @@ go_test( shard_count = 27, deps = [ "//pkg/config", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", "//pkg/kv", "//pkg/sessionctx", "//pkg/sessionctx/vardef", diff --git a/pkg/disttask/framework/storage/converter.go b/pkg/dxf/framework/storage/converter.go similarity index 98% rename from pkg/disttask/framework/storage/converter.go rename to pkg/dxf/framework/storage/converter.go index 8498ccf8c4..586f495749 100644 --- a/pkg/disttask/framework/storage/converter.go +++ b/pkg/dxf/framework/storage/converter.go @@ -20,7 +20,7 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/util/chunk" "github.com/pingcap/tidb/pkg/util/logutil" "go.uber.org/zap" diff --git a/pkg/disttask/framework/storage/history.go b/pkg/dxf/framework/storage/history.go similarity index 98% rename from pkg/disttask/framework/storage/history.go rename to pkg/dxf/framework/storage/history.go index 3f854dcb03..7ea7005364 100644 --- a/pkg/disttask/framework/storage/history.go +++ b/pkg/dxf/framework/storage/history.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/util/injectfailpoint" "github.com/pingcap/tidb/pkg/util/sqlexec" diff --git a/pkg/disttask/framework/storage/nodes.go b/pkg/dxf/framework/storage/nodes.go similarity index 98% rename from pkg/disttask/framework/storage/nodes.go rename to pkg/dxf/framework/storage/nodes.go index c6ecb038e9..3e78b9fbe5 100644 --- a/pkg/disttask/framework/storage/nodes.go +++ b/pkg/dxf/framework/storage/nodes.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/util/cpu" "github.com/pingcap/tidb/pkg/util/injectfailpoint" diff --git a/pkg/disttask/framework/storage/subtask_state.go b/pkg/dxf/framework/storage/subtask_state.go similarity index 98% rename from pkg/disttask/framework/storage/subtask_state.go rename to pkg/dxf/framework/storage/subtask_state.go index c0b9a7abd8..06c166e30e 100644 --- a/pkg/disttask/framework/storage/subtask_state.go +++ b/pkg/dxf/framework/storage/subtask_state.go @@ -17,7 +17,7 @@ package storage import ( "context" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/util/injectfailpoint" "github.com/pingcap/tidb/pkg/util/sqlexec" diff --git a/pkg/disttask/framework/storage/table_test.go b/pkg/dxf/framework/storage/table_test.go similarity index 98% rename from pkg/disttask/framework/storage/table_test.go rename to pkg/dxf/framework/storage/table_test.go index effbca34e9..4e90cf9e37 100644 --- a/pkg/disttask/framework/storage/table_test.go +++ b/pkg/dxf/framework/storage/table_test.go @@ -25,11 +25,11 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/sessionctx/vardef" @@ -363,7 +363,7 @@ func TestSwitchTaskStepInBatch(t *testing.T) { checkAfterSwitchStep(t, startTime, task1, subtasks1, proto.StepOne) // mock another scheduler inserted some subtasks - testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/waitBeforeInsertSubtasks", `1*return(true)`) + testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/waitBeforeInsertSubtasks", `1*return(true)`) task2, subtasks2 := prepare("key2") go func() { storage.TestChannel <- struct{}{} @@ -920,7 +920,7 @@ func TestSubtaskHistoryTable(t *testing.T) { require.Len(t, subTasks, 3) // test GC history table. - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/subtaskHistoryKeepSeconds", func(interval *int) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/subtaskHistoryKeepSeconds", func(interval *int) { *interval = 1 }) time.Sleep(2 * time.Second) diff --git a/pkg/disttask/framework/storage/task_state.go b/pkg/dxf/framework/storage/task_state.go similarity index 99% rename from pkg/disttask/framework/storage/task_state.go rename to pkg/dxf/framework/storage/task_state.go index e6a080f38c..bac5681edd 100644 --- a/pkg/disttask/framework/storage/task_state.go +++ b/pkg/dxf/framework/storage/task_state.go @@ -20,7 +20,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/util/injectfailpoint" "github.com/pingcap/tidb/pkg/util/sqlexec" diff --git a/pkg/disttask/framework/storage/task_state_test.go b/pkg/dxf/framework/storage/task_state_test.go similarity index 96% rename from pkg/disttask/framework/storage/task_state_test.go rename to pkg/dxf/framework/storage/task_state_test.go index 187c398390..bb8e5aa40f 100644 --- a/pkg/disttask/framework/storage/task_state_test.go +++ b/pkg/dxf/framework/storage/task_state_test.go @@ -22,9 +22,9 @@ import ( "sync/atomic" "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" @@ -170,7 +170,7 @@ func TestModifyTask(t *testing.T) { ch := make(chan struct{}) var wg tidbutil.WaitGroupWrapper var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/beforeMoveToModifying", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/beforeMoveToModifying", func() { if counter.Add(1) == 1 { <-ch <-ch @@ -249,7 +249,7 @@ func TestModifyTask(t *testing.T) { ch = make(chan struct{}) wg = tidbutil.WaitGroupWrapper{} var called bool - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/beforeModifiedTask", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/beforeModifiedTask", func() { if called { return } diff --git a/pkg/disttask/framework/storage/task_table.go b/pkg/dxf/framework/storage/task_table.go similarity index 99% rename from pkg/disttask/framework/storage/task_table.go rename to pkg/dxf/framework/storage/task_table.go index 5db17ceabf..0c6fbf6a11 100644 --- a/pkg/disttask/framework/storage/task_table.go +++ b/pkg/dxf/framework/storage/task_table.go @@ -28,8 +28,8 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx" diff --git a/pkg/disttask/framework/storage/task_table_test.go b/pkg/dxf/framework/storage/task_table_test.go similarity index 98% rename from pkg/disttask/framework/storage/task_table_test.go rename to pkg/dxf/framework/storage/task_table_test.go index 96f9f09c05..ba66953213 100644 --- a/pkg/disttask/framework/storage/task_table_test.go +++ b/pkg/dxf/framework/storage/task_table_test.go @@ -19,7 +19,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/config" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit/testsetup" "github.com/stretchr/testify/require" diff --git a/pkg/disttask/framework/taskexecutor/BUILD.bazel b/pkg/dxf/framework/taskexecutor/BUILD.bazel similarity index 70% rename from pkg/disttask/framework/taskexecutor/BUILD.bazel rename to pkg/dxf/framework/taskexecutor/BUILD.bazel index 2b06eac57d..33e8d72495 100644 --- a/pkg/disttask/framework/taskexecutor/BUILD.bazel +++ b/pkg/dxf/framework/taskexecutor/BUILD.bazel @@ -9,18 +9,18 @@ go_library( "slot.go", "task_executor.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor", visibility = ["//visibility:public"], deps = [ "//br/pkg/storage", "//pkg/config", - "//pkg/disttask/framework/dxfmetric", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/dxfmetric", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/kv", "//pkg/lightning/log", "//pkg/metrics", @@ -57,13 +57,13 @@ go_test( flaky = True, shard_count = 14, deps = [ - "//pkg/disttask/framework/mock", - "//pkg/disttask/framework/mock/execute", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", + "//pkg/dxf/framework/mock", + "//pkg/dxf/framework/mock/execute", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", "//pkg/kv", "//pkg/testkit", "//pkg/testkit/testfailpoint", diff --git a/pkg/disttask/framework/taskexecutor/execute/BUILD.bazel b/pkg/dxf/framework/taskexecutor/execute/BUILD.bazel similarity index 72% rename from pkg/disttask/framework/taskexecutor/execute/BUILD.bazel rename to pkg/dxf/framework/taskexecutor/execute/BUILD.bazel index f609abee13..eeb2aac230 100644 --- a/pkg/disttask/framework/taskexecutor/execute/BUILD.bazel +++ b/pkg/dxf/framework/taskexecutor/execute/BUILD.bazel @@ -3,12 +3,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "execute", srcs = ["interface.go"], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute", visibility = ["//visibility:public"], deps = [ "//br/pkg/storage/recording", - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/proto", + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/proto", "@org_uber_go_atomic//:atomic", ], ) diff --git a/pkg/disttask/framework/taskexecutor/execute/interface.go b/pkg/dxf/framework/taskexecutor/execute/interface.go similarity index 99% rename from pkg/disttask/framework/taskexecutor/execute/interface.go rename to pkg/dxf/framework/taskexecutor/execute/interface.go index 14b016e74d..09dfab3df7 100644 --- a/pkg/disttask/framework/taskexecutor/execute/interface.go +++ b/pkg/dxf/framework/taskexecutor/execute/interface.go @@ -20,8 +20,8 @@ import ( "time" "github.com/pingcap/tidb/br/pkg/storage/recording" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "go.uber.org/atomic" ) diff --git a/pkg/disttask/framework/taskexecutor/execute/interface_test.go b/pkg/dxf/framework/taskexecutor/execute/interface_test.go similarity index 100% rename from pkg/disttask/framework/taskexecutor/execute/interface_test.go rename to pkg/dxf/framework/taskexecutor/execute/interface_test.go diff --git a/pkg/disttask/framework/taskexecutor/interface.go b/pkg/dxf/framework/taskexecutor/interface.go similarity index 97% rename from pkg/disttask/framework/taskexecutor/interface.go rename to pkg/dxf/framework/taskexecutor/interface.go index db7ec73c7a..f5bc590389 100644 --- a/pkg/disttask/framework/taskexecutor/interface.go +++ b/pkg/dxf/framework/taskexecutor/interface.go @@ -18,9 +18,9 @@ import ( "context" goerrors "errors" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/sessionctx" ) diff --git a/pkg/disttask/framework/taskexecutor/main_test.go b/pkg/dxf/framework/taskexecutor/main_test.go similarity index 100% rename from pkg/disttask/framework/taskexecutor/main_test.go rename to pkg/dxf/framework/taskexecutor/main_test.go diff --git a/pkg/disttask/framework/taskexecutor/manager.go b/pkg/dxf/framework/taskexecutor/manager.go similarity index 97% rename from pkg/disttask/framework/taskexecutor/manager.go rename to pkg/dxf/framework/taskexecutor/manager.go index 2fb37eb0a6..be5d3ea759 100644 --- a/pkg/disttask/framework/taskexecutor/manager.go +++ b/pkg/dxf/framework/taskexecutor/manager.go @@ -23,11 +23,11 @@ import ( "github.com/pingcap/failpoint" litstorage "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/pkg/config" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/metrics" "github.com/pingcap/tidb/pkg/sessionctx/vardef" diff --git a/pkg/disttask/framework/taskexecutor/manager_test.go b/pkg/dxf/framework/taskexecutor/manager_test.go similarity index 98% rename from pkg/disttask/framework/taskexecutor/manager_test.go rename to pkg/dxf/framework/taskexecutor/manager_test.go index f946aa6b65..b2c834ae3a 100644 --- a/pkg/disttask/framework/taskexecutor/manager_test.go +++ b/pkg/dxf/framework/taskexecutor/manager_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/pingcap/tidb/pkg/util/logutil" "github.com/stretchr/testify/require" @@ -437,7 +437,7 @@ func TestSlotManagerInManager(t *testing.T) { return <-ch }) mockTaskTable.EXPECT().GetTaskByID(gomock.Any(), task1.ID).Return(&proto.Task{TaskBase: *task1}, nil) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/beforeCallStartTaskExecutor", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/beforeCallStartTaskExecutor", func(task *proto.TaskBase) { if task.ID == task1.ID { newTask3 := *task3 diff --git a/pkg/disttask/framework/taskexecutor/register.go b/pkg/dxf/framework/taskexecutor/register.go similarity index 95% rename from pkg/disttask/framework/taskexecutor/register.go rename to pkg/dxf/framework/taskexecutor/register.go index 8c4987c491..f08e3bb449 100644 --- a/pkg/disttask/framework/taskexecutor/register.go +++ b/pkg/dxf/framework/taskexecutor/register.go @@ -17,7 +17,7 @@ package taskexecutor import ( "context" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" ) var factoryFns = make(map[proto.TaskType]FactoryFn) diff --git a/pkg/disttask/framework/taskexecutor/register_test.go b/pkg/dxf/framework/taskexecutor/register_test.go similarity index 95% rename from pkg/disttask/framework/taskexecutor/register_test.go rename to pkg/dxf/framework/taskexecutor/register_test.go index e7ff116668..197efd6619 100644 --- a/pkg/disttask/framework/taskexecutor/register_test.go +++ b/pkg/dxf/framework/taskexecutor/register_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/stretchr/testify/require" ) diff --git a/pkg/disttask/framework/taskexecutor/slot.go b/pkg/dxf/framework/taskexecutor/slot.go similarity index 98% rename from pkg/disttask/framework/taskexecutor/slot.go rename to pkg/dxf/framework/taskexecutor/slot.go index a69f112cb0..d9d6953cfb 100644 --- a/pkg/disttask/framework/taskexecutor/slot.go +++ b/pkg/dxf/framework/taskexecutor/slot.go @@ -19,7 +19,7 @@ import ( "sync" "sync/atomic" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" ) // slotManager is used to manage the slots of the executor. diff --git a/pkg/disttask/framework/taskexecutor/slot_test.go b/pkg/dxf/framework/taskexecutor/slot_test.go similarity index 99% rename from pkg/disttask/framework/taskexecutor/slot_test.go rename to pkg/dxf/framework/taskexecutor/slot_test.go index 47c7e845be..eac9571db5 100644 --- a/pkg/disttask/framework/taskexecutor/slot_test.go +++ b/pkg/dxf/framework/taskexecutor/slot_test.go @@ -17,7 +17,7 @@ package taskexecutor import ( "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/stretchr/testify/require" ) diff --git a/pkg/disttask/framework/taskexecutor/task_executor.go b/pkg/dxf/framework/taskexecutor/task_executor.go similarity index 98% rename from pkg/disttask/framework/taskexecutor/task_executor.go rename to pkg/dxf/framework/taskexecutor/task_executor.go index fb887d4930..b715798178 100644 --- a/pkg/disttask/framework/taskexecutor/task_executor.go +++ b/pkg/dxf/framework/taskexecutor/task_executor.go @@ -26,13 +26,13 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/kv" llog "github.com/pingcap/tidb/pkg/lightning/log" "github.com/pingcap/tidb/pkg/util" diff --git a/pkg/disttask/framework/taskexecutor/task_executor_test.go b/pkg/dxf/framework/taskexecutor/task_executor_test.go similarity index 99% rename from pkg/disttask/framework/taskexecutor/task_executor_test.go rename to pkg/dxf/framework/taskexecutor/task_executor_test.go index 642b05ef72..67f531c1e6 100644 --- a/pkg/disttask/framework/taskexecutor/task_executor_test.go +++ b/pkg/dxf/framework/taskexecutor/task_executor_test.go @@ -20,12 +20,12 @@ import ( "time" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - mockexecute "github.com/pingcap/tidb/pkg/disttask/framework/mock/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + mockexecute "github.com/pingcap/tidb/pkg/dxf/framework/mock/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/taskexecutor/task_executor_testkit_test.go b/pkg/dxf/framework/taskexecutor/task_executor_testkit_test.go similarity index 93% rename from pkg/disttask/framework/taskexecutor/task_executor_testkit_test.go rename to pkg/dxf/framework/taskexecutor/task_executor_testkit_test.go index b53f1eb398..b090315216 100644 --- a/pkg/disttask/framework/taskexecutor/task_executor_testkit_test.go +++ b/pkg/dxf/framework/taskexecutor/task_executor_testkit_test.go @@ -21,10 +21,10 @@ import ( "time" "github.com/ngaut/pools" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" diff --git a/pkg/disttask/framework/testutil/BUILD.bazel b/pkg/dxf/framework/testutil/BUILD.bazel similarity index 62% rename from pkg/disttask/framework/testutil/BUILD.bazel rename to pkg/dxf/framework/testutil/BUILD.bazel index 7864d4a93a..0e4f3102dd 100644 --- a/pkg/disttask/framework/testutil/BUILD.bazel +++ b/pkg/dxf/framework/testutil/BUILD.bazel @@ -10,19 +10,19 @@ go_library( "table_util.go", "task_util.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/framework/testutil", + importpath = "github.com/pingcap/tidb/pkg/dxf/framework/testutil", visibility = ["//visibility:public"], deps = [ "//pkg/config/kerneltype", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/mock", - "//pkg/disttask/framework/mock/execute", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/scheduler/mock", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/mock", + "//pkg/dxf/framework/mock/execute", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/scheduler/mock", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/keyspace", "//pkg/kv", "//pkg/sessionctx", diff --git a/pkg/disttask/framework/testutil/context.go b/pkg/dxf/framework/testutil/context.go similarity index 97% rename from pkg/disttask/framework/testutil/context.go rename to pkg/dxf/framework/testutil/context.go index f4e983fb7d..e4b9017373 100644 --- a/pkg/disttask/framework/testutil/context.go +++ b/pkg/dxf/framework/testutil/context.go @@ -26,10 +26,10 @@ import ( "github.com/docker/go-units" "github.com/ngaut/pools" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" @@ -114,7 +114,7 @@ func (c *TestDXFContext) init(nodeNum, cpuCount int, reduceCheckInterval bool) { term := fmt.Sprintf("return(%d)", cpuCount) testfailpoint.Enable(c.T, "github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", term) testfailpoint.Enable(c.T, "github.com/pingcap/tidb/pkg/domain/MockDisableDistTask", "return(true)") - testfailpoint.Enable(c.T, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockTaskExecutorNodes", "return()") + testfailpoint.Enable(c.T, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockTaskExecutorNodes", "return()") store := testkit.CreateMockStore(c.T) pool := pools.NewResourcePool(func() (pools.Resource, error) { return testkit.NewSession(c.T, store), nil diff --git a/pkg/disttask/framework/testutil/disttest_util.go b/pkg/dxf/framework/testutil/disttest_util.go similarity index 91% rename from pkg/disttask/framework/testutil/disttest_util.go rename to pkg/dxf/framework/testutil/disttest_util.go index c7f8ce0f2b..6669fa961b 100644 --- a/pkg/disttask/framework/testutil/disttest_util.go +++ b/pkg/dxf/framework/testutil/disttest_util.go @@ -18,14 +18,14 @@ import ( "context" "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/mock" - mockexecute "github.com/pingcap/tidb/pkg/disttask/framework/mock/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/mock" + mockexecute "github.com/pingcap/tidb/pkg/dxf/framework/mock/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/testutil/executor_util.go b/pkg/dxf/framework/testutil/executor_util.go similarity index 87% rename from pkg/disttask/framework/testutil/executor_util.go rename to pkg/dxf/framework/testutil/executor_util.go index 422d29d5b8..8cb90ec9b0 100644 --- a/pkg/disttask/framework/testutil/executor_util.go +++ b/pkg/dxf/framework/testutil/executor_util.go @@ -17,9 +17,9 @@ package testutil import ( "context" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/testutil/scheduler_util.go b/pkg/dxf/framework/testutil/scheduler_util.go similarity index 96% rename from pkg/disttask/framework/testutil/scheduler_util.go rename to pkg/dxf/framework/testutil/scheduler_util.go index a7c342e02a..a4ed95c0fa 100644 --- a/pkg/disttask/framework/testutil/scheduler_util.go +++ b/pkg/dxf/framework/testutil/scheduler_util.go @@ -21,10 +21,10 @@ import ( "math" "strings" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - mockScheduler "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + mockScheduler "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/framework/testutil/table_util.go b/pkg/dxf/framework/testutil/table_util.go similarity index 98% rename from pkg/disttask/framework/testutil/table_util.go rename to pkg/dxf/framework/testutil/table_util.go index 105b2529be..26bd5a577a 100644 --- a/pkg/disttask/framework/testutil/table_util.go +++ b/pkg/dxf/framework/testutil/table_util.go @@ -22,8 +22,8 @@ import ( "time" "github.com/ngaut/pools" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/store/mockstore" diff --git a/pkg/disttask/framework/testutil/task_util.go b/pkg/dxf/framework/testutil/task_util.go similarity index 95% rename from pkg/disttask/framework/testutil/task_util.go rename to pkg/dxf/framework/testutil/task_util.go index 16a6d310e3..eea1954763 100644 --- a/pkg/disttask/framework/testutil/task_util.go +++ b/pkg/dxf/framework/testutil/task_util.go @@ -20,9 +20,9 @@ import ( "testing" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/sessionctx" "github.com/pingcap/tidb/pkg/util/sqlexec" diff --git a/pkg/disttask/importinto/BUILD.bazel b/pkg/dxf/importinto/BUILD.bazel similarity index 83% rename from pkg/disttask/importinto/BUILD.bazel rename to pkg/dxf/importinto/BUILD.bazel index 49fa45aa71..be7af84dbd 100644 --- a/pkg/disttask/importinto/BUILD.bazel +++ b/pkg/dxf/importinto/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "task_executor.go", "wrapper.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/importinto", + importpath = "github.com/pingcap/tidb/pkg/dxf/importinto", visibility = ["//visibility:public"], deps = [ "//br/pkg/logutil", @@ -26,20 +26,20 @@ go_library( "//pkg/config", "//pkg/config/kerneltype", "//pkg/ddl", - "//pkg/disttask/framework/dxfmetric", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/planner", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/importinto/conflictedkv", - "//pkg/disttask/operator", "//pkg/domain", "//pkg/domain/infosync", "//pkg/domain/serverinfo", + "//pkg/dxf/framework/dxfmetric", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/planner", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/importinto/conflictedkv", + "//pkg/dxf/operator", "//pkg/executor/importer", "//pkg/infoschema", "//pkg/ingestor/engineapi", @@ -116,17 +116,17 @@ go_test( "//pkg/config", "//pkg/config/kerneltype", "//pkg/ddl", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/planner", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", - "//pkg/disttask/importinto/mock", - "//pkg/disttask/operator", "//pkg/domain/serverinfo", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/planner", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", + "//pkg/dxf/importinto/mock", + "//pkg/dxf/operator", "//pkg/executor/importer", "//pkg/ingestor/engineapi", "//pkg/keyspace", diff --git a/pkg/disttask/importinto/clean_up.go b/pkg/dxf/importinto/clean_up.go similarity index 95% rename from pkg/disttask/importinto/clean_up.go rename to pkg/dxf/importinto/clean_up.go index 49fb5f98ef..1172386759 100644 --- a/pkg/disttask/importinto/clean_up.go +++ b/pkg/dxf/importinto/clean_up.go @@ -24,11 +24,11 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" "github.com/pingcap/tidb/pkg/domain" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/infoschema" "github.com/pingcap/tidb/pkg/lightning/backend/external" diff --git a/pkg/disttask/importinto/collect_conflicts.go b/pkg/dxf/importinto/collect_conflicts.go similarity index 95% rename from pkg/disttask/importinto/collect_conflicts.go rename to pkg/dxf/importinto/collect_conflicts.go index 1dcd8a3846..9d13ba9255 100644 --- a/pkg/disttask/importinto/collect_conflicts.go +++ b/pkg/dxf/importinto/collect_conflicts.go @@ -27,11 +27,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" - dxfhandle "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/importinto/conflictedkv" + dxfhandle "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/importinto/conflictedkv" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/ingestor/engineapi" tidbkv "github.com/pingcap/tidb/pkg/kv" diff --git a/pkg/disttask/importinto/collect_conflicts_test.go b/pkg/dxf/importinto/collect_conflicts_test.go similarity index 94% rename from pkg/disttask/importinto/collect_conflicts_test.go rename to pkg/dxf/importinto/collect_conflicts_test.go index 11fccdb595..800d38ab1a 100644 --- a/pkg/disttask/importinto/collect_conflicts_test.go +++ b/pkg/dxf/importinto/collect_conflicts_test.go @@ -19,8 +19,8 @@ import ( "testing" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/stretchr/testify/require" ) diff --git a/pkg/disttask/importinto/conflict_resolution.go b/pkg/dxf/importinto/conflict_resolution.go similarity index 94% rename from pkg/disttask/importinto/conflict_resolution.go rename to pkg/dxf/importinto/conflict_resolution.go index ab1a4c71d3..a5226da3a5 100644 --- a/pkg/disttask/importinto/conflict_resolution.go +++ b/pkg/dxf/importinto/conflict_resolution.go @@ -21,11 +21,11 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" - dxfhandle "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/importinto/conflictedkv" + dxfhandle "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/importinto/conflictedkv" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/ingestor/engineapi" tidbkv "github.com/pingcap/tidb/pkg/kv" diff --git a/pkg/disttask/importinto/conflict_resolution_test.go b/pkg/dxf/importinto/conflict_resolution_test.go similarity index 94% rename from pkg/disttask/importinto/conflict_resolution_test.go rename to pkg/dxf/importinto/conflict_resolution_test.go index 22a18b1289..13ff051968 100644 --- a/pkg/disttask/importinto/conflict_resolution_test.go +++ b/pkg/dxf/importinto/conflict_resolution_test.go @@ -22,10 +22,10 @@ import ( "github.com/docker/go-units" "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/pkg/config/kerneltype" - dxfhandle "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/importinto" + dxfhandle "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/ingestor/engineapi" tidbkv "github.com/pingcap/tidb/pkg/kv" @@ -160,7 +160,7 @@ func runConflictedKVHandleStep(t *testing.T, subtask *proto.Subtask, stepExe exe t.Helper() resource := &proto.StepResource{CPU: proto.NewAllocatable(1), Mem: proto.NewAllocatable(units.GiB)} execute.SetFrameworkInfo(stepExe, &proto.Task{TaskBase: proto.TaskBase{ID: 1}}, resource, nil, nil) - testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/importinto/createTableImporterForTest", `return(true)`) + testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/importinto/createTableImporterForTest", `return(true)`) ctx := context.Background() require.NoError(t, stepExe.Init(ctx)) require.NoError(t, stepExe.RunSubtask(ctx, subtask)) diff --git a/pkg/disttask/importinto/conflictedkv/BUILD.bazel b/pkg/dxf/importinto/conflictedkv/BUILD.bazel similarity index 94% rename from pkg/disttask/importinto/conflictedkv/BUILD.bazel rename to pkg/dxf/importinto/conflictedkv/BUILD.bazel index 50701608e1..2ddb41cb33 100644 --- a/pkg/disttask/importinto/conflictedkv/BUILD.bazel +++ b/pkg/dxf/importinto/conflictedkv/BUILD.bazel @@ -9,11 +9,11 @@ go_library( "handler.go", "row_handle.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/importinto/conflictedkv", + importpath = "github.com/pingcap/tidb/pkg/dxf/importinto/conflictedkv", visibility = ["//visibility:public"], deps = [ "//br/pkg/storage", - "//pkg/disttask/framework/handle", + "//pkg/dxf/framework/handle", "//pkg/executor/importer", "//pkg/kv", "//pkg/lightning/backend/external", diff --git a/pkg/disttask/importinto/conflictedkv/collector.go b/pkg/dxf/importinto/conflictedkv/collector.go similarity index 100% rename from pkg/disttask/importinto/conflictedkv/collector.go rename to pkg/dxf/importinto/conflictedkv/collector.go diff --git a/pkg/disttask/importinto/conflictedkv/collector_test.go b/pkg/dxf/importinto/conflictedkv/collector_test.go similarity index 100% rename from pkg/disttask/importinto/conflictedkv/collector_test.go rename to pkg/dxf/importinto/conflictedkv/collector_test.go diff --git a/pkg/disttask/importinto/conflictedkv/deleter.go b/pkg/dxf/importinto/conflictedkv/deleter.go similarity index 98% rename from pkg/disttask/importinto/conflictedkv/deleter.go rename to pkg/dxf/importinto/conflictedkv/deleter.go index 12f67571c8..d394cf3ce6 100644 --- a/pkg/disttask/importinto/conflictedkv/deleter.go +++ b/pkg/dxf/importinto/conflictedkv/deleter.go @@ -20,7 +20,7 @@ import ( "github.com/docker/go-units" "github.com/pingcap/errors" - dxfhandle "github.com/pingcap/tidb/pkg/disttask/framework/handle" + dxfhandle "github.com/pingcap/tidb/pkg/dxf/framework/handle" "github.com/pingcap/tidb/pkg/executor/importer" tidbkv "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/external" diff --git a/pkg/disttask/importinto/conflictedkv/deleter_test.go b/pkg/dxf/importinto/conflictedkv/deleter_test.go similarity index 98% rename from pkg/disttask/importinto/conflictedkv/deleter_test.go rename to pkg/dxf/importinto/conflictedkv/deleter_test.go index 699031a5ed..0ba8103b0e 100644 --- a/pkg/disttask/importinto/conflictedkv/deleter_test.go +++ b/pkg/dxf/importinto/conflictedkv/deleter_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/importinto/conflictedkv" + "github.com/pingcap/tidb/pkg/dxf/importinto/conflictedkv" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/parser/ast" "github.com/pingcap/tidb/pkg/session" diff --git a/pkg/disttask/importinto/conflictedkv/doc.go b/pkg/dxf/importinto/conflictedkv/doc.go similarity index 100% rename from pkg/disttask/importinto/conflictedkv/doc.go rename to pkg/dxf/importinto/conflictedkv/doc.go diff --git a/pkg/disttask/importinto/conflictedkv/handler.go b/pkg/dxf/importinto/conflictedkv/handler.go similarity index 100% rename from pkg/disttask/importinto/conflictedkv/handler.go rename to pkg/dxf/importinto/conflictedkv/handler.go diff --git a/pkg/disttask/importinto/conflictedkv/handler_test.go b/pkg/dxf/importinto/conflictedkv/handler_test.go similarity index 99% rename from pkg/disttask/importinto/conflictedkv/handler_test.go rename to pkg/dxf/importinto/conflictedkv/handler_test.go index c66fc002d5..dfd0633a55 100644 --- a/pkg/disttask/importinto/conflictedkv/handler_test.go +++ b/pkg/dxf/importinto/conflictedkv/handler_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/importinto/conflictedkv" + "github.com/pingcap/tidb/pkg/dxf/importinto/conflictedkv" "github.com/pingcap/tidb/pkg/executor/importer" tidbkv "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/encode" diff --git a/pkg/disttask/importinto/conflictedkv/row_handle.go b/pkg/dxf/importinto/conflictedkv/row_handle.go similarity index 100% rename from pkg/disttask/importinto/conflictedkv/row_handle.go rename to pkg/dxf/importinto/conflictedkv/row_handle.go diff --git a/pkg/disttask/importinto/conflictedkv/row_handle_test.go b/pkg/dxf/importinto/conflictedkv/row_handle_test.go similarity index 100% rename from pkg/disttask/importinto/conflictedkv/row_handle_test.go rename to pkg/dxf/importinto/conflictedkv/row_handle_test.go diff --git a/pkg/disttask/importinto/encode_and_sort_operator.go b/pkg/dxf/importinto/encode_and_sort_operator.go similarity index 97% rename from pkg/disttask/importinto/encode_and_sort_operator.go rename to pkg/dxf/importinto/encode_and_sort_operator.go index cee61a8aac..6c6380288d 100644 --- a/pkg/disttask/importinto/encode_and_sort_operator.go +++ b/pkg/dxf/importinto/encode_and_sort_operator.go @@ -23,9 +23,9 @@ import ( "github.com/google/uuid" "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/ingestor/engineapi" "github.com/pingcap/tidb/pkg/lightning/backend/external" diff --git a/pkg/disttask/importinto/encode_and_sort_operator_test.go b/pkg/dxf/importinto/encode_and_sort_operator_test.go similarity index 97% rename from pkg/disttask/importinto/encode_and_sort_operator_test.go rename to pkg/dxf/importinto/encode_and_sort_operator_test.go index ee61db6b69..ae78d8c17b 100644 --- a/pkg/disttask/importinto/encode_and_sort_operator_test.go +++ b/pkg/dxf/importinto/encode_and_sort_operator_test.go @@ -24,10 +24,10 @@ import ( "github.com/docker/go-units" "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/importinto/mock" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/importinto/mock" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/lightning/backend" "github.com/pingcap/tidb/pkg/meta/model" diff --git a/pkg/disttask/importinto/job.go b/pkg/dxf/importinto/job.go similarity index 97% rename from pkg/disttask/importinto/job.go rename to pkg/dxf/importinto/job.go index c9281f2ea3..04336169a8 100644 --- a/pkg/disttask/importinto/job.go +++ b/pkg/dxf/importinto/job.go @@ -26,14 +26,14 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/planner" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/domain" "github.com/pingcap/tidb/pkg/domain/infosync" "github.com/pingcap/tidb/pkg/domain/serverinfo" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/planner" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/kv" diff --git a/pkg/disttask/importinto/job_testkit_test.go b/pkg/dxf/importinto/job_testkit_test.go similarity index 96% rename from pkg/disttask/importinto/job_testkit_test.go rename to pkg/dxf/importinto/job_testkit_test.go index 4ef5765033..f7b98e6256 100644 --- a/pkg/disttask/importinto/job_testkit_test.go +++ b/pkg/dxf/importinto/job_testkit_test.go @@ -26,11 +26,11 @@ import ( "github.com/pingcap/kvproto/pkg/keyspacepb" "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/kv" @@ -360,7 +360,7 @@ func TestShowImportProgress(t *testing.T) { require.NoError(t, importer.StartJob(ctx, conn, jobID, importer.JobStepGlobalSorting)) checkShowInfo("init", "0B", "0B", "N/A", "0B/s", "N/A", 0) - testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/importinto/mockSpeedDuration", "return(5000)") + testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/importinto/mockSpeedDuration", "return(5000)") // Encode step switchTaskStep(ctx, t, manager, taskID, proto.ImportStepEncodeAndSort) @@ -392,7 +392,7 @@ func TestShowImportProgress(t *testing.T) { "", bytes, &s.summary, s.state, proto.ImportInto, 11) } - testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/importinto/mockSpeedDuration", "return(10000)") + testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/importinto/mockSpeedDuration", "return(10000)") switchTaskStep(ctx, t, manager, taskID, proto.ImportStepWriteAndIngest) checkShowInfo("ingest", "500B", "1000B", "50", "50B/s", "00:00:10", 50) diff --git a/pkg/disttask/importinto/metrics.go b/pkg/dxf/importinto/metrics.go similarity index 97% rename from pkg/disttask/importinto/metrics.go rename to pkg/dxf/importinto/metrics.go index e08e2a0a11..482c9b2a02 100644 --- a/pkg/disttask/importinto/metrics.go +++ b/pkg/dxf/importinto/metrics.go @@ -18,7 +18,7 @@ import ( "strconv" "sync" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/lightning/metric" tidbmetrics "github.com/pingcap/tidb/pkg/metrics" "github.com/pingcap/tidb/pkg/util/promutil" diff --git a/pkg/disttask/importinto/metrics_test.go b/pkg/dxf/importinto/metrics_test.go similarity index 100% rename from pkg/disttask/importinto/metrics_test.go rename to pkg/dxf/importinto/metrics_test.go diff --git a/pkg/disttask/importinto/mock/BUILD.bazel b/pkg/dxf/importinto/mock/BUILD.bazel similarity index 65% rename from pkg/disttask/importinto/mock/BUILD.bazel rename to pkg/dxf/importinto/mock/BUILD.bazel index a379efd49d..a1d925d2f2 100644 --- a/pkg/disttask/importinto/mock/BUILD.bazel +++ b/pkg/dxf/importinto/mock/BUILD.bazel @@ -3,10 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "mock", srcs = ["import_mock.go"], - importpath = "github.com/pingcap/tidb/pkg/disttask/importinto/mock", + importpath = "github.com/pingcap/tidb/pkg/dxf/importinto/mock", visibility = ["//visibility:public"], deps = [ - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/lightning/backend", "@org_uber_go_mock//gomock", ], diff --git a/pkg/disttask/importinto/mock/import_mock.go b/pkg/dxf/importinto/mock/import_mock.go similarity index 87% rename from pkg/disttask/importinto/mock/import_mock.go rename to pkg/dxf/importinto/mock/import_mock.go index 76b2c8fad5..a5ee61c0ff 100644 --- a/pkg/disttask/importinto/mock/import_mock.go +++ b/pkg/dxf/importinto/mock/import_mock.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/pingcap/tidb/pkg/disttask/importinto (interfaces: MiniTaskExecutor) +// Source: github.com/pingcap/tidb/pkg/dxf/importinto (interfaces: MiniTaskExecutor) // // Generated by this command: // -// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/importinto MiniTaskExecutor +// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/importinto MiniTaskExecutor // // Package mock is a generated GoMock package. @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - execute "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + execute "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" backend "github.com/pingcap/tidb/pkg/lightning/backend" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/disttask/importinto/planner.go b/pkg/dxf/importinto/planner.go similarity index 99% rename from pkg/disttask/importinto/planner.go rename to pkg/dxf/importinto/planner.go index ac37459a88..f66228e6d4 100644 --- a/pkg/disttask/importinto/planner.go +++ b/pkg/dxf/importinto/planner.go @@ -23,10 +23,10 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/planner" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" "github.com/pingcap/tidb/pkg/domain/serverinfo" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/planner" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/executor/importer" tidbkv "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/external" diff --git a/pkg/disttask/importinto/planner_test.go b/pkg/dxf/importinto/planner_test.go similarity index 97% rename from pkg/disttask/importinto/planner_test.go rename to pkg/dxf/importinto/planner_test.go index 6db9a5b4dc..1636b6cac2 100644 --- a/pkg/disttask/importinto/planner_test.go +++ b/pkg/dxf/importinto/planner_test.go @@ -24,9 +24,9 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/planner" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" "github.com/pingcap/tidb/pkg/domain/serverinfo" + "github.com/pingcap/tidb/pkg/dxf/framework/planner" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/external" @@ -187,9 +187,9 @@ func TestGenerateMergeSortSpecs(t *testing.T) { external.MaxMergeSortFileCountStep = stepBak }) // force merge sort for data kv - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/importinto/forceMergeSort", `return("data")`)) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/dxf/importinto/forceMergeSort", `return("data")`)) t.Cleanup(func() { - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/forceMergeSort")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/forceMergeSort")) }) encodeStepMetaBytes := genEncodeStepMetas(t, 3) planCtx := planner.PlanCtx{ @@ -226,7 +226,7 @@ func TestGenerateMergeSortSpecs(t *testing.T) { require.Equal(t, "d_2_/1", specs[1].(*MergeSortSpec).DataFiles[0]) // force merge sort for all kv groups - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/forceMergeSort")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/forceMergeSort")) p.Plan.ForceMergeStep = true specs, err = generateMergeSortSpecs(planCtx, p) require.NoError(t, err) @@ -301,9 +301,9 @@ func TestGetSortedKVMetas(t *testing.T) { require.Equal(t, []byte("x_2_c"), kvMetas2["data"].EndKey) // force merge sort for data kv - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/importinto/forceMergeSort", `return("data")`)) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/dxf/importinto/forceMergeSort", `return("data")`)) t.Cleanup(func() { - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/forceMergeSort")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/forceMergeSort")) }) allKVMetas, err := getSortedKVMetasForIngest(planner.PlanCtx{ PreviousSubtaskMetas: map[proto.Step][][]byte{ diff --git a/pkg/disttask/importinto/proto.go b/pkg/dxf/importinto/proto.go similarity index 99% rename from pkg/disttask/importinto/proto.go rename to pkg/dxf/importinto/proto.go index f672b07ca2..0987144750 100644 --- a/pkg/disttask/importinto/proto.go +++ b/pkg/dxf/importinto/proto.go @@ -21,8 +21,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/br/pkg/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" "github.com/pingcap/tidb/pkg/domain/serverinfo" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/ingestor/engineapi" "github.com/pingcap/tidb/pkg/lightning/backend" diff --git a/pkg/disttask/importinto/proto_test.go b/pkg/dxf/importinto/proto_test.go similarity index 100% rename from pkg/disttask/importinto/proto_test.go rename to pkg/dxf/importinto/proto_test.go diff --git a/pkg/disttask/importinto/scheduler.go b/pkg/dxf/importinto/scheduler.go similarity index 98% rename from pkg/disttask/importinto/scheduler.go rename to pkg/dxf/importinto/scheduler.go index b6da277cc7..59825249a6 100644 --- a/pkg/disttask/importinto/scheduler.go +++ b/pkg/dxf/importinto/scheduler.go @@ -28,12 +28,12 @@ import ( "github.com/pingcap/tidb/br/pkg/utils" tidb "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/planner" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/planner" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/common" diff --git a/pkg/disttask/importinto/scheduler_test.go b/pkg/dxf/importinto/scheduler_test.go similarity index 98% rename from pkg/disttask/importinto/scheduler_test.go rename to pkg/dxf/importinto/scheduler_test.go index bea282ecfc..8d55b0ecb9 100644 --- a/pkg/disttask/importinto/scheduler_test.go +++ b/pkg/dxf/importinto/scheduler_test.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" "github.com/pingcap/tidb/pkg/executor/importer" drivererr "github.com/pingcap/tidb/pkg/store/driver/error" "github.com/stretchr/testify/require" diff --git a/pkg/disttask/importinto/scheduler_testkit_test.go b/pkg/dxf/importinto/scheduler_testkit_test.go similarity index 96% rename from pkg/disttask/importinto/scheduler_testkit_test.go rename to pkg/dxf/importinto/scheduler_testkit_test.go index 51f8256d38..0ec4a74482 100644 --- a/pkg/disttask/importinto/scheduler_testkit_test.go +++ b/pkg/dxf/importinto/scheduler_testkit_test.go @@ -25,12 +25,12 @@ import ( "github.com/ngaut/pools" "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/importinto" "github.com/pingcap/tidb/pkg/domain/serverinfo" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/meta/model" @@ -313,7 +313,7 @@ func TestSchedulerExtGlobalSort(t *testing.T) { } // to merge-sort stage - testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/importinto/forceMergeSort", `return("data")`) + testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/importinto/forceMergeSort", `return("data")`) subtaskMetas, err = ext.OnNextSubtasksBatch(ctx, d, task, []string{":4000"}, ext.GetNextStep(&task.TaskBase)) require.NoError(t, err) require.Len(t, subtaskMetas, 1) @@ -349,7 +349,7 @@ func TestSchedulerExtGlobalSort(t *testing.T) { } // to write-and-ingest stage - testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/importinto/mockWriteIngestSpecs", "return(true)") + testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/importinto/mockWriteIngestSpecs", "return(true)") subtaskMetas, err = ext.OnNextSubtasksBatch(ctx, d, task, []string{":4000"}, ext.GetNextStep(&task.TaskBase)) require.NoError(t, err) require.Len(t, subtaskMetas, 2) diff --git a/pkg/disttask/importinto/subtask_executor.go b/pkg/dxf/importinto/subtask_executor.go similarity index 98% rename from pkg/disttask/importinto/subtask_executor.go rename to pkg/dxf/importinto/subtask_executor.go index 231571ed97..050737b8ce 100644 --- a/pkg/disttask/importinto/subtask_executor.go +++ b/pkg/dxf/importinto/subtask_executor.go @@ -21,8 +21,8 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/domain" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend" diff --git a/pkg/disttask/importinto/task_executor.go b/pkg/dxf/importinto/task_executor.go similarity index 98% rename from pkg/disttask/importinto/task_executor.go rename to pkg/dxf/importinto/task_executor.go index 87c6366174..3304d86432 100644 --- a/pkg/disttask/importinto/task_executor.go +++ b/pkg/dxf/importinto/task_executor.go @@ -31,13 +31,13 @@ import ( tidbconfig "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - dxfstorage "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + dxfstorage "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/ingestor/engineapi" tidbkv "github.com/pingcap/tidb/pkg/kv" diff --git a/pkg/disttask/importinto/task_executor_test.go b/pkg/dxf/importinto/task_executor_test.go similarity index 94% rename from pkg/disttask/importinto/task_executor_test.go rename to pkg/dxf/importinto/task_executor_test.go index 07a349a5f8..00d0b2d4b2 100644 --- a/pkg/disttask/importinto/task_executor_test.go +++ b/pkg/dxf/importinto/task_executor_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" "github.com/pingcap/tidb/pkg/kv" "github.com/stretchr/testify/require" ) diff --git a/pkg/disttask/importinto/task_executor_testkit_test.go b/pkg/dxf/importinto/task_executor_testkit_test.go similarity index 95% rename from pkg/disttask/importinto/task_executor_testkit_test.go rename to pkg/dxf/importinto/task_executor_testkit_test.go index 96b955b6cb..9528256675 100644 --- a/pkg/disttask/importinto/task_executor_testkit_test.go +++ b/pkg/dxf/importinto/task_executor_testkit_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/lightning/config" diff --git a/pkg/disttask/importinto/wrapper.go b/pkg/dxf/importinto/wrapper.go similarity index 100% rename from pkg/disttask/importinto/wrapper.go rename to pkg/dxf/importinto/wrapper.go diff --git a/pkg/disttask/importinto/wrapper_test.go b/pkg/dxf/importinto/wrapper_test.go similarity index 100% rename from pkg/disttask/importinto/wrapper_test.go rename to pkg/dxf/importinto/wrapper_test.go diff --git a/pkg/disttask/operator/BUILD.bazel b/pkg/dxf/operator/BUILD.bazel similarity index 91% rename from pkg/disttask/operator/BUILD.bazel rename to pkg/dxf/operator/BUILD.bazel index 6d1252f9a5..4f6230db94 100644 --- a/pkg/disttask/operator/BUILD.bazel +++ b/pkg/dxf/operator/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "pipeline.go", "wrapper.go", ], - importpath = "github.com/pingcap/tidb/pkg/disttask/operator", + importpath = "github.com/pingcap/tidb/pkg/dxf/operator", visibility = ["//visibility:public"], deps = [ "//pkg/resourcemanager/pool/workerpool", diff --git a/pkg/disttask/operator/compose.go b/pkg/dxf/operator/compose.go similarity index 100% rename from pkg/disttask/operator/compose.go rename to pkg/dxf/operator/compose.go diff --git a/pkg/disttask/operator/operator.go b/pkg/dxf/operator/operator.go similarity index 100% rename from pkg/disttask/operator/operator.go rename to pkg/dxf/operator/operator.go diff --git a/pkg/disttask/operator/pipeline.go b/pkg/dxf/operator/pipeline.go similarity index 100% rename from pkg/disttask/operator/pipeline.go rename to pkg/dxf/operator/pipeline.go diff --git a/pkg/disttask/operator/pipeline_test.go b/pkg/dxf/operator/pipeline_test.go similarity index 100% rename from pkg/disttask/operator/pipeline_test.go rename to pkg/dxf/operator/pipeline_test.go diff --git a/pkg/disttask/operator/wrapper.go b/pkg/dxf/operator/wrapper.go similarity index 100% rename from pkg/disttask/operator/wrapper.go rename to pkg/dxf/operator/wrapper.go diff --git a/pkg/executor/BUILD.bazel b/pkg/executor/BUILD.bazel index c9984443ab..72e0f02690 100644 --- a/pkg/executor/BUILD.bazel +++ b/pkg/executor/BUILD.bazel @@ -112,15 +112,15 @@ go_library( "//pkg/ddl/util", "//pkg/distsql", "//pkg/distsql/context", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/storage", - "//pkg/disttask/importinto", - "//pkg/disttask/operator", "//pkg/domain", "//pkg/domain/affinity", "//pkg/domain/infosync", "//pkg/domain/serverinfo", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/storage", + "//pkg/dxf/importinto", + "//pkg/dxf/operator", "//pkg/errctx", "//pkg/errno", "//pkg/executor/aggfuncs", @@ -419,10 +419,10 @@ go_test( "//pkg/ddl/util", "//pkg/distsql", "//pkg/distsql/context", - "//pkg/disttask/importinto", "//pkg/domain", "//pkg/domain/affinity", "//pkg/domain/infosync", + "//pkg/dxf/importinto", "//pkg/errctx", "//pkg/errno", "//pkg/executor/aggfuncs", diff --git a/pkg/executor/check_table_index.go b/pkg/executor/check_table_index.go index ce5043bc6c..1127cef94f 100644 --- a/pkg/executor/check_table_index.go +++ b/pkg/executor/check_table_index.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/errno" "github.com/pingcap/tidb/pkg/executor/internal/exec" "github.com/pingcap/tidb/pkg/infoschema" diff --git a/pkg/executor/import_into.go b/pkg/executor/import_into.go index eef178672a..f03ee95292 100644 --- a/pkg/executor/import_into.go +++ b/pkg/executor/import_into.go @@ -23,10 +23,10 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - dxfstorage "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + dxfstorage "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/executor/internal/exec" "github.com/pingcap/tidb/pkg/expression" diff --git a/pkg/executor/importer/BUILD.bazel b/pkg/executor/importer/BUILD.bazel index c7c37e44af..20ef5e8b9f 100644 --- a/pkg/executor/importer/BUILD.bazel +++ b/pkg/executor/importer/BUILD.bazel @@ -20,10 +20,10 @@ go_library( "//pkg/config", "//pkg/config/kerneltype", "//pkg/ddl/util", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/expression", "//pkg/keyspace", "//pkg/kv", @@ -120,10 +120,10 @@ go_test( "//pkg/config", "//pkg/config/kerneltype", "//pkg/ddl", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", "//pkg/expression", "//pkg/infoschema", "//pkg/keyspace", diff --git a/pkg/executor/importer/chunk_process.go b/pkg/executor/importer/chunk_process.go index 892da516d8..86ab1b47f1 100644 --- a/pkg/executor/importer/chunk_process.go +++ b/pkg/executor/importer/chunk_process.go @@ -21,7 +21,7 @@ import ( "github.com/docker/go-units" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/lightning/backend" "github.com/pingcap/tidb/pkg/lightning/backend/encode" "github.com/pingcap/tidb/pkg/lightning/backend/external" diff --git a/pkg/executor/importer/chunk_process_testkit_test.go b/pkg/executor/importer/chunk_process_testkit_test.go index 648a925ad0..b270e0eefc 100644 --- a/pkg/executor/importer/chunk_process_testkit_test.go +++ b/pkg/executor/importer/chunk_process_testkit_test.go @@ -23,8 +23,8 @@ import ( "github.com/google/uuid" "github.com/pingcap/errors" "github.com/pingcap/tidb/br/pkg/mock" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/lightning/backend/encode" "github.com/pingcap/tidb/pkg/lightning/backend/external" diff --git a/pkg/executor/importer/engine_process.go b/pkg/executor/importer/engine_process.go index b1b0d5ff23..e3d0f21151 100644 --- a/pkg/executor/importer/engine_process.go +++ b/pkg/executor/importer/engine_process.go @@ -17,7 +17,7 @@ package importer import ( "context" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/lightning/backend" "github.com/pingcap/tidb/pkg/lightning/checkpoints" "github.com/pingcap/tidb/pkg/lightning/common" diff --git a/pkg/executor/importer/import.go b/pkg/executor/importer/import.go index 9c7087b529..e7a72a2ac0 100644 --- a/pkg/executor/importer/import.go +++ b/pkg/executor/importer/import.go @@ -37,8 +37,8 @@ import ( tidb "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl/util" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" "github.com/pingcap/tidb/pkg/expression" tidbkv "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/local" diff --git a/pkg/executor/importer/importer_testkit_test.go b/pkg/executor/importer/importer_testkit_test.go index f6b985267f..9a9ee3784c 100644 --- a/pkg/executor/importer/importer_testkit_test.go +++ b/pkg/executor/importer/importer_testkit_test.go @@ -28,8 +28,8 @@ import ( "github.com/pingcap/tidb/br/pkg/mock" tidb "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/expression" "github.com/pingcap/tidb/pkg/kv" diff --git a/pkg/executor/importer/table_import.go b/pkg/executor/importer/table_import.go index 3e23c3c117..0d6cd97ae4 100644 --- a/pkg/executor/importer/table_import.go +++ b/pkg/executor/importer/table_import.go @@ -32,7 +32,7 @@ import ( "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" tidb "github.com/pingcap/tidb/pkg/config" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/keyspace" tidbkv "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend" diff --git a/pkg/executor/set.go b/pkg/executor/set.go index 1722b110df..3677955284 100644 --- a/pkg/executor/set.go +++ b/pkg/executor/set.go @@ -20,8 +20,8 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/config" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" "github.com/pingcap/tidb/pkg/domain" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/executor/internal/exec" "github.com/pingcap/tidb/pkg/expression" "github.com/pingcap/tidb/pkg/parser/ast" diff --git a/pkg/executor/show.go b/pkg/executor/show.go index 80b83bf791..195f19ef7e 100644 --- a/pkg/executor/show.go +++ b/pkg/executor/show.go @@ -31,11 +31,11 @@ import ( "github.com/pingcap/tidb/br/pkg/utils" "github.com/pingcap/tidb/pkg/bindinfo" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - fstorage "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/importinto" "github.com/pingcap/tidb/pkg/domain" "github.com/pingcap/tidb/pkg/domain/infosync" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + fstorage "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/executor/internal/exec" "github.com/pingcap/tidb/pkg/expression" diff --git a/pkg/executor/show_test.go b/pkg/executor/show_test.go index 1824fea91a..02d456bdfd 100644 --- a/pkg/executor/show_test.go +++ b/pkg/executor/show_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/errno" "github.com/pingcap/tidb/pkg/executor" "github.com/pingcap/tidb/pkg/executor/importer" diff --git a/pkg/lightning/backend/external/BUILD.bazel b/pkg/lightning/backend/external/BUILD.bazel index 130f7694fb..51bc57c2ba 100644 --- a/pkg/lightning/backend/external/BUILD.bazel +++ b/pkg/lightning/backend/external/BUILD.bazel @@ -25,8 +25,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//br/pkg/storage", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/operator", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/operator", "//pkg/ingestor/engineapi", "//pkg/kv", "//pkg/lightning/backend/encode", @@ -87,7 +87,7 @@ go_test( deps = [ "//br/pkg/storage", "//pkg/config", - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/ingestor/engineapi", "//pkg/kv", "//pkg/lightning/backend/kv", diff --git a/pkg/lightning/backend/external/merge.go b/pkg/lightning/backend/external/merge.go index 5731a53915..167b68b0e7 100644 --- a/pkg/lightning/backend/external/merge.go +++ b/pkg/lightning/backend/external/merge.go @@ -22,8 +22,8 @@ import ( "github.com/google/uuid" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/ingestor/engineapi" "github.com/pingcap/tidb/pkg/lightning/log" "github.com/pingcap/tidb/pkg/lightning/metric" diff --git a/pkg/lightning/backend/external/onefile_writer_test.go b/pkg/lightning/backend/external/onefile_writer_test.go index b5d2e00008..126bc1f061 100644 --- a/pkg/lightning/backend/external/onefile_writer_test.go +++ b/pkg/lightning/backend/external/onefile_writer_test.go @@ -26,7 +26,7 @@ import ( "time" "github.com/pingcap/tidb/br/pkg/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/ingestor/engineapi" dbkv "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/common" diff --git a/pkg/lightning/backend/external/sort_test.go b/pkg/lightning/backend/external/sort_test.go index f1ddf619da..ecd5e3f738 100644 --- a/pkg/lightning/backend/external/sort_test.go +++ b/pkg/lightning/backend/external/sort_test.go @@ -25,7 +25,7 @@ import ( "github.com/google/uuid" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/ingestor/engineapi" dbkv "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/kv" diff --git a/pkg/lightning/backend/local/BUILD.bazel b/pkg/lightning/backend/local/BUILD.bazel index 0112d1737e..73fe82baed 100644 --- a/pkg/lightning/backend/local/BUILD.bazel +++ b/pkg/lightning/backend/local/BUILD.bazel @@ -33,7 +33,7 @@ go_library( "//br/pkg/version", "//pkg/config/kerneltype", "//pkg/distsql", - "//pkg/disttask/framework/taskexecutor/execute", + "//pkg/dxf/framework/taskexecutor/execute", "//pkg/infoschema", "//pkg/ingestor/engineapi", "//pkg/ingestor/errdef", diff --git a/pkg/lightning/backend/local/job_worker.go b/pkg/lightning/backend/local/job_worker.go index bba92a9fdc..21dc25ccfe 100644 --- a/pkg/lightning/backend/local/job_worker.go +++ b/pkg/lightning/backend/local/job_worker.go @@ -26,7 +26,7 @@ import ( sst "github.com/pingcap/kvproto/pkg/import_sstpb" "github.com/pingcap/kvproto/pkg/metapb" "github.com/pingcap/tidb/br/pkg/logutil" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/ingestor/engineapi" "github.com/pingcap/tidb/pkg/ingestor/errdef" "github.com/pingcap/tidb/pkg/ingestor/ingestcli" diff --git a/pkg/lightning/backend/local/local.go b/pkg/lightning/backend/local/local.go index 398ee5a67d..5a89a9b2e3 100644 --- a/pkg/lightning/backend/local/local.go +++ b/pkg/lightning/backend/local/local.go @@ -39,7 +39,7 @@ import ( "github.com/pingcap/tidb/br/pkg/restore/split" "github.com/pingcap/tidb/br/pkg/version" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" "github.com/pingcap/tidb/pkg/infoschema" "github.com/pingcap/tidb/pkg/ingestor/engineapi" "github.com/pingcap/tidb/pkg/ingestor/ingestcli" diff --git a/pkg/meta/BUILD.bazel b/pkg/meta/BUILD.bazel index 11df865603..e29d348c6f 100644 --- a/pkg/meta/BUILD.bazel +++ b/pkg/meta/BUILD.bazel @@ -11,7 +11,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/config/kerneltype", - "//pkg/disttask/framework/schstatus", + "//pkg/dxf/framework/schstatus", "//pkg/errno", "//pkg/kv", "//pkg/meta/metadef", @@ -47,7 +47,7 @@ go_test( deps = [ "//pkg/config/kerneltype", "//pkg/ddl", - "//pkg/disttask/framework/schstatus", + "//pkg/dxf/framework/schstatus", "//pkg/infoschema/context", "//pkg/kv", "//pkg/meta/metadef", diff --git a/pkg/meta/meta.go b/pkg/meta/meta.go index 03412f33b9..bf02dcd661 100644 --- a/pkg/meta/meta.go +++ b/pkg/meta/meta.go @@ -31,7 +31,7 @@ import ( "github.com/pingcap/kvproto/pkg/kvrpcpb" rmpb "github.com/pingcap/kvproto/pkg/resource_manager" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" "github.com/pingcap/tidb/pkg/errno" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta/metadef" diff --git a/pkg/meta/meta_test.go b/pkg/meta/meta_test.go index 269d309390..5570974a70 100644 --- a/pkg/meta/meta_test.go +++ b/pkg/meta/meta_test.go @@ -27,7 +27,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" infoschemacontext "github.com/pingcap/tidb/pkg/infoschema/context" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta" diff --git a/pkg/metrics/BUILD.bazel b/pkg/metrics/BUILD.bazel index e1fff59ef0..634818dd19 100644 --- a/pkg/metrics/BUILD.bazel +++ b/pkg/metrics/BUILD.bazel @@ -32,7 +32,7 @@ go_library( importpath = "github.com/pingcap/tidb/pkg/metrics", visibility = ["//visibility:public"], deps = [ - "//pkg/disttask/framework/dxfmetric", + "//pkg/dxf/framework/dxfmetric", "//pkg/lightning/metric", "//pkg/metrics/common", "//pkg/parser/terror", diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index e75070874b..a0d125dc09 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -17,7 +17,7 @@ package metrics import ( "sync" - "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric" + "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric" metricscommon "github.com/pingcap/tidb/pkg/metrics/common" timermetrics "github.com/pingcap/tidb/pkg/timer/metrics" "github.com/pingcap/tidb/pkg/util/logutil" diff --git a/pkg/server/handler/tests/BUILD.bazel b/pkg/server/handler/tests/BUILD.bazel index 8277e1aaad..6b02fa65d9 100644 --- a/pkg/server/handler/tests/BUILD.bazel +++ b/pkg/server/handler/tests/BUILD.bazel @@ -16,12 +16,12 @@ go_test( "//pkg/config/kerneltype", "//pkg/ddl", "//pkg/ddl/util", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/storage", "//pkg/domain", "//pkg/domain/infosync", "//pkg/domain/serverinfo", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/storage", "//pkg/executor/mppcoordmanager", "//pkg/infoschema", "//pkg/kv", diff --git a/pkg/server/handler/tests/dxf_test.go b/pkg/server/handler/tests/dxf_test.go index e9794708e3..1a89050d97 100644 --- a/pkg/server/handler/tests/dxf_test.go +++ b/pkg/server/handler/tests/dxf_test.go @@ -25,9 +25,9 @@ import ( "time" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" "github.com/stretchr/testify/require" diff --git a/pkg/server/handler/tikvhandler/BUILD.bazel b/pkg/server/handler/tikvhandler/BUILD.bazel index f7b9e5a4d7..19fb2d6c97 100644 --- a/pkg/server/handler/tikvhandler/BUILD.bazel +++ b/pkg/server/handler/tikvhandler/BUILD.bazel @@ -11,13 +11,13 @@ go_library( deps = [ "//pkg/config", "//pkg/ddl", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/storage", "//pkg/domain", "//pkg/domain/infosync", "//pkg/domain/serverinfo", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/storage", "//pkg/executor", "//pkg/infoschema", "//pkg/infoschema/context", @@ -68,7 +68,7 @@ go_test( embed = [":tikvhandler"], flaky = True, deps = [ - "//pkg/disttask/framework/schstatus", + "//pkg/dxf/framework/schstatus", "@com_github_stretchr_testify//require", ], ) diff --git a/pkg/server/handler/tikvhandler/dxf.go b/pkg/server/handler/tikvhandler/dxf.go index 8b67929114..df8825c726 100644 --- a/pkg/server/handler/tikvhandler/dxf.go +++ b/pkg/server/handler/tikvhandler/dxf.go @@ -22,10 +22,10 @@ import ( "github.com/gorilla/mux" "github.com/pingcap/errors" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta" "github.com/pingcap/tidb/pkg/server/handler" diff --git a/pkg/server/handler/tikvhandler/dxf_test.go b/pkg/server/handler/tikvhandler/dxf_test.go index 2f208cde44..ed980a65f5 100644 --- a/pkg/server/handler/tikvhandler/dxf_test.go +++ b/pkg/server/handler/tikvhandler/dxf_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" "github.com/stretchr/testify/require" ) diff --git a/pkg/session/BUILD.bazel b/pkg/session/BUILD.bazel index 839d06bd40..17694b0769 100644 --- a/pkg/session/BUILD.bazel +++ b/pkg/session/BUILD.bazel @@ -27,14 +27,14 @@ go_library( "//pkg/ddl/schematracker", "//pkg/ddl/serverstate", "//pkg/distsql/context", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/importinto", "//pkg/domain", "//pkg/domain/infosync", "//pkg/domain/sqlsvrapi", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/importinto", "//pkg/errno", "//pkg/executor", "//pkg/executor/staticrecordset", diff --git a/pkg/session/session.go b/pkg/session/session.go index 3b5e697169..33c51fffe2 100644 --- a/pkg/session/session.go +++ b/pkg/session/session.go @@ -48,13 +48,13 @@ import ( "github.com/pingcap/tidb/pkg/ddl" "github.com/pingcap/tidb/pkg/ddl/placement" distsqlctx "github.com/pingcap/tidb/pkg/distsql/context" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/importinto" "github.com/pingcap/tidb/pkg/domain" "github.com/pingcap/tidb/pkg/domain/infosync" "github.com/pingcap/tidb/pkg/domain/sqlsvrapi" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/errno" "github.com/pingcap/tidb/pkg/executor" "github.com/pingcap/tidb/pkg/executor/staticrecordset" diff --git a/pkg/session/sync_upgrade.go b/pkg/session/sync_upgrade.go index af57f6f43b..a771b19572 100644 --- a/pkg/session/sync_upgrade.go +++ b/pkg/session/sync_upgrade.go @@ -22,8 +22,8 @@ import ( "github.com/pingcap/log" "github.com/pingcap/tidb/pkg/ddl" "github.com/pingcap/tidb/pkg/ddl/serverstate" - dist_store "github.com/pingcap/tidb/pkg/disttask/framework/storage" "github.com/pingcap/tidb/pkg/domain" + dist_store "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/owner" "github.com/pingcap/tidb/pkg/session/sessionapi" diff --git a/pkg/store/mockstore/teststore/BUILD.bazel b/pkg/store/mockstore/teststore/BUILD.bazel index 6bb31e2a12..1f2cfd8a54 100644 --- a/pkg/store/mockstore/teststore/BUILD.bazel +++ b/pkg/store/mockstore/teststore/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//pkg/config", "//pkg/config/kerneltype", - "//pkg/disttask/framework/handle", + "//pkg/dxf/framework/handle", "//pkg/keyspace", "//pkg/kv", "//pkg/store", diff --git a/pkg/store/mockstore/teststore/store.go b/pkg/store/mockstore/teststore/store.go index 35bbb9abde..3777891d46 100644 --- a/pkg/store/mockstore/teststore/store.go +++ b/pkg/store/mockstore/teststore/store.go @@ -17,7 +17,7 @@ package teststore import ( "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/kv" kvstore "github.com/pingcap/tidb/pkg/store" diff --git a/pkg/testkit/testenv/BUILD.bazel b/pkg/testkit/testenv/BUILD.bazel index 18eb5438ac..1fbb9d91e9 100644 --- a/pkg/testkit/testenv/BUILD.bazel +++ b/pkg/testkit/testenv/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/config", - "//pkg/disttask/framework/handle", + "//pkg/dxf/framework/handle", "//pkg/keyspace", ], ) diff --git a/pkg/testkit/testenv/testenv.go b/pkg/testkit/testenv/testenv.go index 6ffd8ef6b8..794c54d190 100644 --- a/pkg/testkit/testenv/testenv.go +++ b/pkg/testkit/testenv/testenv.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/pingcap/tidb/pkg/config" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" "github.com/pingcap/tidb/pkg/keyspace" ) diff --git a/tests/realtikvtest/BUILD.bazel b/tests/realtikvtest/BUILD.bazel index 3994beed7f..418c41215d 100644 --- a/tests/realtikvtest/BUILD.bazel +++ b/tests/realtikvtest/BUILD.bazel @@ -10,8 +10,8 @@ go_library( "//pkg/config/kerneltype", "//pkg/ddl", "//pkg/ddl/ingest/testutil", - "//pkg/disttask/framework/handle", "//pkg/domain", + "//pkg/dxf/framework/handle", "//pkg/keyspace", "//pkg/kv", "//pkg/session", diff --git a/tests/realtikvtest/addindextest/BUILD.bazel b/tests/realtikvtest/addindextest/BUILD.bazel index de8b96b887..8a525907ae 100644 --- a/tests/realtikvtest/addindextest/BUILD.bazel +++ b/tests/realtikvtest/addindextest/BUILD.bazel @@ -15,7 +15,7 @@ go_test( deps = [ "//pkg/config", "//pkg/config/kerneltype", - "//pkg/disttask/framework/testutil", + "//pkg/dxf/framework/testutil", "//pkg/meta/model", "//pkg/testkit", "//pkg/testkit/testfailpoint", diff --git a/tests/realtikvtest/addindextest/add_index_test.go b/tests/realtikvtest/addindextest/add_index_test.go index f9d3604ead..ff48cad2f9 100644 --- a/tests/realtikvtest/addindextest/add_index_test.go +++ b/tests/realtikvtest/addindextest/add_index_test.go @@ -20,7 +20,7 @@ import ( "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/meta/model" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" diff --git a/tests/realtikvtest/addindextest/concurrent_ddl_test.go b/tests/realtikvtest/addindextest/concurrent_ddl_test.go index 11118b9142..046454ad86 100644 --- a/tests/realtikvtest/addindextest/concurrent_ddl_test.go +++ b/tests/realtikvtest/addindextest/concurrent_ddl_test.go @@ -17,7 +17,7 @@ package addindextest import ( "testing" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/tests/realtikvtest/testutils" "github.com/stretchr/testify/require" ) diff --git a/tests/realtikvtest/addindextest1/BUILD.bazel b/tests/realtikvtest/addindextest1/BUILD.bazel index bc58c44f6f..cdca0f9652 100644 --- a/tests/realtikvtest/addindextest1/BUILD.bazel +++ b/tests/realtikvtest/addindextest1/BUILD.bazel @@ -16,11 +16,11 @@ go_test( "//pkg/ddl", "//pkg/ddl/ingest", "//pkg/ddl/schemaver", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/testutil", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/testutil", "//pkg/errno", "//pkg/keyspace", "//pkg/kv", diff --git a/tests/realtikvtest/addindextest1/disttask_test.go b/tests/realtikvtest/addindextest1/disttask_test.go index 99beed7ea8..770f44397d 100644 --- a/tests/realtikvtest/addindextest1/disttask_test.go +++ b/tests/realtikvtest/addindextest1/disttask_test.go @@ -32,11 +32,11 @@ import ( "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl/ingest" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/errno" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/local" @@ -79,10 +79,10 @@ func TestAddIndexDistBasic(t *testing.T) { } // mock that we only have 1 cpu, add-index task can be scheduled as usual require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", `return(1)`)) - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/framework/storage/testSetLastTaskID", `return(true)`)) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/dxf/framework/storage/testSetLastTaskID", `return(true)`)) t.Cleanup(func() { require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu")) - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/storage/testSetLastTaskID")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/storage/testSetLastTaskID")) }) store := realtikvtest.CreateMockStoreAndSetup(t) if store.Name() != "TiKV" { @@ -129,7 +129,7 @@ func TestAddIndexDistBasic(t *testing.T) { tk.MustExec("admin check index t1 idx;") var counter atomic.Int32 - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask", func(e taskexecutor.TaskExecutor, errP *error, _ context.Context) { if counter.Add(1) == 1 { *errP = context.Canceled @@ -138,7 +138,7 @@ func TestAddIndexDistBasic(t *testing.T) { ) tk.MustExec("alter table t1 add index idx1(a);") tk.MustExec("admin check index t1 idx1;") - testfailpoint.Disable(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask") + testfailpoint.Disable(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask") require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/injectPanicForTableScan", "return()")) tk.MustExecToErr("alter table t1 add index idx2(a);") @@ -314,7 +314,7 @@ func TestAddIndexDistPauseAndResume(t *testing.T) { } }) - require.NoError(t, failpoint.EnableCall("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockDMLExecutionOnPausedState", func() { + require.NoError(t, failpoint.EnableCall("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockDMLExecutionOnPausedState", func() { row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows() require.Equal(t, 1, len(row)) jobID := row[0][0].(string) @@ -334,7 +334,7 @@ func TestAddIndexDistPauseAndResume(t *testing.T) { tk.MustExec("alter table t add index idx1(a);") tk.MustExec("admin check table t;") require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/mockDMLExecutionAddIndexSubTaskFinish")) - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockDMLExecutionOnPausedState")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockDMLExecutionOnPausedState")) // dist task succeed, job paused and resumed. testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/ddl/afterWaitSchemaSynced", func(job *model.Job) { @@ -474,10 +474,10 @@ func TestAddIndexScheduleAway(t *testing.T) { } }) // Do not balance subtasks automatically. - testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockNoEnoughSlots", "return") + testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockNoEnoughSlots", "return") afterCancel := make(chan struct{}) // Capture the cancel operation from checkBalanceLoop. - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterCancelSubtaskExec", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterCancelSubtaskExec", func() { close(afterCancel) }) var once sync.Once @@ -496,7 +496,7 @@ func TestAddIndexScheduleAway(t *testing.T) { tk1.MustExec(updateExecID) }) }) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask", func(_ taskexecutor.TaskExecutor, _ *error, ctx context.Context) { require.Error(t, ctx.Err()) require.Equal(t, context.Canceled, context.Cause(ctx)) @@ -510,7 +510,7 @@ func TestAddIndexDistCleanUpBlock(t *testing.T) { proto.MaxConcurrentTask = 1 testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", `return(1)`) ch := make(chan struct{}) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/doCleanupTask", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/doCleanupTask", func() { <-ch }) store := realtikvtest.CreateMockStoreAndSetup(t) diff --git a/tests/realtikvtest/addindextest2/BUILD.bazel b/tests/realtikvtest/addindextest2/BUILD.bazel index 390b6fa653..c899174f05 100644 --- a/tests/realtikvtest/addindextest2/BUILD.bazel +++ b/tests/realtikvtest/addindextest2/BUILD.bazel @@ -15,14 +15,14 @@ go_test( "//pkg/config", "//pkg/config/kerneltype", "//pkg/ddl", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", - "//pkg/disttask/operator", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", + "//pkg/dxf/operator", "//pkg/kv", "//pkg/lightning/backend/external", "//pkg/lightning/backend/local", diff --git a/tests/realtikvtest/addindextest2/alter_job_test.go b/tests/realtikvtest/addindextest2/alter_job_test.go index 07fc0d7ce6..504109a52e 100644 --- a/tests/realtikvtest/addindextest2/alter_job_test.go +++ b/tests/realtikvtest/addindextest2/alter_job_test.go @@ -22,9 +22,9 @@ import ( "time" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/lightning/backend/local" "github.com/pingcap/tidb/pkg/meta/model" "github.com/pingcap/tidb/pkg/testkit" @@ -115,7 +115,7 @@ func TestAlterJobOnDXF(t *testing.T) { require.EqualValues(t, 1024, be.GetWriteSpeedLimit()) }) var modified atomic.Bool - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterDetectAndHandleParamModify", func(_ proto.Step) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterDetectAndHandleParamModify", func(_ proto.Step) { modified.Store(true) }) var once sync.Once diff --git a/tests/realtikvtest/addindextest2/global_sort_test.go b/tests/realtikvtest/addindextest2/global_sort_test.go index 752deb203c..7332dc24fb 100644 --- a/tests/realtikvtest/addindextest2/global_sort_test.go +++ b/tests/realtikvtest/addindextest2/global_sort_test.go @@ -32,14 +32,14 @@ import ( "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - diststorage "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" - "github.com/pingcap/tidb/pkg/disttask/operator" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + diststorage "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/meta/model" @@ -163,10 +163,10 @@ func TestGlobalSortBasic(t *testing.T) { store := realtikvtest.CreateMockStoreAndSetup(t) tk := testkit.NewTestKit(t, store) ch := make(chan struct{}) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/doCleanupTask", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/doCleanupTask", func() { ch <- struct{}{} }) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/WaitCleanUpFinished", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/WaitCleanUpFinished", func() { ch <- struct{}{} }) tk.MustExec("drop database if exists addindexlit;") @@ -376,7 +376,7 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) { }) testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/ddl/mockRegionBatch", `return(1)`) testErrStep := proto.StepInit - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask", func(e taskexecutor.TaskExecutor, errP *error, _ context.Context) { if errP != nil { testErrStep = e.GetTaskBase().Step @@ -629,7 +629,7 @@ func TestAlterJobOnDXFWithGlobalSort(t *testing.T) { modifiedMerge atomic.Bool ) testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/ddl/forceMergeSort", "return(true)") - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterDetectAndHandleParamModify", func(step proto.Step) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterDetectAndHandleParamModify", func(step proto.Step) { switch step { case proto.BackfillStepReadIndex: modifiedReadIndex.Store(true) @@ -961,14 +961,14 @@ func TestNextGenMetering(t *testing.T) { tk.MustExec("insert into t values ('a',1,1),('b',2,2),('c',3,3);") baseTime := time.Now().Truncate(time.Minute).Unix() - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/metering/forceTSAtMinuteBoundary", func(ts *int64) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/metering/forceTSAtMinuteBoundary", func(ts *int64) { // the metering library requires the timestamp to be at minute boundary, but // during test, we want to reduce the flush interval. *ts = baseTime baseTime += 60 }) var gotMeterData uberatomic.String - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/metering/meteringFinalFlush", func(s fmt.Stringer) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/metering/meteringFinalFlush", func(s fmt.Stringer) { gotMeterData.Store(s.String()) }) var jobID int64 @@ -979,7 +979,7 @@ func TestNextGenMetering(t *testing.T) { }) testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/ddl/forceMergeSort", `return()`) var rowAndSizeMeterItems atomic.Pointer[map[string]any] - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/handle/afterSendRowAndSizeMeterData", func(items map[string]any) { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/handle/afterSendRowAndSizeMeterData", func(items map[string]any) { rowAndSizeMeterItems.Store(&items) }) tk.MustExec("alter table t add index idx(c);") @@ -1054,7 +1054,7 @@ func TestGlobalSortExtraParams(t *testing.T) { t.Skip("only for nextgen kernel") } testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", "return(16)") - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/beforeSubmitTask", + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/beforeSubmitTask", func(requiredSlots *int, params *proto.ExtraParams) { *requiredSlots = 16 params.MaxRuntimeSlots = 12 diff --git a/tests/realtikvtest/addindextest3/BUILD.bazel b/tests/realtikvtest/addindextest3/BUILD.bazel index 4ab217b746..302fd2f5c3 100644 --- a/tests/realtikvtest/addindextest3/BUILD.bazel +++ b/tests/realtikvtest/addindextest3/BUILD.bazel @@ -19,10 +19,10 @@ go_test( "//pkg/ddl/copr", "//pkg/ddl/ingest", "//pkg/ddl/testutil", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", - "//pkg/disttask/operator", "//pkg/domain", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", + "//pkg/dxf/operator", "//pkg/errno", "//pkg/kv", "//pkg/lightning/backend/local", diff --git a/tests/realtikvtest/addindextest3/functional_test.go b/tests/realtikvtest/addindextest3/functional_test.go index 715a03fdfc..f8b38dd210 100644 --- a/tests/realtikvtest/addindextest3/functional_test.go +++ b/tests/realtikvtest/addindextest3/functional_test.go @@ -25,7 +25,7 @@ import ( "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" "github.com/pingcap/tidb/pkg/ddl/ingest" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/meta/model" "github.com/pingcap/tidb/pkg/parser/ast" "github.com/pingcap/tidb/pkg/table/tables" diff --git a/tests/realtikvtest/addindextest3/ingest_test.go b/tests/realtikvtest/addindextest3/ingest_test.go index 45de951a2a..abab189b7d 100644 --- a/tests/realtikvtest/addindextest3/ingest_test.go +++ b/tests/realtikvtest/addindextest3/ingest_test.go @@ -29,7 +29,7 @@ import ( "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl/ingest" - disttestutil "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + disttestutil "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/errno" "github.com/pingcap/tidb/pkg/lightning/backend/local" "github.com/pingcap/tidb/pkg/meta/model" diff --git a/tests/realtikvtest/addindextest3/operator_test.go b/tests/realtikvtest/addindextest3/operator_test.go index 2e0c82f333..3aedd091e0 100644 --- a/tests/realtikvtest/addindextest3/operator_test.go +++ b/tests/realtikvtest/addindextest3/operator_test.go @@ -30,9 +30,9 @@ import ( "github.com/pingcap/tidb/pkg/ddl/copr" "github.com/pingcap/tidb/pkg/ddl/ingest" "github.com/pingcap/tidb/pkg/ddl/testutil" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/operator" "github.com/pingcap/tidb/pkg/domain" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/operator" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/meta/model" "github.com/pingcap/tidb/pkg/parser/ast" diff --git a/tests/realtikvtest/addindextest4/BUILD.bazel b/tests/realtikvtest/addindextest4/BUILD.bazel index c533718f4b..dc019433dc 100644 --- a/tests/realtikvtest/addindextest4/BUILD.bazel +++ b/tests/realtikvtest/addindextest4/BUILD.bazel @@ -16,8 +16,8 @@ go_test( "//pkg/config/kerneltype", "//pkg/ddl", "//pkg/ddl/ingest", - "//pkg/disttask/framework/proto", "//pkg/domain", + "//pkg/dxf/framework/proto", "//pkg/errno", "//pkg/kv", "//pkg/meta/model", diff --git a/tests/realtikvtest/addindextest4/integration_test.go b/tests/realtikvtest/addindextest4/integration_test.go index 7bfc50eec7..5c779fd11c 100644 --- a/tests/realtikvtest/addindextest4/integration_test.go +++ b/tests/realtikvtest/addindextest4/integration_test.go @@ -27,7 +27,7 @@ import ( "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" "github.com/pingcap/tidb/pkg/ddl/ingest" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/errno" "github.com/pingcap/tidb/pkg/meta/model" "github.com/pingcap/tidb/pkg/testkit" @@ -418,7 +418,7 @@ func TestCancelAfterReorgTimeout(t *testing.T) { }) afterTimeout := false timeout := make(chan struct{}) - testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/handle/afterDXFTaskSubmitted", func() { + testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/handle/afterDXFTaskSubmitted", func() { <-meetErr <-timeout tk1 := testkit.NewTestKit(t, store) diff --git a/tests/realtikvtest/importintotest/BUILD.bazel b/tests/realtikvtest/importintotest/BUILD.bazel index a0e5c58102..5344380753 100644 --- a/tests/realtikvtest/importintotest/BUILD.bazel +++ b/tests/realtikvtest/importintotest/BUILD.bazel @@ -27,14 +27,14 @@ go_test( "//br/pkg/streamhelper", "//br/pkg/utils", "//pkg/config/kerneltype", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/schstatus", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor", - "//pkg/disttask/framework/testutil", - "//pkg/disttask/importinto", "//pkg/domain", "//pkg/domain/infosync", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/schstatus", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor", + "//pkg/dxf/framework/testutil", + "//pkg/dxf/importinto", "//pkg/executor/importer", "//pkg/importsdk", "//pkg/infoschema", diff --git a/tests/realtikvtest/importintotest/detach_test.go b/tests/realtikvtest/importintotest/detach_test.go index f0787b97e9..864a217a30 100644 --- a/tests/realtikvtest/importintotest/detach_test.go +++ b/tests/realtikvtest/importintotest/detach_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/stretchr/testify/require" "github.com/tikv/client-go/v2/util" ) diff --git a/tests/realtikvtest/importintotest/import_into_test.go b/tests/realtikvtest/importintotest/import_into_test.go index 5af2d70427..6531b9a02b 100644 --- a/tests/realtikvtest/importintotest/import_into_test.go +++ b/tests/realtikvtest/importintotest/import_into_test.go @@ -36,13 +36,13 @@ import ( "github.com/pingcap/tidb/br/pkg/mock/mocklocal" "github.com/pingcap/tidb/br/pkg/utils" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/schstatus" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor" - "github.com/pingcap/tidb/pkg/disttask/importinto" "github.com/pingcap/tidb/pkg/domain" "github.com/pingcap/tidb/pkg/domain/infosync" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/schstatus" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/infoschema" "github.com/pingcap/tidb/pkg/kv" @@ -864,7 +864,7 @@ func (s *mockGCSSuite) TestChecksumNotMatch() { } func (s *mockGCSSuite) TestColumnsAndUserVars() { - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/storage/testSetLastTaskID", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/storage/testSetLastTaskID", "return(true)") s.tk.MustExec("DROP DATABASE IF EXISTS load_data;") s.tk.MustExec("CREATE DATABASE load_data;") s.tk.MustExec(`CREATE TABLE load_data.cols_and_vars (a INT, b INT, c int);`) @@ -965,7 +965,7 @@ func (s *mockGCSSuite) TestImportMode() { // better start a cluster without TiDB instance. testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/parser/ast/forceRedactURL", "return(true)") ch := make(chan struct{}, 1) - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/WaitCleanUpFinished", func() { + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/WaitCleanUpFinished", func() { ch <- struct{}{} }) sql := fmt.Sprintf(`IMPORT INTO load_data.import_mode FROM 'gs://test-load/import_mode-*.tsv?access-key=aaaaaa&secret-access-key=bbbbbb&endpoint=%s'`, gcsEndpoint) @@ -981,16 +981,16 @@ func (s *mockGCSSuite) TestImportMode() { intoNormalTime, intoImportTime = time.Time{}, time.Time{} switcher.EXPECT().ToImportMode(gomock.Any(), gomock.Any()).DoAndReturn(toImportModeFn).Times(1) switcher.EXPECT().ToNormalMode(gomock.Any(), gomock.Any()).DoAndReturn(toNormalModeFn).Times(1) - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/clearLastSwitchTime", "return(true)") - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/waitBeforePostProcess", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/clearLastSwitchTime", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/waitBeforePostProcess", "return(true)") s.tk.MustExec("truncate table load_data.import_mode;") sql = fmt.Sprintf(`IMPORT INTO load_data.import_mode FROM 'gs://test-load/import_mode-*.tsv?endpoint=%s'`, gcsEndpoint) s.tk.MustQuery(sql) s.tk.MustQuery("SELECT * FROM load_data.import_mode;").Sort().Check(testkit.Rows("1 11 111")) s.tk.MustExec("truncate table load_data.import_mode;") s.Greater(intoNormalTime, intoImportTime) - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/clearLastSwitchTime")) - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/waitBeforePostProcess")) + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/clearLastSwitchTime")) + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/waitBeforePostProcess")) <-ch // test disable_tikv_import_mode, should not call ToImportMode and ToNormalMode @@ -1016,8 +1016,8 @@ func (s *mockGCSSuite) TestImportMode() { intoNormalTime, intoImportTime = time.Time{}, time.Time{} switcher.EXPECT().ToImportMode(gomock.Any(), gomock.Any()).DoAndReturn(toImportModeFn).Times(1) switcher.EXPECT().ToNormalMode(gomock.Any(), gomock.Any()).DoAndReturn(toNormalModeFn).Times(1) - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/beforeSortChunk", "sleep(3000)") - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/errorWhenSortChunk", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/beforeSortChunk", "sleep(3000)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/errorWhenSortChunk", "return(true)") testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/executor/importer/setLastImportJobID", `return(true)`) sql = fmt.Sprintf(`IMPORT INTO load_data.import_mode FROM 'gs://test-load/import_mode-*.tsv?access-key=aaaaaa&secret-access-key=bbbbbb&endpoint=%s'`, gcsEndpoint) @@ -1026,7 +1026,7 @@ func (s *mockGCSSuite) TestImportMode() { s.Greater(intoNormalTime, intoImportTime) <-ch s.checkTaskMetaRedacted(importer.TestLastImportJobID.Load()) - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/WaitCleanUpFinished")) + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/WaitCleanUpFinished")) } func (s *mockGCSSuite) TestRegisterTask() { @@ -1076,8 +1076,8 @@ func (s *mockGCSSuite) TestRegisterTask() { taskRegister.EXPECT().RegisterTaskOnce(gomock.Any()).DoAndReturn(mockedRegister).Times(1) taskRegister.EXPECT().Close(gomock.Any()).DoAndReturn(mockedClose).Times(1) s.tk.MustExec("truncate table load_data.register_task;") - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/beforeSortChunk", "sleep(3000)") - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/errorWhenSortChunk", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/beforeSortChunk", "sleep(3000)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/errorWhenSortChunk", "return(true)") err := s.tk.QueryToErr(sql) s.Error(err) s.Greater(unregisterTime, registerTime) @@ -1090,9 +1090,9 @@ func (s *mockGCSSuite) TestRegisterTask() { }) var etcdKey string importinto.NewTaskRegisterWithTTL = backup - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/beforeSortChunk")) - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/errorWhenSortChunk")) - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/syncBeforeSortChunk", + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/beforeSortChunk")) + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/errorWhenSortChunk")) + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/syncBeforeSortChunk", func() { // cannot run 2 import job to the same target table. tk2 := testkit.NewTestKit(s.T(), s.store) @@ -1109,7 +1109,7 @@ func (s *mockGCSSuite) TestRegisterTask() { }, maxWaitTime, 300*time.Millisecond) }, ) - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/storage/testSetLastTaskID", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/storage/testSetLastTaskID", "return(true)") wg := sync.WaitGroup{} wg.Add(1) go func() { @@ -1333,7 +1333,7 @@ func (s *mockGCSSuite) TestZeroDateTime() { } func (s *mockGCSSuite) TestBadCases() { - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/beforeSortChunk", `panic("mock panic")`) + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/beforeSortChunk", `panic("mock panic")`) s.tk.MustExec("DROP DATABASE IF EXISTS bad_cases;") s.tk.MustExec("CREATE DATABASE bad_cases;") s.tk.MustExec(`CREATE TABLE bad_cases.t (a INT, b INT, c INT);`) @@ -1454,11 +1454,11 @@ func (s *mockGCSSuite) TestTableMode() { query := "SELECT * FROM table_mode" // Test import into clean up can alter table mode to Normal finally. - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/skipPostProcessAlterTableMode", `return`) + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/skipPostProcessAlterTableMode", `return`) s.tk.MustQuery(loadDataSQL) s.checkMode(s.tk, query, "table_mode", true) s.tk.MustQuery(query).Check(testkit.Rows([]string{"1 1", "2 2"}...)) - testfailpoint.Disable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/skipPostProcessAlterTableMode") + testfailpoint.Disable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/skipPostProcessAlterTableMode") // Test import into post process will alter table mode to Normal. s.tk.MustExec("truncate table table_mode") @@ -1466,10 +1466,10 @@ func (s *mockGCSSuite) TestTableMode() { wg.Add(2) go func() { defer func() { - testfailpoint.Disable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/waitBeforePostProcess") + testfailpoint.Disable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/waitBeforePostProcess") wg.Done() }() - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/waitBeforePostProcess", "return") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/waitBeforePostProcess", "return") s.tk.MustQuery(loadDataSQL) }() go func() { @@ -1485,7 +1485,7 @@ func (s *mockGCSSuite) TestTableMode() { s.tk.MustExec("truncate table table_mode") testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/executor/importer/retryableError", `return`) getError := false - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask", + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask", func(e taskexecutor.TaskExecutor, errP *error, _ context.Context) { if errP != nil && *errP == common.ErrWriteTooSlow { getError = true @@ -1520,10 +1520,10 @@ func (s *mockGCSSuite) TestTableMode() { wg.Add(2) go func() { defer func() { - testfailpoint.Disable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/waitBeforePostProcess") + testfailpoint.Disable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/waitBeforePostProcess") wg.Done() }() - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/waitBeforePostProcess", "return") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/waitBeforePostProcess", "return") s.tk.MustQuery(loadDataSQL) }() go func() { diff --git a/tests/realtikvtest/importintotest/job_test.go b/tests/realtikvtest/importintotest/job_test.go index d434c0ba62..76ddb5915b 100644 --- a/tests/realtikvtest/importintotest/job_test.go +++ b/tests/realtikvtest/importintotest/job_test.go @@ -29,9 +29,9 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/tidb/br/pkg/utils" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/parser/auth" plannercore "github.com/pingcap/tidb/pkg/planner/core" @@ -103,7 +103,7 @@ func (s *mockGCSSuite) TestShowJob() { // test show job by id using test_show_job1 testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/executor/importer/setLastImportJobID", `return(true)`) - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/storage/testSetLastTaskID", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/storage/testSetLastTaskID", "return(true)") testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/parser/ast/forceRedactURL", "return(true)") s.NoError(s.tk.Session().Auth(&auth.UserIdentity{Username: "test_show_job1", Hostname: "localhost"}, nil, nil, nil)) result1 := s.tk.MustQuery(fmt.Sprintf(`import into t1 FROM 'gs://test-show-job/t.csv?access-key=aaaaaa&secret-access-key=bbbbbb&endpoint=%s'`, @@ -189,7 +189,7 @@ func (s *mockGCSSuite) TestShowJob() { // show running jobs with 2 subtasks var counter atomic.Int32 tk2 := testkit.NewTestKit(s.T(), s.store) - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/syncAfterSubtaskFinish", + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/syncAfterSubtaskFinish", func() { newVal := counter.Add(1) if newVal == 1 { @@ -236,7 +236,7 @@ func (s *mockGCSSuite) TestShowJob() { jobInfo.Summary.ImportedRows = 4 s.compareJobInfoWithoutTime(jobInfo, rows[0]) // resume the taskexecutor, need disable failpoint first, otherwise the post-process subtask will be blocked - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/syncAfterSubtaskFinish")) + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/syncAfterSubtaskFinish")) } }, ) @@ -335,7 +335,7 @@ func (s *mockGCSSuite) TestShowDetachedJob() { s.compareJobInfoWithoutTime(jobInfo, rows[0]) // subtask fail with error - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/errorWhenSortChunk", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/errorWhenSortChunk", "return(true)") result3 := s.tk.MustQuery(fmt.Sprintf(`import into t3 FROM 'gs://test-show-detached-job/t.csv?endpoint=%s' with detached`, gcsEndpoint)).Rows() s.Len(result3, 1) @@ -407,8 +407,8 @@ func (s *mockGCSSuite) TestCancelJob() { // cancel a running job created by self syncCh := make(chan struct{}) - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/beforeSortChunk", "sleep(3000)") - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/syncAfterJobStarted", + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/beforeSortChunk", "sleep(3000)") + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/syncAfterJobStarted", func() { close(syncCh) }, @@ -457,12 +457,12 @@ func (s *mockGCSSuite) TestCancelJob() { // cancel job in post-process phase, using test_cancel_job2 s.NoError(s.tk.Session().Auth(&auth.UserIdentity{Username: "test_cancel_job2", Hostname: "localhost"}, nil, nil, nil)) - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/beforeSortChunk")) - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/syncAfterJobStarted")) + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/beforeSortChunk")) + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/syncAfterJobStarted")) wg := sync.WaitGroup{} wg.Add(1) tk2 := testkit.NewTestKit(s.T(), s.store) - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/syncBeforePostProcess", + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/syncBeforePostProcess", func(jobID int64) { go func() { defer wg.Done() @@ -523,11 +523,11 @@ func (s *mockGCSSuite) TestCancelJob() { }, maxWaitTime, 1*time.Second) // cancel a pending job created by test_cancel_job2 using root - s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/importinto/syncBeforePostProcess")) + s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/importinto/syncBeforePostProcess")) s.NoError(failpoint.Disable("github.com/pingcap/tidb/pkg/executor/importer/waitCtxDone")) wg = sync.WaitGroup{} wg.Add(1) - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/syncBeforeJobStarted", + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/syncBeforeJobStarted", func(jobID int64) { s.NoError(tk2.Session().Auth(&auth.UserIdentity{Username: "root", Hostname: "localhost"}, nil, nil, nil)) go func() { @@ -597,7 +597,7 @@ func (s *mockGCSSuite) TestJobFailWhenDispatchSubtask() { Step: importer.JobStepValidating, ErrorMessage: "injected error after ImportStepImport", } - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/failWhenDispatchPostProcessSubtask", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/failWhenDispatchPostProcessSubtask", "return(true)") testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/executor/importer/setLastImportJobID", `return(true)`) s.NoError(s.tk.Session().Auth(&auth.UserIdentity{Username: "root", Hostname: "localhost"}, nil, nil, nil)) err = s.tk.QueryToErr(fmt.Sprintf(`import into t1 FROM 'gs://fail_job_after_import/t.csv?endpoint=%s'`, gcsEndpoint)) @@ -623,7 +623,7 @@ func (s *mockGCSSuite) TestKillBeforeFinish() { }) var cancelFn atomic.Pointer[context.CancelFunc] - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/syncBeforeSortChunk", + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/syncBeforeSortChunk", func() { // cancel the job when the task reach sort chunk (*cancelFn.Load())() diff --git a/tests/realtikvtest/importintotest/one_parquet_test.go b/tests/realtikvtest/importintotest/one_parquet_test.go index 2f97faf02d..a35af3e94a 100644 --- a/tests/realtikvtest/importintotest/one_parquet_test.go +++ b/tests/realtikvtest/importintotest/one_parquet_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/testkit" "github.com/stretchr/testify/require" "github.com/tikv/client-go/v2/util" diff --git a/tests/realtikvtest/importintotest/sdk_test.go b/tests/realtikvtest/importintotest/sdk_test.go index 021b3d2dec..b4cbd84fd4 100644 --- a/tests/realtikvtest/importintotest/sdk_test.go +++ b/tests/realtikvtest/importintotest/sdk_test.go @@ -124,7 +124,7 @@ func (s *mockGCSSuite) TestImportSDK() { // 11. Test JobManager.CancelJob with failpoint s.tk.MustExec("TRUNCATE TABLE t") - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/syncBeforeJobStarted", "pause") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/syncBeforeJobStarted", "pause") jobID2, err := sdk.SubmitJob(ctx, sql) s.NoError(err) @@ -134,7 +134,7 @@ func (s *mockGCSSuite) TestImportSDK() { s.NoError(err) // Unpause - testfailpoint.Disable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/syncBeforeJobStarted") + testfailpoint.Disable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/syncBeforeJobStarted") // Verify status is cancelled s.Eventually(func() bool { diff --git a/tests/realtikvtest/importintotest/util_test.go b/tests/realtikvtest/importintotest/util_test.go index 4ddb329553..1bee6f8076 100644 --- a/tests/realtikvtest/importintotest/util_test.go +++ b/tests/realtikvtest/importintotest/util_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/sessionctx/vardef" "github.com/pingcap/tidb/pkg/testkit" diff --git a/tests/realtikvtest/importintotest2/BUILD.bazel b/tests/realtikvtest/importintotest2/BUILD.bazel index cce8d5d106..8b0ba5a3e2 100644 --- a/tests/realtikvtest/importintotest2/BUILD.bazel +++ b/tests/realtikvtest/importintotest2/BUILD.bazel @@ -12,8 +12,8 @@ go_test( race = "on", deps = [ "//pkg/config/kerneltype", - "//pkg/disttask/framework/testutil", "//pkg/domain", + "//pkg/dxf/framework/testutil", "//pkg/executor/importer", "//pkg/infoschema", "//pkg/kv", diff --git a/tests/realtikvtest/importintotest2/main_test.go b/tests/realtikvtest/importintotest2/main_test.go index 719fe67d73..60a12e4061 100644 --- a/tests/realtikvtest/importintotest2/main_test.go +++ b/tests/realtikvtest/importintotest2/main_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/tests/realtikvtest" diff --git a/tests/realtikvtest/importintotest3/BUILD.bazel b/tests/realtikvtest/importintotest3/BUILD.bazel index 47d6961430..9b82251bd0 100644 --- a/tests/realtikvtest/importintotest3/BUILD.bazel +++ b/tests/realtikvtest/importintotest3/BUILD.bazel @@ -16,11 +16,11 @@ go_test( deps = [ "//br/pkg/storage", "//pkg/config/kerneltype", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", - "//pkg/disttask/importinto", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", + "//pkg/dxf/importinto", "//pkg/executor/importer", "//pkg/kv", "//pkg/lightning/mydump", diff --git a/tests/realtikvtest/importintotest3/cross_ks_test.go b/tests/realtikvtest/importintotest3/cross_ks_test.go index 0d10488290..242d0dbff3 100644 --- a/tests/realtikvtest/importintotest3/cross_ks_test.go +++ b/tests/realtikvtest/importintotest3/cross_ks_test.go @@ -25,8 +25,8 @@ import ( "github.com/pingcap/tidb/br/pkg/storage" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" plannercore "github.com/pingcap/tidb/pkg/planner/core" "github.com/pingcap/tidb/pkg/sessionctx/vardef" diff --git a/tests/realtikvtest/importintotest3/extra_param_test.go b/tests/realtikvtest/importintotest3/extra_param_test.go index a70b29777e..654683cd7b 100644 --- a/tests/realtikvtest/importintotest3/extra_param_test.go +++ b/tests/realtikvtest/importintotest3/extra_param_test.go @@ -18,14 +18,14 @@ import ( "fmt" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" "github.com/pingcap/tidb/pkg/lightning/mydump" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" ) func (s *mockGCSSuite) TestExtraParamMaxRuntimeSlots() { - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/storage/beforeSubmitTask", + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/storage/beforeSubmitTask", func(requiredSlots *int, params *proto.ExtraParams) { *requiredSlots = 16 params.MaxRuntimeSlots = 12 diff --git a/tests/realtikvtest/importintotest3/from_server_test.go b/tests/realtikvtest/importintotest3/from_server_test.go index 5c30ed4867..e7828b479c 100644 --- a/tests/realtikvtest/importintotest3/from_server_test.go +++ b/tests/realtikvtest/importintotest3/from_server_test.go @@ -22,8 +22,8 @@ import ( "path" "strconv" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/lightning/mydump" "github.com/pingcap/tidb/pkg/testkit" "github.com/stretchr/testify/require" diff --git a/tests/realtikvtest/importintotest3/main_test.go b/tests/realtikvtest/importintotest3/main_test.go index 9f717e89a0..0d08e5f988 100644 --- a/tests/realtikvtest/importintotest3/main_test.go +++ b/tests/realtikvtest/importintotest3/main_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" diff --git a/tests/realtikvtest/importintotest4/BUILD.bazel b/tests/realtikvtest/importintotest4/BUILD.bazel index d1a796a54e..d63b8181e9 100644 --- a/tests/realtikvtest/importintotest4/BUILD.bazel +++ b/tests/realtikvtest/importintotest4/BUILD.bazel @@ -17,15 +17,15 @@ go_test( shard_count = 3, deps = [ "//pkg/config/kerneltype", - "//pkg/disttask/framework/handle", - "//pkg/disttask/framework/metering", - "//pkg/disttask/framework/proto", - "//pkg/disttask/framework/scheduler", - "//pkg/disttask/framework/storage", - "//pkg/disttask/framework/taskexecutor/execute", - "//pkg/disttask/framework/testutil", - "//pkg/disttask/importinto", - "//pkg/disttask/importinto/conflictedkv", + "//pkg/dxf/framework/handle", + "//pkg/dxf/framework/metering", + "//pkg/dxf/framework/proto", + "//pkg/dxf/framework/scheduler", + "//pkg/dxf/framework/storage", + "//pkg/dxf/framework/taskexecutor/execute", + "//pkg/dxf/framework/testutil", + "//pkg/dxf/importinto", + "//pkg/dxf/importinto/conflictedkv", "//pkg/executor/importer", "//pkg/importsdk", "//pkg/kv", diff --git a/tests/realtikvtest/importintotest4/cloud_sdk_test.go b/tests/realtikvtest/importintotest4/cloud_sdk_test.go index 28def1c633..66bf954630 100644 --- a/tests/realtikvtest/importintotest4/cloud_sdk_test.go +++ b/tests/realtikvtest/importintotest4/cloud_sdk_test.go @@ -32,7 +32,7 @@ import ( "github.com/fsouza/fake-gcs-server/fakestorage" "github.com/golang/snappy" "github.com/klauspost/compress/zstd" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" "github.com/pingcap/tidb/pkg/importsdk" "github.com/pingcap/tidb/pkg/lightning/config" "github.com/pingcap/tidb/pkg/lightning/mydump" @@ -243,7 +243,7 @@ func (s *mockGCSSuite) TestAutoDetectFileType() { {objectName: "csv_as_sql.sql", options: "", wantSubstr: "encode kv error"}, } - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/storage/testSetLastTaskID", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/storage/testSetLastTaskID", "return(true)") taskMgr, err := storage.GetTaskManager() s.NoError(err) ctx := util.WithInternalSourceType(context.Background(), "taskManager") diff --git a/tests/realtikvtest/importintotest4/conflict_resolution_test.go b/tests/realtikvtest/importintotest4/conflict_resolution_test.go index bd00fb92ee..25ae6959a6 100644 --- a/tests/realtikvtest/importintotest4/conflict_resolution_test.go +++ b/tests/realtikvtest/importintotest4/conflict_resolution_test.go @@ -25,9 +25,9 @@ import ( "github.com/fsouza/fake-gcs-server/fakestorage" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/importinto" - "github.com/pingcap/tidb/pkg/disttask/importinto/conflictedkv" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/importinto" + "github.com/pingcap/tidb/pkg/dxf/importinto/conflictedkv" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/lightning/backend/external" "github.com/pingcap/tidb/pkg/testkit" @@ -656,11 +656,11 @@ func (s *mockGCSSuite) TestGlobalSortRetryOnConflictResolutionStep() { } s.Run("retry on collect conflicts step", func() { - doTestWithFP(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/afterCollectOneKVGroup") + doTestWithFP(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/afterCollectOneKVGroup") }) s.Run("retry on conflict resolution step", func() { - doTestWithFP(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/afterResolveOneKVGroup") + doTestWithFP(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/afterResolveOneKVGroup") }) } @@ -670,7 +670,7 @@ func (s *mockGCSSuite) TestGlobalSortConflictedRowsExceedMaxFileSize() { } s.server.CreateBucketWithOpts(fakestorage.CreateBucketOpts{Name: "conflicts"}) s.server.CreateBucketWithOpts(fakestorage.CreateBucketOpts{Name: "sorted"}) - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/forceHandleConflictsBySingleThread", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/forceHandleConflictsBySingleThread", "return(true)") bak := conflictedkv.MaxConflictRowFileSize conflictedkv.MaxConflictRowFileSize = 48 s.T().Cleanup(func() { @@ -712,9 +712,9 @@ func (s *mockGCSSuite) TestGlobalSortTooManyConflictedRowsFromIndex() { s.server.CreateBucketWithOpts(fakestorage.CreateBucketOpts{Name: "conflicts"}) s.server.CreateBucketWithOpts(fakestorage.CreateBucketOpts{Name: "sorted"}) - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/forceHandleConflictsBySingleThread", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/forceHandleConflictsBySingleThread", "return(true)") var fpEntered atomic.Int32 - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/conflictedkv/mockHandleSetSizeLimit", func(limitP *int64) { + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/conflictedkv/mockHandleSetSizeLimit", func(limitP *int64) { *limitP = 0 fpEntered.CompareAndSwap(0, 1) }) diff --git a/tests/realtikvtest/importintotest4/global_sort_test.go b/tests/realtikvtest/importintotest4/global_sort_test.go index 9749904902..39f3143472 100644 --- a/tests/realtikvtest/importintotest4/global_sort_test.go +++ b/tests/realtikvtest/importintotest4/global_sort_test.go @@ -27,13 +27,13 @@ import ( "github.com/fsouza/fake-gcs-server/fakestorage" "github.com/pingcap/tidb/pkg/config/kerneltype" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/metering" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/scheduler" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/metering" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/scheduler" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/session" "github.com/pingcap/tidb/pkg/testkit" @@ -159,12 +159,12 @@ func (s *mockGCSSuite) TestGlobalSortBasic() { key(a), key(c,d), key(d));`) testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/parser/ast/forceRedactURL", "return(true)") ch := make(chan struct{}, 1) - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/WaitCleanUpFinished", func() { + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/WaitCleanUpFinished", func() { ch <- struct{}{} }) var counter atomic.Int32 tk2 := testkit.NewTestKit(s.T(), s.store) - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/syncAfterSubtaskFinish", + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/syncAfterSubtaskFinish", func() { newVal := counter.Add(1) if newVal == 1 { @@ -237,7 +237,7 @@ func (s *mockGCSSuite) TestGlobalSortBasic() { <-ch // failed task, should clean up all sorted data too. - testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/failWhenDispatchWriteIngestSubtask", "return(true)") + testfailpoint.Enable(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/failWhenDispatchWriteIngestSubtask", "return(true)") s.tk.MustExec("truncate table t") result = s.tk.MustQuery(importSQL + ", detached").Rows() s.Len(result, 1) @@ -516,18 +516,18 @@ func TestNextGenMetering(t *testing.T) { s.tk.MustExec("create table t (a bigint primary key , b varchar(100), index(b));") baseTime := time.Now().Truncate(time.Minute).Unix() - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/metering/forceTSAtMinuteBoundary", func(ts *int64) { + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/metering/forceTSAtMinuteBoundary", func(ts *int64) { // the metering library requires the timestamp to be at minute boundary, but // during test, we want to reduce the flush interval. *ts = baseTime baseTime += 60 }) var gotMeterData atomic.String - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/metering/meteringFinalFlush", func(s fmt.Stringer) { + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/metering/meteringFinalFlush", func(s fmt.Stringer) { gotMeterData.Store(s.String()) }) var rowAndSizeMeterItems atomic.Pointer[map[string]any] - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/framework/handle/afterSendRowAndSizeMeterData", func(items map[string]any) { + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/framework/handle/afterSendRowAndSizeMeterData", func(items map[string]any) { rowAndSizeMeterItems.Store(&items) }) @@ -613,7 +613,7 @@ func TestDropTableBeforeCleanup(t *testing.T) { dropCh := make(chan struct{}) waitDropCh := make(chan struct{}) var mockError atomic.Bool - testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/disttask/importinto/mockCleanupError", func(err *error) { + testfailpoint.EnableCall(s.T(), "github.com/pingcap/tidb/pkg/dxf/importinto/mockCleanupError", func(err *error) { if mockError.CompareAndSwap(false, true) { // Start drop table and wait finished close(waitDropCh) diff --git a/tests/realtikvtest/importintotest4/import_summary_test.go b/tests/realtikvtest/importintotest4/import_summary_test.go index d1fe2e0fbc..2cd8c3463c 100644 --- a/tests/realtikvtest/importintotest4/import_summary_test.go +++ b/tests/realtikvtest/importintotest4/import_summary_test.go @@ -21,9 +21,9 @@ import ( "strconv" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/executor/importer" "github.com/pingcap/tidb/pkg/testkit" "github.com/stretchr/testify/require" @@ -84,12 +84,12 @@ func (s *mockGCSSuite) TestGlobalSortSummary() { require.NoError(s.T(), err) sql := ` - SELECT step, summary - FROM mysql.tidb_background_subtask + SELECT step, summary + FROM mysql.tidb_background_subtask WHERE task_key = ? UNION ALL - SELECT step, summary - FROM mysql.tidb_background_subtask_history + SELECT step, summary + FROM mysql.tidb_background_subtask_history WHERE task_key = ? ` rs = s.tk.MustQuery(sql, id, id).Rows() diff --git a/tests/realtikvtest/importintotest4/main_test.go b/tests/realtikvtest/importintotest4/main_test.go index 7f41fcd87e..ad9de99ba8 100644 --- a/tests/realtikvtest/importintotest4/main_test.go +++ b/tests/realtikvtest/importintotest4/main_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/framework/testutil" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/framework/testutil" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/testkit" "github.com/pingcap/tidb/pkg/testkit/testfailpoint" diff --git a/tests/realtikvtest/importintotest4/manual_recovery_test.go b/tests/realtikvtest/importintotest4/manual_recovery_test.go index 46c1bdea7f..2e3a59ee92 100644 --- a/tests/realtikvtest/importintotest4/manual_recovery_test.go +++ b/tests/realtikvtest/importintotest4/manual_recovery_test.go @@ -21,10 +21,10 @@ import ( "time" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/importinto" plannercore "github.com/pingcap/tidb/pkg/planner/core" "github.com/pingcap/tidb/pkg/testkit" "github.com/stretchr/testify/require" diff --git a/tests/realtikvtest/importintotest4/split_file_test.go b/tests/realtikvtest/importintotest4/split_file_test.go index aecabe89e2..e4ecfe73ec 100644 --- a/tests/realtikvtest/importintotest4/split_file_test.go +++ b/tests/realtikvtest/importintotest4/split_file_test.go @@ -22,9 +22,9 @@ import ( "strconv" "github.com/fsouza/fake-gcs-server/fakestorage" - "github.com/pingcap/tidb/pkg/disttask/framework/proto" - "github.com/pingcap/tidb/pkg/disttask/framework/storage" - "github.com/pingcap/tidb/pkg/disttask/importinto" + "github.com/pingcap/tidb/pkg/dxf/framework/proto" + "github.com/pingcap/tidb/pkg/dxf/framework/storage" + "github.com/pingcap/tidb/pkg/dxf/importinto" "github.com/pingcap/tidb/pkg/lightning/config" "github.com/pingcap/tidb/pkg/testkit" "github.com/tikv/client-go/v2/util" diff --git a/tests/realtikvtest/testkit.go b/tests/realtikvtest/testkit.go index c6e629b956..a764f9a98a 100644 --- a/tests/realtikvtest/testkit.go +++ b/tests/realtikvtest/testkit.go @@ -29,8 +29,8 @@ import ( "github.com/pingcap/tidb/pkg/config/kerneltype" "github.com/pingcap/tidb/pkg/ddl" "github.com/pingcap/tidb/pkg/ddl/ingest/testutil" - "github.com/pingcap/tidb/pkg/disttask/framework/handle" "github.com/pingcap/tidb/pkg/domain" + "github.com/pingcap/tidb/pkg/dxf/framework/handle" "github.com/pingcap/tidb/pkg/keyspace" "github.com/pingcap/tidb/pkg/kv" "github.com/pingcap/tidb/pkg/session"