RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-27 00:53:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changing TotalQueryableSamples from int to int64 (#10549)

Browse Source 
* Changing TotalQueryableSamples from int to int64

Signed-off-by: Alan Protasio <approtas@amazon.com>
This commit is contained in:
Alan Protasio 2022-04-11 16:22:25 -07:00 committed by GitHub
parent 08de38b700
commit ce6a643ee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
promql/engine.go
View File

@ -1398,7 +1398,7 @@ func (ev *evaluator) eval(expr parser.Expr) (parser.Value, storage.Warnings) {
enh.Ts = ts enh.Ts = ts
// Make the function call. // Make the function call.
outVec := call(inArgs, e.Args, enh) outVec := call(inArgs, e.Args, enh)
ev.samplesStats.IncrementSamplesAtStep(step, len(points)) ev.samplesStats.IncrementSamplesAtStep(step, int64(len(points)))
enh.Out = outVec[:0] enh.Out = outVec[:0]
if len(outVec) > 0 { if len(outVec) > 0 {
ss.Points = append(ss.Points, Point{V: outVec[0].Point.V, T: ts}) ss.Points = append(ss.Points, Point{V: outVec[0].Point.V, T: ts})
@ -1783,7 +1783,7 @@ func (ev *evaluator) matrixSelector(node *parser.MatrixSelector) (Matrix, storag
} }
ss.Points = ev.matrixIterSlice(it, mint, maxt, getPointSlice(16)) ss.Points = ev.matrixIterSlice(it, mint, maxt, getPointSlice(16))
ev.samplesStats.IncrementSamplesAtTimestamp(ev.startTimestamp, len(ss.Points)) ev.samplesStats.IncrementSamplesAtTimestamp(ev.startTimestamp, int64(len(ss.Points)))
if len(ss.Points) > 0 { if len(ss.Points) > 0 {
matrix = append(matrix, ss) matrix = append(matrix, ss)

3
promql/engine_test.go
View File

@ -747,7 +747,6 @@ load 10s
metricWith3SampleEvery10Seconds{a="2",b="2"} 1+1x100 metricWith3SampleEvery10Seconds{a="2",b="2"} 1+1x100
metricWith3SampleEvery10Seconds{a="3",b="2"} 1+1x100 metricWith3SampleEvery10Seconds{a="3",b="2"} 1+1x100
`) `)
require.NoError(t, err) require.NoError(t, err)
defer test.Close() defer test.Close()
@ -757,7 +756,7 @@ load 10s
cases := []struct { cases := []struct {
Query string Query string
SkipMaxCheck bool SkipMaxCheck bool
TotalSamples int TotalSamples int64
TotalSamplesPerStep stats.TotalSamplesPerStep TotalSamplesPerStep stats.TotalSamplesPerStep
PeakSamples int PeakSamples int
Start time.Time Start time.Time

14
util/stats/query_stats.go
View File

@ -104,7 +104,7 @@ type queryTimings struct {
type querySamples struct { type querySamples struct {
TotalQueryableSamplesPerStep []stepStat `json:"totalQueryableSamplesPerStep,omitempty"` TotalQueryableSamplesPerStep []stepStat `json:"totalQueryableSamplesPerStep,omitempty"`
TotalQueryableSamples int `json:"totalQueryableSamples"` TotalQueryableSamples int64 `json:"totalQueryableSamples"`
PeakSamples int `json:"peakSamples"` PeakSamples int `json:"peakSamples"`
} }
@ -182,7 +182,7 @@ func (qs *QuerySamples) totalSamplesPerStepPoints() []stepStat {
ts := make([]stepStat, len(qs.TotalSamplesPerStep)) ts := make([]stepStat, len(qs.TotalSamplesPerStep))
for i, c := range qs.TotalSamplesPerStep { for i, c := range qs.TotalSamplesPerStep {
ts[i] = stepStat{T: qs.startTimestamp + int64(i)*qs.interval, V: int64(c)} ts[i] = stepStat{T: qs.startTimestamp + int64(i)*qs.interval, V: c}
} }
return ts return ts
} }
@ -236,14 +236,14 @@ type QuerySamples struct {
// TotalSamples represents the total number of samples scanned // TotalSamples represents the total number of samples scanned
// while evaluating a query. // while evaluating a query.
TotalSamples int TotalSamples int64
// TotalSamplesPerStep represents the total number of samples scanned // TotalSamplesPerStep represents the total number of samples scanned
// per step while evaluating a query. Each step should be identical to the // per step while evaluating a query. Each step should be identical to the
// TotalSamples when a step is run as an instant query, which means // TotalSamples when a step is run as an instant query, which means
// we intentionally do not account for optimizations that happen inside the // we intentionally do not account for optimizations that happen inside the
// range query engine that reduce the actual work that happens. // range query engine that reduce the actual work that happens.
TotalSamplesPerStep []int TotalSamplesPerStep []int64
EnablePerStepStats bool EnablePerStepStats bool
startTimestamp int64 startTimestamp int64
@ -261,13 +261,13 @@ func (qs *QuerySamples) InitStepTracking(start, end, interval int64) {
} }
numSteps := int((end-start)/interval) + 1 numSteps := int((end-start)/interval) + 1
qs.TotalSamplesPerStep = make([]int, numSteps) qs.TotalSamplesPerStep = make([]int64, numSteps)
qs.startTimestamp = start qs.startTimestamp = start
qs.interval = interval qs.interval = interval
} }
// IncrementSamplesAtStep increments the total samples count. Use this if you know the step index. // IncrementSamplesAtStep increments the total samples count. Use this if you know the step index.
func (qs *QuerySamples) IncrementSamplesAtStep(i, samples int) { func (qs *QuerySamples) IncrementSamplesAtStep(i int, samples int64) {
if qs == nil { if qs == nil {
return return
} }
@ -280,7 +280,7 @@ func (qs *QuerySamples) IncrementSamplesAtStep(i, samples int) {
// IncrementSamplesAtTimestamp increments the total samples count. Use this if you only have the corresponding step // IncrementSamplesAtTimestamp increments the total samples count. Use this if you only have the corresponding step
// timestamp. // timestamp.
func (qs *QuerySamples) IncrementSamplesAtTimestamp(t int64, samples int) { func (qs *QuerySamples) IncrementSamplesAtTimestamp(t, samples int64) {
if qs == nil { if qs == nil {
return return
} }