Move values reset function to a common location.

xichen2020 · Feb 20, 2019 · f113279 · f113279
1 parent e1bc514
commit f113279
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/storage/mutable_segment.go b/storage/mutable_segment.go
@@ -11,6 +11,7 @@ import (
 	"github.com/xichen2020/eventdb/persist"
 	"github.com/xichen2020/eventdb/query"
 	"github.com/xichen2020/eventdb/x/hash"
+	"github.com/xichen2020/eventdb/x/strings"
 	"github.com/xichen2020/eventdb/x/unsafe"
 
 	"github.com/m3db/m3x/context"
@@ -101,11 +102,7 @@ func newMutableSegment(
 		SetDoubleArrayPool(opts.DoubleArrayPool()).
 		SetStringArrayPool(opts.StringArrayPool()).
 		SetInt64ArrayPool(opts.Int64ArrayPool()).
-		SetStringValuesResetFn(func(values []string) {
-			for idx := range values {
-				values[idx] = ""
-			}
-		})
+		SetStringValuesResetFn(strings.ValuesResetFn)
 
 	fieldHashFn := opts.FieldHashFn()
 	timestampFieldPath := opts.TimestampFieldPath()

diff --git a/x/pool/ref_counted_pooled_string_array_test.go b/x/pool/ref_counted_pooled_string_array_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"github.com/xichen2020/eventdb/x/strings"
 )
 
 func TestRefCountedPooledStringArray(t *testing.T) {
@@ -16,12 +17,8 @@ func TestRefCountedPooledStringArray(t *testing.T) {
 	pool.Init(func(capacity int) []string { return make([]string, 0, capacity) })
 
 	vals := pool.Get(4)
-	resetFn := func(values []string) {
-		for idx := range values {
-			values[idx] = ""
-		}
-	}
-	arr := NewRefCountedPooledStringArray(vals, pool, &resetFn)
+	var valuesResetFn = strings.ValuesResetFn
+	arr := NewRefCountedPooledStringArray(vals, pool, &valuesResetFn)
 	require.Equal(t, int32(1), arr.cnt.RefCount())
 	require.Equal(t, 0, len(arr.Get()))
 	require.Equal(t, 4, cap(arr.Get()))

diff --git a/x/strings/strings.go b/x/strings/strings.go
@@ -0,0 +1,8 @@
+package strings
+
+// ValuesResetFn clears string pointers inside of a slice of strings.
+func ValuesResetFn(values []string) {
+	for idx := range values {
+		values[idx] = ""
+	}
+}