floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.infini.ltd:64221/infini/console

This commit is contained in:
liugq 2023-04-19 16:01:46 +08:00
parent 9e8422c7f5 1d7eb3769c
commit 592d768a86
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/migration/model.go
View File

@ -135,7 +135,7 @@ type IndexMigrationSourceConfig struct {
ScrollTime string `json:"scroll_time"` ScrollTime string `json:"scroll_time"`
IndexRename util.MapStr `json:"index_rename,omitempty"` IndexRename util.MapStr `json:"index_rename,omitempty"`
TypeRename util.MapStr `json:"type_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"` QueryDSL util.MapStr `json:"query_dsl,omitempty"`
// Parition configs // Parition configs

5
plugin/migration/pipeline.go
View File

@ -987,8 +987,9 @@ func (p *DispatcherProcessor) splitMajorMigrationTask(taskItem *task2.Task) erro
FieldName: index.Partition.FieldName, FieldName: index.Partition.FieldName,
FieldType: index.Partition.FieldType, FieldType: index.Partition.FieldType,
Step: index.Partition.Step, Step: index.Partition.Step,
//Filter: index.RawFilter, }
Filter: source.QueryDSL, if source.QueryDSL != nil {
partitionQ.Filter = source.QueryDSL
} }
partitions, err := elastic.GetPartitions(partitionQ, esSourceClient) partitions, err := elastic.GetPartitions(partitionQ, esSourceClient)
if err != nil { if err != nil {