remove RegexpLen() function, since it returns almost the same as len(…

…regexp)

This should increase the max cache size by roughly 2x

regexp_cache.go

@@ -60,13 +60,6 @@ type regexpCacheValue struct {
 	err error
 }
 
-func (rcv *regexpCacheValue) RegexpLen() int {
-	if r := rcv.r; r != nil {
-		return len(r.String())
-	}
-	return len(rcv.err.Error())
-}
-
 type regexpCache struct {
 	// Move atomic counters to the top of struct for 8-byte alignment on 32-bit arch.
 	// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/212
@@ -131,10 +124,10 @@ func (rc *regexpCache) Put(regexp string, rcv *regexpCacheValue) {
 	if rc.charsCurrent > rc.charsLimit {
 		// Remove items accounting for 10% chars from the cache.
 		overflow := int(float64(rc.charsLimit) * 0.1)
-		for k, v := range rc.m {
+		for k := range rc.m {
 			delete(rc.m, k)
 
-			size := len(k) + v.RegexpLen()
+			size := len(k)
 			overflow -= size
 			rc.charsCurrent -= size
 
@@ -144,6 +137,6 @@ func (rc *regexpCache) Put(regexp string, rcv *regexpCacheValue) {
 		}
 	}
 	rc.m[regexp] = rcv
-	rc.charsCurrent += len(regexp) + rcv.RegexpLen()
+	rc.charsCurrent += len(regexp)
 	rc.mu.Unlock()
 }

regexp_cache_test.go

@@ -94,13 +94,13 @@ func TestRegexpCache(t *testing.T) {
 		}
 	}
 
-	fn(10, []string{"a", "b", "c"}, 3, 6)
-	fn(2, []string{"a", "b", "c"}, 2, 4) // overflow by 1 entry is allowed
-	fn(2, []string{"a", "b", "c", "d"}, 2, 4)
-	fn(1, []string{"a", "b", "c"}, 1, 2)
-	fn(2, []string{"abcd", "efgh", "ijkl"}, 1, 8)   // overflow by 1 entry is allowed
-	fn(5, []string{"123", "fd{456", "789"}, 1, 6)   // overflow by 1 entry is allowed
-	fn(18, []string{"123", "fd{456", "789"}, 3, 24) // overflow by 1 entry is allowed
-	fn(24, []string{"123", "fd{456", "789"}, 3, 24)
-	fn(30, []string{"123", "fd{456", "789"}, 3, 24)
+	fn(10, []string{"a", "b", "c"}, 3, 3)
+	fn(2, []string{"a", "b", "c"}, 3, 3) // overflow by 1 entry is allowed
+	fn(2, []string{"a", "b", "c", "d"}, 3, 3)
+	fn(1, []string{"a", "b", "c"}, 2, 2)  // overflow by 1 tnery is allowed
+	fn(2, []string{"abcd", "efgh", "ijkl"}, 1, 4)   // overflow by 1 entry is allowed
+	fn(2, []string{"123", "fd{456", "789"}, 1, 3)   // overflow by 1 entry is allowed
+	fn(9, []string{"123", "fd{456", "789"}, 3, 12) // overflow by 1 entry is allowed
+	fn(12, []string{"123", "fd{456", "789"}, 3, 12)
+	fn(15, []string{"123", "fd{456", "789"}, 3, 12)
 }