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

fix(models): Remove tsdb package dependency from tests (#16918)

pull/17000/head
Michael Angerman 2020-02-25 12:06:47 -08:00 committed by GitHub
parent e6cf208400
commit 4c1e682117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
models/points_test.go
View File

@ -2,6 +2,7 @@ package models_test
import ( import (
"bytes" "bytes"
"encoding/binary"
"errors" "errors"
"fmt" "fmt"
"io" "io"
@ -16,9 +17,7 @@ import (
"time" "time"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/models"
"github.com/influxdata/influxdb/tsdb"
) )
var ( var (
@ -37,6 +36,16 @@ var (
sink interface{} sink interface{}
) )
type ID uint64
// EncodeName converts org/bucket pairs to the tsdb internal serialization
func EncodeName(org, bucket ID) [16]byte {
var nameBytes [16]byte
binary.BigEndian.PutUint64(nameBytes[0:8], uint64(org))
binary.BigEndian.PutUint64(nameBytes[8:16], uint64(bucket))
return nameBytes
}
func TestMarshal(t *testing.T) { func TestMarshal(t *testing.T) {
got := tags.HashKey() got := tags.HashKey()
if exp := ",apple=orange,foo=bar,host=serverA,region=uswest"; string(got) != exp { if exp := ",apple=orange,foo=bar,host=serverA,region=uswest"; string(got) != exp {
@ -2493,7 +2502,7 @@ func TestParsePointsWithOptions(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
buf := test.read(t) buf := test.read(t)
encoded := tsdb.EncodeName(influxdb.ID(1000), influxdb.ID(2000)) encoded := EncodeName(ID(1000), ID(2000))
mm := models.EscapeMeasurement(encoded[:]) mm := models.EscapeMeasurement(encoded[:])
var stats models.ParserStats var stats models.ParserStats
@ -3021,7 +3030,7 @@ func BenchmarkNewTagsKeyValues(b *testing.B) {
func benchParseFile(b *testing.B, name string, repeat int, fn func(b *testing.B, buf []byte, mm []byte, now time.Time)) { func benchParseFile(b *testing.B, name string, repeat int, fn func(b *testing.B, buf []byte, mm []byte, now time.Time)) {
b.Helper() b.Helper()
buf := mustReadTestData(b, name, repeat) buf := mustReadTestData(b, name, repeat)
encoded := tsdb.EncodeName(influxdb.ID(1000), influxdb.ID(2000)) encoded := EncodeName(ID(1000), ID(2000))
mm := models.EscapeMeasurement(encoded[:]) mm := models.EscapeMeasurement(encoded[:])
now := time.Now() now := time.Now()