Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename WAL.WritePoints to WAL.WriteMulti 

To match Cache.WriteMulti
pull/8337/head
Jason Wilder 2017-04-06 15:58:42 -06:00
parent 28422f2fec
commit 137d0c0d09
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tsdb/engine/tsm1/engine.go
View File

@ -760,7 +760,7 @@ func (e *Engine) WritePoints(points []models.Point) error {
return err return err
} }
_, err = e.WAL.WritePoints(values) _, err = e.WAL.WriteMulti(values)
return err return err
} }

4
tsdb/engine/tsm1/wal.go
View File

@ -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 // which the points were written. If an error is returned the segment ID should
// be ignored. // be ignored.
func (l *WAL) WritePoints(values map[string][]Value) (int, error) { func (l *WAL) WriteMulti(values map[string][]Value) (int, error) {
entry := &WriteWALEntry{ entry := &WriteWALEntry{
Values: values, Values: values,
} }

12
tsdb/engine/tsm1/wal_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/golang/snappy" "github.com/golang/snappy"
) )
func TestWALWriter_WritePoints_Single(t *testing.T) { func TestWALWriter_WriteMulti_Single(t *testing.T) {
dir := MustTempDir() dir := MustTempDir()
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
f := MustTempFile(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() dir := MustTempDir()
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
f := MustTempFile(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)) 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() dir := MustTempDir()
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
f := MustTempFile(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() dir := MustTempDir()
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
f := MustTempFile(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() dir := MustTempDir()
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
f := MustTempFile(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) 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{ "cpu,host=A#!~#value": []tsm1.Value{
tsm1.NewValue(1, 1.1), tsm1.NewValue(1, 1.1),
}, },