From eced674817b11e4995a582bc36be1a6fb2b4c336 Mon Sep 17 00:00:00 2001 From: Kassian Sun Date: Mon, 17 Apr 2023 12:41:34 +0800 Subject: [PATCH] [migration] cleanup unused target config --- plugin/migration/model.go | 1 - plugin/migration/pipeline.go | 31 +------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/plugin/migration/model.go b/plugin/migration/model.go index ffa5832c..12329ae5 100644 --- a/plugin/migration/model.go +++ b/plugin/migration/model.go @@ -153,7 +153,6 @@ type IndexMigrationBulkConfig struct { type IndexMigrationTargetConfig struct { ClusterId string `json:"cluster_id"` Bulk IndexMigrationBulkConfig `json:"bulk"` - QueryDSL util.MapStr `json:"query_dsl,omitempty"` } type PipelineTaskLoggingConfig struct { diff --git a/plugin/migration/pipeline.go b/plugin/migration/pipeline.go index 660a3054..92798ccf 100644 --- a/plugin/migration/pipeline.go +++ b/plugin/migration/pipeline.go @@ -1014,34 +1014,6 @@ func (p *DispatcherProcessor) splitMajorMigrationTask(taskItem *task2.Task) erro partitionSource.PartitionId = partitionID partitionSource.QueryDSL = partition.Filter partitionSource.QueryString = "" - var must []interface{} - - if partition.Other { - must = append(must, partition.Filter) - } else { - must = append(must, util.MapStr{ - "range": util.MapStr{ - index.Partition.FieldName: util.MapStr{ - "gte": partition.Start, - "lt": partition.End, - }, - }, - }) - } - - if targetMust != nil { - must = append(must, targetMust...) - } - partitionTarget := target - if len(must) > 0 { - partitionTarget.QueryDSL = util.MapStr{ - "query": util.MapStr{ - "bool": util.MapStr{ - "must": must, - }, - }, - } - } partitionMigrationTask := task2.Task{ ParentId: []string{taskItem.ID}, @@ -1060,13 +1032,12 @@ func (p *DispatcherProcessor) splitMajorMigrationTask(taskItem *task2.Task) erro }, ConfigString: util.MustToJSON(IndexMigrationTaskConfig{ Source: partitionSource, - Target: partitionTarget, + Target: target, Execution: clusterMigrationTask.Settings.Execution, }), } partitionMigrationTask.ID = util.GetUUID() err = orm.Create(nil, &partitionMigrationTask) - target.QueryDSL = nil if err != nil { return fmt.Errorf("store index migration task(partition) error: %w", err) }