Skip to content
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

feat: add data pointer value reader #9

Merged
merged 1 commit into from
Dec 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions pkg/btree/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,68 @@ type DataPointer struct {
FieldOffset, Length uint32
}

func (n *Node) encode(w io.Writer) error {
func (p DataPointer) Value(r io.ReadSeeker) ([]byte, error) {
buf := make([]byte, p.Length)
if _, err := r.Seek(int64(p.RecordOffset+uint64(p.FieldOffset)), io.SeekStart); err != nil {
return nil, err
}
n, err := r.Read(buf)
if err != nil {
return nil, err
}
if n != int(p.Length) {
return nil, io.ErrUnexpectedEOF
}
return buf, nil
}

func (n *Node) WriteTo(w io.Writer) (int64, error) {
size := n.Size
if n.Leaf {
// mark the first bit
size |= 1 << 7
}
if err := encoding.WriteUint8(w, size); err != nil {
return err
return 0, err
}
for i := 0; i < int(n.Size); i++ {
if err := encoding.WriteUint64(w, n.Keys[i].RecordOffset); err != nil {
return err
return 0, err
}
if err := encoding.WriteUint32(w, n.Keys[i].FieldOffset); err != nil {
return err
return 0, err
}
if err := encoding.WriteUint32(w, n.Keys[i].Length); err != nil {
return err
return 0, err
}
}
for i := 0; i < int(n.Size)+1; i++ {
if err := encoding.WriteUint64(w, n.Children[i]); err != nil {
return err
return 0, err
}
}
return nil
return 1 + 16*int64(n.Size) + 8*int64(n.Size+1), nil
}

func (n *Node) decode(r io.Reader) error {
func (n *Node) ReadFrom(r io.Reader) (int64, error) {
size, err := encoding.ReadByte(r)
if err != nil {
return err
return 0, err
}
n.Size = size & 0x7f
n.Leaf = size&(1<<7) != 0
for i := 0; i < int(n.Size); i++ {
recordOffset, err := encoding.ReadUint64(r)
if err != nil {
return err
return 0, err
}
fieldOffset, err := encoding.ReadUint32(r)
if err != nil {
return err
return 0, err
}
length, err := encoding.ReadUint32(r)
if err != nil {
return err
return 0, err
}
n.Keys[i] = DataPointer{
RecordOffset: recordOffset,
Expand All @@ -75,9 +90,9 @@ func (n *Node) decode(r io.Reader) error {
for i := 0; i < int(n.Size)+1; i++ {
child, err := encoding.ReadUint64(r)
if err != nil {
return err
return 0, err
}
n.Children[i] = child
}
return nil
return 1 + 16*int64(n.Size) + 8*int64(n.Size+1), nil
}
25 changes: 22 additions & 3 deletions pkg/btree/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestNode(t *testing.T) {
Leaf: true,
}
buf := &bytes.Buffer{}
if err := n.encode(buf); err != nil {
if _, err := n.WriteTo(buf); err != nil {
t.Fatal(err)
}
if buf.Len() != 1+16*2+8*3 {
Expand All @@ -53,15 +53,34 @@ func TestNode(t *testing.T) {
Leaf: true,
}
buf := &bytes.Buffer{}
if err := n.encode(buf); err != nil {
if _, err := n.WriteTo(buf); err != nil {
t.Fatal(err)
}
m := &Node{}
if err := m.decode(buf); err != nil {
if _, err := m.ReadFrom(buf); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(n, m) {
t.Fatalf("expected decoded node to be equal to original node")
}
})
}

func TestDataPointer(t *testing.T) {
buf := newSeekableBuffer()
if _, err := buf.Write([]byte("moocowslmao")); err != nil {
t.Fatal(err)
}
p := DataPointer{
RecordOffset: 1,
FieldOffset: 2,
Length: 5,
}
b, err := p.Value(buf)
if err != nil {
t.Fatal(err)
}
if !bytes.Equal(b, []byte("cowsl")) {
t.Fatalf("expected value to be ocows, got %s", string(b))
}
}