-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
use local serialization lib, part-1 #30
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,171 @@ | ||
/* | ||
Copyright 2015 The Kubernetes Authors. | ||
Copyright 2022 Authors of Arktos - file modified. | ||
|
||
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 framer implements simple frame decoding techniques for an io.ReadCloser | ||
package framer | ||
|
||
import ( | ||
"encoding/binary" | ||
"encoding/json" | ||
"io" | ||
) | ||
|
||
type lengthDelimitedFrameWriter struct { | ||
w io.Writer | ||
h [4]byte | ||
} | ||
|
||
func NewLengthDelimitedFrameWriter(w io.Writer) io.Writer { | ||
return &lengthDelimitedFrameWriter{w: w} | ||
} | ||
|
||
// Write writes a single frame to the nested writer, prepending it with the length in | ||
// in bytes of data (as a 4 byte, bigendian uint32). | ||
func (w *lengthDelimitedFrameWriter) Write(data []byte) (int, error) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When you have time, can you make a quick introduction to the framer? Many thanks! |
||
binary.BigEndian.PutUint32(w.h[:], uint32(len(data))) | ||
n, err := w.w.Write(w.h[:]) | ||
if err != nil { | ||
return 0, err | ||
} | ||
if n != len(w.h) { | ||
return 0, io.ErrShortWrite | ||
} | ||
return w.w.Write(data) | ||
} | ||
|
||
type lengthDelimitedFrameReader struct { | ||
r io.ReadCloser | ||
remaining int | ||
} | ||
|
||
// NewLengthDelimitedFrameReader returns an io.Reader that will decode length-prefixed | ||
// frames off of a stream. | ||
// | ||
// The protocol is: | ||
// | ||
// stream: message ... | ||
// message: prefix body | ||
// prefix: 4 byte uint32 in BigEndian order, denotes length of body | ||
// body: bytes (0..prefix) | ||
// | ||
// If the buffer passed to Read is not long enough to contain an entire frame, io.ErrShortRead | ||
// will be returned along with the number of bytes read. | ||
func NewLengthDelimitedFrameReader(r io.ReadCloser) io.ReadCloser { | ||
return &lengthDelimitedFrameReader{r: r} | ||
} | ||
|
||
// Read attempts to read an entire frame into data. If that is not possible, io.ErrShortBuffer | ||
// is returned and subsequent calls will attempt to read the last frame. A frame is complete when | ||
// err is nil. | ||
func (r *lengthDelimitedFrameReader) Read(data []byte) (int, error) { | ||
if r.remaining <= 0 { | ||
header := [4]byte{} | ||
n, err := io.ReadAtLeast(r.r, header[:4], 4) | ||
if err != nil { | ||
return 0, err | ||
} | ||
if n != 4 { | ||
return 0, io.ErrUnexpectedEOF | ||
} | ||
frameLength := int(binary.BigEndian.Uint32(header[:])) | ||
r.remaining = frameLength | ||
} | ||
|
||
expect := r.remaining | ||
max := expect | ||
if max > len(data) { | ||
max = len(data) | ||
} | ||
n, err := io.ReadAtLeast(r.r, data[:max], int(max)) | ||
r.remaining -= n | ||
if err == io.ErrShortBuffer || r.remaining > 0 { | ||
return n, io.ErrShortBuffer | ||
} | ||
if err != nil { | ||
return n, err | ||
} | ||
if n != expect { | ||
return n, io.ErrUnexpectedEOF | ||
} | ||
|
||
return n, nil | ||
} | ||
|
||
func (r *lengthDelimitedFrameReader) Close() error { | ||
return r.r.Close() | ||
} | ||
|
||
type jsonFrameReader struct { | ||
r io.ReadCloser | ||
decoder *json.Decoder | ||
remaining []byte | ||
} | ||
|
||
// NewJSONFramedReader returns an io.Reader that will decode individual JSON objects off | ||
// of a wire. | ||
// | ||
// The boundaries between each frame are valid JSON objects. A JSON parsing error will terminate | ||
// the read. | ||
func NewJSONFramedReader(r io.ReadCloser) io.ReadCloser { | ||
return &jsonFrameReader{ | ||
r: r, | ||
decoder: json.NewDecoder(r), | ||
} | ||
} | ||
|
||
// ReadFrame decodes the next JSON object in the stream, or returns an error. The returned | ||
// byte slice will be modified the next time ReadFrame is invoked and should not be altered. | ||
func (r *jsonFrameReader) Read(data []byte) (int, error) { | ||
// Return whatever remaining data exists from an in progress frame | ||
if n := len(r.remaining); n > 0 { | ||
if n <= len(data) { | ||
//nolint:staticcheck // SA4006,SA4010 underlying array of data is modified here. | ||
data = append(data[0:0], r.remaining...) | ||
r.remaining = nil | ||
return n, nil | ||
} | ||
|
||
n = len(data) | ||
//nolint:staticcheck // SA4006,SA4010 underlying array of data is modified here. | ||
data = append(data[0:0], r.remaining[:n]...) | ||
r.remaining = r.remaining[n:] | ||
return n, io.ErrShortBuffer | ||
} | ||
|
||
// RawMessage#Unmarshal appends to data - we reset the slice down to 0 and will either see | ||
// data written to data, or be larger than data and a different array. | ||
n := len(data) | ||
m := json.RawMessage(data[:0]) | ||
if err := r.decoder.Decode(&m); err != nil { | ||
return 0, err | ||
} | ||
|
||
// If capacity of data is less than length of the message, decoder will allocate a new slice | ||
// and set m to it, which means we need to copy the partial result back into data and preserve | ||
// the remaining result for subsequent reads. | ||
if len(m) > n { | ||
//nolint:staticcheck // SA4006,SA4010 underlying array of data is modified here. | ||
data = append(data[0:0], m[:n]...) | ||
r.remaining = m[n:] | ||
return n, io.ErrShortBuffer | ||
} | ||
return len(m), nil | ||
} | ||
|
||
func (r *jsonFrameReader) Close() error { | ||
return r.r.Close() | ||
} |
177 changes: 177 additions & 0 deletions
177
resource-management/pkg/common-lib/framer/framer_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors. | ||
Copyright 2022 Authors of Arktos - file modified. | ||
|
||
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 framer | ||
|
||
import ( | ||
"bytes" | ||
"io" | ||
"io/ioutil" | ||
"testing" | ||
) | ||
|
||
func TestRead(t *testing.T) { | ||
data := []byte{ | ||
0x00, 0x00, 0x00, 0x04, | ||
0x01, 0x02, 0x03, 0x04, | ||
0x00, 0x00, 0x00, 0x03, | ||
0x05, 0x06, 0x07, | ||
0x00, 0x00, 0x00, 0x00, | ||
0x00, 0x00, 0x00, 0x01, | ||
0x08, | ||
} | ||
b := bytes.NewBuffer(data) | ||
r := NewLengthDelimitedFrameReader(ioutil.NopCloser(b)) | ||
buf := make([]byte, 1) | ||
if n, err := r.Read(buf); err != io.ErrShortBuffer && n != 1 && bytes.Equal(buf, []byte{0x01}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != io.ErrShortBuffer && n != 1 && bytes.Equal(buf, []byte{0x02}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
// read the remaining frame | ||
buf = make([]byte, 2) | ||
if n, err := r.Read(buf); err != nil && n != 2 && bytes.Equal(buf, []byte{0x03, 0x04}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
// read with buffer equal to frame | ||
buf = make([]byte, 3) | ||
if n, err := r.Read(buf); err != nil && n != 3 && bytes.Equal(buf, []byte{0x05, 0x06, 0x07}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
// read empty frame | ||
buf = make([]byte, 3) | ||
if n, err := r.Read(buf); err != nil && n != 0 && bytes.Equal(buf, []byte{}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
// read with larger buffer than frame | ||
buf = make([]byte, 3) | ||
if n, err := r.Read(buf); err != nil && n != 1 && bytes.Equal(buf, []byte{0x08}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
// read EOF | ||
if n, err := r.Read(buf); err != io.EOF && n != 0 { | ||
t.Fatalf("unexpected: %v %d", err, n) | ||
} | ||
} | ||
|
||
func TestReadLarge(t *testing.T) { | ||
data := []byte{ | ||
0x00, 0x00, 0x00, 0x04, | ||
0x01, 0x02, 0x03, 0x04, | ||
0x00, 0x00, 0x00, 0x03, | ||
0x05, 0x06, 0x07, | ||
0x00, 0x00, 0x00, 0x00, | ||
0x00, 0x00, 0x00, 0x01, | ||
0x08, | ||
} | ||
b := bytes.NewBuffer(data) | ||
r := NewLengthDelimitedFrameReader(ioutil.NopCloser(b)) | ||
buf := make([]byte, 40) | ||
if n, err := r.Read(buf); err != nil && n != 4 && bytes.Equal(buf, []byte{0x01, 0x02, 0x03, 0x04}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != nil && n != 3 && bytes.Equal(buf, []byte{0x05, 0x06, 0x7}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != nil && n != 0 && bytes.Equal(buf, []byte{}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != nil && n != 1 && bytes.Equal(buf, []byte{0x08}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
// read EOF | ||
if n, err := r.Read(buf); err != io.EOF && n != 0 { | ||
t.Fatalf("unexpected: %v %d", err, n) | ||
} | ||
} | ||
func TestReadInvalidFrame(t *testing.T) { | ||
data := []byte{ | ||
0x00, 0x00, 0x00, 0x04, | ||
0x01, 0x02, | ||
} | ||
b := bytes.NewBuffer(data) | ||
r := NewLengthDelimitedFrameReader(ioutil.NopCloser(b)) | ||
buf := make([]byte, 1) | ||
if n, err := r.Read(buf); err != io.ErrShortBuffer && n != 1 && bytes.Equal(buf, []byte{0x01}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
// read the remaining frame | ||
buf = make([]byte, 3) | ||
if n, err := r.Read(buf); err != io.ErrUnexpectedEOF && n != 1 && bytes.Equal(buf, []byte{0x02}) { | ||
t.Fatalf("unexpected: %v %d %v", err, n, buf) | ||
} | ||
// read EOF | ||
if n, err := r.Read(buf); err != io.EOF && n != 0 { | ||
t.Fatalf("unexpected: %v %d", err, n) | ||
} | ||
} | ||
|
||
func TestJSONFrameReader(t *testing.T) { | ||
b := bytes.NewBufferString("{\"test\":true}\n1\n[\"a\"]") | ||
r := NewJSONFramedReader(ioutil.NopCloser(b)) | ||
buf := make([]byte, 20) | ||
if n, err := r.Read(buf); err != nil || n != 13 || string(buf[:n]) != `{"test":true}` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != nil || n != 1 || string(buf[:n]) != `1` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != nil || n != 5 || string(buf[:n]) != `["a"]` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != io.EOF || n != 0 { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
} | ||
|
||
func TestJSONFrameReaderShortBuffer(t *testing.T) { | ||
b := bytes.NewBufferString("{\"test\":true}\n1\n[\"a\"]") | ||
r := NewJSONFramedReader(ioutil.NopCloser(b)) | ||
buf := make([]byte, 3) | ||
|
||
if n, err := r.Read(buf); err != io.ErrShortBuffer || n != 3 || string(buf[:n]) != `{"t` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != io.ErrShortBuffer || n != 3 || string(buf[:n]) != `est` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != io.ErrShortBuffer || n != 3 || string(buf[:n]) != `":t` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != io.ErrShortBuffer || n != 3 || string(buf[:n]) != `rue` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != nil || n != 1 || string(buf[:n]) != `}` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
|
||
if n, err := r.Read(buf); err != nil || n != 1 || string(buf[:n]) != `1` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
|
||
if n, err := r.Read(buf); err != io.ErrShortBuffer || n != 3 || string(buf[:n]) != `["a` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
if n, err := r.Read(buf); err != nil || n != 2 || string(buf[:n]) != `"]` { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
|
||
if n, err := r.Read(buf); err != io.EOF || n != 0 { | ||
t.Fatalf("unexpected: %v %d %q", err, n, buf) | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand the file was copied from Arktos. But the copyright header here looks a bit strange since all others do not have the header.