Skip to content

fix(embedded/tbtree): add marker entry to store timestamp when tree i… #2048

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

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

fix(embedded/tbtree): add marker entry to store timestamp when tree i… #2048

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
29 changes: 24 additions & 5 deletions embedded/tbtree/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,15 @@ func (n *innerNode) writeTo(nw, hw io.Writer, writeOpts *WriteOpts, buf []byte)
buf[bi] = InnerNodeType
bi++

binary.BigEndian.PutUint16(buf[bi:], uint16(len(n.nodes)))
bi += 2
if n.tsMutated() {
binary.BigEndian.PutUint16(buf[bi:], uint16(len(n.nodes)+1))
bi += 2

bi += writeNodeRefToWithOffset(n, math.MaxInt64, math.MaxInt64, buf[bi:])
} else {
binary.BigEndian.PutUint16(buf[bi:], uint16(len(n.nodes)))
bi += 2
}

for i, c := range n.nodes {
n := writeNodeRefToWithOffset(c, offsets[i], minOffsets[i], buf[bi:])
Expand Down Expand Up @@ -505,11 +512,23 @@ func (l *leafNode) writeTo(nw, hw io.Writer, writeOpts *WriteOpts, buf []byte) (
buf[bi] = LeafNodeType
bi++

binary.BigEndian.PutUint16(buf[bi:], uint16(len(l.values)))
bi += 2
if l.tsMutated() {
// NOTE: we store a marker entry to remember the highest timestamp seen

accH := int64(0)
binary.BigEndian.PutUint16(buf[bi:], uint16(len(l.values)+1))
bi += 2

binary.BigEndian.PutUint16(buf[bi:], 0)
bi += 2

binary.BigEndian.PutUint64(buf[bi:], l._ts)
bi += 8
} else {
binary.BigEndian.PutUint16(buf[bi:], uint16(len(l.values)))
bi += 2
}

accH := int64(0)
for _, v := range l.values {
timedValue := v.timedValues[0]

Expand Down
51 changes: 43 additions & 8 deletions embedded/tbtree/tbtree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ type node interface {
minKey() []byte
ts() uint64
setTs(ts uint64) (node, error)
tsMutated() bool
size() (int, error)
mutated() bool
offset() int64 // only valid when !mutated()
Expand Down Expand Up @@ -825,7 +826,6 @@ func (t *TBtree) readNodeFrom(r *appendable.Reader) (node, error) {
n.off = off
return n, nil
}

return nil, ErrReadingFileContent
}

Expand All @@ -837,7 +837,7 @@ func (t *TBtree) readInnerNodeFrom(r *appendable.Reader) (*innerNode, error) {

n := &innerNode{
t: t,
nodes: make([]node, childCount),
nodes: make([]node, 0, childCount),
_minOff: math.MaxInt64,
}

Expand All @@ -847,7 +847,13 @@ func (t *TBtree) readInnerNodeFrom(r *appendable.Reader) (*innerNode, error) {
return nil, err
}

n.nodes[c] = nref
// marker node
if nref.off == math.MaxInt64 {
n._ts = nref.ts()
continue
}

n.nodes = append(n.nodes, nref)

if n._ts < nref._ts {
n._ts = nref._ts
Expand All @@ -857,7 +863,6 @@ func (t *TBtree) readInnerNodeFrom(r *appendable.Reader) (*innerNode, error) {
n._minOff = nref._minOff
}
}

return n, nil
}

Expand Down Expand Up @@ -905,7 +910,7 @@ func (t *TBtree) readLeafNodeFrom(r *appendable.Reader) (*leafNode, error) {

l := &leafNode{
t: t,
values: make([]*leafValue, valueCount),
values: make([]*leafValue, 0, valueCount),
}

for c := 0; c < int(valueCount); c++ {
Expand All @@ -914,6 +919,16 @@ func (t *TBtree) readLeafNodeFrom(r *appendable.Reader) (*leafNode, error) {
return nil, err
}

if ksize == 0 {
ts, err := r.ReadUint64()
if err != nil {
return nil, err
}

l._ts = ts
continue
}

key := make([]byte, ksize)
_, err = r.Read(key)
if err != nil {
Expand Down Expand Up @@ -953,13 +968,12 @@ func (t *TBtree) readLeafNodeFrom(r *appendable.Reader) (*leafNode, error) {
hCount: hCount,
}

l.values[c] = leafValue
l.values = append(l.values, leafValue)

if l._ts < ts {
l._ts = ts
}
}

return l, nil
}

Expand Down Expand Up @@ -1607,7 +1621,6 @@ func (t *TBtree) IncreaseTs(ts uint64) error {
_, _, err := t.flushTree(t.cleanupPercentage, false, false, "increaseTs")
return err
}

return nil
}

Expand Down Expand Up @@ -2097,6 +2110,15 @@ func (n *innerNode) size() (int, error) {
return size, nil
}

func (l *innerNode) tsMutated() bool {
for _, nd := range l.nodes {
if nd.ts() >= l.ts() {
return false
}
}
return true
}

func (n *innerNode) mutated() bool {
return n.mut
}
Expand Down Expand Up @@ -2265,6 +2287,10 @@ func (r *nodeRef) size() (int, error) {
return n.size()
}

func (r *nodeRef) tsMutated() bool {
return false
}

func (r *nodeRef) mutated() bool {
return false
}
Expand Down Expand Up @@ -2600,6 +2626,15 @@ func (l *leafNode) size() (int, error) {
return size, nil
}

func (l *leafNode) tsMutated() bool {
for _, v := range l.values {
if v.timedValues[0].Ts >= l.ts() {
return false
}
}
return true
}

func (l *leafNode) mutated() bool {
return l.mut
}
Expand Down
94 changes: 94 additions & 0 deletions embedded/tbtree/tbtree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,100 @@ func TestTBTreeIncreaseTs(t *testing.T) {
require.ErrorIs(t, err, ErrAlreadyClosed)
}

func TestTBTreeFlushAfterIncreaseTs(t *testing.T) {
dir := t.TempDir()
t.Cleanup(func() {
os.RemoveAll(dir)
})

tbtree, err := Open(dir, DefaultOptions())
require.NoError(t, err)

t.Run("increase ts to empty tree", func(t *testing.T) {
err = tbtree.IncreaseTs(100)
require.NoError(t, err)

_, _, err = tbtree.Flush()
require.NoError(t, err)

err = tbtree.Close()
require.NoError(t, err)

tbtree, err = Open(dir, DefaultOptions())
require.NoError(t, err)

require.Equal(t, tbtree.Ts(), uint64(100))
})

insertValues := func(n int) {
for i := 0; i < n; i++ {
var buf [4]byte
binary.BigEndian.PutUint32(buf[:], uint32(i))

err := tbtree.Insert(
buf[:],
buf[:],
)
require.NoError(t, err)
}
}

t.Run("increase ts after insertions", func(t *testing.T) {
insertValues(10)
require.Equal(t, uint64(110), tbtree.Ts())

err := tbtree.IncreaseTs(200)
require.NoError(t, err)

_, _, err = tbtree.Flush()
require.NoError(t, err)

err = tbtree.Close()
require.NoError(t, err)

tbtree, err = Open(dir, DefaultOptions())
require.NoError(t, err)

require.Equal(t, uint64(200), tbtree.Ts())

ln, isLeaf := tbtree.root.(*leafNode)
require.True(t, isLeaf)

require.Equal(t, uint64(200), ln.ts())
require.Len(t, ln.values, 10)

for _, v := range ln.values {
require.Less(t, v.timedValue().Ts, ln.ts())
}
})

t.Run("increase ts after more insertions", func(t *testing.T) {
insertValues(1000)
require.Equal(t, uint64(1200), tbtree.Ts())

err := tbtree.IncreaseTs(2500)
require.NoError(t, err)

_, _, err = tbtree.Flush()
require.NoError(t, err)

err = tbtree.Close()
require.NoError(t, err)

tbtree, err = Open(dir, DefaultOptions())
require.NoError(t, err)

require.Equal(t, uint64(2500), tbtree.Ts())

nd, isInner := tbtree.root.(*innerNode)
require.True(t, isInner)

for _, child := range nd.nodes {
require.Less(t, child.ts(), nd.ts())
}
})
}

func BenchmarkRandomInsertion(b *testing.B) {
seed := rand.NewSource(time.Now().UnixNano())
rnd := rand.New(seed)
Expand Down
Loading