Skip to content

[DB-1650]: Use single file handle in PTable #5310

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

Merged
merged 16 commits into from
Oct 16, 2025
Merged

[DB-1650]: Use single file handle in PTable #5310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
87dea40
Fixed compiler warnings
sakno Oct 10, 2025
781c73f
Fixed compiler warnings
sakno Oct 10, 2025
be856be
Migration to modern incremental hash
sakno Oct 10, 2025
eb9a75b
Modernize version analysis
sakno Oct 10, 2025
8c55293
Reuse reinterpret cast
sakno Oct 10, 2025
ee8f6cf
Fixed compiler errors
sakno Oct 10, 2025
e7b7269
Migration of index to random file access
sakno Oct 13, 2025
2cb7a87
Code cleanup
sakno Oct 13, 2025
6a392bb
Reuse constants for clarity
sakno Oct 13, 2025
368c3d2
Fixed compiler warning
sakno Oct 13, 2025
a8004ec
Code cleanup
sakno Oct 13, 2025
653edb4
Reduced struct size
sakno Oct 13, 2025
8176cea
Reference field directly to avoid copy on stack
sakno Oct 14, 2025
ef580c5
Added more assertions to check correctness
sakno Oct 16, 2025
aa81f45
Update src/KurrentDB.Core/Configuration/ClusterVNodeOptions.cs
sakno Oct 16, 2025
cb757d2
Fixed compiler error
sakno Oct 16, 2025
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
9 changes: 3 additions & 6 deletions src/KurrentDB.Common/Utils/Empty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
namespace KurrentDB.Common.Utils;

public static class Empty {
public static readonly byte[] ByteArray = new byte[0];
public static readonly string[] StringArray = new string[0];
public static readonly object[] ObjectArray = new object[0];
public static byte[] ByteArray => [];

public static readonly Action Action = () => { };
public static readonly object Result = new object();
public static readonly string Xml = String.Empty;
public static readonly object Result = new();
public static readonly string Xml = string.Empty;
public static readonly string Json = "{}";
}
20 changes: 0 additions & 20 deletions src/KurrentDB.Core.Tests/Constants.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_set.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ protected void AddTables(int count) {
var first = _map;
if (_result != null)
first = _result.MergedMap;
var pTable = PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
var pTable = PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify);
_result = first.AddAndMergePTable(pTable,
10, 20, _fileNameProvider, _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
for (int i = 3; i <= count * 2; i += 2) {
pTable = PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
pTable = PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify);
_result = _result.MergedMap.AddAndMergePTable(
pTable,
prepareCheckpoint: i * 10,
Expand Down
5 changes: 2 additions & 3 deletions src/KurrentDB.Core.Tests/Index/IndexMapTestFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ public static IndexMap FromFile(string filename, int maxTablesPerLevel = 4,
bool useBloomFilter = true,
int lruCacheSize = 1_000_000,
int threads = 1,
int maxAutoMergeLevel = int.MaxValue,
int pTableMaxReaderCount = Constants.PTableMaxReaderCountDefault) {
int maxAutoMergeLevel = int.MaxValue) {
return IndexMap.FromFile(filename, maxTablesPerLevel, loadPTables, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize, threads,
maxAutoMergeLevel, pTableMaxReaderCount);
maxAutoMergeLevel);
}
}
2 changes: 1 addition & 1 deletion src/KurrentDB.Core.Tests/Index/IndexV1/PTableReadScenario.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public override async Task SetUp() {

AddItemsForScenario(table);

PTable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, cacheDepth: _midpointCacheDepth,
PTable = PTable.FromMemtable(table, Filename, cacheDepth: _midpointCacheDepth,
skipIndexVerify: _skipIndexVerify);
}

Expand Down
8 changes: 4 additions & 4 deletions ...x/IndexV1/adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,27 @@ public override async Task TestFixtureSetUp() {
memtable.Add(0, 1, 0);

_result = _map.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 1, 2,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 1, 2,
new GuidFilenameProvider(PathName),
_ptableVersion,
0,
skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());

_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 3, 4,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 3, 4,
new GuidFilenameProvider(PathName),
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());

_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 4, 5,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 4, 5,
new GuidFilenameProvider(PathName),
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());

_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 1,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 1,
new FakeFilenameProvider(_mergeFile),
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
Expand Down
8 changes: 4 additions & 4 deletions ...xV1/adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,25 @@ public override async Task TestFixtureSetUp() {
memtable.Add(0, 1, 0);

_result = _map.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify),
10, 20,
new GuidFilenameProvider(PathName), _ptableVersion, 0,
skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify),
20, 30,
new GuidFilenameProvider(PathName), _ptableVersion, 0,
skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify),
30, 40,
new GuidFilenameProvider(PathName), _ptableVersion, 0,
skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify),
50, 60,
new FakeFilenameProvider(_mergeFile + ".firstmerge", _mergeFile), _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
Expand Down
2 changes: 1 addition & 1 deletion src/KurrentDB.Core.Tests/Index/IndexV1/adding_item_to_empty_index_map.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public override async Task TestFixtureSetUp() {
_map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
memtable.Add(0, 1, 0);
var table = PTable.FromMemtable(memtable, _tablename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
var table = PTable.FromMemtable(memtable, _tablename, skipIndexVerify: _skipIndexVerify);
_result = _map.AddAndMergePTable(table, 7, 11,
new FakeFilenameProvider(_mergeFile), _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
table.MarkForDestruction();
Expand Down
32 changes: 16 additions & 16 deletions ...adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,82 +47,82 @@ public override async Task TestFixtureSetUp() {
memtable.Add(0, 1, 0);
var guidFilename = new GuidFilenameProvider(PathName);
_result = _map.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 0, 0,
guidFilename,
_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 1, 2,
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify), 1, 2,
new FakeFilenameProvider(_finalmergefile, _finalmergefile2), _ptableVersion, 0,
skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
Expand Down
4 changes: 2 additions & 2 deletions ...dex/IndexV1/adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ public override async Task TestFixtureSetUp() {
memtable.Add(0, 1, 0);

_result = _map.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify),
123, 321,
new GuidFilenameProvider(PathName), _ptableVersion, 0,
skipIndexVerify: _skipIndexVerify);
_result.ToDelete.ForEach(x => x.MarkForDestruction());
_result = _result.MergedMap.AddAndMergePTable(
PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
PTable.FromMemtable(memtable, GetTempFilePath(), skipIndexVerify: _skipIndexVerify),
100, 400,
new FakeFilenameProvider(_mergeFile), _ptableVersion, 0,
skipIndexVerify: _skipIndexVerify);
Expand Down
Loading
Loading