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.

Sign up for GitHub

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

reuse cborreader in diskpersister #848

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

reuse cborreader in diskpersister #848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions events/diskpersist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,7 @@ func (dp *DiskPersistence) readEventsFrom(ctx context.Context, since int64, fn s

lastSeq := int64(0)

cr := cbg.NewCborReader(nil)
scratch := make([]byte, headerSize)
for {
h, err := readHeader(bufr, scratch)
Expand All @@ -731,10 +732,12 @@ func (dp *DiskPersistence) readEventsFrom(ctx context.Context, since int64, fn s
continue
}

limr := io.LimitReader(bufr, h.Len64())
cr.SetReader(limr)
switch h.Kind {
case evtKindCommit:
var evt atproto.SyncSubscribeRepos_Commit
if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len64())); err != nil {
if err := evt.UnmarshalCBOR(cr); err != nil {
return nil, err
}
evt.Seq = h.Seq
Expand All @@ -743,7 +746,7 @@ func (dp *DiskPersistence) readEventsFrom(ctx context.Context, since int64, fn s
}
case evtKindHandle:
var evt atproto.SyncSubscribeRepos_Handle
if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len64())); err != nil {
if err := evt.UnmarshalCBOR(cr); err != nil {
return nil, err
}
evt.Seq = h.Seq
Expand All @@ -752,7 +755,7 @@ func (dp *DiskPersistence) readEventsFrom(ctx context.Context, since int64, fn s
}
case evtKindIdentity:
var evt atproto.SyncSubscribeRepos_Identity
if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len64())); err != nil {
if err := evt.UnmarshalCBOR(cr); err != nil {
return nil, err
}
evt.Seq = h.Seq
Expand All @@ -761,7 +764,7 @@ func (dp *DiskPersistence) readEventsFrom(ctx context.Context, since int64, fn s
}
case evtKindAccount:
var evt atproto.SyncSubscribeRepos_Account
if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len64())); err != nil {
if err := evt.UnmarshalCBOR(cr); err != nil {
return nil, err
}
evt.Seq = h.Seq
Expand All @@ -770,7 +773,7 @@ func (dp *DiskPersistence) readEventsFrom(ctx context.Context, since int64, fn s
}
case evtKindTombstone:
var evt atproto.SyncSubscribeRepos_Tombstone
if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len64())); err != nil {
if err := evt.UnmarshalCBOR(cr); err != nil {
return nil, err
}
evt.Seq = h.Seq
Expand Down
Loading