Skip to content

Fix ColumnsDb constructor recursion and reuse resolved keys #9818

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
LukaszRozmej merged 2 commits into from
Nov 28, 2025
Merged

Fix ColumnsDb constructor recursion and reuse resolved keys #9818

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c23d1c
Update ColumnsDb.cs
soniseth0 Nov 28, 2025
454858f
Update ColumnsDb.cs
soniseth0 Nov 28, 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
17 changes: 14 additions & 3 deletions src/Nethermind/Nethermind.Db.Rocks/ColumnsDb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ public class ColumnsDb<T> : DbOnTheRocks, IColumnsDb<T> where T : struct, Enum
private readonly IDictionary<T, ColumnDb> _columnDbs = new Dictionary<T, ColumnDb>();

public ColumnsDb(string basePath, DbSettings settings, IDbConfig dbConfig, IRocksDbConfigFactory rocksDbConfigFactory, ILogManager logManager, IReadOnlyList<T> keys, IntPtr? sharedCache = null)
: base(basePath, settings, dbConfig, rocksDbConfigFactory, logManager, GetEnumKeys(keys).Select(static (key) => key.ToString()).ToList(), sharedCache: sharedCache)
: this(basePath, settings, dbConfig, rocksDbConfigFactory, logManager, ResolveKeys(keys), sharedCache)
{
keys = GetEnumKeys(keys);
}

foreach (T key in keys)
private ColumnsDb(string basePath, DbSettings settings, IDbConfig dbConfig, IRocksDbConfigFactory rocksDbConfigFactory, ILogManager logManager, (IReadOnlyList<T> Keys, IList<string> ColumnNames) keyInfo, IntPtr? sharedCache)
: base(basePath, settings, dbConfig, rocksDbConfigFactory, logManager, keyInfo.ColumnNames, sharedCache: sharedCache)
{
foreach (T key in keyInfo.Keys)
{
_columnDbs[key] = new ColumnDb(_db, this, key.ToString()!);
}
Expand Down Expand Up @@ -61,6 +64,14 @@ private static IReadOnlyList<T> GetEnumKeys(IReadOnlyList<T> keys)
return keys;
}

private static (IReadOnlyList<T> Keys, IList<string> ColumnNames) ResolveKeys(IReadOnlyList<T> keys)
{
IReadOnlyList<T> resolvedKeys = GetEnumKeys(keys);
IList<string> columnNames = resolvedKeys.Select(static key => key.ToString()).ToList();

return (resolvedKeys, columnNames);
}

protected override void BuildOptions<TOptions>(IRocksDbConfig dbConfig, Options<TOptions> options, IntPtr? sharedCache, IMergeOperator? mergeOperator)
{
base.BuildOptions(dbConfig, options, sharedCache, mergeOperator);
Expand Down