-
Notifications
You must be signed in to change notification settings - Fork 529
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MQE: Add support for count aggregation (#9342)
* MQE: Add support for count aggregation * Extend tests * Enable upstream count tests * Update CHANGELOG * Fix linting * Remove floatPresent * Rename floatValues
- Loading branch information
Showing
8 changed files
with
107 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
| // Provenance-includes-location: https://github.com/prometheus/prometheus/blob/main/promql/engine.go | ||
| // Provenance-includes-license: Apache-2.0 | ||
| // Provenance-includes-copyright: The Prometheus Authors | ||
|
|
||
| package aggregations | ||
|
|
||
| import ( | ||
| "github.com/prometheus/prometheus/promql" | ||
|
|
||
| "github.com/grafana/mimir/pkg/streamingpromql/functions" | ||
| "github.com/grafana/mimir/pkg/streamingpromql/limiting" | ||
| "github.com/grafana/mimir/pkg/streamingpromql/types" | ||
| ) | ||
|
|
||
| type CountAggregationGroup struct { | ||
| values []float64 | ||
| } | ||
|
|
||
| func (g *CountAggregationGroup) AccumulateSeries(data types.InstantVectorSeriesData, timeRange types.QueryTimeRange, memoryConsumptionTracker *limiting.MemoryConsumptionTracker, _ functions.EmitAnnotationFunc) error { | ||
| if (len(data.Floats) > 0 || len(data.Histograms) > 0) && g.values == nil { | ||
| var err error | ||
| // First series with values for this group, populate it. | ||
| g.values, err = types.Float64SlicePool.Get(timeRange.StepCount, memoryConsumptionTracker) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
| g.values = g.values[:timeRange.StepCount] | ||
| } | ||
|
|
||
| for _, p := range data.Floats { | ||
| idx := (p.T - timeRange.StartT) / timeRange.IntervalMs | ||
| g.values[idx]++ | ||
| } | ||
|
|
||
| for _, p := range data.Histograms { | ||
| idx := (p.T - timeRange.StartT) / timeRange.IntervalMs | ||
| g.values[idx]++ | ||
| } | ||
|
|
||
| types.PutInstantVectorSeriesData(data, memoryConsumptionTracker) | ||
| return nil | ||
| } | ||
|
|
||
| func (g *CountAggregationGroup) ComputeOutputSeries(timeRange types.QueryTimeRange, memoryConsumptionTracker *limiting.MemoryConsumptionTracker) (types.InstantVectorSeriesData, bool, error) { | ||
| floatPointCount := 0 | ||
| for _, fv := range g.values { | ||
| if fv > 0 { | ||
| floatPointCount++ | ||
| } | ||
| } | ||
| var floatPoints []promql.FPoint | ||
| var err error | ||
| if floatPointCount > 0 { | ||
| floatPoints, err = types.FPointSlicePool.Get(floatPointCount, memoryConsumptionTracker) | ||
| if err != nil { | ||
| return types.InstantVectorSeriesData{}, false, err | ||
| } | ||
|
|
||
| for i, fv := range g.values { | ||
| if fv > 0 { | ||
| t := timeRange.StartT + int64(i)*timeRange.IntervalMs | ||
| floatPoints = append(floatPoints, promql.FPoint{T: t, F: fv}) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| types.Float64SlicePool.Put(g.values, memoryConsumptionTracker) | ||
|
|
||
| return types.InstantVectorSeriesData{Floats: floatPoints}, false, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters