improves numeric literal stringer impl (#2663)

grafana · Sep 23, 2020 · 89b8ae4 · 89b8ae4
1 parent 5729d88
commit 89b8ae4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/pkg/logql/ast.go b/pkg/logql/ast.go
@@ -495,7 +495,7 @@ func mustNewLiteralExpr(s string, invert bool) *literalExpr {
 }
 
 func (e *literalExpr) String() string {
-	return fmt.Sprintf("%f", e.value)
+	return fmt.Sprint(e.value)
 }
 
 // literlExpr impls SampleExpr & LogSelectorExpr mainly to reduce the need for more complicated typings

diff --git a/pkg/logql/ast_test.go b/pkg/logql/ast_test.go
@@ -196,24 +196,28 @@ func TestStringer(t *testing.T) {
 	}{
 		{
 			in:  `1 > 1 > 1`,
-			out: `0.000000`,
+			out: `0`,
+		},
+		{
+			in:  `1.6`,
+			out: `1.6`,
 		},
 		{
 			in:  `1 > 1 > bool 1`,
-			out: `0.000000`,
+			out: `0`,
 		},
 		{
 			in:  `1 > bool 1 > count_over_time({foo="bar"}[1m])`,
-			out: `0.000000 > count_over_time({foo="bar"}[1m])`,
+			out: `0 > count_over_time({foo="bar"}[1m])`,
 		},
 		{
 			in:  `1 > bool 1 > bool count_over_time({foo="bar"}[1m])`,
-			out: `0.000000 > bool count_over_time({foo="bar"}[1m])`,
+			out: `0 > bool count_over_time({foo="bar"}[1m])`,
 		},
 		{
 
-			in:  `0.000000 > count_over_time({foo="bar"}[1m])`,
-			out: `0.000000 > count_over_time({foo="bar"}[1m])`,
+			in:  `0 > count_over_time({foo="bar"}[1m])`,
+			out: `0 > count_over_time({foo="bar"}[1m])`,
 		},
 	} {
 		t.Run(tc.in, func(t *testing.T) {

diff --git a/pkg/logql/shardmapper_test.go b/pkg/logql/shardmapper_test.go
@@ -136,7 +136,7 @@ func TestMappingStrings(t *testing.T) {
 		},
 		{
 			in:  `max(count(rate({foo="bar"}[5m]))) / 2`,
-			out: `max(sum(downstream<count(rate({foo="bar"}[5m])), shard=0_of_2> ++ downstream<count(rate({foo="bar"}[5m])), shard=1_of_2>)) / 2.000000`,
+			out: `max(sum(downstream<count(rate({foo="bar"}[5m])), shard=0_of_2> ++ downstream<count(rate({foo="bar"}[5m])), shard=1_of_2>)) / 2`,
 		},
 		{
 			in:  `topk(3, rate({foo="bar"}[5m]))`,