From ff219a211b8efdb5c6fc2f997d1e4830ea76b6f0 Mon Sep 17 00:00:00 2001 From: Kassian Sun Date: Wed, 19 Apr 2023 10:33:16 +0800 Subject: [PATCH 1/2] [migration] fix query_string json field name --- plugin/migration/model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/migration/model.go b/plugin/migration/model.go index 37fa2d71..1486e482 100644 --- a/plugin/migration/model.go +++ b/plugin/migration/model.go @@ -135,7 +135,7 @@ type IndexMigrationSourceConfig struct { ScrollTime string `json:"scroll_time"` IndexRename util.MapStr `json:"index_rename,omitempty"` TypeRename util.MapStr `json:"type_rename,omitempty"` - QueryString string `json:"query_string,omitempty'` + QueryString string `json:"query_string,omitempty"` QueryDSL util.MapStr `json:"query_dsl,omitempty"` // Parition configs From 163464013402e41002036de8b16a9de2fd9a6bed Mon Sep 17 00:00:00 2001 From: Kassian Sun Date: Wed, 19 Apr 2023 11:33:42 +0800 Subject: [PATCH 2/2] [migration] fix partion query nil check --- plugin/migration/pipeline.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugin/migration/pipeline.go b/plugin/migration/pipeline.go index 92798ccf..5b4e39ba 100644 --- a/plugin/migration/pipeline.go +++ b/plugin/migration/pipeline.go @@ -987,8 +987,9 @@ func (p *DispatcherProcessor) splitMajorMigrationTask(taskItem *task2.Task) erro FieldName: index.Partition.FieldName, FieldType: index.Partition.FieldType, Step: index.Partition.Step, - //Filter: index.RawFilter, - Filter: source.QueryDSL, + } + if source.QueryDSL != nil { + partitionQ.Filter = source.QueryDSL } partitions, err := elastic.GetPartitions(partitionQ, esSourceClient) if err != nil {