Skip to content
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
10 changes: 10 additions & 0 deletions src/DryDB/RangeIterator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ public bool TrySeek(ReadOnlySpan<byte> key)
currentPage?.Release();
currentPage = page;
}
else
{
// TrySearch acquired another reference to the page we already hold
page.Release();
}
currentEntryIndex = entryIndex;
return true;
}
Expand Down Expand Up @@ -169,6 +174,11 @@ public async ValueTask<bool> TrySeekAsync(
currentPage?.Release();
currentPage = page;
}
else
{
// TrySearch acquired another reference to the page we already hold
page.Release();
}
currentEntryIndex = entryIndex;
return true;
}
Expand Down
37 changes: 37 additions & 0 deletions tests/DryDB.Tests/RangeIteratorTest.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using DryDB.Internal;
Expand All @@ -7,6 +8,42 @@ namespace DryDB.Tests;
[TestFixture]
public class RangeIteratorTest
{
[Test]
public async Task Seek_SameKeyTwice_DoesNotLeakPageReference()
{
var tree = await TestHelper.BuildTreeAsync(
new UniqueKeyValueList(KeyEncoding.Ascii)
{
{ "key1"u8.ToArray(), "value1"u8.ToArray() },
{ "key2"u8.ToArray(), "value2"u8.ToArray() },
{ "key3"u8.ToArray(), "value3"u8.ToArray() },
{ "key5"u8.ToArray(), "value5"u8.ToArray() },
{ "key7"u8.ToArray(), "value7"u8.ToArray() },
{ "key8"u8.ToArray(), "value8"u8.ToArray() },
{ "key9"u8.ToArray(), "value9"u8.ToArray() },
}, 128);

var iterator = tree.CreateIterator();
Assert.That(iterator.TrySeek("key5"u8), Is.True);
Assert.That(iterator.TrySeek("key5"u8), Is.True);
Assert.That(await iterator.TrySeekAsync("key5"u8.ToArray()), Is.True);

// one reference held by the page cache + one held by the iterator
Assert.That(GetCurrentPageRefCount(iterator), Is.EqualTo(2));

Assert.That(
Encoding.ASCII.GetString(iterator.Current.Span),
Is.EqualTo("value5"));
}

static int GetCurrentPageRefCount(RangeIterator iterator)
{
var currentPage = typeof(RangeIterator)
.GetField("currentPage", BindingFlags.NonPublic | BindingFlags.Instance)!
.GetValue(iterator)!;
return (int)currentPage.GetType().GetField("RefCount")!.GetValue(currentPage)!;
}

[Test]
public async Task MoveNext_FirstValue()
{
Expand Down
Loading