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

Jump to bottom

Dedupe Reload/NoSyncReload, prefer empty instead of nil init #804

Merged
merged 1 commit into from
Aug 6, 2024
Merged

Dedupe Reload/NoSyncReload, prefer empty instead of nil init #804

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions internal/freelist/freelist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type ReadWriter interface {
// Write writes the freelist into the given page.
Write(page *common.Page)

// EstimatedWritePageSize returns the size of the freelist after serialization in Write.
// EstimatedWritePageSize returns the size in bytes of the freelist after serialization in Write.
// This should never underestimate the size.
EstimatedWritePageSize() int
}
Expand Down Expand Up @@ -46,7 +46,7 @@ type Interface interface {
ReleasePendingPages()

// Free releases a page and its overflow for a given transaction id.
// If the page is already free then a panic will occur.
// If the page is already free or is one of the meta pages, then a panic will occur.
Free(txId common.Txid, p *common.Page)

// Freed returns whether a given page is in the free list.
Expand All @@ -65,7 +65,7 @@ type Interface interface {
// NoSyncReload reads the freelist from Pgids and filters out pending items.
NoSyncReload(pgIds common.Pgids)

// freePageIds returns the IDs of all free pages.
// freePageIds returns the IDs of all free pages. Returns an empty slice if no free pages are available.
freePageIds() common.Pgids

// pendingPageIds returns all pending pages by transaction id.
Expand Down
24 changes: 3 additions & 21 deletions internal/freelist/shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,25 +208,7 @@ func (t *shared) Copyall(dst []common.Pgid) {

func (t *shared) Reload(p *common.Page) {
t.Read(p)

// Build a cache of only pending pages.
pcache := make(map[common.Pgid]bool)
for _, txp := range t.pending {
for _, pendingID := range txp.ids {
pcache[pendingID] = true
}
}

// Check each page in the freelist and build a new available freelist
// with any pages not in the pending lists.
var a []common.Pgid
for _, id := range t.freePageIds() {
if !pcache[id] {
a = append(a, id)
}
}

t.Init(a)
t.NoSyncReload(t.freePageIds())
}

func (t *shared) NoSyncReload(pgIds common.Pgids) {
Expand All @@ -240,7 +222,7 @@ func (t *shared) NoSyncReload(pgIds common.Pgids) {

// Check each page in the freelist and build a new available freelist
// with any pages not in the pending lists.
var a []common.Pgid
a := []common.Pgid{}
for _, id := range pgIds {
if !pcache[id] {
a = append(a, id)
Expand Down Expand Up @@ -274,7 +256,7 @@ func (t *shared) Read(p *common.Page) {

// Copy the list of page ids from the freelist.
if len(ids) == 0 {
t.Init(nil)
t.Init([]common.Pgid{})
} else {
// copy the ids, so we don't modify on the freelist page directly
idsCopy := make([]common.Pgid, len(ids))
Expand Down