lib/bytesutil: add InternBytes() function as a shortcut to InternString(ToUnsafeString(..))

lib/bytesutil/internstring.go

@@ -8,6 +8,12 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
 )
 
+// InternBytes interns b as a string
+func InternBytes(b []byte) string {
+	s := ToUnsafeString(b)
+	return InternString(s)
+}
+
 // InternString returns interned s.
 //
 // This may be needed for reducing the amounts of allocated memory.

lib/bytesutil/itoa.go

@@ -11,7 +11,7 @@ func Itoa(n int) string {
 	bb := bbPool.Get()
 	b := bb.B[:0]
 	b = strconv.AppendInt(b, int64(n), 10)
-	s := InternString(ToUnsafeString(b))
+	s := InternBytes(b)
 	bb.B = b
 	bbPool.Put(bb)
 	return s

lib/promrelabel/relabel.go

@@ -181,7 +181,7 @@ func (prc *parsedRelabelConfig) apply(labels []prompbmarshal.Label, labelsOffset
 		bb := relabelBufPool.Get()
 		for _, gl := range prc.graphiteLabelRules {
 			bb.B = gl.grt.Expand(bb.B[:0], gm.a)
-			valueStr := bytesutil.InternString(bytesutil.ToUnsafeString(bb.B))
+			valueStr := bytesutil.InternBytes(bb.B)
 			labels = setLabelValue(labels, labelsOffset, gl.targetLabel, valueStr)
 		}
 		relabelBufPool.Put(bb)
@@ -194,7 +194,7 @@ func (prc *parsedRelabelConfig) apply(labels []prompbmarshal.Label, labelsOffset
 		if prc.hasLabelReferenceInReplacement {
 			// Fill {{labelName}} references in the replacement
 			bb.B = fillLabelReferences(bb.B[:0], replacement, labels[labelsOffset:])
-			replacement = bytesutil.InternString(bytesutil.ToUnsafeString(bb.B))
+			replacement = bytesutil.InternBytes(bb.B)
 		}
 		bb.B = concatLabelValues(bb.B[:0], src, prc.SourceLabels, prc.Separator)
 		if prc.RegexAnchored == defaultRegexForRelabelConfig && !prc.hasCaptureGroupInTargetLabel {
@@ -202,7 +202,7 @@ func (prc *parsedRelabelConfig) apply(labels []prompbmarshal.Label, labelsOffset
 				// Fast path for the rule that copies source label values to destination:
 				// - source_labels: [...]
 				//   target_label: foobar
-				valueStr := bytesutil.InternString(bytesutil.ToUnsafeString(bb.B))
+				valueStr := bytesutil.InternBytes(bb.B)
 				relabelBufPool.Put(bb)
 				return setLabelValue(labels, labelsOffset, prc.TargetLabel, valueStr)
 			}
@@ -245,7 +245,7 @@ func (prc *parsedRelabelConfig) apply(labels []prompbmarshal.Label, labelsOffset
 		// and store the result at `target_label`
 		bb := relabelBufPool.Get()
 		bb.B = concatLabelValues(bb.B[:0], src, prc.SourceLabels, prc.Separator)
-		sourceStr := bytesutil.InternString(bytesutil.ToUnsafeString(bb.B))
+		sourceStr := bytesutil.InternBytes(bb.B)
 		relabelBufPool.Put(bb)
 		valueStr := prc.replaceStringSubmatchesFast(sourceStr)
 		if valueStr != sourceStr {
@@ -381,7 +381,7 @@ func (prc *parsedRelabelConfig) apply(labels []prompbmarshal.Label, labelsOffset
 	case "uppercase":
 		bb := relabelBufPool.Get()
 		bb.B = concatLabelValues(bb.B[:0], src, prc.SourceLabels, prc.Separator)
-		valueStr := bytesutil.InternString(bytesutil.ToUnsafeString(bb.B))
+		valueStr := bytesutil.InternBytes(bb.B)
 		relabelBufPool.Put(bb)
 		valueStr = strings.ToUpper(valueStr)
 		labels = setLabelValue(labels, labelsOffset, prc.TargetLabel, valueStr)
@@ -389,7 +389,7 @@ func (prc *parsedRelabelConfig) apply(labels []prompbmarshal.Label, labelsOffset
 	case "lowercase":
 		bb := relabelBufPool.Get()
 		bb.B = concatLabelValues(bb.B[:0], src, prc.SourceLabels, prc.Separator)
-		valueStr := bytesutil.InternString(bytesutil.ToUnsafeString(bb.B))
+		valueStr := bytesutil.InternBytes(bb.B)
 		relabelBufPool.Put(bb)
 		valueStr = strings.ToLower(valueStr)
 		labels = setLabelValue(labels, labelsOffset, prc.TargetLabel, valueStr)
@@ -478,7 +478,7 @@ func (prc *parsedRelabelConfig) replaceStringSubmatchesSlow(s string) string {
 func (prc *parsedRelabelConfig) expandCaptureGroups(template, source string, match []int) string {
 	bb := relabelBufPool.Get()
 	bb.B = prc.RegexAnchored.ExpandString(bb.B[:0], template, source, match)
-	s := bytesutil.InternString(bytesutil.ToUnsafeString(bb.B))
+	s := bytesutil.InternBytes(bb.B)
 	relabelBufPool.Put(bb)
 	return s
 }

lib/promscrape/client.go

@@ -72,8 +72,7 @@ func concatTwoStrings(x, y string) string {
 	b := bb.B[:0]
 	b = append(b, x...)
 	b = append(b, y...)
-	s := bytesutil.ToUnsafeString(b)
+	s := bytesutil.InternBytes(b)
-	s = bytesutil.InternString(s)
 	bb.B = b
 	bbPool.Put(bb)
 	return s

lib/promscrape/config.go

@@ -1338,8 +1338,7 @@ func getScrapeURL(scheme, address, metricsPath, optionalQuestion, paramsStr stri
 	b = append(b, metricsPath...)
 	b = append(b, optionalQuestion...)
 	b = append(b, paramsStr...)
-	s := bytesutil.ToUnsafeString(b)
+	s := bytesutil.InternBytes(b)
-	s = bytesutil.InternString(s)
 	bb.B = b
 	bbPool.Put(bb)
 	return s

lib/promscrape/discoveryutils/utils.go

@@ -41,8 +41,7 @@ func JoinHostPort(host string, port int) string {
 	}
 	b = append(b, ':')
 	b = strconv.AppendInt(b, int64(port), 10)
-	s := bytesutil.ToUnsafeString(b)
+	s := bytesutil.InternBytes(b)
-	s = bytesutil.InternString(s)
 	bb.B = b
 	bbPool.Put(bb)
 	return s

lib/promscrape/scrapework.go

@@ -848,7 +848,7 @@ func (sw *scrapeWork) addRowToTimeseries(wc *writeRequestCtx, r *parser.Row, tim
 		bb := bbPool.Get()
 		bb.B = append(bb.B, "exported_"...)
 		bb.B = append(bb.B, metric...)
-		metric = bytesutil.InternString(bytesutil.ToUnsafeString(bb.B))
+		metric = bytesutil.InternBytes(bb.B)
 		bbPool.Put(bb)
 	}
 	labelsLen := len(wc.labels)