Merge "Don't keep extra labels in aggregations by default."
This commit is contained in:
Julius Volz
Gerrit Code Review
commit
97d84239df
|
|
@ -164,9 +164,10 @@ type (
|
|||
|
||||
// A vector aggregation with vector return type.
|
||||
VectorAggregation struct {
|
||||
aggrType AggrType
|
||||
groupBy clientmodel.LabelNames
|
||||
vector VectorNode
|
||||
aggrType AggrType
|
||||
groupBy clientmodel.LabelNames
|
||||
keepExtraLabels bool
|
||||
vector VectorNode
|
||||
}
|
||||
|
||||
// An arithmetic expression of vector type.
|
||||
|
|
@ -367,7 +368,10 @@ func (node *VectorAggregation) Eval(timestamp clientmodel.Timestamp, view *viewA
|
|||
for _, sample := range vector {
|
||||
groupingKey := node.labelsToGroupingKey(sample.Metric)
|
||||
if groupedResult, ok := result[groupingKey]; ok {
|
||||
groupedResult.labels = labelIntersection(groupedResult.labels, sample.Metric)
|
||||
if node.keepExtraLabels {
|
||||
groupedResult.labels = labelIntersection(groupedResult.labels, sample.Metric)
|
||||
}
|
||||
|
||||
switch node.aggrType {
|
||||
case SUM:
|
||||
groupedResult.value += sample.Value
|
||||
|
|
@ -388,8 +392,17 @@ func (node *VectorAggregation) Eval(timestamp clientmodel.Timestamp, view *viewA
|
|||
panic("Unknown aggregation type")
|
||||
}
|
||||
} else {
|
||||
m := clientmodel.Metric{}
|
||||
if node.keepExtraLabels {
|
||||
m = sample.Metric
|
||||
} else {
|
||||
m[clientmodel.MetricNameLabel] = sample.Metric[clientmodel.MetricNameLabel]
|
||||
for _, l := range node.groupBy {
|
||||
m[l] = sample.Metric[l]
|
||||
}
|
||||
}
|
||||
result[groupingKey] = &groupedAggregation{
|
||||
labels: sample.Metric,
|
||||
labels: m,
|
||||
value: sample.Value,
|
||||
groupCount: 1,
|
||||
}
|
||||
|
|
@ -644,11 +657,12 @@ func NewVectorLiteral(labels clientmodel.LabelSet) *VectorLiteral {
|
|||
}
|
||||
}
|
||||
|
||||
func NewVectorAggregation(aggrType AggrType, vector VectorNode, groupBy clientmodel.LabelNames) *VectorAggregation {
|
||||
func NewVectorAggregation(aggrType AggrType, vector VectorNode, groupBy clientmodel.LabelNames, keepExtraLabels bool) *VectorAggregation {
|
||||
return &VectorAggregation{
|
||||
aggrType: aggrType,
|
||||
groupBy: groupBy,
|
||||
vector: vector,
|
||||
aggrType: aggrType,
|
||||
groupBy: groupBy,
|
||||
keepExtraLabels: keepExtraLabels,
|
||||
vector: vector,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ func NewFunctionCall(name string, args []ast.Node) (ast.Node, error) {
|
|||
return functionCall, nil
|
||||
}
|
||||
|
||||
func NewVectorAggregation(aggrTypeStr string, vector ast.Node, groupBy clientmodel.LabelNames) (*ast.VectorAggregation, error) {
|
||||
func NewVectorAggregation(aggrTypeStr string, vector ast.Node, groupBy clientmodel.LabelNames, keepExtraLabels bool) (*ast.VectorAggregation, error) {
|
||||
if _, ok := vector.(ast.VectorNode); !ok {
|
||||
return nil, fmt.Errorf("Operand of %v aggregation must be of vector type", aggrTypeStr)
|
||||
}
|
||||
|
|
@ -69,7 +69,7 @@ func NewVectorAggregation(aggrTypeStr string, vector ast.Node, groupBy clientmod
|
|||
if !ok {
|
||||
return nil, fmt.Errorf("Unknown aggregation type '%v'", aggrTypeStr)
|
||||
}
|
||||
return ast.NewVectorAggregation(aggrType, vector.(ast.VectorNode), groupBy), nil
|
||||
return ast.NewVectorAggregation(aggrType, vector.(ast.VectorNode), groupBy, keepExtraLabels), nil
|
||||
}
|
||||
|
||||
func NewArithExpr(opTypeStr string, lhs ast.Node, rhs ast.Node) (ast.Node, error) {
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ DESCRIPTION|description return DESCRIPTION
|
|||
|
||||
PERMANENT|permanent return PERMANENT
|
||||
BY|by return GROUP_OP
|
||||
KEEPING_EXTRA|keeping_extra return KEEPING_EXTRA
|
||||
AVG|SUM|MAX|MIN|COUNT lval.str = lexer.token(); return AGGR_OP
|
||||
avg|sum|max|min|count lval.str = strings.ToUpper(lexer.token()); return AGGR_OP
|
||||
\<|>|AND|OR|and|or lval.str = strings.ToUpper(lexer.token()); return CMP_OP
|
||||
|
|
|
|||
1117
rules/lexer.l.go
1117
rules/lexer.l.go
File diff suppressed because it is too large
Load Diff
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
%token <str> IDENTIFIER STRING DURATION
|
||||
%token <num> NUMBER
|
||||
%token PERMANENT GROUP_OP
|
||||
%token PERMANENT GROUP_OP KEEPING_EXTRA
|
||||
%token <str> AGGR_OP CMP_OP ADDITIVE_OP MULT_OP
|
||||
%token ALERT IF FOR WITH SUMMARY DESCRIPTION
|
||||
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
%type <labelNameSlice> label_list grouping_opts
|
||||
%type <labelSet> label_assign label_assign_list rule_labels
|
||||
%type <ruleNode> rule_expr func_arg
|
||||
%type <boolean> qualifier
|
||||
%type <boolean> qualifier extra_labels_opts
|
||||
%type <str> for_duration
|
||||
|
||||
%right '='
|
||||
|
|
@ -135,10 +135,10 @@ rule_expr : '(' rule_expr ')'
|
|||
$$, err = NewMatrix($1, $3)
|
||||
if err != nil { yylex.Error(err.Error()); return 1 }
|
||||
}
|
||||
| AGGR_OP '(' rule_expr ')' grouping_opts
|
||||
| AGGR_OP '(' rule_expr ')' grouping_opts extra_labels_opts
|
||||
{
|
||||
var err error
|
||||
$$, err = NewVectorAggregation($1, $3, $5)
|
||||
$$, err = NewVectorAggregation($1, $3, $5, $6)
|
||||
if err != nil { yylex.Error(err.Error()); return 1 }
|
||||
}
|
||||
/* Yacc can only attach associativity to terminals, so we
|
||||
|
|
@ -165,6 +165,12 @@ rule_expr : '(' rule_expr ')'
|
|||
{ $$ = ast.NewScalarLiteral($1)}
|
||||
;
|
||||
|
||||
extra_labels_opts :
|
||||
{ $$ = false }
|
||||
| KEEPING_EXTRA
|
||||
{ $$ = true }
|
||||
;
|
||||
|
||||
grouping_opts :
|
||||
{ $$ = clientmodel.LabelNames{} }
|
||||
| GROUP_OP '(' label_list ')'
|
||||
|
|
|
|||
|
|
@ -30,16 +30,17 @@ const DURATION = 57350
|
|||
const NUMBER = 57351
|
||||
const PERMANENT = 57352
|
||||
const GROUP_OP = 57353
|
||||
const AGGR_OP = 57354
|
||||
const CMP_OP = 57355
|
||||
const ADDITIVE_OP = 57356
|
||||
const MULT_OP = 57357
|
||||
const ALERT = 57358
|
||||
const IF = 57359
|
||||
const FOR = 57360
|
||||
const WITH = 57361
|
||||
const SUMMARY = 57362
|
||||
const DESCRIPTION = 57363
|
||||
const KEEPING_EXTRA = 57354
|
||||
const AGGR_OP = 57355
|
||||
const CMP_OP = 57356
|
||||
const ADDITIVE_OP = 57357
|
||||
const MULT_OP = 57358
|
||||
const ALERT = 57359
|
||||
const IF = 57360
|
||||
const FOR = 57361
|
||||
const WITH = 57362
|
||||
const SUMMARY = 57363
|
||||
const DESCRIPTION = 57364
|
||||
|
||||
var yyToknames = []string{
|
||||
"START_RULES",
|
||||
|
|
@ -50,6 +51,7 @@ var yyToknames = []string{
|
|||
"NUMBER",
|
||||
"PERMANENT",
|
||||
"GROUP_OP",
|
||||
"KEEPING_EXTRA",
|
||||
"AGGR_OP",
|
||||
"CMP_OP",
|
||||
"ADDITIVE_OP",
|
||||
|
|
@ -68,7 +70,7 @@ const yyEofCode = 1
|
|||
const yyErrCode = 2
|
||||
const yyMaxDepth = 200
|
||||
|
||||
//line parser.y:191
|
||||
//line parser.y:197
|
||||
|
||||
|
||||
//line yacctab:1
|
||||
|
|
@ -81,79 +83,79 @@ var yyExca = []int{
|
|||
-2, 1,
|
||||
}
|
||||
|
||||
const yyNprod = 36
|
||||
const yyNprod = 38
|
||||
const yyPrivate = 57344
|
||||
|
||||
var yyTokenNames []string
|
||||
var yyStates []string
|
||||
|
||||
const yyLast = 101
|
||||
const yyLast = 103
|
||||
|
||||
var yyAct = []int{
|
||||
|
||||
20, 38, 34, 43, 33, 17, 6, 18, 16, 17,
|
||||
19, 15, 59, 18, 16, 17, 16, 17, 15, 27,
|
||||
28, 29, 15, 60, 23, 41, 40, 49, 15, 22,
|
||||
15, 8, 35, 67, 10, 66, 45, 9, 44, 50,
|
||||
18, 16, 17, 46, 47, 51, 18, 16, 17, 53,
|
||||
52, 7, 32, 57, 30, 15, 39, 8, 35, 48,
|
||||
10, 15, 65, 9, 8, 22, 71, 10, 21, 68,
|
||||
9, 61, 42, 14, 37, 56, 62, 7, 26, 13,
|
||||
72, 70, 54, 69, 7, 64, 39, 25, 24, 2,
|
||||
3, 11, 5, 4, 1, 58, 12, 36, 55, 63,
|
||||
31,
|
||||
20, 38, 34, 17, 33, 43, 6, 18, 16, 17,
|
||||
19, 15, 59, 18, 16, 17, 15, 62, 23, 27,
|
||||
28, 29, 15, 46, 47, 41, 40, 49, 15, 22,
|
||||
8, 35, 69, 10, 68, 50, 45, 9, 44, 39,
|
||||
18, 16, 17, 48, 73, 51, 18, 16, 17, 53,
|
||||
52, 7, 32, 57, 30, 15, 8, 35, 37, 10,
|
||||
70, 15, 8, 9, 67, 10, 16, 17, 22, 9,
|
||||
61, 21, 63, 42, 14, 64, 56, 7, 26, 74,
|
||||
15, 13, 72, 7, 54, 71, 66, 39, 25, 24,
|
||||
2, 3, 11, 5, 4, 1, 58, 60, 12, 36,
|
||||
55, 65, 31,
|
||||
}
|
||||
var yyPact = []int{
|
||||
|
||||
85, -1000, -1000, 58, 63, -1000, 33, 58, 42, -2,
|
||||
-1000, -1000, 82, 81, -1000, 70, 58, 58, 58, 27,
|
||||
-1000, 25, 50, 58, 6, 55, -26, -10, -17, 2,
|
||||
-1000, 11, -1000, -1000, 33, -1000, 19, -1000, -1000, 37,
|
||||
0, 17, 58, -1000, -1000, 51, -1000, 80, 75, 64,
|
||||
58, -6, -1000, -1000, -1000, -1000, -3, 33, 52, 68,
|
||||
79, 6, -1000, 8, -1000, 49, -1000, 77, 74, -1000,
|
||||
45, 73, -1000,
|
||||
86, -1000, -1000, 56, 64, -1000, 32, 56, 44, -9,
|
||||
-1000, -1000, 83, 82, -1000, 70, 56, 56, 56, 26,
|
||||
-1000, 24, 33, 56, 5, 55, -25, -13, -18, 51,
|
||||
-1000, 10, -1000, -1000, 32, -1000, -2, -1000, -1000, 20,
|
||||
-1, 12, 56, -1000, -1000, 50, -1000, 81, 77, 65,
|
||||
56, -7, -1000, -1000, -1000, 58, -10, 32, 52, 67,
|
||||
-1000, -1000, 80, 5, -1000, 6, -1000, 39, -1000, 79,
|
||||
75, -1000, 22, 72, -1000,
|
||||
}
|
||||
var yyPgo = []int{
|
||||
|
||||
0, 100, 99, 98, 1, 97, 0, 2, 4, 96,
|
||||
95, 94, 93, 92, 91,
|
||||
0, 102, 101, 100, 1, 99, 0, 2, 4, 98,
|
||||
97, 96, 95, 94, 93, 92,
|
||||
}
|
||||
var yyR1 = []int{
|
||||
|
||||
0, 11, 11, 12, 12, 13, 14, 14, 10, 10,
|
||||
0, 12, 12, 13, 13, 14, 15, 15, 11, 11,
|
||||
9, 9, 6, 6, 6, 5, 5, 4, 7, 7,
|
||||
7, 7, 7, 7, 7, 7, 7, 7, 3, 3,
|
||||
2, 2, 1, 1, 8, 8,
|
||||
7, 7, 7, 7, 7, 7, 7, 7, 10, 10,
|
||||
3, 3, 2, 2, 1, 1, 8, 8,
|
||||
}
|
||||
var yyR2 = []int{
|
||||
|
||||
0, 2, 2, 0, 2, 1, 5, 11, 0, 2,
|
||||
0, 1, 0, 3, 2, 1, 3, 3, 3, 2,
|
||||
4, 3, 4, 5, 3, 3, 3, 1, 0, 4,
|
||||
1, 3, 1, 3, 1, 1,
|
||||
4, 3, 4, 6, 3, 3, 3, 1, 0, 1,
|
||||
0, 4, 1, 3, 1, 3, 1, 1,
|
||||
}
|
||||
var yyChk = []int{
|
||||
|
||||
-1000, -11, 4, 5, -12, -13, -7, 26, 6, 12,
|
||||
9, -14, -9, 16, 10, 28, 14, 15, 13, -7,
|
||||
-6, 26, 23, 26, 6, 6, 8, -7, -7, -7,
|
||||
27, -1, 27, -8, -7, 7, -5, 24, -4, 6,
|
||||
-7, -6, 17, 29, 27, 25, 24, 25, 22, 27,
|
||||
22, -7, -8, -4, 7, -3, 11, -7, -10, 18,
|
||||
26, 19, 8, -2, 6, -6, 27, 25, 20, 6,
|
||||
7, 21, 7,
|
||||
-1000, -12, 4, 5, -13, -14, -7, 27, 6, 13,
|
||||
9, -15, -9, 17, 10, 29, 15, 16, 14, -7,
|
||||
-6, 27, 24, 27, 6, 6, 8, -7, -7, -7,
|
||||
28, -1, 28, -8, -7, 7, -5, 25, -4, 6,
|
||||
-7, -6, 18, 30, 28, 26, 25, 26, 23, 28,
|
||||
23, -7, -8, -4, 7, -3, 11, -7, -11, 19,
|
||||
-10, 12, 27, 20, 8, -2, 6, -6, 28, 26,
|
||||
21, 6, 7, 22, 7,
|
||||
}
|
||||
var yyDef = []int{
|
||||
|
||||
0, -2, 3, 0, -2, 2, 5, 0, 12, 0,
|
||||
27, 4, 0, 0, 11, 0, 0, 0, 0, 0,
|
||||
19, 0, 0, 0, 12, 0, 0, 24, 25, 26,
|
||||
18, 0, 21, 32, 34, 35, 0, 14, 15, 0,
|
||||
0, 0, 0, 22, 20, 0, 13, 0, 0, 28,
|
||||
0, 8, 33, 16, 17, 23, 0, 6, 0, 0,
|
||||
0, 12, 9, 0, 30, 0, 29, 0, 0, 31,
|
||||
0, 0, 7,
|
||||
18, 0, 21, 34, 36, 37, 0, 14, 15, 0,
|
||||
0, 0, 0, 22, 20, 0, 13, 0, 0, 30,
|
||||
0, 8, 35, 16, 17, 28, 0, 6, 0, 0,
|
||||
23, 29, 0, 12, 9, 0, 32, 0, 31, 0,
|
||||
0, 33, 0, 0, 7,
|
||||
}
|
||||
var yyTok1 = []int{
|
||||
|
||||
|
|
@ -161,20 +163,21 @@ var yyTok1 = []int{
|
|||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
26, 27, 3, 3, 25, 3, 3, 3, 3, 3,
|
||||
27, 28, 3, 3, 26, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 22, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 23, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 28, 3, 29, 3, 3, 3, 3, 3, 3,
|
||||
3, 29, 3, 30, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 23, 3, 24,
|
||||
3, 3, 3, 24, 3, 25,
|
||||
}
|
||||
var yyTok2 = []int{
|
||||
|
||||
2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
|
||||
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22,
|
||||
}
|
||||
var yyTok3 = []int{
|
||||
0,
|
||||
|
|
@ -483,7 +486,7 @@ yydefault:
|
|||
//line parser.y:139
|
||||
{
|
||||
var err error
|
||||
yyVAL.ruleNode, err = NewVectorAggregation(yyS[yypt-4].str, yyS[yypt-2].ruleNode, yyS[yypt-0].labelNameSlice)
|
||||
yyVAL.ruleNode, err = NewVectorAggregation(yyS[yypt-5].str, yyS[yypt-3].ruleNode, yyS[yypt-1].labelNameSlice, yyS[yypt-0].boolean)
|
||||
if err != nil { yylex.Error(err.Error()); return 1 }
|
||||
}
|
||||
case 24:
|
||||
|
|
@ -512,27 +515,33 @@ yydefault:
|
|||
{ yyVAL.ruleNode = ast.NewScalarLiteral(yyS[yypt-0].num)}
|
||||
case 28:
|
||||
//line parser.y:169
|
||||
{ yyVAL.labelNameSlice = clientmodel.LabelNames{} }
|
||||
{ yyVAL.boolean = false }
|
||||
case 29:
|
||||
//line parser.y:171
|
||||
{ yyVAL.labelNameSlice = yyS[yypt-1].labelNameSlice }
|
||||
{ yyVAL.boolean = true }
|
||||
case 30:
|
||||
//line parser.y:175
|
||||
{ yyVAL.labelNameSlice = clientmodel.LabelNames{clientmodel.LabelName(yyS[yypt-0].str)} }
|
||||
{ yyVAL.labelNameSlice = clientmodel.LabelNames{} }
|
||||
case 31:
|
||||
//line parser.y:177
|
||||
{ yyVAL.labelNameSlice = append(yyVAL.labelNameSlice, clientmodel.LabelName(yyS[yypt-0].str)) }
|
||||
{ yyVAL.labelNameSlice = yyS[yypt-1].labelNameSlice }
|
||||
case 32:
|
||||
//line parser.y:181
|
||||
{ yyVAL.ruleNodeSlice = []ast.Node{yyS[yypt-0].ruleNode} }
|
||||
{ yyVAL.labelNameSlice = clientmodel.LabelNames{clientmodel.LabelName(yyS[yypt-0].str)} }
|
||||
case 33:
|
||||
//line parser.y:183
|
||||
{ yyVAL.ruleNodeSlice = append(yyVAL.ruleNodeSlice, yyS[yypt-0].ruleNode) }
|
||||
{ yyVAL.labelNameSlice = append(yyVAL.labelNameSlice, clientmodel.LabelName(yyS[yypt-0].str)) }
|
||||
case 34:
|
||||
//line parser.y:187
|
||||
{ yyVAL.ruleNode = yyS[yypt-0].ruleNode }
|
||||
{ yyVAL.ruleNodeSlice = []ast.Node{yyS[yypt-0].ruleNode} }
|
||||
case 35:
|
||||
//line parser.y:189
|
||||
{ yyVAL.ruleNodeSlice = append(yyVAL.ruleNodeSlice, yyS[yypt-0].ruleNode) }
|
||||
case 36:
|
||||
//line parser.y:193
|
||||
{ yyVAL.ruleNode = yyS[yypt-0].ruleNode }
|
||||
case 37:
|
||||
//line parser.y:195
|
||||
{ yyVAL.ruleNode = ast.NewStringLiteral(yyS[yypt-0].str) }
|
||||
}
|
||||
goto yystack /* stack new state and value */
|
||||
|
|
|
|||
|
|
@ -115,6 +115,22 @@ func TestExpressions(t *testing.T) {
|
|||
output: []string{`http_requests => 3600 @[%v]`},
|
||||
fullRanges: 0,
|
||||
intervalRanges: 8,
|
||||
}, {
|
||||
expr: `SUM(http_requests{instance="0"}) BY(job)`,
|
||||
output: []string{
|
||||
`http_requests{job="api-server"} => 400 @[%v]`,
|
||||
`http_requests{job="app-server"} => 1200 @[%v]`,
|
||||
},
|
||||
fullRanges: 0,
|
||||
intervalRanges: 4,
|
||||
}, {
|
||||
expr: `SUM(http_requests{instance="0"}) BY(job) KEEPING_EXTRA`,
|
||||
output: []string{
|
||||
`http_requests{instance="0", job="api-server"} => 400 @[%v]`,
|
||||
`http_requests{instance="0", job="app-server"} => 1200 @[%v]`,
|
||||
},
|
||||
fullRanges: 0,
|
||||
intervalRanges: 4,
|
||||
}, {
|
||||
expr: `SUM(http_requests) BY (job)`,
|
||||
output: []string{
|
||||
|
|
|
|||
Loading…
Reference in New Issue