From 3898cc02859048aa153424125a4e73d1d5687aa8 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Mon, 13 Jul 2020 21:40:38 +0300 Subject: [PATCH] app/vmselect/prometheus: minimize the diff for the change 1033dc7e2a71588364b8af5dc9fb0cabc96a5de9 over 619b0a25c92556765bb40cc466c21577a2992653 --- app/vmselect/prometheus/util.qtpl | 32 +++---- app/vmselect/prometheus/util.qtpl.go | 120 ++++++++++++++------------- 2 files changed, 79 insertions(+), 73 deletions(-) diff --git a/app/vmselect/prometheus/util.qtpl b/app/vmselect/prometheus/util.qtpl index b19c48acdb..acc3cbbd86 100644 --- a/app/vmselect/prometheus/util.qtpl +++ b/app/vmselect/prometheus/util.qtpl @@ -21,24 +21,26 @@ {% endfunc %} {% func valuesWithTimestamps(values []float64, timestamps []int64) %} + {% if len(values) == 0 %} + [] + {% return %} + {% endif %} [ + {% code /* inline metricRow call here for the sake of performance optimization */ %} + [{%f= float64(timestamps[0])/1e3 %},"{%f= values[0] %}"] + {% code + timestamps = timestamps[1:] + values = values[1:] + %} {% if len(values) > 0 %} - {% code /* inline metricRow call here for the sake of performance optimization */ %} - [{%f= float64(timestamps[0])/1e3 %},"{%f= values[0] %}"] - {% code - timestamps = timestamps[1:] - values = values[1:] + {%code + // Remove bounds check inside the loop below + _ = timestamps[len(values)-1] %} - {% if len(values) > 0 %} - {%code - // Remove bounds check inside the loop below - _ = timestamps[len(values)-1] - %} - {% for i, v := range values %} - {% code /* inline metricRow call here for the sake of performance optimization */ %} - ,[{%f= float64(timestamps[i])/1e3 %},"{%f= v %}"] - {% endfor %} - {% endif %} + {% for i, v := range values %} + {% code /* inline metricRow call here for the sake of performance optimization */ %} + ,[{%f= float64(timestamps[i])/1e3 %},"{%f= v %}"] + {% endfor %} {% endif %} ] {% endfunc %} diff --git a/app/vmselect/prometheus/util.qtpl.go b/app/vmselect/prometheus/util.qtpl.go index aaccda7d0c..361e7d8c35 100644 --- a/app/vmselect/prometheus/util.qtpl.go +++ b/app/vmselect/prometheus/util.qtpl.go @@ -133,81 +133,85 @@ func metricRow(timestamp int64, value float64) string { //line app/vmselect/prometheus/util.qtpl:23 func streamvaluesWithTimestamps(qw422016 *qt422016.Writer, values []float64, timestamps []int64) { -//line app/vmselect/prometheus/util.qtpl:23 - qw422016.N().S(`[`) -//line app/vmselect/prometheus/util.qtpl:25 - if len(values) > 0 { +//line app/vmselect/prometheus/util.qtpl:24 + if len(values) == 0 { +//line app/vmselect/prometheus/util.qtpl:24 + qw422016.N().S(`[]`) //line app/vmselect/prometheus/util.qtpl:26 - /* inline metricRow call here for the sake of performance optimization */ - -//line app/vmselect/prometheus/util.qtpl:26 - qw422016.N().S(`[`) + return //line app/vmselect/prometheus/util.qtpl:27 - qw422016.N().F(float64(timestamps[0]) / 1e3) -//line app/vmselect/prometheus/util.qtpl:27 - qw422016.N().S(`,"`) -//line app/vmselect/prometheus/util.qtpl:27 - qw422016.N().F(values[0]) -//line app/vmselect/prometheus/util.qtpl:27 - qw422016.N().S(`"]`) -//line app/vmselect/prometheus/util.qtpl:29 - timestamps = timestamps[1:] - values = values[1:] - -//line app/vmselect/prometheus/util.qtpl:32 - if len(values) > 0 { -//line app/vmselect/prometheus/util.qtpl:34 - // Remove bounds check inside the loop below - _ = timestamps[len(values)-1] - -//line app/vmselect/prometheus/util.qtpl:37 - for i, v := range values { -//line app/vmselect/prometheus/util.qtpl:38 - /* inline metricRow call here for the sake of performance optimization */ - -//line app/vmselect/prometheus/util.qtpl:38 - qw422016.N().S(`,[`) -//line app/vmselect/prometheus/util.qtpl:39 - qw422016.N().F(float64(timestamps[i]) / 1e3) -//line app/vmselect/prometheus/util.qtpl:39 - qw422016.N().S(`,"`) -//line app/vmselect/prometheus/util.qtpl:39 - qw422016.N().F(v) -//line app/vmselect/prometheus/util.qtpl:39 - qw422016.N().S(`"]`) -//line app/vmselect/prometheus/util.qtpl:40 - } -//line app/vmselect/prometheus/util.qtpl:41 - } -//line app/vmselect/prometheus/util.qtpl:42 } +//line app/vmselect/prometheus/util.qtpl:27 + qw422016.N().S(`[`) +//line app/vmselect/prometheus/util.qtpl:29 + /* inline metricRow call here for the sake of performance optimization */ + +//line app/vmselect/prometheus/util.qtpl:29 + qw422016.N().S(`[`) +//line app/vmselect/prometheus/util.qtpl:30 + qw422016.N().F(float64(timestamps[0]) / 1e3) +//line app/vmselect/prometheus/util.qtpl:30 + qw422016.N().S(`,"`) +//line app/vmselect/prometheus/util.qtpl:30 + qw422016.N().F(values[0]) +//line app/vmselect/prometheus/util.qtpl:30 + qw422016.N().S(`"]`) +//line app/vmselect/prometheus/util.qtpl:32 + timestamps = timestamps[1:] + values = values[1:] + +//line app/vmselect/prometheus/util.qtpl:35 + if len(values) > 0 { +//line app/vmselect/prometheus/util.qtpl:37 + // Remove bounds check inside the loop below + _ = timestamps[len(values)-1] + +//line app/vmselect/prometheus/util.qtpl:40 + for i, v := range values { +//line app/vmselect/prometheus/util.qtpl:41 + /* inline metricRow call here for the sake of performance optimization */ + +//line app/vmselect/prometheus/util.qtpl:41 + qw422016.N().S(`,[`) //line app/vmselect/prometheus/util.qtpl:42 + qw422016.N().F(float64(timestamps[i]) / 1e3) +//line app/vmselect/prometheus/util.qtpl:42 + qw422016.N().S(`,"`) +//line app/vmselect/prometheus/util.qtpl:42 + qw422016.N().F(v) +//line app/vmselect/prometheus/util.qtpl:42 + qw422016.N().S(`"]`) +//line app/vmselect/prometheus/util.qtpl:43 + } +//line app/vmselect/prometheus/util.qtpl:44 + } +//line app/vmselect/prometheus/util.qtpl:44 qw422016.N().S(`]`) -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 } -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 func writevaluesWithTimestamps(qq422016 qtio422016.Writer, values []float64, timestamps []int64) { -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 qw422016 := qt422016.AcquireWriter(qq422016) -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 streamvaluesWithTimestamps(qw422016, values, timestamps) -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 qt422016.ReleaseWriter(qw422016) -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 } -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 func valuesWithTimestamps(values []float64, timestamps []int64) string { -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 qb422016 := qt422016.AcquireByteBuffer() -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 writevaluesWithTimestamps(qb422016, values, timestamps) -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 qs422016 := string(qb422016.B) -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 qt422016.ReleaseByteBuffer(qb422016) -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 return qs422016 -//line app/vmselect/prometheus/util.qtpl:44 +//line app/vmselect/prometheus/util.qtpl:46 }