Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: aggregate of avg and percentile #1045

Merged
merged 1 commit into from
May 3, 2022
Merged

fix: aggregate of avg and percentile #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: aggregate of avg and percentile
  • Loading branch information
@makeavish
makeavish committed May 3, 2022
commit 5708da8141cc1c65e451dd58a80d9d9cec051bfb
14 changes: 8 additions & 6 deletions pkg/query-service/app/clickhouseReader/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2069,19 +2069,19 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
if queryParams.Dimension == "duration" {
switch queryParams.AggregationOption {
case "p50":
aggregation_query = " quantile(0.50)(durationNano) as value "
aggregation_query = " quantile(0.50)(durationNano) as float64Value "
case "p95":
aggregation_query = " quantile(0.95)(durationNano) as value "
aggregation_query = " quantile(0.95)(durationNano) as float64Value "
case "p90":
aggregation_query = " quantile(0.90)(durationNano) as value "
aggregation_query = " quantile(0.90)(durationNano) as float64Value "
case "p99":
aggregation_query = " quantile(0.99)(durationNano) as value "
aggregation_query = " quantile(0.99)(durationNano) as float64Value "
case "max":
aggregation_query = " max(durationNano) as value "
case "min":
aggregation_query = " min(durationNano) as value "
case "avg":
aggregation_query = " avg(durationNano) as value "
aggregation_query = " avg(durationNano) as float64Value "
case "sum":
aggregation_query = " sum(durationNano) as value "
default:
Expand Down Expand Up @@ -2222,7 +2222,9 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
}

for i := range SpanAggregatesDBResponseItems {

if SpanAggregatesDBResponseItems[i].Value == 0 {
SpanAggregatesDBResponseItems[i].Value = uint64(SpanAggregatesDBResponseItems[i].Float64Value)
}
SpanAggregatesDBResponseItems[i].Timestamp = int64(SpanAggregatesDBResponseItems[i].Time.UnixNano())
SpanAggregatesDBResponseItems[i].FloatValue = float32(SpanAggregatesDBResponseItems[i].Value)
if queryParams.AggregationOption == "rate_per_sec" {
Expand Down
11 changes: 6 additions & 5 deletions pkg/query-service/model/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,12 @@ type SpanAggregatesResponseItem struct {
GroupBy map[string]float32 `json:"groupBy,omitempty"`
}
type SpanAggregatesDBResponseItem struct {
Timestamp int64 `ch:"timestamp" `
Time time.Time `ch:"time"`
Value uint64 `ch:"value"`
FloatValue float32 `ch:"floatValue"`
GroupBy string `ch:"groupBy"`
Timestamp int64 `ch:"timestamp" `
Time time.Time `ch:"time"`
Value uint64 `ch:"value"`
FloatValue float32 `ch:"floatValue"`
Float64Value float64 `ch:"float64Value"`
GroupBy string `ch:"groupBy"`
}

type SetTTLResponseItem struct {
Expand Down