innov
/
nightingale1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

When the time exceeds the limit, adjust the end time (#409)

This commit is contained in:
yubo 2020-11-18 16:14:58 +08:00 committed by GitHub
parent 227652ec8f
commit 38e060f704
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/transfer/backend/m3db/convert.go
View File

@ -114,18 +114,19 @@ func xcludeResp(iter ident.TagIterator) *dataobj.XcludeResp {
return ret return ret
} }
func aggregateResp(data []*dataobj.TsdbQueryResponse, opts dataobj.QueryDataForUI) []*dataobj.TsdbQueryResponse { func resampleResp(data []*dataobj.TsdbQueryResponse, opts dataobj.QueryDataForUI) []*dataobj.TsdbQueryResponse {
if len(data) < 2 {
return data
}
// resample the data
for _, v := range data { for _, v := range data {
if len(v.Values) <= MAX_PONINTS {
continue
}
v.Values = resample(v.Values, opts.Start, opts.End, int64(opts.Step), opts.ConsolFunc) v.Values = resample(v.Values, opts.Start, opts.End, int64(opts.Step), opts.ConsolFunc)
} }
return data
}
func aggregateResp(data []*dataobj.TsdbQueryResponse, opts dataobj.QueryDataForUI) []*dataobj.TsdbQueryResponse {
// aggregateResp // aggregateResp
if opts.AggrFunc == "" { if len(data) < 2 || opts.AggrFunc == "" {
return data return data
} }
@ -188,6 +189,7 @@ func aggregateResp(data []*dataobj.TsdbQueryResponse, opts dataobj.QueryDataForU
} }
func resample(data []*dataobj.RRDData, start, end, step int64, consolFunc string) []*dataobj.RRDData { func resample(data []*dataobj.RRDData, start, end, step int64, consolFunc string) []*dataobj.RRDData {
l := int((end - start) / step) l := int((end - start) / step)
if l <= 0 { if l <= 0 {
return []*dataobj.RRDData{} return []*dataobj.RRDData{}

7
src/modules/transfer/backend/m3db/m3db.go
View File

@ -155,6 +155,8 @@ func (p *Client) QueryDataForUI(input dataobj.QueryDataForUI) []*dataobj.TsdbQue
return nil return nil
} }
ret = resampleResp(ret, input)
return aggregateResp(ret, input) return aggregateResp(ret, input)
} }
@ -484,9 +486,8 @@ func (cfg M3dbSection) validateQueryDataForUI(in *dataobj.QueryDataForUI) (err e
} }
if cfg.DaysLimit > 0 { if cfg.DaysLimit > 0 {
if t := in.End - cfg.timeLimit; in.Start < t { if t := in.Start + cfg.timeLimit; in.End > t {
// return fmt.Errorf("query time reange in invalid, daysLimit(%d/%d)", days, cfg.DaysLimit) in.End = t
in.Start = t
} }
} }