Merge branch 'feature/conflict_key_priority' into feature/support_domain

client/client.go

@@ -16,6 +16,7 @@ import (
 	"github.com/volcengine/datatester-go-sdk/handler"
 	"github.com/volcengine/datatester-go-sdk/log"
 	"github.com/volcengine/datatester-go-sdk/meta/manager"
+	"github.com/volcengine/datatester-go-sdk/utils"
 )
 
 type AbClient struct {
@@ -180,7 +181,10 @@ func (t *AbClient) GetAllExperimentConfigs(decisionId string,
 			continue
 		}
 		for k, v := range confMap {
-			configs[k] = v
+			existConfig, conflict := configs[k]
+			if !conflict || utils.IsHigherPriorityConfig(existConfig, v) {
+				configs[k] = v
+			}
 		}
 	}
 	t.updateUserAbInfo(decisionId, experiment2variant)
@@ -212,7 +216,10 @@ func (t *AbClient) getAllExperimentConfigs4Activate(variantKey, decisionId strin
 			continue
 		}
 		for k, v := range confMap {
-			configs[k] = v
+			existConfig, conflict := configs[k]
+			if !conflict || utils.IsHigherPriorityConfig(existConfig, v) {
+				configs[k] = v
+			}
 		}
 		vid2ExperimentIdMap[variant.Id] = variant.ExperimentId
 	}
@@ -426,7 +433,10 @@ func (t *AbClient) GetAllFeatureConfigs(decisionId string,
 			continue
 		}
 		for k, v := range confMap {
-			configs[k] = v
+			existConfig, conflict := configs[k]
+			if !conflict || utils.IsHigherPriorityConfig(existConfig, v) {
+				configs[k] = v
+			}
 		}
 	}
 	return configs, nil

utils/conflict.go

@@ -0,0 +1,18 @@
+package utils
+
+import (
+	"strconv"
+	"strings"
+)
+
+func IsHigherPriorityConfig(existConf, newConf map[string]interface{}) bool {
+	vid1 := existConf["vid"].(string)
+	vid2 := newConf["vid"].(string)
+	v1, err1 := strconv.ParseInt(vid1, 10, 64)
+	v2, err2 := strconv.ParseInt(vid2, 10, 64)
+	// 转换失败，则按照字符串对比，一般不会出现
+	if err1 != nil || err2 != nil {
+		return strings.Compare(vid2, vid1) < 0
+	}
+	return v2 < v1
+}