mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-26 22:19:40 -08:00
c0879d64cf
In other words: Instead of having a “polymorphous” `Point` that can either contain a float value or a histogram value, use an `FPoint` for floats and an `HPoint` for histograms. This seemingly small change has a _lot_ of repercussions throughout the codebase. The idea here is to avoid the increase in size of `Point` arrays that happened after native histograms had been added. The higher-level data structures (`Sample`, `Series`, etc.) are still “polymorphous”. The same idea could be applied to them, but at each step the trade-offs needed to be evaluated. The idea with this change is to do the minimum necessary to get back to pre-histogram performance for functions that do not touch histograms. Here are comparisons for the `changes` function. The test data doesn't include histograms yet. Ideally, there would be no change in the benchmark result at all. First runtime v2.39 compared to directly prior to this commit: ``` name old time/op new time/op delta RangeQuery/expr=changes(a_one[1d]),steps=1-16 391µs ± 2% 542µs ± 1% +38.58% (p=0.000 n=9+8) RangeQuery/expr=changes(a_one[1d]),steps=10-16 452µs ± 2% 617µs ± 2% +36.48% (p=0.000 n=10+10) RangeQuery/expr=changes(a_one[1d]),steps=100-16 1.12ms ± 1% 1.36ms ± 2% +21.58% (p=0.000 n=8+10) RangeQuery/expr=changes(a_one[1d]),steps=1000-16 7.83ms ± 1% 8.94ms ± 1% +14.21% (p=0.000 n=10+10) RangeQuery/expr=changes(a_ten[1d]),steps=1-16 2.98ms ± 0% 3.30ms ± 1% +10.67% (p=0.000 n=9+10) RangeQuery/expr=changes(a_ten[1d]),steps=10-16 3.66ms ± 1% 4.10ms ± 1% +11.82% (p=0.000 n=10+10) RangeQuery/expr=changes(a_ten[1d]),steps=100-16 10.5ms ± 0% 11.8ms ± 1% +12.50% (p=0.000 n=8+10) RangeQuery/expr=changes(a_ten[1d]),steps=1000-16 77.6ms ± 1% 87.4ms ± 1% +12.63% (p=0.000 n=9+9) RangeQuery/expr=changes(a_hundred[1d]),steps=1-16 30.4ms ± 2% 32.8ms ± 1% +8.01% (p=0.000 n=10+10) RangeQuery/expr=changes(a_hundred[1d]),steps=10-16 37.1ms ± 2% 40.6ms ± 2% +9.64% (p=0.000 n=10+10) RangeQuery/expr=changes(a_hundred[1d]),steps=100-16 105ms ± 1% 117ms ± 1% +11.69% (p=0.000 n=10+10) RangeQuery/expr=changes(a_hundred[1d]),steps=1000-16 783ms ± 3% 876ms ± 1% +11.83% (p=0.000 n=9+10) ``` And then runtime v2.39 compared to after this commit: ``` name old time/op new time/op delta RangeQuery/expr=changes(a_one[1d]),steps=1-16 391µs ± 2% 547µs ± 1% +39.84% (p=0.000 n=9+8) RangeQuery/expr=changes(a_one[1d]),steps=10-16 452µs ± 2% 616µs ± 2% +36.15% (p=0.000 n=10+10) RangeQuery/expr=changes(a_one[1d]),steps=100-16 1.12ms ± 1% 1.26ms ± 1% +12.20% (p=0.000 n=8+10) RangeQuery/expr=changes(a_one[1d]),steps=1000-16 7.83ms ± 1% 7.95ms ± 1% +1.59% (p=0.000 n=10+8) RangeQuery/expr=changes(a_ten[1d]),steps=1-16 2.98ms ± 0% 3.38ms ± 2% +13.49% (p=0.000 n=9+10) RangeQuery/expr=changes(a_ten[1d]),steps=10-16 3.66ms ± 1% 4.02ms ± 1% +9.80% (p=0.000 n=10+9) RangeQuery/expr=changes(a_ten[1d]),steps=100-16 10.5ms ± 0% 10.8ms ± 1% +3.08% (p=0.000 n=8+10) RangeQuery/expr=changes(a_ten[1d]),steps=1000-16 77.6ms ± 1% 78.1ms ± 1% +0.58% (p=0.035 n=9+10) RangeQuery/expr=changes(a_hundred[1d]),steps=1-16 30.4ms ± 2% 33.5ms ± 4% +10.18% (p=0.000 n=10+10) RangeQuery/expr=changes(a_hundred[1d]),steps=10-16 37.1ms ± 2% 40.0ms ± 1% +7.98% (p=0.000 n=10+10) RangeQuery/expr=changes(a_hundred[1d]),steps=100-16 105ms ± 1% 107ms ± 1% +1.92% (p=0.000 n=10+10) RangeQuery/expr=changes(a_hundred[1d]),steps=1000-16 783ms ± 3% 775ms ± 1% -1.02% (p=0.019 n=9+9) ``` In summary, the runtime doesn't really improve with this change for queries with just a few steps. For queries with many steps, this commit essentially reinstates the old performance. This is good because the many-step queries are the one that matter most (longest absolute runtime). In terms of allocations, though, this commit doesn't make a dent at all (numbers not shown). The reason is that most of the allocations happen in the sampleRingIterator (in the storage package), which has to be addressed in a separate commit. Signed-off-by: beorn7 <beorn@grafana.com>
159 lines
4.1 KiB
Go
159 lines
4.1 KiB
Go
// Copyright 2019 The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package promql
|
|
|
|
import (
|
|
"math"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/prometheus/prometheus/model/labels"
|
|
"github.com/prometheus/prometheus/tsdb/chunkenc"
|
|
)
|
|
|
|
func TestLazyLoader_WithSamplesTill(t *testing.T) {
|
|
type testCase struct {
|
|
ts time.Time
|
|
series []Series // Each series is checked separately. Need not mention all series here.
|
|
checkOnlyError bool // If this is true, series is not checked.
|
|
}
|
|
|
|
cases := []struct {
|
|
loadString string
|
|
// These testCases are run in sequence. So the testCase being run is dependent on the previous testCase.
|
|
testCases []testCase
|
|
}{
|
|
{
|
|
loadString: `
|
|
load 10s
|
|
metric1 1+1x10
|
|
`,
|
|
testCases: []testCase{
|
|
{
|
|
ts: time.Unix(40, 0),
|
|
series: []Series{
|
|
{
|
|
Metric: labels.FromStrings("__name__", "metric1"),
|
|
Floats: []FPoint{
|
|
{0, 1}, {10000, 2}, {20000, 3}, {30000, 4}, {40000, 5},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
ts: time.Unix(10, 0),
|
|
series: []Series{
|
|
{
|
|
Metric: labels.FromStrings("__name__", "metric1"),
|
|
Floats: []FPoint{
|
|
{0, 1}, {10000, 2}, {20000, 3}, {30000, 4}, {40000, 5},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
ts: time.Unix(60, 0),
|
|
series: []Series{
|
|
{
|
|
Metric: labels.FromStrings("__name__", "metric1"),
|
|
Floats: []FPoint{
|
|
{0, 1}, {10000, 2}, {20000, 3}, {30000, 4}, {40000, 5}, {50000, 6}, {60000, 7},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
loadString: `
|
|
load 10s
|
|
metric1 1+0x5
|
|
metric2 1+1x100
|
|
`,
|
|
testCases: []testCase{
|
|
{ // Adds all samples of metric1.
|
|
ts: time.Unix(70, 0),
|
|
series: []Series{
|
|
{
|
|
Metric: labels.FromStrings("__name__", "metric1"),
|
|
Floats: []FPoint{
|
|
{0, 1}, {10000, 1}, {20000, 1}, {30000, 1}, {40000, 1}, {50000, 1},
|
|
},
|
|
},
|
|
{
|
|
Metric: labels.FromStrings("__name__", "metric2"),
|
|
Floats: []FPoint{
|
|
{0, 1}, {10000, 2}, {20000, 3}, {30000, 4}, {40000, 5}, {50000, 6}, {60000, 7}, {70000, 8},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{ // This tests fix for https://github.com/prometheus/prometheus/issues/5064.
|
|
ts: time.Unix(300, 0),
|
|
checkOnlyError: true,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
suite, err := NewLazyLoader(t, c.loadString, LazyLoaderOpts{})
|
|
require.NoError(t, err)
|
|
defer suite.Close()
|
|
|
|
for _, tc := range c.testCases {
|
|
suite.WithSamplesTill(tc.ts, func(err error) {
|
|
require.NoError(t, err)
|
|
if tc.checkOnlyError {
|
|
return
|
|
}
|
|
|
|
// Check the series.
|
|
queryable := suite.Queryable()
|
|
querier, err := queryable.Querier(suite.Context(), math.MinInt64, math.MaxInt64)
|
|
require.NoError(t, err)
|
|
for _, s := range tc.series {
|
|
var matchers []*labels.Matcher
|
|
s.Metric.Range(func(label labels.Label) {
|
|
m, err := labels.NewMatcher(labels.MatchEqual, label.Name, label.Value)
|
|
require.NoError(t, err)
|
|
matchers = append(matchers, m)
|
|
})
|
|
|
|
// Get the series for the matcher.
|
|
ss := querier.Select(false, nil, matchers...)
|
|
require.True(t, ss.Next())
|
|
storageSeries := ss.At()
|
|
require.False(t, ss.Next(), "Expecting only 1 series")
|
|
|
|
// Convert `storage.Series` to `promql.Series`.
|
|
got := Series{
|
|
Metric: storageSeries.Labels(),
|
|
}
|
|
it := storageSeries.Iterator(nil)
|
|
for it.Next() == chunkenc.ValFloat {
|
|
t, v := it.At()
|
|
got.Floats = append(got.Floats, FPoint{T: t, F: v})
|
|
}
|
|
require.NoError(t, it.Err())
|
|
|
|
require.Equal(t, s, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|