*: remove deprecated LOAD DATA actions (pingcap#49470)

ref pingcap#44078
mjonss · Dec 15, 2023 · 323b0f7 · 323b0f7
1 parent 074af10
commit 323b0f7
Show file tree

Hide file tree

Showing 22 changed files with 7,287 additions and 8,587 deletions.
diff --git a/pkg/disttask/importinto/BUILD.bazel b/pkg/disttask/importinto/BUILD.bazel
@@ -41,7 +41,6 @@ go_library(
         "//pkg/disttask/operator",
         "//pkg/domain/infosync",
         "//pkg/errno",
-        "//pkg/executor/asyncloaddata",
         "//pkg/executor/importer",
         "//pkg/keyspace",
         "//pkg/kv",

diff --git a/pkg/disttask/importinto/proto.go b/pkg/disttask/importinto/proto.go
@@ -24,7 +24,6 @@ import (
 	"github.com/pingcap/tidb/br/pkg/lightning/verification"
 	"github.com/pingcap/tidb/pkg/disttask/framework/proto"
 	"github.com/pingcap/tidb/pkg/domain/infosync"
-	"github.com/pingcap/tidb/pkg/executor/asyncloaddata"
 	"github.com/pingcap/tidb/pkg/executor/importer"
 	"github.com/pingcap/tidb/pkg/meta/autoid"
 )
@@ -132,7 +131,7 @@ type SharedVars struct {
 	TableImporter *importer.TableImporter
 	DataEngine    *backend.OpenedEngine
 	IndexEngine   *backend.OpenedEngine
-	Progress      *asyncloaddata.Progress
+	Progress      *importer.Progress
 
 	mu       sync.Mutex
 	Checksum *verification.KVChecksum

diff --git a/pkg/disttask/importinto/task_executor.go b/pkg/disttask/importinto/task_executor.go
@@ -35,7 +35,6 @@ import (
 	"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/executor/asyncloaddata"
 	"github.com/pingcap/tidb/pkg/executor/importer"
 	"github.com/pingcap/tidb/pkg/meta/autoid"
 	"github.com/pingcap/tidb/pkg/table/tables"
@@ -81,8 +80,8 @@ func getTableImporter(ctx context.Context, taskID int64, taskMeta *TaskMeta) (*i
 
 	return importer.NewTableImporter(&importer.JobImportParam{
 		GroupCtx: ctx,
-		Progress: asyncloaddata.NewProgress(false),
-		Job:      &asyncloaddata.Job{},
+		Progress: importer.NewProgress(),
+		Job:      &importer.Job{},
 	}, controller, taskID)
 }
 
@@ -146,7 +145,7 @@ func (s *importStepExecutor) RunSubtask(ctx context.Context, subtask *proto.Subt
 		TableImporter:    s.tableImporter,
 		DataEngine:       dataEngine,
 		IndexEngine:      indexEngine,
-		Progress:         asyncloaddata.NewProgress(false),
+		Progress:         importer.NewProgress(),
 		Checksum:         &verification.KVChecksum{},
 		SortedDataMeta:   &external.SortedKVMeta{},
 		SortedIndexMetas: make(map[int64]*external.SortedKVMeta),

diff --git a/pkg/executor/BUILD.bazel b/pkg/executor/BUILD.bazel
@@ -114,7 +114,6 @@ go_library(
         "//pkg/errno",
         "//pkg/executor/aggfuncs",
         "//pkg/executor/aggregate",
-        "//pkg/executor/asyncloaddata",
         "//pkg/executor/importer",
         "//pkg/executor/internal/applycache",
         "//pkg/executor/internal/builder",

diff --git a/pkg/executor/asyncloaddata/BUILD.bazel b/pkg/executor/asyncloaddata/BUILD.bazel
diff --git a/pkg/executor/asyncloaddata/main_test.go b/pkg/executor/asyncloaddata/main_test.go
diff --git a/pkg/executor/asyncloaddata/progress.go b/pkg/executor/asyncloaddata/progress.go
diff --git a/pkg/executor/asyncloaddata/progress_test.go b/pkg/executor/asyncloaddata/progress_test.go