From 7fbc4041a3894bc1e99df629148b496988264e41 Mon Sep 17 00:00:00 2001 From: "zhangkun9038@dingtalk.com" Date: Wed, 12 Feb 2025 11:24:01 +0800 Subject: [PATCH] =?UTF-8?q?siago=E7=94=A8=E5=88=B0=E7=9A=84paster,coaster?= =?UTF-8?q?=E7=AD=89=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89,=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=87=BD=E6=95=B0,=E9=83=BD=E4=BB=8Ecore=E4=B8=AD?= =?UTF-8?q?=E8=8E=B7=E5=BE=97,=E4=B8=8D=E5=86=8D=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E5=86=99=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maX.go | 7 +++---- plate.go | 9 ++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/maX.go b/maX.go index a6cde8c..ee4dd4c 100644 --- a/maX.go +++ b/maX.go @@ -136,13 +136,12 @@ func (mxl *MaXList) RPush(sm *MaX) (Sample, error) { mxl.List = append(mxl.List, sm) return nil, nil } - return nil, nil } // 冒泡排序 func (mxl *MaXList) RecursiveBubbleS(length int, ctype string) error { if length == 0 { - return nil + return errors.New("length is zero") } realLength := len(mxl.List) //FIXME:在对这个List进行排序时,List中途长度变了,就会报错: @@ -166,6 +165,6 @@ func (mxl *MaXList) RecursiveBubbleS(length int, ctype string) error { } } length-- - mxl.RecursiveBubbleS(length, ctype) - return nil + err := mxl.RecursiveBubbleS(length, ctype) + return err } diff --git a/plate.go b/plate.go index db146ad..178274b 100644 --- a/plate.go +++ b/plate.go @@ -113,19 +113,22 @@ func (pl *Plate) MakeCoaster(cr *Core, period string) error { if err != nil { return err } - cdl.RecursiveBubbleS(len(cdl.List), "asc") + err = cdl.RecursiveBubbleS(len(cdl.List), "asc") setName7 := "ma7|" + setName setName30 := "ma30|" + setName mxl7, err := cr.GetRangeMaXSortedSet(setName7, pl.Count, lastTime) if err != nil { return err } - mxl7.RecursiveBubbleS(len(mxl7.List), "asc") + err = mxl7.RecursiveBubbleS(len(mxl7.List), "asc") + if err != nil { + return err + } mxl30, err := cr.GetRangeMaXSortedSet(setName30, pl.Count, lastTime) if err != nil { return err } - mxl30.RecursiveBubbleS(len(mxl30.List), "asc") + err = mxl30.RecursiveBubbleS(len(mxl30.List), "asc") coaster := Coaster{ InstID: pl.InstID, Period: period,