Merge pull request #1156 from PapaPiya/fix_transform

[PDR-13448]修复transform new字段校验问题

Author: liukai2012

mgr/runner_test.go

@@ -802,8 +802,8 @@ func TestReplaceTransforms(t *testing.T) {
 		"transforms":[{
 			"type":"replace",
 			"stage":"before_parser",
-			"old":"\\x",
-			"new":"\\\\x"
+			"old_string":"\\x",
+			"new_string":"\\\\x"
 		}],
 		"senders":[{
 			"name":"file_sender",
@@ -905,7 +905,7 @@ func TestSplitAndConvertTransforms(t *testing.T) {
 			"type":"split",
 			"key":"status",
 			"sep":",",
-			"newfield":"newarray"
+			"new":"newarray"
 		},{
 			"type":"convert",
 			"dsl":"newarray array(long)"

transforms/mutate/replace.go

@@ -18,8 +18,8 @@ var (
 type Replacer struct {
 	StageTime string `json:"stage"`
 	Key       string `json:"key"`
-	Old       string `json:"old"`
-	New       string `json:"new"`
+	Old       string `json:"old_string"`
+	New       string `json:"new_string"`
 	Regex     bool   `json:"regex"`
 	stats     StatsInfo
 	Regexp    *regexp.Regexp
@@ -102,8 +102,8 @@ func (g *Replacer) SampleConfig() string {
 		"type":"replace",
 		"stage":"before_parser",
 		"key":"MyReplaceFieldKey",
-		"old":"myOldString",
-		"new":"myNewString",
+		"old_string":"myOldString",
+		"new_string":"myNewString",
         "regex":"false"
 	}`
 }
@@ -113,23 +113,23 @@ func (g *Replacer) ConfigOptions() []Option {
 		transforms.KeyStage,
 		transforms.KeyFieldName,
 		{
-			KeyName:      "old",
+			KeyName:      "old_string",
 			ChooseOnly:   false,
 			Default:      "",
 			Required:     true,
 			Placeholder:  "myOldString",
 			DefaultNoUse: true,
-			Description:  "要替换的字符串内容(old)",
+			Description:  "要替换的字符串内容(old_string)",
 			Type:         transforms.TransformTypeString,
 		},
 		{
-			KeyName:      "new",
+			KeyName:      "new_string",
 			ChooseOnly:   false,
 			Default:      "",
 			Required:     false,
 			Placeholder:  "myNewString",
 			DefaultNoUse: true,
-			Description:  "替换为的字符串内容(new)",
+			Description:  "替换为的字符串内容(new_string)",
 			Type:         transforms.TransformTypeString,
 		},
 		{

transforms/mutate/split.go

@@ -18,8 +18,7 @@ var (
 type Spliter struct {
 	Key          string `json:"key"`
 	SeparateKey  string `json:"sep"`
-	ArrayName    string `json:"newfield"`
-	ArrayNameNew string `json:"new"`
+	ArrayName    string `json:"new"`
 
 	stats      StatsInfo
 	keys       []string
@@ -56,9 +55,6 @@ func (g *Spliter) Transform(datas []Data) ([]Data, error) {
 		resultChan   = make(chan transforms.TransformResult)
 		wg           = new(sync.WaitGroup)
 	)
-	if g.ArrayName == "" {
-		g.ArrayName = g.ArrayNameNew
-	}
 	if g.ArrayName == "" {
 		err = errors.New("array name is empty string,can't use as array field key name")
 		errNum = dataLen
@@ -120,21 +116,21 @@ func (g *Spliter) SampleConfig() string {
 		"type":"split",
 		"key":"SplitFieldKey",
 		"sep":",",
-		"newfield":"name"
+		"new":"name"
 	}`
 }
 
 func (g *Spliter) ConfigOptions() []Option {
 	return []Option{
 		transforms.KeyFieldName,
 		{
-			KeyName:      "newfield",
+			KeyName:      "new",
 			ChooseOnly:   false,
 			Default:      "",
 			Required:     true,
 			Placeholder:  "new_field_keyname",
 			DefaultNoUse: true,
-			Description:  "解析后数据的字段名(newfield)",
+			Description:  "解析后数据的字段名(new)",
 			CheckRegex:   CheckPattern,
 			Type:         transforms.TransformTypeString,
 		},