Skip to content

Commit 0374589

Browse files
committed
[PDR-13448]修复transform new字段校验问题
1 parent d60f1b5 commit 0374589

File tree

3 files changed

+15
-19
lines changed

3 files changed

+15
-19
lines changed

mgr/runner_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -802,8 +802,8 @@ func TestReplaceTransforms(t *testing.T) {
802802
"transforms":[{
803803
"type":"replace",
804804
"stage":"before_parser",
805-
"old":"\\x",
806-
"new":"\\\\x"
805+
"old_string":"\\x",
806+
"new_string":"\\\\x"
807807
}],
808808
"senders":[{
809809
"name":"file_sender",
@@ -905,7 +905,7 @@ func TestSplitAndConvertTransforms(t *testing.T) {
905905
"type":"split",
906906
"key":"status",
907907
"sep":",",
908-
"newfield":"newarray"
908+
"new":"newarray"
909909
},{
910910
"type":"convert",
911911
"dsl":"newarray array(long)"

transforms/mutate/replace.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ var (
1818
type Replacer struct {
1919
StageTime string `json:"stage"`
2020
Key string `json:"key"`
21-
Old string `json:"old"`
22-
New string `json:"new"`
21+
Old string `json:"old_string"`
22+
New string `json:"new_string"`
2323
Regex bool `json:"regex"`
2424
stats StatsInfo
2525
Regexp *regexp.Regexp
@@ -102,8 +102,8 @@ func (g *Replacer) SampleConfig() string {
102102
"type":"replace",
103103
"stage":"before_parser",
104104
"key":"MyReplaceFieldKey",
105-
"old":"myOldString",
106-
"new":"myNewString",
105+
"old_string":"myOldString",
106+
"new_string":"myNewString",
107107
"regex":"false"
108108
}`
109109
}
@@ -113,23 +113,23 @@ func (g *Replacer) ConfigOptions() []Option {
113113
transforms.KeyStage,
114114
transforms.KeyFieldName,
115115
{
116-
KeyName: "old",
116+
KeyName: "old_string",
117117
ChooseOnly: false,
118118
Default: "",
119119
Required: true,
120120
Placeholder: "myOldString",
121121
DefaultNoUse: true,
122-
Description: "要替换的字符串内容(old)",
122+
Description: "要替换的字符串内容(old_string)",
123123
Type: transforms.TransformTypeString,
124124
},
125125
{
126-
KeyName: "new",
126+
KeyName: "new_string",
127127
ChooseOnly: false,
128128
Default: "",
129129
Required: false,
130130
Placeholder: "myNewString",
131131
DefaultNoUse: true,
132-
Description: "替换为的字符串内容(new)",
132+
Description: "替换为的字符串内容(new_string)",
133133
Type: transforms.TransformTypeString,
134134
},
135135
{

transforms/mutate/split.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ var (
1818
type Spliter struct {
1919
Key string `json:"key"`
2020
SeparateKey string `json:"sep"`
21-
ArrayName string `json:"newfield"`
22-
ArrayNameNew string `json:"new"`
21+
ArrayName string `json:"new"`
2322

2423
stats StatsInfo
2524
keys []string
@@ -56,9 +55,6 @@ func (g *Spliter) Transform(datas []Data) ([]Data, error) {
5655
resultChan = make(chan transforms.TransformResult)
5756
wg = new(sync.WaitGroup)
5857
)
59-
if g.ArrayName == "" {
60-
g.ArrayName = g.ArrayNameNew
61-
}
6258
if g.ArrayName == "" {
6359
err = errors.New("array name is empty string,can't use as array field key name")
6460
errNum = dataLen
@@ -120,21 +116,21 @@ func (g *Spliter) SampleConfig() string {
120116
"type":"split",
121117
"key":"SplitFieldKey",
122118
"sep":",",
123-
"newfield":"name"
119+
"new":"name"
124120
}`
125121
}
126122

127123
func (g *Spliter) ConfigOptions() []Option {
128124
return []Option{
129125
transforms.KeyFieldName,
130126
{
131-
KeyName: "newfield",
127+
KeyName: "new",
132128
ChooseOnly: false,
133129
Default: "",
134130
Required: true,
135131
Placeholder: "new_field_keyname",
136132
DefaultNoUse: true,
137-
Description: "解析后数据的字段名(newfield)",
133+
Description: "解析后数据的字段名(new)",
138134
CheckRegex: CheckPattern,
139135
Type: transforms.TransformTypeString,
140136
},

0 commit comments

Comments
 (0)