From 137d0c0d09ed96e9e3d964d0c29e7e725dec52a1 Mon Sep 17 00:00:00 2001 From: Jason Wilder Date: Thu, 6 Apr 2017 15:58:42 -0600 Subject: [PATCH] Rename WAL.WritePoints to WAL.WriteMulti To match Cache.WriteMulti --- tsdb/engine/tsm1/engine.go | 2 +- tsdb/engine/tsm1/wal.go | 4 ++-- tsdb/engine/tsm1/wal_test.go | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tsdb/engine/tsm1/engine.go b/tsdb/engine/tsm1/engine.go index a53cba6c33..6bcb9d7186 100644 --- a/tsdb/engine/tsm1/engine.go +++ b/tsdb/engine/tsm1/engine.go @@ -760,7 +760,7 @@ func (e *Engine) WritePoints(points []models.Point) error { return err } - _, err = e.WAL.WritePoints(values) + _, err = e.WAL.WriteMulti(values) return err } diff --git a/tsdb/engine/tsm1/wal.go b/tsdb/engine/tsm1/wal.go index 51989b5300..faff78c425 100644 --- a/tsdb/engine/tsm1/wal.go +++ b/tsdb/engine/tsm1/wal.go @@ -289,10 +289,10 @@ func (l *WAL) sync() { } } -// WritePoints writes the given points to the WAL. It returns the WAL segment ID to +// WriteMulti writes the given values to the WAL. It returns the WAL segment ID to // which the points were written. If an error is returned the segment ID should // be ignored. -func (l *WAL) WritePoints(values map[string][]Value) (int, error) { +func (l *WAL) WriteMulti(values map[string][]Value) (int, error) { entry := &WriteWALEntry{ Values: values, } diff --git a/tsdb/engine/tsm1/wal_test.go b/tsdb/engine/tsm1/wal_test.go index ba4ca741f0..75c8dfeea7 100644 --- a/tsdb/engine/tsm1/wal_test.go +++ b/tsdb/engine/tsm1/wal_test.go @@ -11,7 +11,7 @@ import ( "github.com/golang/snappy" ) -func TestWALWriter_WritePoints_Single(t *testing.T) { +func TestWALWriter_WriteMulti_Single(t *testing.T) { dir := MustTempDir() defer os.RemoveAll(dir) f := MustTempFile(dir) @@ -70,7 +70,7 @@ func TestWALWriter_WritePoints_Single(t *testing.T) { } } -func TestWALWriter_WritePoints_LargeBatch(t *testing.T) { +func TestWALWriter_WriteMulti_LargeBatch(t *testing.T) { dir := MustTempDir() defer os.RemoveAll(dir) f := MustTempFile(dir) @@ -126,7 +126,7 @@ func TestWALWriter_WritePoints_LargeBatch(t *testing.T) { t.Fatalf("wrong count of bytes read, got %d, exp %d", n, MustReadFileSize(f)) } } -func TestWALWriter_WritePoints_Multiple(t *testing.T) { +func TestWALWriter_WriteMulti_Multiple(t *testing.T) { dir := MustTempDir() defer os.RemoveAll(dir) f := MustTempFile(dir) @@ -240,7 +240,7 @@ func TestWALWriter_WriteDelete_Single(t *testing.T) { } } -func TestWALWriter_WritePointsDelete_Multiple(t *testing.T) { +func TestWALWriter_WriteMultiDelete_Multiple(t *testing.T) { dir := MustTempDir() defer os.RemoveAll(dir) f := MustTempFile(dir) @@ -326,7 +326,7 @@ func TestWALWriter_WritePointsDelete_Multiple(t *testing.T) { } } -func TestWALWriter_WritePointsDeleteRange_Multiple(t *testing.T) { +func TestWALWriter_WriteMultiDeleteRange_Multiple(t *testing.T) { dir := MustTempDir() defer os.RemoveAll(dir) f := MustTempFile(dir) @@ -444,7 +444,7 @@ func TestWAL_ClosedSegments(t *testing.T) { t.Fatalf("close segment length mismatch: got %v, exp %v", got, exp) } - if _, err := w.WritePoints(map[string][]tsm1.Value{ + if _, err := w.WriteMulti(map[string][]tsm1.Value{ "cpu,host=A#!~#value": []tsm1.Value{ tsm1.NewValue(1, 1.1), },