GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-09-20 23:43:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

alias for timstamp interval changed in sql query (#1509)

Browse Source
This commit is contained in:
Nityananda Gohain 2022-08-11 13:53:33 +05:30 committed by GitHub
parent 7a4750a882
commit 66b67a08a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/query-service/app/clickhouseReader/reader.go
View File

@ -3171,12 +3171,12 @@ func (r *ClickHouseReader) AggregateLogs(ctx context.Context, params *model.Logs
query := "" query := ""
if params.GroupBy != "" { if params.GroupBy != "" {
query = fmt.Sprintf("SELECT toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(timestamp/1000000000), INTERVAL %d minute))*1000000000) as time, toString(%s) as groupBy, "+ query = fmt.Sprintf("SELECT toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(timestamp/1000000000), INTERVAL %d minute))*1000000000) as ts_start_interval, toString(%s) as groupBy, "+
"%s "+ "%s "+
"FROM %s.%s WHERE timestamp >= '%d' AND timestamp <= '%d' ", "FROM %s.%s WHERE timestamp >= '%d' AND timestamp <= '%d' ",
params.StepSeconds/60, params.GroupBy, function, r.logsDB, r.logsTable, params.TimestampStart, params.TimestampEnd) params.StepSeconds/60, params.GroupBy, function, r.logsDB, r.logsTable, params.TimestampStart, params.TimestampEnd)
} else { } else {
query = fmt.Sprintf("SELECT toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(timestamp/1000000000), INTERVAL %d minute))*1000000000) as time, "+ query = fmt.Sprintf("SELECT toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(timestamp/1000000000), INTERVAL %d minute))*1000000000) as ts_start_interval, "+
"%s "+ "%s "+
"FROM %s.%s WHERE timestamp >= '%d' AND timestamp <= '%d' ", "FROM %s.%s WHERE timestamp >= '%d' AND timestamp <= '%d' ",
params.StepSeconds/60, function, r.logsDB, r.logsTable, params.TimestampStart, params.TimestampEnd) params.StepSeconds/60, function, r.logsDB, r.logsTable, params.TimestampStart, params.TimestampEnd)
@ -3185,9 +3185,9 @@ func (r *ClickHouseReader) AggregateLogs(ctx context.Context, params *model.Logs
query = fmt.Sprintf("%s AND %s ", query, filterSql) query = fmt.Sprintf("%s AND %s ", query, filterSql)
} }
if params.GroupBy != "" { if params.GroupBy != "" {
query = fmt.Sprintf("%s GROUP BY time, toString(%s) as groupBy ORDER BY time", query, params.GroupBy) query = fmt.Sprintf("%s GROUP BY ts_start_interval, toString(%s) as groupBy ORDER BY ts_start_interval", query, params.GroupBy)
} else { } else {
query = fmt.Sprintf("%s GROUP BY time ORDER BY time", query) query = fmt.Sprintf("%s GROUP BY ts_start_interval ORDER BY ts_start_interval", query)
} }
zap.S().Debug(query) zap.S().Debug(query)

2
pkg/query-service/model/response.go
View File

@ -461,7 +461,7 @@ type LogsAggregatesResponseItem struct {
} }
type LogsAggregatesDBResponseItem struct { type LogsAggregatesDBResponseItem struct {
Timestamp int64 `ch:"time"` Timestamp int64 `ch:"ts_start_interval"`
Value float64 `ch:"value"` Value float64 `ch:"value"`
GroupBy string `ch:"groupBy"` GroupBy string `ch:"groupBy"`
} }