phyer/core
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

trace bug

Browse Source
This commit is contained in:
zhangkun9038@dingtalk.com 2025-01-14 20:40:31 +08:00
parent 4ae67cbcd6
commit 374c772da4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core.go
View File

@ -619,7 +619,7 @@ func (cr *Core) AddToGeneralCandleChnl(candle *Candle, channels []string) {
// from: 倒推的起始时间点 // from: 倒推的起始时间点
// ctype: candle或者maX // ctype: candle或者maX
func (core *Core) GetRangeMaXSortedSet(setName string, count int, from time.Time) (*MaXList, error) { func (core *Core) GetRangeMaXSortedSet(setName string, count int, from time.Time) (*MaXList, error) {
mxl := MaXList{} mxl := &MaXList{Count: count}
ary1 := strings.Split(setName, "|") ary1 := strings.Split(setName, "|")
ary2 := []string{} ary2 := []string{}
period := "" period := ""
@ -628,7 +628,7 @@ func (core *Core) GetRangeMaXSortedSet(setName string, count int, from time.Time
dui, err := core.PeriodToMinutes(period) dui, err := core.PeriodToMinutes(period)
if err != nil { if err != nil {
return &mxl, err return mxl, err
} }
fromt := from.UnixMilli() fromt := from.UnixMilli()
froms := strconv.FormatInt(fromt, 10) froms := strconv.FormatInt(fromt, 10)
@ -640,10 +640,10 @@ func (core *Core) GetRangeMaXSortedSet(setName string, count int, from time.Time
Count: int64(count), Count: int64(count),
} }
ary := []string{} ary := []string{}
logrus.Debug("ZRevRangeByScore ", setName, froms, sts) logrus.Debug("ZRevRangeByScore ", " setName:", setName, " froms:", froms, " sts:", sts)
dura, err := core.GetExpiration(period) dura, err := core.GetExpiration(period)
if err != nil { if err != nil {
return &mxl, err return mxl, err
} }
// fmt.Println("GetExpiration dura: ", dura, " period: ", period) // fmt.Println("GetExpiration dura: ", dura, " period: ", period)
ot := time.Now().Add(dura * -1) ot := time.Now().Add(dura * -1)
@ -653,17 +653,17 @@ func (core *Core) GetRangeMaXSortedSet(setName string, count int, from time.Time
cli.LTrim(setName, 0, oti) cli.LTrim(setName, 0, oti)
cunt, _ := cli.ZRemRangeByScore(setName, "0", strconv.FormatInt(oti, 10)).Result() cunt, _ := cli.ZRemRangeByScore(setName, "0", strconv.FormatInt(oti, 10)).Result()
if cunt > 0 { if cunt > 0 {
logrus.Warning("移出过期的引用数量：", "setName:", setName, " count:", count) logrus.Warning("移出过期的引用数量：", "setName:", setName, " cunt:", cunt)
} }
ary, err = cli.ZRevRangeByScore(setName, opt).Result() ary, err = cli.ZRevRangeByScore(setName, opt).Result()
if err != nil { if err != nil {
logrus.Warning("GetRangeMaXSortedSet ZRevRangeByScore err: ", " setName: ", setName, ", opt:", opt, ", res:", ary, ", err:", err) logrus.Warning("GetRangeMaXSortedSet ZRevRangeByScore err: ", " setName: ", setName, ", opt:", opt, ", res:", ary, ", err:", err)
return &mxl, err return mxl, err
} }
keyAry, err := cli.MGet(ary...).Result() keyAry, err := cli.MGet(ary...).Result()
if err != nil { if err != nil {
logrus.Warning("GetRangeMaXSortedSet mget err: ", "setName:", setName, ", max:", opt.Max, ", min:", opt.Min, ", res:", keyAry, ", err:", err) logrus.Warning("GetRangeMaXSortedSet mget err: ", "setName:", setName, ", max:", opt.Max, ", min:", opt.Min, ", res:", keyAry, ", err:", err)
return &mxl, err return mxl, err
} }
for _, str := range keyAry { for _, str := range keyAry {
if str == nil { if str == nil {
@ -685,7 +685,7 @@ func (core *Core) GetRangeMaXSortedSet(setName string, count int, from time.Time
mxl.List = append(mxl.List, &mx) mxl.List = append(mxl.List, &mx)
} }
mxl.Count = count mxl.Count = count
return &mxl, nil return mxl, nil
} }
// 根据周期的文本内容，返回这代表多少个分钟 // 根据周期的文本内容，返回这代表多少个分钟