2017-05-26 15:56:31 +00:00
// Copyright 2017 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
2017-05-16 07:13:33 +00:00
package tsdb
2017-11-21 11:15:02 +00:00
import (
2018-12-05 16:34:42 +00:00
"context"
2019-03-24 20:33:08 +00:00
"encoding/binary"
"errors"
2019-12-04 07:37:49 +00:00
"hash/crc32"
2017-11-21 11:15:02 +00:00
"io/ioutil"
2018-10-23 21:35:52 +00:00
"math/rand"
2017-11-21 11:15:02 +00:00
"os"
2017-11-30 14:34:49 +00:00
"path/filepath"
2019-05-27 11:24:46 +00:00
"strconv"
2017-11-21 11:15:02 +00:00
"testing"
2017-12-07 01:06:14 +00:00
2018-10-23 21:35:52 +00:00
"github.com/go-kit/kit/log"
2019-11-18 19:53:33 +00:00
"github.com/prometheus/prometheus/pkg/labels"
2020-02-06 15:58:38 +00:00
"github.com/prometheus/prometheus/storage"
2019-08-13 08:34:14 +00:00
"github.com/prometheus/prometheus/tsdb/chunks"
2019-11-18 19:53:33 +00:00
"github.com/prometheus/prometheus/tsdb/fileutil"
2019-08-13 08:34:14 +00:00
"github.com/prometheus/prometheus/tsdb/tsdbutil"
2020-07-31 15:03:02 +00:00
"github.com/prometheus/prometheus/tsdb/wal"
2019-08-14 09:07:02 +00:00
"github.com/prometheus/prometheus/util/testutil"
2017-11-21 11:15:02 +00:00
)
2018-02-12 10:40:12 +00:00
// In Prometheus 2.1.0 we had a bug where the meta.json version was falsely bumped
// to 2. We had a migration in place resetting it to 1 but we should move immediately to
// version 3 next time to avoid confusion and issues.
func TestBlockMetaMustNeverBeVersion2 ( t * testing . T ) {
dir , err := ioutil . TempDir ( "" , "metaversion" )
testutil . Ok ( t , err )
2019-03-19 13:31:57 +00:00
defer func ( ) {
testutil . Ok ( t , os . RemoveAll ( dir ) )
} ( )
2018-02-12 10:40:12 +00:00
2019-06-24 15:42:29 +00:00
_ , err = writeMetaFile ( log . NewNopLogger ( ) , dir , & BlockMeta { } )
testutil . Ok ( t , err )
2018-02-12 10:40:12 +00:00
2019-06-24 15:42:29 +00:00
meta , _ , err := readMetaFile ( dir )
2018-02-12 10:40:12 +00:00
testutil . Ok ( t , err )
testutil . Assert ( t , meta . Version != 2 , "meta.json version must never be 2" )
}
2017-11-21 11:15:02 +00:00
func TestSetCompactionFailed ( t * testing . T ) {
2018-02-23 15:04:50 +00:00
tmpdir , err := ioutil . TempDir ( "" , "test" )
2017-12-07 01:06:14 +00:00
testutil . Ok ( t , err )
2019-03-19 13:31:57 +00:00
defer func ( ) {
testutil . Ok ( t , os . RemoveAll ( tmpdir ) )
} ( )
2017-11-21 11:15:02 +00:00
2019-07-03 10:47:31 +00:00
blockDir := createBlock ( t , tmpdir , genSeries ( 1 , 1 , 0 , 1 ) )
2019-01-16 10:03:52 +00:00
b , err := OpenBlock ( nil , blockDir , nil )
2018-12-29 11:20:51 +00:00
testutil . Ok ( t , err )
2017-12-07 01:06:14 +00:00
testutil . Equals ( t , false , b . meta . Compaction . Failed )
testutil . Ok ( t , b . setCompactionFailed ( ) )
testutil . Equals ( t , true , b . meta . Compaction . Failed )
testutil . Ok ( t , b . Close ( ) )
2017-11-21 11:15:02 +00:00
2019-01-16 10:03:52 +00:00
b , err = OpenBlock ( nil , blockDir , nil )
2017-12-07 01:06:14 +00:00
testutil . Ok ( t , err )
testutil . Equals ( t , true , b . meta . Compaction . Failed )
2018-12-29 11:20:51 +00:00
testutil . Ok ( t , b . Close ( ) )
2017-11-21 11:15:02 +00:00
}
2019-03-19 13:31:57 +00:00
func TestCreateBlock ( t * testing . T ) {
tmpdir , err := ioutil . TempDir ( "" , "test" )
testutil . Ok ( t , err )
defer func ( ) {
testutil . Ok ( t , os . RemoveAll ( tmpdir ) )
} ( )
b , err := OpenBlock ( nil , createBlock ( t , tmpdir , genSeries ( 1 , 1 , 0 , 10 ) ) , nil )
if err == nil {
testutil . Ok ( t , b . Close ( ) )
}
testutil . Ok ( t , err )
}
2019-03-24 20:33:08 +00:00
func TestCorruptedChunk ( t * testing . T ) {
2020-07-31 15:03:02 +00:00
for _ , tc := range [ ] struct {
name string
2019-03-24 20:33:08 +00:00
corrFunc func ( f * os . File ) // Func that applies the corruption.
2019-12-04 07:37:49 +00:00
openErr error
2020-07-31 15:03:02 +00:00
iterErr error
2019-03-24 20:33:08 +00:00
} {
2020-07-31 15:03:02 +00:00
{
name : "invalid header size" ,
corrFunc : func ( f * os . File ) {
testutil . Ok ( t , f . Truncate ( 1 ) )
2019-03-24 20:33:08 +00:00
} ,
2020-07-31 15:03:02 +00:00
openErr : errors . New ( "invalid segment header in segment 0: invalid size" ) ,
2019-03-24 20:33:08 +00:00
} ,
2020-07-31 15:03:02 +00:00
{
name : "invalid magic number" ,
corrFunc : func ( f * os . File ) {
2019-03-24 20:33:08 +00:00
magicChunksOffset := int64 ( 0 )
_ , err := f . Seek ( magicChunksOffset , 0 )
testutil . Ok ( t , err )
// Set invalid magic number.
b := make ( [ ] byte , chunks . MagicChunksSize )
binary . BigEndian . PutUint32 ( b [ : chunks . MagicChunksSize ] , 0x00000000 )
n , err := f . Write ( b )
testutil . Ok ( t , err )
testutil . Equals ( t , chunks . MagicChunksSize , n )
} ,
2020-07-31 15:03:02 +00:00
openErr : errors . New ( "invalid magic number 0" ) ,
2019-03-24 20:33:08 +00:00
} ,
2020-07-31 15:03:02 +00:00
{
name : "invalid chunk format version" ,
corrFunc : func ( f * os . File ) {
2019-03-24 20:33:08 +00:00
chunksFormatVersionOffset := int64 ( 4 )
_ , err := f . Seek ( chunksFormatVersionOffset , 0 )
testutil . Ok ( t , err )
// Set invalid chunk format version.
b := make ( [ ] byte , chunks . ChunksFormatVersionSize )
b [ 0 ] = 0
n , err := f . Write ( b )
testutil . Ok ( t , err )
testutil . Equals ( t , chunks . ChunksFormatVersionSize , n )
} ,
2020-07-31 15:03:02 +00:00
openErr : errors . New ( "invalid chunk format version 0" ) ,
2019-12-04 07:37:49 +00:00
} ,
2020-07-31 15:03:02 +00:00
{
name : "chunk not enough bytes to read the chunk length" ,
corrFunc : func ( f * os . File ) {
2019-12-04 07:37:49 +00:00
// Truncate one byte after the segment header.
2020-07-31 15:03:02 +00:00
testutil . Ok ( t , f . Truncate ( chunks . SegmentHeaderSize + 1 ) )
2019-12-04 07:37:49 +00:00
} ,
2020-07-31 15:03:02 +00:00
iterErr : errors . New ( "cannot populate chunk 8: segment doesn't include enough bytes to read the chunk size data field - required:13, available:9" ) ,
2019-12-04 07:37:49 +00:00
} ,
2020-07-31 15:03:02 +00:00
{
name : "chunk not enough bytes to read the data" ,
corrFunc : func ( f * os . File ) {
2019-12-04 07:37:49 +00:00
fi , err := f . Stat ( )
testutil . Ok ( t , err )
2020-07-31 15:03:02 +00:00
testutil . Ok ( t , f . Truncate ( fi . Size ( ) - 1 ) )
2019-12-04 07:37:49 +00:00
} ,
2020-07-31 15:03:02 +00:00
iterErr : errors . New ( "cannot populate chunk 8: segment doesn't include enough bytes to read the chunk - required:26, available:25" ) ,
2019-12-04 07:37:49 +00:00
} ,
2020-07-31 15:03:02 +00:00
{
name : "checksum mismatch" ,
corrFunc : func ( f * os . File ) {
2019-12-04 07:37:49 +00:00
fi , err := f . Stat ( )
testutil . Ok ( t , err )
// Get the chunk data end offset.
chkEndOffset := int ( fi . Size ( ) ) - crc32 . Size
// Seek to the last byte of chunk data and modify it.
_ , err = f . Seek ( int64 ( chkEndOffset - 1 ) , 0 )
testutil . Ok ( t , err )
n , err := f . Write ( [ ] byte ( "x" ) )
testutil . Ok ( t , err )
testutil . Equals ( t , n , 1 )
} ,
2020-07-31 15:03:02 +00:00
iterErr : errors . New ( "cannot populate chunk 8: checksum mismatch expected:cfc0526c, actual:34815eae" ) ,
2019-03-24 20:33:08 +00:00
} ,
} {
2020-07-31 15:03:02 +00:00
t . Run ( tc . name , func ( t * testing . T ) {
2019-03-24 20:33:08 +00:00
tmpdir , err := ioutil . TempDir ( "" , "test_open_block_chunk_corrupted" )
testutil . Ok ( t , err )
defer func ( ) {
testutil . Ok ( t , os . RemoveAll ( tmpdir ) )
} ( )
2020-07-31 15:03:02 +00:00
series := storage . NewListSeries ( labels . FromStrings ( "a" , "b" ) , [ ] tsdbutil . Sample { sample { 1 , 1 } } )
2020-02-06 15:58:38 +00:00
blockDir := createBlock ( t , tmpdir , [ ] storage . Series { series } )
2019-03-24 20:33:08 +00:00
files , err := sequenceFiles ( chunkDir ( blockDir ) )
testutil . Ok ( t , err )
testutil . Assert ( t , len ( files ) > 0 , "No chunk created." )
f , err := os . OpenFile ( files [ 0 ] , os . O_RDWR , 0666 )
testutil . Ok ( t , err )
// Apply corruption function.
2020-07-31 15:03:02 +00:00
tc . corrFunc ( f )
2019-03-24 20:33:08 +00:00
testutil . Ok ( t , f . Close ( ) )
2019-12-04 07:37:49 +00:00
// Check open err.
b , err := OpenBlock ( nil , blockDir , nil )
2020-07-31 15:03:02 +00:00
if tc . openErr != nil {
testutil . Equals ( t , tc . openErr . Error ( ) , err . Error ( ) )
2019-12-04 07:37:49 +00:00
return
}
2020-01-04 14:55:02 +00:00
defer func ( ) { testutil . Ok ( t , b . Close ( ) ) } ( )
2019-12-04 07:37:49 +00:00
querier , err := NewBlockQuerier ( b , 0 , 1 )
testutil . Ok ( t , err )
2020-01-04 14:55:02 +00:00
defer func ( ) { testutil . Ok ( t , querier . Close ( ) ) } ( )
2020-06-09 16:57:31 +00:00
set := querier . Select ( false , nil , labels . MustNewMatcher ( labels . MatchEqual , "a" , "b" ) )
2019-12-04 07:37:49 +00:00
2020-07-31 15:03:02 +00:00
// Check chunk errors during iter time.
testutil . Assert ( t , set . Next ( ) , "" )
it := set . At ( ) . Iterator ( )
testutil . Equals ( t , false , it . Next ( ) )
testutil . Equals ( t , tc . iterErr . Error ( ) , it . Err ( ) . Error ( ) )
2019-03-24 20:33:08 +00:00
} )
}
}
2019-06-24 15:42:29 +00:00
// TestBlockSize ensures that the block size is calculated correctly.
func TestBlockSize ( t * testing . T ) {
tmpdir , err := ioutil . TempDir ( "" , "test_blockSize" )
testutil . Ok ( t , err )
defer func ( ) {
testutil . Ok ( t , os . RemoveAll ( tmpdir ) )
} ( )
var (
blockInit * Block
expSizeInit int64
blockDirInit string
)
// Create a block and compare the reported size vs actual disk size.
{
blockDirInit = createBlock ( t , tmpdir , genSeries ( 10 , 1 , 1 , 100 ) )
blockInit , err = OpenBlock ( nil , blockDirInit , nil )
testutil . Ok ( t , err )
defer func ( ) {
testutil . Ok ( t , blockInit . Close ( ) )
} ( )
expSizeInit = blockInit . Size ( )
2019-11-12 02:40:16 +00:00
actSizeInit , err := fileutil . DirSize ( blockInit . Dir ( ) )
testutil . Ok ( t , err )
2019-06-24 15:42:29 +00:00
testutil . Equals ( t , expSizeInit , actSizeInit )
}
// Delete some series and check the sizes again.
{
2019-11-18 19:53:33 +00:00
testutil . Ok ( t , blockInit . Delete ( 1 , 10 , labels . MustNewMatcher ( labels . MatchRegexp , "" , ".*" ) ) )
2019-06-24 15:42:29 +00:00
expAfterDelete := blockInit . Size ( )
testutil . Assert ( t , expAfterDelete > expSizeInit , "after a delete the block size should be bigger as the tombstone file should grow %v > %v" , expAfterDelete , expSizeInit )
2019-11-12 02:40:16 +00:00
actAfterDelete , err := fileutil . DirSize ( blockDirInit )
2019-06-24 15:42:29 +00:00
testutil . Ok ( t , err )
testutil . Equals ( t , expAfterDelete , actAfterDelete , "after a delete reported block size doesn't match actual disk size" )
c , err := NewLeveledCompactor ( context . Background ( ) , nil , log . NewNopLogger ( ) , [ ] int64 { 0 } , nil )
testutil . Ok ( t , err )
blockDirAfterCompact , err := c . Compact ( tmpdir , [ ] string { blockInit . Dir ( ) } , nil )
testutil . Ok ( t , err )
blockAfterCompact , err := OpenBlock ( nil , filepath . Join ( tmpdir , blockDirAfterCompact . String ( ) ) , nil )
testutil . Ok ( t , err )
defer func ( ) {
testutil . Ok ( t , blockAfterCompact . Close ( ) )
} ( )
expAfterCompact := blockAfterCompact . Size ( )
2019-11-12 02:40:16 +00:00
actAfterCompact , err := fileutil . DirSize ( blockAfterCompact . Dir ( ) )
testutil . Ok ( t , err )
2019-06-24 15:42:29 +00:00
testutil . Assert ( t , actAfterDelete > actAfterCompact , "after a delete and compaction the block size should be smaller %v,%v" , actAfterDelete , actAfterCompact )
testutil . Equals ( t , expAfterCompact , actAfterCompact , "after a delete and compaction reported block size doesn't match actual disk size" )
}
}
Load only some offsets into the symbol table into memory.
Rather than keeping the entire symbol table in memory, keep every nth
offset and walk from there to the entry we need. This ends up slightly
slower, ~360ms per 1M series returned from PostingsForMatchers which is
not much considering the rest of the CPU such a query would go on to
use.
Make LabelValues use the postings tables, rather than having
to do symbol lookups. Use yoloString, as PostingsForMatchers
doesn't need the strings to stick around and adjust the API
call to keep the Querier open until it's all marshalled.
Remove allocatedSymbols memory optimisation, we no longer keep all the
symbol strings in heap memory. Remove LabelValuesFor and LabelIndices,
they're dead code. Ensure we've still tests for label indices,
and add missing test that we can work with old V1 Format index files.
PostingForMatchers performance is slightly better, with a big drop in
allocation counts due to using yoloString for LabelValues:
benchmark old ns/op new ns/op delta
BenchmarkPostingsForMatchers/Block/n="1"-4 36698 36681 -0.05%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 522786 560887 +7.29%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 511652 537680 +5.09%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 522102 564239 +8.07%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 113689911 111795919 -1.67%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 135825572 132871085 -2.18%
BenchmarkPostingsForMatchers/Block/i=~""-4 40782628 38038181 -6.73%
BenchmarkPostingsForMatchers/Block/i!=""-4 31267869 29194327 -6.63%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 112733329 111568823 -1.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 112868153 111232029 -1.45%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 31338257 29349446 -6.35%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 32054482 29972436 -6.50%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 136504654 133968442 -1.86%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 27960350 27264997 -2.49%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 136765564 133860724 -2.12%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 163714583 159453668 -2.60%
benchmark old allocs new allocs delta
BenchmarkPostingsForMatchers/Block/n="1"-4 6 6 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 17 15 -11.76%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 100012 12 -99.99%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 200040 100040 -49.99%
BenchmarkPostingsForMatchers/Block/i=~""-4 200045 100045 -49.99%
BenchmarkPostingsForMatchers/Block/i!=""-4 200041 100041 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 100017 17 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 100023 23 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 200046 100046 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 200050 100050 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 200049 100049 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 111150 11150 -89.97%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 200055 100055 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 311238 111238 -64.26%
benchmark old bytes new bytes delta
BenchmarkPostingsForMatchers/Block/n="1"-4 296 296 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 552 1544 +179.71%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 1600482 1606125 +0.35%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 17259065 17264709 +0.03%
BenchmarkPostingsForMatchers/Block/i=~""-4 17259150 17264780 +0.03%
BenchmarkPostingsForMatchers/Block/i!=""-4 17259048 17264680 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 1600610 1606242 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 1600813 1606434 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 17259176 17264808 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 17259304 17264936 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 17259333 17264965 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 3142628 3148262 +0.18%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 17259509 17265141 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 20405680 20416944 +0.06%
However overall Select performance is down and involves more allocs, due to
having to do more than a simple map lookup to resolve a symbol and that all the strings
returned are allocated:
benchmark old ns/op new ns/op delta
BenchmarkQuerierSelect/Block/1of1000000-4 506092636 862678244 +70.46%
BenchmarkQuerierSelect/Block/10of1000000-4 505638968 860917636 +70.26%
BenchmarkQuerierSelect/Block/100of1000000-4 505229450 882150048 +74.60%
BenchmarkQuerierSelect/Block/1000of1000000-4 515905414 862241115 +67.13%
BenchmarkQuerierSelect/Block/10000of1000000-4 516785354 874841110 +69.29%
BenchmarkQuerierSelect/Block/100000of1000000-4 540742808 907030187 +67.74%
BenchmarkQuerierSelect/Block/1000000of1000000-4 815224288 1181236903 +44.90%
benchmark old allocs new allocs delta
BenchmarkQuerierSelect/Block/1of1000000-4 4000020 6000020 +50.00%
BenchmarkQuerierSelect/Block/10of1000000-4 4000038 6000038 +50.00%
BenchmarkQuerierSelect/Block/100of1000000-4 4000218 6000218 +50.00%
BenchmarkQuerierSelect/Block/1000of1000000-4 4002018 6002018 +49.97%
BenchmarkQuerierSelect/Block/10000of1000000-4 4020018 6020018 +49.75%
BenchmarkQuerierSelect/Block/100000of1000000-4 4200018 6200018 +47.62%
BenchmarkQuerierSelect/Block/1000000of1000000-4 6000018 8000019 +33.33%
benchmark old bytes new bytes delta
BenchmarkQuerierSelect/Block/1of1000000-4 176001468 227201476 +29.09%
BenchmarkQuerierSelect/Block/10of1000000-4 176002620 227202628 +29.09%
BenchmarkQuerierSelect/Block/100of1000000-4 176014140 227214148 +29.09%
BenchmarkQuerierSelect/Block/1000of1000000-4 176129340 227329348 +29.07%
BenchmarkQuerierSelect/Block/10000of1000000-4 177281340 228481348 +28.88%
BenchmarkQuerierSelect/Block/100000of1000000-4 188801340 240001348 +27.12%
BenchmarkQuerierSelect/Block/1000000of1000000-4 304001340 355201616 +16.84%
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2019-12-12 16:55:32 +00:00
func TestReadIndexFormatV1 ( t * testing . T ) {
2020-01-06 14:06:11 +00:00
/ * The block here was produced at the commit
706602 daed1487f7849990678b4ece4599745905 used in 2.0 .0 with :
db , _ := Open ( "v1db" , nil , nil , nil )
app := db . Appender ( )
app . Add ( labels . FromStrings ( "foo" , "bar" ) , 1 , 2 )
app . Add ( labels . FromStrings ( "foo" , "baz" ) , 3 , 4 )
app . Add ( labels . FromStrings ( "foo" , "meh" ) , 1000 * 3600 * 4 , 4 ) // Not in the block.
// Make sure we've enough values for the lack of sorting of postings offsets to show up.
for i := 0 ; i < 100 ; i ++ {
app . Add ( labels . FromStrings ( "bar" , strconv . FormatInt ( int64 ( i ) , 10 ) ) , 0 , 0 )
}
app . Commit ( )
db . compact ( )
db . Close ( )
Load only some offsets into the symbol table into memory.
Rather than keeping the entire symbol table in memory, keep every nth
offset and walk from there to the entry we need. This ends up slightly
slower, ~360ms per 1M series returned from PostingsForMatchers which is
not much considering the rest of the CPU such a query would go on to
use.
Make LabelValues use the postings tables, rather than having
to do symbol lookups. Use yoloString, as PostingsForMatchers
doesn't need the strings to stick around and adjust the API
call to keep the Querier open until it's all marshalled.
Remove allocatedSymbols memory optimisation, we no longer keep all the
symbol strings in heap memory. Remove LabelValuesFor and LabelIndices,
they're dead code. Ensure we've still tests for label indices,
and add missing test that we can work with old V1 Format index files.
PostingForMatchers performance is slightly better, with a big drop in
allocation counts due to using yoloString for LabelValues:
benchmark old ns/op new ns/op delta
BenchmarkPostingsForMatchers/Block/n="1"-4 36698 36681 -0.05%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 522786 560887 +7.29%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 511652 537680 +5.09%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 522102 564239 +8.07%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 113689911 111795919 -1.67%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 135825572 132871085 -2.18%
BenchmarkPostingsForMatchers/Block/i=~""-4 40782628 38038181 -6.73%
BenchmarkPostingsForMatchers/Block/i!=""-4 31267869 29194327 -6.63%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 112733329 111568823 -1.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 112868153 111232029 -1.45%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 31338257 29349446 -6.35%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 32054482 29972436 -6.50%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 136504654 133968442 -1.86%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 27960350 27264997 -2.49%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 136765564 133860724 -2.12%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 163714583 159453668 -2.60%
benchmark old allocs new allocs delta
BenchmarkPostingsForMatchers/Block/n="1"-4 6 6 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 17 15 -11.76%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 100012 12 -99.99%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 200040 100040 -49.99%
BenchmarkPostingsForMatchers/Block/i=~""-4 200045 100045 -49.99%
BenchmarkPostingsForMatchers/Block/i!=""-4 200041 100041 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 100017 17 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 100023 23 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 200046 100046 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 200050 100050 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 200049 100049 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 111150 11150 -89.97%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 200055 100055 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 311238 111238 -64.26%
benchmark old bytes new bytes delta
BenchmarkPostingsForMatchers/Block/n="1"-4 296 296 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 552 1544 +179.71%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 1600482 1606125 +0.35%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 17259065 17264709 +0.03%
BenchmarkPostingsForMatchers/Block/i=~""-4 17259150 17264780 +0.03%
BenchmarkPostingsForMatchers/Block/i!=""-4 17259048 17264680 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 1600610 1606242 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 1600813 1606434 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 17259176 17264808 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 17259304 17264936 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 17259333 17264965 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 3142628 3148262 +0.18%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 17259509 17265141 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 20405680 20416944 +0.06%
However overall Select performance is down and involves more allocs, due to
having to do more than a simple map lookup to resolve a symbol and that all the strings
returned are allocated:
benchmark old ns/op new ns/op delta
BenchmarkQuerierSelect/Block/1of1000000-4 506092636 862678244 +70.46%
BenchmarkQuerierSelect/Block/10of1000000-4 505638968 860917636 +70.26%
BenchmarkQuerierSelect/Block/100of1000000-4 505229450 882150048 +74.60%
BenchmarkQuerierSelect/Block/1000of1000000-4 515905414 862241115 +67.13%
BenchmarkQuerierSelect/Block/10000of1000000-4 516785354 874841110 +69.29%
BenchmarkQuerierSelect/Block/100000of1000000-4 540742808 907030187 +67.74%
BenchmarkQuerierSelect/Block/1000000of1000000-4 815224288 1181236903 +44.90%
benchmark old allocs new allocs delta
BenchmarkQuerierSelect/Block/1of1000000-4 4000020 6000020 +50.00%
BenchmarkQuerierSelect/Block/10of1000000-4 4000038 6000038 +50.00%
BenchmarkQuerierSelect/Block/100of1000000-4 4000218 6000218 +50.00%
BenchmarkQuerierSelect/Block/1000of1000000-4 4002018 6002018 +49.97%
BenchmarkQuerierSelect/Block/10000of1000000-4 4020018 6020018 +49.75%
BenchmarkQuerierSelect/Block/100000of1000000-4 4200018 6200018 +47.62%
BenchmarkQuerierSelect/Block/1000000of1000000-4 6000018 8000019 +33.33%
benchmark old bytes new bytes delta
BenchmarkQuerierSelect/Block/1of1000000-4 176001468 227201476 +29.09%
BenchmarkQuerierSelect/Block/10of1000000-4 176002620 227202628 +29.09%
BenchmarkQuerierSelect/Block/100of1000000-4 176014140 227214148 +29.09%
BenchmarkQuerierSelect/Block/1000of1000000-4 176129340 227329348 +29.07%
BenchmarkQuerierSelect/Block/10000of1000000-4 177281340 228481348 +28.88%
BenchmarkQuerierSelect/Block/100000of1000000-4 188801340 240001348 +27.12%
BenchmarkQuerierSelect/Block/1000000of1000000-4 304001340 355201616 +16.84%
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2019-12-12 16:55:32 +00:00
* /
blockDir := filepath . Join ( "testdata" , "index_format_v1" )
block , err := OpenBlock ( nil , blockDir , nil )
testutil . Ok ( t , err )
q , err := NewBlockQuerier ( block , 0 , 1000 )
testutil . Ok ( t , err )
testutil . Equals ( t , query ( t , q , labels . MustNewMatcher ( labels . MatchEqual , "foo" , "bar" ) ) ,
2020-04-15 10:17:41 +00:00
map [ string ] [ ] tsdbutil . Sample { ` { foo="bar"} ` : { sample { t : 1 , v : 2 } } } )
Load only some offsets into the symbol table into memory.
Rather than keeping the entire symbol table in memory, keep every nth
offset and walk from there to the entry we need. This ends up slightly
slower, ~360ms per 1M series returned from PostingsForMatchers which is
not much considering the rest of the CPU such a query would go on to
use.
Make LabelValues use the postings tables, rather than having
to do symbol lookups. Use yoloString, as PostingsForMatchers
doesn't need the strings to stick around and adjust the API
call to keep the Querier open until it's all marshalled.
Remove allocatedSymbols memory optimisation, we no longer keep all the
symbol strings in heap memory. Remove LabelValuesFor and LabelIndices,
they're dead code. Ensure we've still tests for label indices,
and add missing test that we can work with old V1 Format index files.
PostingForMatchers performance is slightly better, with a big drop in
allocation counts due to using yoloString for LabelValues:
benchmark old ns/op new ns/op delta
BenchmarkPostingsForMatchers/Block/n="1"-4 36698 36681 -0.05%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 522786 560887 +7.29%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 511652 537680 +5.09%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 522102 564239 +8.07%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 113689911 111795919 -1.67%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 135825572 132871085 -2.18%
BenchmarkPostingsForMatchers/Block/i=~""-4 40782628 38038181 -6.73%
BenchmarkPostingsForMatchers/Block/i!=""-4 31267869 29194327 -6.63%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 112733329 111568823 -1.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 112868153 111232029 -1.45%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 31338257 29349446 -6.35%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 32054482 29972436 -6.50%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 136504654 133968442 -1.86%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 27960350 27264997 -2.49%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 136765564 133860724 -2.12%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 163714583 159453668 -2.60%
benchmark old allocs new allocs delta
BenchmarkPostingsForMatchers/Block/n="1"-4 6 6 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 17 15 -11.76%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 100012 12 -99.99%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 200040 100040 -49.99%
BenchmarkPostingsForMatchers/Block/i=~""-4 200045 100045 -49.99%
BenchmarkPostingsForMatchers/Block/i!=""-4 200041 100041 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 100017 17 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 100023 23 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 200046 100046 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 200050 100050 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 200049 100049 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 111150 11150 -89.97%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 200055 100055 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 311238 111238 -64.26%
benchmark old bytes new bytes delta
BenchmarkPostingsForMatchers/Block/n="1"-4 296 296 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 552 1544 +179.71%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 1600482 1606125 +0.35%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 17259065 17264709 +0.03%
BenchmarkPostingsForMatchers/Block/i=~""-4 17259150 17264780 +0.03%
BenchmarkPostingsForMatchers/Block/i!=""-4 17259048 17264680 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 1600610 1606242 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 1600813 1606434 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 17259176 17264808 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 17259304 17264936 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 17259333 17264965 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 3142628 3148262 +0.18%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 17259509 17265141 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 20405680 20416944 +0.06%
However overall Select performance is down and involves more allocs, due to
having to do more than a simple map lookup to resolve a symbol and that all the strings
returned are allocated:
benchmark old ns/op new ns/op delta
BenchmarkQuerierSelect/Block/1of1000000-4 506092636 862678244 +70.46%
BenchmarkQuerierSelect/Block/10of1000000-4 505638968 860917636 +70.26%
BenchmarkQuerierSelect/Block/100of1000000-4 505229450 882150048 +74.60%
BenchmarkQuerierSelect/Block/1000of1000000-4 515905414 862241115 +67.13%
BenchmarkQuerierSelect/Block/10000of1000000-4 516785354 874841110 +69.29%
BenchmarkQuerierSelect/Block/100000of1000000-4 540742808 907030187 +67.74%
BenchmarkQuerierSelect/Block/1000000of1000000-4 815224288 1181236903 +44.90%
benchmark old allocs new allocs delta
BenchmarkQuerierSelect/Block/1of1000000-4 4000020 6000020 +50.00%
BenchmarkQuerierSelect/Block/10of1000000-4 4000038 6000038 +50.00%
BenchmarkQuerierSelect/Block/100of1000000-4 4000218 6000218 +50.00%
BenchmarkQuerierSelect/Block/1000of1000000-4 4002018 6002018 +49.97%
BenchmarkQuerierSelect/Block/10000of1000000-4 4020018 6020018 +49.75%
BenchmarkQuerierSelect/Block/100000of1000000-4 4200018 6200018 +47.62%
BenchmarkQuerierSelect/Block/1000000of1000000-4 6000018 8000019 +33.33%
benchmark old bytes new bytes delta
BenchmarkQuerierSelect/Block/1of1000000-4 176001468 227201476 +29.09%
BenchmarkQuerierSelect/Block/10of1000000-4 176002620 227202628 +29.09%
BenchmarkQuerierSelect/Block/100of1000000-4 176014140 227214148 +29.09%
BenchmarkQuerierSelect/Block/1000of1000000-4 176129340 227329348 +29.07%
BenchmarkQuerierSelect/Block/10000of1000000-4 177281340 228481348 +28.88%
BenchmarkQuerierSelect/Block/100000of1000000-4 188801340 240001348 +27.12%
BenchmarkQuerierSelect/Block/1000000of1000000-4 304001340 355201616 +16.84%
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2019-12-12 16:55:32 +00:00
q , err = NewBlockQuerier ( block , 0 , 1000 )
testutil . Ok ( t , err )
2020-01-06 14:06:11 +00:00
testutil . Equals ( t , query ( t , q , labels . MustNewMatcher ( labels . MatchNotRegexp , "foo" , "^.?$" ) ) ,
Load only some offsets into the symbol table into memory.
Rather than keeping the entire symbol table in memory, keep every nth
offset and walk from there to the entry we need. This ends up slightly
slower, ~360ms per 1M series returned from PostingsForMatchers which is
not much considering the rest of the CPU such a query would go on to
use.
Make LabelValues use the postings tables, rather than having
to do symbol lookups. Use yoloString, as PostingsForMatchers
doesn't need the strings to stick around and adjust the API
call to keep the Querier open until it's all marshalled.
Remove allocatedSymbols memory optimisation, we no longer keep all the
symbol strings in heap memory. Remove LabelValuesFor and LabelIndices,
they're dead code. Ensure we've still tests for label indices,
and add missing test that we can work with old V1 Format index files.
PostingForMatchers performance is slightly better, with a big drop in
allocation counts due to using yoloString for LabelValues:
benchmark old ns/op new ns/op delta
BenchmarkPostingsForMatchers/Block/n="1"-4 36698 36681 -0.05%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 522786 560887 +7.29%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 511652 537680 +5.09%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 522102 564239 +8.07%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 113689911 111795919 -1.67%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 135825572 132871085 -2.18%
BenchmarkPostingsForMatchers/Block/i=~""-4 40782628 38038181 -6.73%
BenchmarkPostingsForMatchers/Block/i!=""-4 31267869 29194327 -6.63%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 112733329 111568823 -1.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 112868153 111232029 -1.45%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 31338257 29349446 -6.35%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 32054482 29972436 -6.50%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 136504654 133968442 -1.86%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 27960350 27264997 -2.49%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 136765564 133860724 -2.12%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 163714583 159453668 -2.60%
benchmark old allocs new allocs delta
BenchmarkPostingsForMatchers/Block/n="1"-4 6 6 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 17 15 -11.76%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 100012 12 -99.99%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 200040 100040 -49.99%
BenchmarkPostingsForMatchers/Block/i=~""-4 200045 100045 -49.99%
BenchmarkPostingsForMatchers/Block/i!=""-4 200041 100041 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 100017 17 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 100023 23 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 200046 100046 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 200050 100050 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 200049 100049 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 111150 11150 -89.97%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 200055 100055 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 311238 111238 -64.26%
benchmark old bytes new bytes delta
BenchmarkPostingsForMatchers/Block/n="1"-4 296 296 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 552 1544 +179.71%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 1600482 1606125 +0.35%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 17259065 17264709 +0.03%
BenchmarkPostingsForMatchers/Block/i=~""-4 17259150 17264780 +0.03%
BenchmarkPostingsForMatchers/Block/i!=""-4 17259048 17264680 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 1600610 1606242 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 1600813 1606434 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 17259176 17264808 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 17259304 17264936 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 17259333 17264965 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 3142628 3148262 +0.18%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 17259509 17265141 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 20405680 20416944 +0.06%
However overall Select performance is down and involves more allocs, due to
having to do more than a simple map lookup to resolve a symbol and that all the strings
returned are allocated:
benchmark old ns/op new ns/op delta
BenchmarkQuerierSelect/Block/1of1000000-4 506092636 862678244 +70.46%
BenchmarkQuerierSelect/Block/10of1000000-4 505638968 860917636 +70.26%
BenchmarkQuerierSelect/Block/100of1000000-4 505229450 882150048 +74.60%
BenchmarkQuerierSelect/Block/1000of1000000-4 515905414 862241115 +67.13%
BenchmarkQuerierSelect/Block/10000of1000000-4 516785354 874841110 +69.29%
BenchmarkQuerierSelect/Block/100000of1000000-4 540742808 907030187 +67.74%
BenchmarkQuerierSelect/Block/1000000of1000000-4 815224288 1181236903 +44.90%
benchmark old allocs new allocs delta
BenchmarkQuerierSelect/Block/1of1000000-4 4000020 6000020 +50.00%
BenchmarkQuerierSelect/Block/10of1000000-4 4000038 6000038 +50.00%
BenchmarkQuerierSelect/Block/100of1000000-4 4000218 6000218 +50.00%
BenchmarkQuerierSelect/Block/1000of1000000-4 4002018 6002018 +49.97%
BenchmarkQuerierSelect/Block/10000of1000000-4 4020018 6020018 +49.75%
BenchmarkQuerierSelect/Block/100000of1000000-4 4200018 6200018 +47.62%
BenchmarkQuerierSelect/Block/1000000of1000000-4 6000018 8000019 +33.33%
benchmark old bytes new bytes delta
BenchmarkQuerierSelect/Block/1of1000000-4 176001468 227201476 +29.09%
BenchmarkQuerierSelect/Block/10of1000000-4 176002620 227202628 +29.09%
BenchmarkQuerierSelect/Block/100of1000000-4 176014140 227214148 +29.09%
BenchmarkQuerierSelect/Block/1000of1000000-4 176129340 227329348 +29.07%
BenchmarkQuerierSelect/Block/10000of1000000-4 177281340 228481348 +28.88%
BenchmarkQuerierSelect/Block/100000of1000000-4 188801340 240001348 +27.12%
BenchmarkQuerierSelect/Block/1000000of1000000-4 304001340 355201616 +16.84%
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2019-12-12 16:55:32 +00:00
map [ string ] [ ] tsdbutil . Sample {
2020-04-15 10:17:41 +00:00
` { foo="bar"} ` : { sample { t : 1 , v : 2 } } ,
` { foo="baz"} ` : { sample { t : 3 , v : 4 } } ,
Load only some offsets into the symbol table into memory.
Rather than keeping the entire symbol table in memory, keep every nth
offset and walk from there to the entry we need. This ends up slightly
slower, ~360ms per 1M series returned from PostingsForMatchers which is
not much considering the rest of the CPU such a query would go on to
use.
Make LabelValues use the postings tables, rather than having
to do symbol lookups. Use yoloString, as PostingsForMatchers
doesn't need the strings to stick around and adjust the API
call to keep the Querier open until it's all marshalled.
Remove allocatedSymbols memory optimisation, we no longer keep all the
symbol strings in heap memory. Remove LabelValuesFor and LabelIndices,
they're dead code. Ensure we've still tests for label indices,
and add missing test that we can work with old V1 Format index files.
PostingForMatchers performance is slightly better, with a big drop in
allocation counts due to using yoloString for LabelValues:
benchmark old ns/op new ns/op delta
BenchmarkPostingsForMatchers/Block/n="1"-4 36698 36681 -0.05%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 522786 560887 +7.29%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 511652 537680 +5.09%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 522102 564239 +8.07%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 113689911 111795919 -1.67%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 135825572 132871085 -2.18%
BenchmarkPostingsForMatchers/Block/i=~""-4 40782628 38038181 -6.73%
BenchmarkPostingsForMatchers/Block/i!=""-4 31267869 29194327 -6.63%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 112733329 111568823 -1.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 112868153 111232029 -1.45%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 31338257 29349446 -6.35%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 32054482 29972436 -6.50%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 136504654 133968442 -1.86%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 27960350 27264997 -2.49%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 136765564 133860724 -2.12%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 163714583 159453668 -2.60%
benchmark old allocs new allocs delta
BenchmarkPostingsForMatchers/Block/n="1"-4 6 6 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 11 11 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 17 15 -11.76%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 100012 12 -99.99%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 200040 100040 -49.99%
BenchmarkPostingsForMatchers/Block/i=~""-4 200045 100045 -49.99%
BenchmarkPostingsForMatchers/Block/i!=""-4 200041 100041 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 100017 17 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 100023 23 -99.98%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 200046 100046 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 200050 100050 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 200049 100049 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 111150 11150 -89.97%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 200055 100055 -49.99%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 311238 111238 -64.26%
benchmark old bytes new bytes delta
BenchmarkPostingsForMatchers/Block/n="1"-4 296 296 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j="foo"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/j="foo",n="1"-4 424 424 +0.00%
BenchmarkPostingsForMatchers/Block/n="1",j!="foo"-4 552 1544 +179.71%
BenchmarkPostingsForMatchers/Block/i=~".*"-4 1600482 1606125 +0.35%
BenchmarkPostingsForMatchers/Block/i=~".+"-4 17259065 17264709 +0.03%
BenchmarkPostingsForMatchers/Block/i=~""-4 17259150 17264780 +0.03%
BenchmarkPostingsForMatchers/Block/i!=""-4 17259048 17264680 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",j="foo"-4 1600610 1606242 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i=~".*",i!="2",j="foo"-4 1600813 1606434 +0.35%
BenchmarkPostingsForMatchers/Block/n="1",i!=""-4 17259176 17264808 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i!="",j="foo"-4 17259304 17264936 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",j="foo"-4 17259333 17264965 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~"1.+",j="foo"-4 3142628 3148262 +0.18%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!="2",j="foo"-4 17259509 17265141 +0.03%
BenchmarkPostingsForMatchers/Block/n="1",i=~".+",i!~"2.*",j="foo"-4 20405680 20416944 +0.06%
However overall Select performance is down and involves more allocs, due to
having to do more than a simple map lookup to resolve a symbol and that all the strings
returned are allocated:
benchmark old ns/op new ns/op delta
BenchmarkQuerierSelect/Block/1of1000000-4 506092636 862678244 +70.46%
BenchmarkQuerierSelect/Block/10of1000000-4 505638968 860917636 +70.26%
BenchmarkQuerierSelect/Block/100of1000000-4 505229450 882150048 +74.60%
BenchmarkQuerierSelect/Block/1000of1000000-4 515905414 862241115 +67.13%
BenchmarkQuerierSelect/Block/10000of1000000-4 516785354 874841110 +69.29%
BenchmarkQuerierSelect/Block/100000of1000000-4 540742808 907030187 +67.74%
BenchmarkQuerierSelect/Block/1000000of1000000-4 815224288 1181236903 +44.90%
benchmark old allocs new allocs delta
BenchmarkQuerierSelect/Block/1of1000000-4 4000020 6000020 +50.00%
BenchmarkQuerierSelect/Block/10of1000000-4 4000038 6000038 +50.00%
BenchmarkQuerierSelect/Block/100of1000000-4 4000218 6000218 +50.00%
BenchmarkQuerierSelect/Block/1000of1000000-4 4002018 6002018 +49.97%
BenchmarkQuerierSelect/Block/10000of1000000-4 4020018 6020018 +49.75%
BenchmarkQuerierSelect/Block/100000of1000000-4 4200018 6200018 +47.62%
BenchmarkQuerierSelect/Block/1000000of1000000-4 6000018 8000019 +33.33%
benchmark old bytes new bytes delta
BenchmarkQuerierSelect/Block/1of1000000-4 176001468 227201476 +29.09%
BenchmarkQuerierSelect/Block/10of1000000-4 176002620 227202628 +29.09%
BenchmarkQuerierSelect/Block/100of1000000-4 176014140 227214148 +29.09%
BenchmarkQuerierSelect/Block/1000of1000000-4 176129340 227329348 +29.07%
BenchmarkQuerierSelect/Block/10000of1000000-4 177281340 228481348 +28.88%
BenchmarkQuerierSelect/Block/100000of1000000-4 188801340 240001348 +27.12%
BenchmarkQuerierSelect/Block/1000000of1000000-4 304001340 355201616 +16.84%
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2019-12-12 16:55:32 +00:00
} )
}
2019-01-28 11:24:49 +00:00
// createBlock creates a block with given set of series and returns its dir.
2020-02-06 15:58:38 +00:00
func createBlock ( tb testing . TB , dir string , series [ ] storage . Series ) string {
2020-10-12 16:04:20 +00:00
blockDir , err := CreateBlock ( series , dir , 0 , log . NewNopLogger ( ) )
2020-05-06 15:30:00 +00:00
testutil . Ok ( tb , err )
2020-10-12 16:04:20 +00:00
return blockDir
2019-12-06 07:47:31 +00:00
}
func createBlockFromHead ( tb testing . TB , dir string , head * Head ) string {
2019-06-07 13:41:44 +00:00
compactor , err := NewLeveledCompactor ( context . Background ( ) , nil , log . NewNopLogger ( ) , [ ] int64 { 1000000 } , nil )
testutil . Ok ( tb , err )
testutil . Ok ( tb , os . MkdirAll ( dir , 0777 ) )
2019-07-03 10:47:31 +00:00
// Add +1 millisecond to block maxt because block intervals are half-open: [b.MinTime, b.MaxTime).
// Because of this block intervals are always +1 than the total samples it includes.
ulid , err := compactor . Write ( dir , head , head . MinTime ( ) , head . MaxTime ( ) + 1 , nil )
2019-06-07 13:41:44 +00:00
testutil . Ok ( tb , err )
return filepath . Join ( dir , ulid . String ( ) )
}
2020-07-31 15:03:02 +00:00
func createHead ( tb testing . TB , w * wal . WAL , series [ ] storage . Series , chunkDir string ) * Head {
head , err := NewHead ( nil , nil , w , DefaultBlockDuration , chunkDir , nil , DefaultStripeSize , nil )
2018-10-23 21:35:52 +00:00
testutil . Ok ( tb , err )
2020-07-30 11:11:13 +00:00
app := head . Appender ( context . Background ( ) )
2019-01-28 11:24:49 +00:00
for _ , s := range series {
ref := uint64 ( 0 )
it := s . Iterator ( )
for it . Next ( ) {
t , v := it . At ( )
if ref != 0 {
err := app . AddFast ( ref , t , v )
2019-01-18 16:58:17 +00:00
if err == nil {
continue
}
2018-10-23 21:35:52 +00:00
}
2019-01-28 11:24:49 +00:00
ref , err = app . Add ( s . Labels ( ) , t , v )
2018-10-23 21:35:52 +00:00
testutil . Ok ( tb , err )
}
2019-01-28 11:24:49 +00:00
testutil . Ok ( tb , it . Err ( ) )
2018-10-23 21:35:52 +00:00
}
2020-07-31 15:03:02 +00:00
testutil . Ok ( tb , app . Commit ( ) )
2019-06-07 13:41:44 +00:00
return head
2018-10-23 21:35:52 +00:00
}
2019-01-28 11:24:49 +00:00
2019-05-27 11:24:46 +00:00
const (
defaultLabelName = "labelName"
defaultLabelValue = "labelValue"
)
2019-01-28 11:24:49 +00:00
// genSeries generates series with a given number of labels and values.
2020-02-06 15:58:38 +00:00
func genSeries ( totalSeries , labelCount int , mint , maxt int64 ) [ ] storage . Series {
2019-01-28 11:24:49 +00:00
if totalSeries == 0 || labelCount == 0 {
return nil
}
2020-02-06 15:58:38 +00:00
series := make ( [ ] storage . Series , totalSeries )
2019-06-07 13:41:44 +00:00
2019-01-28 11:24:49 +00:00
for i := 0 ; i < totalSeries ; i ++ {
lbls := make ( map [ string ] string , labelCount )
2019-05-27 11:24:46 +00:00
lbls [ defaultLabelName ] = strconv . Itoa ( i )
for j := 1 ; len ( lbls ) < labelCount ; j ++ {
lbls [ defaultLabelName + strconv . Itoa ( j ) ] = defaultLabelValue + strconv . Itoa ( j )
2019-01-28 11:24:49 +00:00
}
samples := make ( [ ] tsdbutil . Sample , 0 , maxt - mint + 1 )
2019-07-03 10:47:31 +00:00
for t := mint ; t < maxt ; t ++ {
2019-01-28 11:24:49 +00:00
samples = append ( samples , sample { t : t , v : rand . Float64 ( ) } )
}
2020-07-31 15:03:02 +00:00
series [ i ] = storage . NewListSeries ( labels . FromMap ( lbls ) , samples )
2019-01-28 11:24:49 +00:00
}
2019-02-14 13:29:41 +00:00
return series
}
// populateSeries generates series from given labels, mint and maxt.
2020-02-06 15:58:38 +00:00
func populateSeries ( lbls [ ] map [ string ] string , mint , maxt int64 ) [ ] storage . Series {
2019-02-14 13:29:41 +00:00
if len ( lbls ) == 0 {
return nil
}
2019-01-28 11:24:49 +00:00
2020-02-06 15:58:38 +00:00
series := make ( [ ] storage . Series , 0 , len ( lbls ) )
2019-02-14 13:29:41 +00:00
for _ , lbl := range lbls {
if len ( lbl ) == 0 {
continue
}
samples := make ( [ ] tsdbutil . Sample , 0 , maxt - mint + 1 )
for t := mint ; t <= maxt ; t ++ {
samples = append ( samples , sample { t : t , v : rand . Float64 ( ) } )
}
2020-07-31 15:03:02 +00:00
series = append ( series , storage . NewListSeries ( labels . FromMap ( lbl ) , samples ) )
2019-02-14 13:29:41 +00:00
}
2019-01-28 11:24:49 +00:00
return series
}