mirror of
https://github.com/prometheus/prometheus.git
synced 2025-03-05 20:59:13 -08:00
remote-read: Added stream writer and reader.
This is inspired by https://github.com/kythe/kythe/blob/master/kythe/go/platform/delimited/delimited.go but bit improved and tailored to our needs. Signed-off-by: Bartek Plotka <bwplotka@gmail.com> Fixed typos in the comment. Signed-off-by: Bartek Plotka <bwplotka@gmail.com> Moved to chunked* naming, added flusher. Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
This commit is contained in:
parent
46943c6bda
commit
a91ee49705
103
storage/remote/chunked.go
Normal file
103
storage/remote/chunked.go
Normal file
|
@ -0,0 +1,103 @@
|
|||
// Copyright 2019 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.
|
||||
package remote
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"encoding/binary"
|
||||
"github.com/gogo/protobuf/proto"
|
||||
"io"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// ChunkedWriter is an io.Writer wrapper that allows streaming by adding uvarint delimiter before each write in a form
|
||||
// of length of the corresponded byte array.
|
||||
type ChunkedWriter struct {
|
||||
writer io.Writer
|
||||
flusher http.Flusher
|
||||
}
|
||||
|
||||
// NewChunkedWriter constructs a ChunkedWriter.
|
||||
func NewChunkedWriter(w io.Writer, f http.Flusher) *ChunkedWriter {
|
||||
return &ChunkedWriter{writer: w, flusher: f}
|
||||
}
|
||||
|
||||
// Write writes given bytes to the stream. It adds uvarint delimiter before each message.
|
||||
// Returned bytes number represents sent bytes for a given buffer. The number does not include delimiter bytes.
|
||||
// It does the flushing for you.
|
||||
func (w *ChunkedWriter) Write(b []byte) (int, error) {
|
||||
if len(b) == 0 {
|
||||
return 0, nil
|
||||
}
|
||||
|
||||
var buf [binary.MaxVarintLen64]byte
|
||||
v := binary.PutUvarint(buf[:], uint64(len(b)))
|
||||
|
||||
if _, err := w.writer.Write(buf[:v]); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
n, err := w.writer.Write(b)
|
||||
if err != nil {
|
||||
return n, err
|
||||
}
|
||||
|
||||
w.flusher.Flush()
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// ChunkedReader is a buffered reader that expects uvarint delimiter before each message.
|
||||
// It will allocate as much as the biggest frame defined by delimiter (on top of bufio.Reader allocations).
|
||||
type ChunkedReader struct {
|
||||
b *bufio.Reader
|
||||
data []byte
|
||||
}
|
||||
|
||||
// NewChunkedReader constructs a ChunkedReader.
|
||||
func NewChunkedReader(r io.Reader) *ChunkedReader {
|
||||
return &ChunkedReader{b: bufio.NewReader(r)}
|
||||
}
|
||||
|
||||
// Next returns the next length-delimited record from the input, or io.EOF if
|
||||
// there are no more records available. Returns io.ErrUnexpectedEOF if a short
|
||||
// record is found, with a length of n but fewer than n bytes of data.
|
||||
//
|
||||
// NOTE: The slice returned is valid only until a subsequent call to Next. It's a caller's responsibility to copy the
|
||||
// returned slice if needed.
|
||||
func (r *ChunkedReader) Next() ([]byte, error) {
|
||||
size, err := binary.ReadUvarint(r.b)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if cap(r.data) < int(size) {
|
||||
r.data = make([]byte, size)
|
||||
} else {
|
||||
r.data = r.data[:size]
|
||||
}
|
||||
|
||||
if _, err := io.ReadFull(r.b, r.data); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return r.data, nil
|
||||
}
|
||||
|
||||
// NextProto consumes the next available record by calling r.Next, and decodes
|
||||
// it into the protobuf with proto.Unmarshal.
|
||||
func (r *ChunkedReader) NextProto(pb proto.Message) error {
|
||||
rec, err := r.Next()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return proto.Unmarshal(rec, pb)
|
||||
}
|
72
storage/remote/chunked_test.go
Normal file
72
storage/remote/chunked_test.go
Normal file
|
@ -0,0 +1,72 @@
|
|||
// Copyright 2019 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.
|
||||
package remote
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"github.com/prometheus/prometheus/util/testutil"
|
||||
"io"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type mockedFlusher struct {
|
||||
flushed int
|
||||
}
|
||||
|
||||
func (f *mockedFlusher) Flush() {
|
||||
f.flushed++
|
||||
}
|
||||
|
||||
func TestStreamReaderCanReadWriter(t *testing.T) {
|
||||
b := &bytes.Buffer{}
|
||||
f := &mockedFlusher{}
|
||||
w := NewChunkedWriter(b, f)
|
||||
r := NewChunkedReader(b)
|
||||
|
||||
msgs := [][]byte{
|
||||
[]byte("test1"),
|
||||
[]byte("test2"),
|
||||
[]byte("test3"),
|
||||
[]byte("test4"),
|
||||
[]byte{}, // This is ignored by writer.
|
||||
[]byte("test5-after-empty"),
|
||||
}
|
||||
|
||||
for _, msg := range msgs {
|
||||
n, err := w.Write(msg)
|
||||
testutil.Ok(t, err)
|
||||
testutil.Equals(t, len(msg), n)
|
||||
}
|
||||
|
||||
i := 0
|
||||
for ; i < 4; i++ {
|
||||
msg, err := r.Next()
|
||||
testutil.Ok(t, err)
|
||||
testutil.Assert(t, i < len(msgs), "more messages then expected")
|
||||
testutil.Equals(t, msgs[i], msg)
|
||||
}
|
||||
|
||||
// Empty byte slice is skipped.
|
||||
i++
|
||||
|
||||
msg, err := r.Next()
|
||||
testutil.Ok(t, err)
|
||||
testutil.Assert(t, i < len(msgs), "more messages then expected")
|
||||
testutil.Equals(t, msgs[i], msg)
|
||||
|
||||
_, err = r.Next()
|
||||
testutil.NotOk(t, err, "expected io.EOF")
|
||||
testutil.Equals(t, io.EOF, err)
|
||||
|
||||
testutil.Equals(t, 5, f.flushed)
|
||||
}
|
Loading…
Reference in a new issue