github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-02-19 15:30:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

all: follow-up after 4bdd10ab90

Browse source 
Properly use new bytesutil.Resize* functions
This commit is contained in:
Aliaksandr Valialkin 2022-02-01 17:48:25 +02:00
parent 13c2692ca1
commit 5f266370c5
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/vmselect/netstorage/netstorage.go
View file

@ -2537,7 +2537,7 @@ func sendAccountIDProjectID(bc *handshake.BufferedConn, accountID, projectID uin
} }
func readBytes(buf []byte, bc *handshake.BufferedConn, maxDataSize int) ([]byte, error) { func readBytes(buf []byte, bc *handshake.BufferedConn, maxDataSize int) ([]byte, error) {
buf = bytesutil.ResizeNoCopy(buf, 8) buf = bytesutil.ResizeNoCopyMayOverallocate(buf, 8)
if n, err := io.ReadFull(bc, buf); err != nil { if n, err := io.ReadFull(bc, buf); err != nil {
return buf, fmt.Errorf("cannot read %d bytes with data size: %w; read only %d bytes", len(buf), err, n) return buf, fmt.Errorf("cannot read %d bytes with data size: %w; read only %d bytes", len(buf), err, n)
} }
@ -2545,7 +2545,7 @@ func readBytes(buf []byte, bc *handshake.BufferedConn, maxDataSize int) ([]byte,
if dataSize > uint64(maxDataSize) { if dataSize > uint64(maxDataSize) {
return buf, fmt.Errorf("too big data size: %d; it mustn't exceed %d bytes", dataSize, maxDataSize) return buf, fmt.Errorf("too big data size: %d; it mustn't exceed %d bytes", dataSize, maxDataSize)
} }
buf = bytesutil.ResizeNoCopy(buf, int(dataSize)) buf = bytesutil.ResizeNoCopyMayOverallocate(buf, int(dataSize))
if dataSize == 0 { if dataSize == 0 {
return buf, nil return buf, nil
} }

12
app/vmstorage/transport/server.go
View file

@ -321,7 +321,7 @@ func (ctx *vmselectRequestCtx) readTimeRange() (storage.TimeRange, error) {
} }
func (ctx *vmselectRequestCtx) readUint32() (uint32, error) { func (ctx *vmselectRequestCtx) readUint32() (uint32, error) {
ctx.sizeBuf = bytesutil.ResizeNoCopy(ctx.sizeBuf, 4) ctx.sizeBuf = bytesutil.ResizeNoCopyMayOverallocate(ctx.sizeBuf, 4)
if _, err := io.ReadFull(ctx.bc, ctx.sizeBuf); err != nil { if _, err := io.ReadFull(ctx.bc, ctx.sizeBuf); err != nil {
if err == io.EOF { if err == io.EOF {
return 0, err return 0, err
@ -333,7 +333,7 @@ func (ctx *vmselectRequestCtx) readUint32() (uint32, error) {
} }
func (ctx *vmselectRequestCtx) readUint64() (uint64, error) { func (ctx *vmselectRequestCtx) readUint64() (uint64, error) {
ctx.sizeBuf = bytesutil.ResizeNoCopy(ctx.sizeBuf, 8) ctx.sizeBuf = bytesutil.ResizeNoCopyMayOverallocate(ctx.sizeBuf, 8)
if _, err := io.ReadFull(ctx.bc, ctx.sizeBuf); err != nil { if _, err := io.ReadFull(ctx.bc, ctx.sizeBuf); err != nil {
if err == io.EOF { if err == io.EOF {
return 0, err return 0, err
@ -371,7 +371,7 @@ func (ctx *vmselectRequestCtx) readSearchQuery() error {
} }
func (ctx *vmselectRequestCtx) readDataBufBytes(maxDataSize int) error { func (ctx *vmselectRequestCtx) readDataBufBytes(maxDataSize int) error {
ctx.sizeBuf = bytesutil.ResizeNoCopy(ctx.sizeBuf, 8) ctx.sizeBuf = bytesutil.ResizeNoCopyMayOverallocate(ctx.sizeBuf, 8)
if _, err := io.ReadFull(ctx.bc, ctx.sizeBuf); err != nil { if _, err := io.ReadFull(ctx.bc, ctx.sizeBuf); err != nil {
if err == io.EOF { if err == io.EOF {
return err return err
@ -382,7 +382,7 @@ func (ctx *vmselectRequestCtx) readDataBufBytes(maxDataSize int) error {
if dataSize > uint64(maxDataSize) { if dataSize > uint64(maxDataSize) {
return fmt.Errorf("too big data size: %d; it mustn't exceed %d bytes", dataSize, maxDataSize) return fmt.Errorf("too big data size: %d; it mustn't exceed %d bytes", dataSize, maxDataSize)
} }
ctx.dataBuf = bytesutil.ResizeNoCopy(ctx.dataBuf, int(dataSize)) ctx.dataBuf = bytesutil.ResizeNoCopyMayOverallocate(ctx.dataBuf, int(dataSize))
if dataSize == 0 { if dataSize == 0 {
return nil return nil
} }
@ -393,7 +393,7 @@ func (ctx *vmselectRequestCtx) readDataBufBytes(maxDataSize int) error {
} }
func (ctx *vmselectRequestCtx) readBool() (bool, error) { func (ctx *vmselectRequestCtx) readBool() (bool, error) {
ctx.dataBuf = bytesutil.ResizeNoCopy(ctx.dataBuf, 1) ctx.dataBuf = bytesutil.ResizeNoCopyMayOverallocate(ctx.dataBuf, 1)
if _, err := io.ReadFull(ctx.bc, ctx.dataBuf); err != nil { if _, err := io.ReadFull(ctx.bc, ctx.dataBuf); err != nil {
if err == io.EOF { if err == io.EOF {
return false, err return false, err
@ -405,7 +405,7 @@ func (ctx *vmselectRequestCtx) readBool() (bool, error) {
} }
func (ctx *vmselectRequestCtx) readByte() (byte, error) { func (ctx *vmselectRequestCtx) readByte() (byte, error) {
ctx.dataBuf = bytesutil.ResizeNoCopy(ctx.dataBuf, 1) ctx.dataBuf = bytesutil.ResizeNoCopyMayOverallocate(ctx.dataBuf, 1)
if _, err := io.ReadFull(ctx.bc, ctx.dataBuf); err != nil { if _, err := io.ReadFull(ctx.bc, ctx.dataBuf); err != nil {
if err == io.EOF { if err == io.EOF {
return 0, err return 0, err

4
lib/protoparser/clusternative/streamparser.go
View file

@ -65,7 +65,7 @@ func ParseStream(bc *handshake.BufferedConn, callback func(rows []storage.Metric
func readBlock(dst []byte, bc *handshake.BufferedConn, isReadOnly func() bool) ([]byte, error) { func readBlock(dst []byte, bc *handshake.BufferedConn, isReadOnly func() bool) ([]byte, error) {
sizeBuf := auxBufPool.Get() sizeBuf := auxBufPool.Get()
defer auxBufPool.Put(sizeBuf) defer auxBufPool.Put(sizeBuf)
sizeBuf.B = bytesutil.ResizeNoCopy(sizeBuf.B, 8) sizeBuf.B = bytesutil.ResizeNoCopyMayOverallocate(sizeBuf.B, 8)
if _, err := io.ReadFull(bc, sizeBuf.B); err != nil { if _, err := io.ReadFull(bc, sizeBuf.B); err != nil {
if err != io.EOF { if err != io.EOF {
readErrors.Inc() readErrors.Inc()
@ -79,7 +79,7 @@ func readBlock(dst []byte, bc *handshake.BufferedConn, isReadOnly func() bool) (
return dst, fmt.Errorf("too big packet size: %d; shouldn't exceed %d", packetSize, consts.MaxInsertPacketSize) return dst, fmt.Errorf("too big packet size: %d; shouldn't exceed %d", packetSize, consts.MaxInsertPacketSize)
} }
dstLen := len(dst) dstLen := len(dst)
dst = bytesutil.ResizeWithCopy(dst, dstLen+int(packetSize)) dst = bytesutil.ResizeWithCopyMayOverallocate(dst, dstLen+int(packetSize))
if n, err := io.ReadFull(bc, dst[dstLen:]); err != nil { if n, err := io.ReadFull(bc, dst[dstLen:]); err != nil {
readErrors.Inc() readErrors.Inc()
return dst, fmt.Errorf("cannot read packet with size %d bytes: %w; read only %d bytes", packetSize, err, n) return dst, fmt.Errorf("cannot read packet with size %d bytes: %w; read only %d bytes", packetSize, err, n)

2
lib/storage/metric_name.go
View file

@ -438,7 +438,7 @@ func (mn *MetricName) MarshalNoAccountIDProjectID(dst []byte) []byte {
tag := &mn.Tags[i] tag := &mn.Tags[i]
requiredSize += len(tag.Key) + len(tag.Value) + 2 requiredSize += len(tag.Key) + len(tag.Value) + 2
} }
dst = bytesutil.ResizeWithCopy(dst, requiredSize)[:dstLen] dst = bytesutil.ResizeWithCopyMayOverallocate(dst, requiredSize)[:dstLen]
dst = marshalTagValue(dst, mn.MetricGroup) dst = marshalTagValue(dst, mn.MetricGroup)
tags := mn.Tags tags := mn.Tags