Skip to content

Commit

Permalink
fix: implement check for series key before proceeding
Browse files Browse the repository at this point in the history
  • Loading branch information
jdockerty committed Jan 11, 2024
1 parent bc3bb84 commit 7c33dd9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tsdb/series_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
var (
ErrSeriesFileClosed = errors.New("tsdb: series file closed")
ErrInvalidSeriesPartitionID = errors.New("tsdb: invalid series partition id")
// ErrInvalidMeasurement = errors.New("tsdb: invalid measurement for series key provided")
)

// SeriesIDSize is the size in bytes of a series key ID.
Expand Down Expand Up @@ -378,9 +377,6 @@ func ReadSeriesKeyLen(data []byte) (sz int, remainder []byte) {
}

func ReadSeriesKeyMeasurement(data []byte) (name, remainder []byte) {
if len(data) < 2 {
// return nil, nil, ErrInvalidMeasurement
}
n, data := binary.BigEndian.Uint16(data), data[2:]
return data[:n], data[n:]
}
Expand Down Expand Up @@ -417,7 +413,11 @@ func ParseSeriesKeyInto(data []byte, dstTags models.Tags) ([]byte, models.Tags)
// different length and capacity to those provided.
func parseSeriesKey(data []byte, dst models.Tags) ([]byte, models.Tags) {
var name []byte
_, data = ReadSeriesKeyLen(data)
sz, data := ReadSeriesKeyLen(data)
// Ensure that the seriesKey is valid before proceeding to subsequent calls.
if sz == 0 && len(data) == 0 {
return nil, nil
}
name, data = ReadSeriesKeyMeasurement(data)
tagN, data := ReadSeriesKeyTagN(data)

Expand Down

0 comments on commit 7c33dd9

Please sign in to comment.