mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-08-06 14:17:12 +02:00
Code Issues Projects Releases Wiki Activity

Backward compatibility with upcoming index v3 (#16762)

Browse Source 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
Bartlomiej Plotka 2025-06-25 09:11:26 +01:00 committed by GitHub
parent a8e32147b3
commit eb44f9232d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tsdb/index/index.go
View File

@ -43,10 +43,12 @@ const (
// HeaderLen represents number of bytes reserved of index for header. // HeaderLen represents number of bytes reserved of index for header.
HeaderLen = 5 HeaderLen = 5
// FormatV1 represents 1 version of index. // FormatV1 represents version 1 of index.
FormatV1 = 1 FormatV1 = 1
// FormatV2 represents 2 version of index. // FormatV2 represents version 2 of index.
FormatV2 = 2 FormatV2 = 2
// FormatV3 represents version 3 of index.
FormatV3 = 3
indexFilename = "index" indexFilename = "index"
@ -1192,7 +1194,9 @@ func newReader(b ByteSlice, c io.Closer) (*Reader, error) {
} }
r.version = int(r.b.Range(4, 5)[0]) r.version = int(r.b.Range(4, 5)[0])
if r.version != FormatV1 && r.version != FormatV2 { switch r.version {
case FormatV1, FormatV2, FormatV3:
default:
return nil, fmt.Errorf("unknown index file version %d", r.version) return nil, fmt.Errorf("unknown index file version %d", r.version)
} }
@ -1350,7 +1354,9 @@ func (s Symbols) Lookup(o uint32) (string, error) {
B: s.bs.Range(0, s.bs.Len()), B: s.bs.Range(0, s.bs.Len()),
} }
if s.version == FormatV2 { if s.version == FormatV1 {
d.Skip(int(o))
} else {
if int(o) >= s.seen { if int(o) >= s.seen {
return "", fmt.Errorf("unknown symbol offset %d", o) return "", fmt.Errorf("unknown symbol offset %d", o)
} }
@ -1359,8 +1365,6 @@ func (s Symbols) Lookup(o uint32) (string, error) {
for i := o - (o / symbolFactor * symbolFactor); i > 0; i-- { for i := o - (o / symbolFactor * symbolFactor); i > 0; i-- {
d.UvarintBytes() d.UvarintBytes()
} }
} else {
d.Skip(int(o))
} }
sym := d.UvarintStr() sym := d.UvarintStr()
if d.Err() != nil { if d.Err() != nil {
@ -1406,10 +1410,10 @@ func (s Symbols) ReverseLookup(sym string) (uint32, error) {
if lastSymbol != sym { if lastSymbol != sym {
return 0, fmt.Errorf("unknown symbol %q", sym) return 0, fmt.Errorf("unknown symbol %q", sym)
} }
if s.version == FormatV2 { if s.version == FormatV1 {
return uint32(res), nil return uint32(s.bs.Len() - lastLen), nil
} }
return uint32(s.bs.Len() - lastLen), nil return uint32(res), nil
} }
func (s Symbols) Size() int { func (s Symbols) Size() int {
@ -1562,7 +1566,7 @@ func (r *Reader) LabelNamesFor(ctx context.Context, ids ...storage.SeriesRef) ([
offset := id offset := id
// In version 2 series IDs are no longer exact references but series are 16-byte padded // In version 2 series IDs are no longer exact references but series are 16-byte padded
// and the ID is the multiple of 16 of the actual position. // and the ID is the multiple of 16 of the actual position.
if r.version == FormatV2 { if r.version != FormatV1 {
offset = id * seriesByteAlign offset = id * seriesByteAlign
} }
@ -1601,7 +1605,7 @@ func (r *Reader) LabelValueFor(ctx context.Context, id storage.SeriesRef, label
offset := id offset := id
// In version 2 series IDs are no longer exact references but series are 16-byte padded // In version 2 series IDs are no longer exact references but series are 16-byte padded
// and the ID is the multiple of 16 of the actual position. // and the ID is the multiple of 16 of the actual position.
if r.version == FormatV2 { if r.version != FormatV1 {
offset = id * seriesByteAlign offset = id * seriesByteAlign
} }
d := encoding.NewDecbufUvarintAt(r.b, int(offset), castagnoliTable) d := encoding.NewDecbufUvarintAt(r.b, int(offset), castagnoliTable)
@ -1627,7 +1631,7 @@ func (r *Reader) Series(id storage.SeriesRef, builder *labels.ScratchBuilder, ch
offset := id offset := id
// In version 2 series IDs are no longer exact references but series are 16-byte padded // In version 2 series IDs are no longer exact references but series are 16-byte padded
// and the ID is the multiple of 16 of the actual position. // and the ID is the multiple of 16 of the actual position.
if r.version == FormatV2 { if r.version != FormatV1 {
offset = id * seriesByteAlign offset = id * seriesByteAlign
} }
d := encoding.NewDecbufUvarintAt(r.b, int(offset), castagnoliTable) d := encoding.NewDecbufUvarintAt(r.b, int(offset), castagnoliTable)