Skip to content

Commit 1246a0c

Browse files
authored
fix: wrong time for binop (openGemini#581)
Signed-off-by: Jack Liu <[email protected]>
1 parent 3716d82 commit 1246a0c

File tree

3 files changed

+41
-39
lines changed

3 files changed

+41
-39
lines changed

lib/util/lifted/promql2influxql/binary_expr.go

+2
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ func (t *Transpiler) transpileBinOpOfBothVector(b *parser.BinaryExpr, op influxq
273273
Sources: influxql.Sources{binOp},
274274
Fields: influxql.Fields{&influxql.Field{Expr: &influxql.VarRef{Val: DefaultFieldKey, Alias: DefaultFieldKey}}},
275275
}
276+
// set query time range
277+
t.setTimeCondition(newStmt)
276278
t.removeTableName = true
277279
return newStmt, nil
278280
}

lib/util/lifted/promql2influxql/transpiler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ func Test_SubQueryAndBinOp(t *testing.T) {
569569
args := args{
570570
expr: BinaryExpr("avg(node_load5{instance=\"\",job=\"\"}) / count(count(node_cpu_seconds_total{instance=\"\",job=\"\"}) by (cpu)) * 100"),
571571
}
572-
want := "SELECT value * 100 AS value FROM (SELECT mean(value) AS value FROM node_load5 WHERE time >= '2023-01-06T06:55:00Z' AND time <= '2023-01-06T07:00:00Z') binary op (SELECT count_prom(value) AS value FROM (SELECT count_prom(value) AS value FROM node_cpu_seconds_total WHERE time >= '2023-01-06T06:55:00Z' AND time <= '2023-01-06T07:00:00Z' GROUP BY cpu) WHERE time >= '2023-01-06T06:55:00Z' AND time <= '2023-01-06T07:00:00Z') false false() 0()"
572+
want := "SELECT value * 100 AS value FROM (SELECT mean(value) AS value FROM node_load5 WHERE time >= '2023-01-06T06:55:00Z' AND time <= '2023-01-06T07:00:00Z') binary op (SELECT count_prom(value) AS value FROM (SELECT count_prom(value) AS value FROM node_cpu_seconds_total WHERE time >= '2023-01-06T06:55:00Z' AND time <= '2023-01-06T07:00:00Z' GROUP BY cpu) WHERE time >= '2023-01-06T06:55:00Z' AND time <= '2023-01-06T07:00:00Z') false false() 0() WHERE time >= '2023-01-06T06:55:00Z' AND time <= '2023-01-06T07:00:00Z'"
573573
trans := &Transpiler{
574574
PromCommand: PromCommand{
575575
Start: fields.Start,

0 commit comments

Comments
 (0)