From cbb81c2ce9b7c6b474c9d7e33acc416ab2f5a5d2 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Fri, 30 Jul 2021 09:55:08 +0300 Subject: [PATCH] app/vmselect/netstorage: do not query Go maps with unsafe string keys, since this breaks in Go 1.17 --- app/vmselect/netstorage/netstorage.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/vmselect/netstorage/netstorage.go b/app/vmselect/netstorage/netstorage.go index 2d19def4e3..9f9d5162b3 100644 --- a/app/vmselect/netstorage/netstorage.go +++ b/app/vmselect/netstorage/netstorage.go @@ -1253,12 +1253,10 @@ func (tbfw *tmpBlocksFileWrapper) RegisterAndWriteBlock(mb *storage.MetricBlock) tmpBufPool.Put(bb) if err == nil { metricName := mb.MetricName - metricNameStrUnsafe := bytesutil.ToUnsafeString(metricName) - addrs := tbfw.m[metricNameStrUnsafe] + addrs := tbfw.m[string(metricName)] addrs = append(addrs, addr) if len(addrs) > 1 { - // An optimization: avoid memory allocation and copy for already existing metricName key in tbfw.m. - tbfw.m[metricNameStrUnsafe] = addrs + tbfw.m[string(metricName)] = addrs } else { // An optimization for big number of time series with long names: store only a single copy of metricNameStr // in both tbfw.orderedMetricNames and tbfw.m.