RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

promql: export SmapleStream

This commit is contained in:
Fabian Reinartz 2016-12-24 11:29:39 +01:00
parent 6315d00942
commit 65581a3d46
3 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
promql/engine.go
View File

@ -62,12 +62,13 @@ type ValueType string
// The valid value types.
const (
ValueTypeNone = "none"
ValueTypeVector = "Vector"
ValueTypeScalar = "Scalar"
ValueTypeMatrix = "Matrix"
ValueTypeVector = "vector"
ValueTypeScalar = "scalar"
ValueTypeMatrix = "matrix"
ValueTypeString = "string"
)
// String represents a string value.
type String struct {
V string
T int64
@ -87,13 +88,13 @@ func (s Scalar) String() string {
return ""
}
// sampleStream is a stream of Values belonging to an attached COWMetric.
type sampleStream struct {
// SampleStream is a stream of data points belonging to a metric.
type SampleStream struct {
Metric labels.Labels
Values []Point
Points []Point
}
func (s sampleStream) String() string {
func (s SampleStream) String() string {
return ""
}
@ -132,7 +133,7 @@ func (vec Vector) String() string {
// Matrix is a slice of SampleStreams that implements sort.Interface and
// has a String method.
type Matrix []sampleStream
type Matrix []SampleStream
func (m Matrix) String() string {
// TODO(fabxc): sort, or can we rely on order from the querier?
@ -456,7 +457,7 @@ func (ng *Engine) execEvalStmt(ctx context.Context, query *query, s *EvalStmt) (
numSteps := int(s.End.Sub(s.Start) / s.Interval)
// Range evaluation.
sampleStreams := map[uint64]sampleStream{}
SampleStreams := map[uint64]SampleStream{}
for ts := s.Start; !ts.After(s.End); ts = ts.Add(s.Interval) {
if err := contextDone(ctx, "range evaluation"); err != nil {
@ -476,24 +477,24 @@ func (ng *Engine) execEvalStmt(ctx context.Context, query *query, s *EvalStmt) (
case Scalar:
// As the expression type does not change we can safely default to 0
// as the fingerprint for Scalar expressions.
ss, ok := sampleStreams[0]
ss, ok := SampleStreams[0]
if !ok {
ss = sampleStream{Values: make([]Point, 0, numSteps)}
sampleStreams[0] = ss
ss = SampleStream{Points: make([]Point, 0, numSteps)}
SampleStreams[0] = ss
}
ss.Values = append(ss.Values, Point(v))
ss.Points = append(ss.Points, Point(v))
case Vector:
for _, sample := range v {
h := sample.Metric.Hash()
ss, ok := sampleStreams[h]
ss, ok := SampleStreams[h]
if !ok {
ss = sampleStream{
ss = SampleStream{
Metric: sample.Metric,
Values: make([]Point, 0, numSteps),
Points: make([]Point, 0, numSteps),
}
sampleStreams[h] = ss
SampleStreams[h] = ss
}
ss.Values = append(ss.Values, sample.Point)
ss.Points = append(ss.Points, sample.Point)
}
default:
panic(fmt.Errorf("promql.Engine.exec: invalid expression type %q", val.Type()))
@ -507,7 +508,7 @@ func (ng *Engine) execEvalStmt(ctx context.Context, query *query, s *EvalStmt) (
appendTimer := query.stats.GetTimer(stats.ResultAppendTime).Start()
mat := Matrix{}
for _, ss := range sampleStreams {
for _, ss := range SampleStreams {
mat = append(mat, ss)
}
appendTimer.Stop()
@ -821,9 +822,9 @@ func (ev *evaluator) MatrixSelector(node *MatrixSelector) Matrix {
)
for i, it := range node.iterators {
ss := sampleStream{
ss := SampleStream{
Metric: node.series[i].Labels(),
Values: make([]Point, 0, 16),
Points: make([]Point, 0, 16),
}
if !it.Seek(maxt) {
@ -838,13 +839,13 @@ func (ev *evaluator) MatrixSelector(node *MatrixSelector) Matrix {
t, v := buf.Values()
// Values in the buffer are guaranteed to be smaller than maxt.
if t >= mint {
ss.Values = append(ss.Values, Point{T: t + offset, V: v})
ss.Points = append(ss.Points, Point{T: t + offset, V: v})
}
}
// The seeked sample might also be in the range.
t, v := it.Values()
if t == maxt {
ss.Values = append(ss.Values, Point{T: t + offset, V: v})
ss.Points = append(ss.Points, Point{T: t + offset, V: v})
}
Matrix = append(Matrix, ss)

54
promql/functions.go
View File

@ -58,29 +58,29 @@ func extrapolatedRate(ev *evaluator, arg Expr, isCounter bool, isRate bool) Valu
for _, samples := range MatrixValue {
// No sense in trying to compute a rate without at least two points. Drop
// this Vector element.
if len(samples.Values) < 2 {
if len(samples.Points) < 2 {
continue
}
var (
counterCorrection float64
lastValue float64
)
for _, sample := range samples.Values {
for _, sample := range samples.Points {
if isCounter && sample.V < lastValue {
counterCorrection += lastValue
}
lastValue = sample.V
}
resultValue := lastValue - samples.Values[0].V + counterCorrection
resultValue := lastValue - samples.Points[0].V + counterCorrection
// Duration between first/last samples and boundary of range.
durationToStart := float64(samples.Values[0].T - rangeStart)
durationToEnd := float64(rangeEnd - samples.Values[len(samples.Values)-1].T)
durationToStart := float64(samples.Points[0].T - rangeStart)
durationToEnd := float64(rangeEnd - samples.Points[len(samples.Points)-1].T)
sampledInterval := float64(samples.Values[len(samples.Values)-1].T - samples.Values[0].T)
averageDurationBetweenSamples := float64(sampledInterval) / float64(len(samples.Values)-1)
sampledInterval := float64(samples.Points[len(samples.Points)-1].T - samples.Points[0].T)
averageDurationBetweenSamples := float64(sampledInterval) / float64(len(samples.Points)-1)
if isCounter && resultValue > 0 && samples.Values[0].V >= 0 {
if isCounter && resultValue > 0 && samples.Points[0].V >= 0 {
// Counters cannot be negative. If we have any slope at
// all (i.e. resultValue went up), we can extrapolate
// the zero point of the counter. If the duration to the
@ -88,7 +88,7 @@ func extrapolatedRate(ev *evaluator, arg Expr, isCounter bool, isRate bool) Valu
// take the zero point as the start of the series,
// thereby avoiding extrapolation to negative counter
// values.
durationToZero := float64(sampledInterval) * float64(samples.Values[0].V/resultValue)
durationToZero := float64(sampledInterval) * float64(samples.Points[0].V/resultValue)
if durationToZero < durationToStart {
durationToStart = durationToZero
}
@ -154,12 +154,12 @@ func instantValue(ev *evaluator, arg Expr, isRate bool) Value {
for _, samples := range ev.evalMatrix(arg) {
// No sense in trying to compute a rate without at least two points. Drop
// this Vector element.
if len(samples.Values) < 2 {
if len(samples.Points) < 2 {
continue
}
lastSample := samples.Values[len(samples.Values)-1]
previousSample := samples.Values[len(samples.Values)-2]
lastSample := samples.Points[len(samples.Points)-1]
previousSample := samples.Points[len(samples.Points)-2]
var resultValue float64
if isRate && lastSample.V < previousSample.V {
@ -236,7 +236,7 @@ func funcHoltWinters(ev *evaluator, args Expressions) Value {
var l int
for _, samples := range mat {
l = len(samples.Values)
l = len(samples.Points)
// Can't do the smoothing operation with less than two points.
if l < 2 {
@ -251,7 +251,7 @@ func funcHoltWinters(ev *evaluator, args Expressions) Value {
}
// Fill in the d values with the raw values from the input.
for i, v := range samples.Values {
for i, v := range samples.Points {
d[i] = v.V
}
@ -409,13 +409,13 @@ func aggrOverTime(ev *evaluator, args Expressions, aggrFn func([]Point) float64)
resultVector := Vector{}
for _, el := range mat {
if len(el.Values) == 0 {
if len(el.Points) == 0 {
continue
}
resultVector = append(resultVector, sample{
Metric: copyLabels(el.Metric, false),
Point: Point{V: aggrFn(el.Values), T: ev.Timestamp},
Point: Point{V: aggrFn(el.Points), T: ev.Timestamp},
})
}
return resultVector
@ -489,13 +489,13 @@ func funcQuantileOverTime(ev *evaluator, args Expressions) Value {
resultVector := Vector{}
for _, el := range mat {
if len(el.Values) == 0 {
if len(el.Points) == 0 {
continue
}
el.Metric = copyLabels(el.Metric, false)
values := make(VectorByValueHeap, 0, len(el.Values))
for _, v := range el.Values {
values := make(VectorByValueHeap, 0, len(el.Points))
for _, v := range el.Points {
values = append(values, sample{Point: Point{V: v.V}})
}
resultVector = append(resultVector, sample{
@ -659,10 +659,10 @@ func funcDeriv(ev *evaluator, args Expressions) Value {
for _, samples := range mat {
// No sense in trying to compute a derivative without at least two points.
// Drop this Vector element.
if len(samples.Values) < 2 {
if len(samples.Points) < 2 {
continue
}
slope, _ := linearRegression(samples.Values, 0)
slope, _ := linearRegression(samples.Points, 0)
resultSample := sample{
Metric: copyLabels(samples.Metric, false),
Point: Point{V: slope, T: ev.Timestamp},
@ -682,10 +682,10 @@ func funcPredictLinear(ev *evaluator, args Expressions) Value {
for _, samples := range mat {
// No sense in trying to predict anything without at least two points.
// Drop this Vector element.
if len(samples.Values) < 2 {
if len(samples.Points) < 2 {
continue
}
slope, intercept := linearRegression(samples.Values, ev.Timestamp)
slope, intercept := linearRegression(samples.Points, ev.Timestamp)
resultVector = append(resultVector, sample{
Metric: copyLabels(samples.Metric, false),
@ -743,8 +743,8 @@ func funcResets(ev *evaluator, args Expressions) Value {
for _, samples := range in {
resets := 0
prev := samples.Values[0].V
for _, sample := range samples.Values[1:] {
prev := samples.Points[0].V
for _, sample := range samples.Points[1:] {
current := sample.V
if current < prev {
resets++
@ -767,8 +767,8 @@ func funcChanges(ev *evaluator, args Expressions) Value {
for _, samples := range in {
changes := 0
prev := samples.Values[0].V
for _, sample := range samples.Values[1:] {
prev := samples.Points[0].V
for _, sample := range samples.Points[1:] {
current := sample.V
if current != prev && !(math.IsNaN(float64(current)) && math.IsNaN(float64(prev))) {
changes++

4
promql/test.go
View File

@ -366,8 +366,8 @@ func (ev *evalCmd) compareResult(result Value) error {
return fmt.Errorf("expected metric %s with %v at position %d but was at %d", v.Metric, exp.vals, exp.pos, pos+1)
}
for i, expVal := range exp.vals {
if !almostEqual(expVal.value, v.Values[i].V) {
return fmt.Errorf("expected %v for %s but got %v", expVal, v.Metric, v.Values)
if !almostEqual(expVal.value, v.Points[i].V) {
return fmt.Errorf("expected %v for %s but got %v", expVal, v.Metric, v.Points)
}
}
seen[fp] = true