diff --git a/src/SharpCoreDB/DataStructures/Table.CRUD.cs b/src/SharpCoreDB/DataStructures/Table.CRUD.cs index fdaee9fd..1d2984c5 100644 --- a/src/SharpCoreDB/DataStructures/Table.CRUD.cs +++ b/src/SharpCoreDB/DataStructures/Table.CRUD.cs @@ -20,6 +20,9 @@ public partial class Table /// Error message used by every write path when the table is opened read-only. private const string ReadOnlyInsertError = "Cannot insert in readonly mode"; + /// Error message used by every DELETE path when the table is opened read-only. + private const string ReadOnlyDeleteError = "Cannot delete in readonly mode"; + /// /// Inserts a row into the table. /// Routes to columnar or page-based storage ENGINE based on StorageMode. @@ -1615,6 +1618,29 @@ private void ValidateUpdatedRow(Dictionary row) } } + /// + /// Patches a single row in place when the existing record bytes can be located and every + /// updated field fits its slot (fixed-size fields resolved at their actual offsets, or an + /// unchanged-size trailing variable field); otherwise falls back to a full serialization. + /// A same-length patch enables an in-place overwrite (Issue #6) so the file does not grow. + /// + private byte[] TryPatchOrSerializeRow(byte[]? existingData, Dictionary updates, Dictionary row) + { + if (existingData is { Length: > 0 }) + { + var patched = _fixedWidthRecords + ? TryOverwriteFixedWidthInPlace(existingData, updates) + : TryOverwriteFieldsInPlaceActual(existingData, updates); + + if (patched is not null) + { + return patched; + } + } + + return SerializeRowExact(row); + } + private void UpdateColumnarRow(Dictionary row, IStorageEngine engine, Dictionary updates, string? oldPkValue, Dictionary? oldHashKeys, long rowPos) { // Fixed-width layout step: when the row's existing bytes can be located, patch @@ -1627,12 +1653,7 @@ private void UpdateColumnarRow(Dictionary row, IStorageEngine en if (rowPos >= 0) { var existingData = engine.Read(Name, rowPos); - rowData = existingData is { Length: > 0 } - && (_fixedWidthRecords - ? TryOverwriteFixedWidthInPlace(existingData, updates) - : TryOverwriteFieldsInPlaceActual(existingData, updates)) is { } patched - ? patched - : SerializeRowExact(row); + rowData = TryPatchOrSerializeRow(existingData, updates, row); } else { @@ -1771,7 +1792,7 @@ private void RepointPrimaryKeyIfChanged(Dictionary row, string? /// via the PK when present). The position lets the columnar write path patch fields in place /// (fixed-width layout) instead of appending a new version. /// - private List<(long Position, Dictionary Row)> ResolveUpdateRows(string? where) + private List<(long Position, Dictionary Row)> ResolveUpdateRows(string? where) // NOSONAR:S3776 - sequential guarded index-resolution steps (PK -> hash -> scan); extracting branches would re-read/duplicate shared fallbacks { var engine = GetOrCreateStorageEngine(); var result = new List<(long, Dictionary)>(); @@ -1866,7 +1887,7 @@ private void RepointPrimaryKeyIfChanged(Dictionary row, string? /// The storage position after relocation. /// The PK value before the update (may be null if the table has no PK). /// The PK value after the update (may be null if the table has no PK). - private void RepointIndexesAfterRelocation(long oldPosition, long newPosition, string? oldPkValue, string? newPkValue) + private void RepointIndexesAfterRelocation(long oldPosition, long newPosition, string? oldPkValue, string? newPkValue) // NOSONAR:S1172 - oldPosition retained for call-site symmetry with relocation-reporting engines (all callers already hold it) { if (this.PrimaryKeyIndex >= 0) { @@ -1933,7 +1954,7 @@ internal void UpdateMultiple(List<(string where, Dictionary upda bool touchesHashIndexedColumn = false; if (this.hashIndexes.Count > 0) { - foreach (var updateKey in updates.Keys) + foreach (var updateKey in updates.Keys) // NOSONAR:S3267 - updates.Keys is tiny; LINQ would add a closure + enumerator alloc per op in the batch-DML hot path { if (this.hashIndexes.ContainsKey(updateKey)) { @@ -2167,12 +2188,7 @@ internal void UpdateMultiple(List<(string where, Dictionary upda if (oldPosition >= 0) { var existingData = engine.Read(Name, oldPosition); - rowData = existingData is { Length: > 0 } - && (_fixedWidthRecords - ? TryOverwriteFixedWidthInPlace(existingData, updates) - : TryOverwriteFieldsInPlaceActual(existingData, updates)) is { } patched - ? patched - : SerializeRowExact(row); + rowData = TryPatchOrSerializeRow(existingData, updates, row); } else { @@ -2312,7 +2328,7 @@ private bool HasColumnCheckConstraints() return false; } - foreach (var expr in expressions) + foreach (var expr in expressions) // NOSONAR:S3267 - LINQ would allocate per call; this runs per UPDATE op in the batch-DML hot path { if (expr is not null) { @@ -2347,7 +2363,7 @@ private bool HasExplicitNamedIndex(string column) /// cleanup, key-only hash-index cleanup (single lock per index) and row-count bookkeeping. /// /// The storage positions and their deserialized rows. - private void DeleteRecordsCore(List<(long storagePosition, Dictionary row)> recordsToDelete) + private void DeleteRecordsCore(List<(long storagePosition, Dictionary row)> recordsToDelete) // NOSONAR:S3776 - per-engine physical delete, PK cleanup, key-only hash removal and compaction bookkeeping are distinct but share the batch; extraction would force intermediate lists { if (recordsToDelete.Count == 0) return; @@ -2438,7 +2454,7 @@ public void Delete(string? where) /// public int DeleteAffected(string? where) { - if (this.isReadOnly) throw new InvalidOperationException("Cannot delete in readonly mode"); + if (this.isReadOnly) throw new InvalidOperationException(ReadOnlyDeleteError); this.rwLock.EnterWriteLock(); try @@ -2462,7 +2478,7 @@ public int DeleteAffected(string? where) /// public List> DeleteAffectedRows(string? where) { - if (this.isReadOnly) throw new InvalidOperationException("Cannot delete in readonly mode"); + if (this.isReadOnly) throw new InvalidOperationException(ReadOnlyDeleteError); this.rwLock.EnterWriteLock(); try @@ -2637,7 +2653,7 @@ public List> DeleteAffectedRows(string? where) [MethodImpl(MethodImplOptions.AggressiveOptimization)] internal void DeleteMultiple(List whereConditions) { - if (this.isReadOnly) throw new InvalidOperationException("Cannot delete in readonly mode"); + if (this.isReadOnly) throw new InvalidOperationException(ReadOnlyDeleteError); if (whereConditions.Count == 0) return; this.rwLock.EnterWriteLock(); @@ -3102,7 +3118,7 @@ public bool UpdateByPrimaryKey(object key, Dictionary updates) // WP13: capture only what index maintenance needs instead of copying the whole row. Dictionary? oldHashKeys = null; - foreach (var kvp in this.hashIndexes) + foreach (var kvp in this.hashIndexes) // NOSONAR:S3267 - deliberate: LINQ Select/Where would allocate per point-update on the hot path { if (row.TryGetValue(kvp.Key, out var oldVal)) { @@ -3202,7 +3218,7 @@ public bool DeleteByPrimaryKey(object key) ArgumentNullException.ThrowIfNull(key); if (this.isReadOnly) - throw new InvalidOperationException("Cannot delete in readonly mode"); + throw new InvalidOperationException(ReadOnlyDeleteError); if (this.PrimaryKeyIndex < 0) return false; diff --git a/src/SharpCoreDB/DataStructures/Table.Serialization.cs b/src/SharpCoreDB/DataStructures/Table.Serialization.cs index 15893b36..5925b4bf 100644 --- a/src/SharpCoreDB/DataStructures/Table.Serialization.cs +++ b/src/SharpCoreDB/DataStructures/Table.Serialization.cs @@ -1021,7 +1021,7 @@ private int EstimateRowSize(Dictionary row) /// The data type of the value. /// Number of bytes written. [MethodImpl(MethodImplOptions.AggressiveOptimization)] - internal static int WriteTypedValueToSpan(Span buffer, object value, DataType type) + internal static int WriteTypedValueToSpan(Span buffer, object value, DataType type) // NOSONAR:S3776 - exhaustive per-DataType binary writer with size guards; splitting would add a dispatch layer on the row-serialization hot path { if (value == DBNull.Value || value == null) { @@ -1193,7 +1193,7 @@ internal static int WriteTypedValueToSpan(Span buffer, object value, DataT /// Output: number of bytes consumed. /// The deserialized value. [MethodImpl(MethodImplOptions.AggressiveOptimization)] - internal static object ReadTypedValueFromSpan(ReadOnlySpan buffer, DataType type, out int bytesRead) + internal static object ReadTypedValueFromSpan(ReadOnlySpan buffer, DataType type, out int bytesRead) // NOSONAR:S3776 - exhaustive per-DataType binary reader with size guards; splitting would add a dispatch layer on the row-deserialization hot path { bytesRead = 1; diff --git a/src/SharpCoreDB/DataStructures/Table.StructScanning.cs b/src/SharpCoreDB/DataStructures/Table.StructScanning.cs index af4666d6..1d2d0951 100644 --- a/src/SharpCoreDB/DataStructures/Table.StructScanning.cs +++ b/src/SharpCoreDB/DataStructures/Table.StructScanning.cs @@ -53,6 +53,14 @@ public partial class Table /// Zero-allocation enumerable of StructRow instances. [MethodImpl(MethodImplOptions.AggressiveOptimization)] public IEnumerable ScanStructRows(bool enableCaching = false) + { + // ✅ FIX: Validate upfront, then delegate to the iterator so argument errors surface at + // the call site instead of on first enumeration (iterator bodies defer all validation). + ArgumentNullException.ThrowIfNull(this.storage); + return ScanStructRowsCore(enableCaching); + } + + private IEnumerable ScanStructRowsCore(bool enableCaching) { // Fixed-width record layout (out-of-line overflow): the zero-alloc struct scan walks the // variable-length record format, so fixed-width tables fall back to the dictionary path @@ -69,9 +77,6 @@ public IEnumerable ScanStructRows(bool enableCaching = false) yield break; } - // ✅ FIX: Validate upfront, then delegate to iterator methods - ArgumentNullException.ThrowIfNull(this.storage); - // Build schema once for entire scan var schema = BuildVariableLengthSchema(); @@ -191,7 +196,7 @@ private IEnumerable ScanStructRowsWhereCore(string? where, bool enabl return ScanStructRowsWhereCoreIterator(where, enableCaching); } - private IEnumerable ScanStructRowsWhereCoreIterator(string? where, bool enableCaching) + private IEnumerable ScanStructRowsWhereCoreIterator(string? where, bool enableCaching) // NOSONAR:S3776 - ordered fast-path cascade (hash -> PK -> SIMD -> scan); each guard is a separate resolution strategy with early yield-break { // Fixed-width records: StructRow's variable-length schema can't walk the fixed-width // format, so matched records are materialized through the dictionary path. The numeric-SIMD @@ -247,15 +252,15 @@ private IEnumerable ScanStructRowsWhereCoreIterator(string? where, bo { foreach (var row in Select(where)) { - yield return StructRow.FromDictionary(row, fixedColumns ?? [], fixedTypes ?? []); + // fixedColumns/fixedTypes are non-null here (assigned when fixedWidth was resolved). + yield return StructRow.FromDictionary(row, fixedColumns!, fixedTypes!); } yield break; } // Fallback: full scan with a simple equality predicate (scalar, allocation-free per row). - // NOSONAR:S3267 - intentional: LINQ Where would allocate per row on the scan hot path. - foreach (var row in ScanStructRows(enableCaching)) + foreach (var row in ScanStructRows(enableCaching)) // NOSONAR:S3267 - intentional: LINQ Where would allocate per row on the scan hot path { if (!hasSimpleWhere || simpleColumn is null || simpleValue is null || MatchesSimpleWhere(row, schema, simpleColumn, simpleValue)) @@ -318,7 +323,7 @@ private IEnumerable ScanByPrimaryKeyPoint( /// (no deserialization, no boxing). Integer/Long use portable Vector<T>; Real uses /// direct per-record reads. Fixed-width tables materialize rows through the dictionary path. /// - private IEnumerable ScanByNumericSimd( + private IEnumerable ScanByNumericSimd( // NOSONAR - S3776 (SIMD kernel with per-type extraction passes) + S107 (layout parameters intentionally threaded; grouped further would add an allocation in the hot path) int numericOffset, DataType numericType, object numericExpected, VariableLengthSchema schema, IStorageEngine engine, bool enableCaching, bool fixedWidth, string[]? fixedColumns, DataType[]? fixedTypes) @@ -510,7 +515,7 @@ public bool MoveNext() } } - private bool InitAndMoveNext() + private bool InitAndMoveNext() // NOSONAR:S3776 - init resolves the WHERE via an ordered fast-path cascade and seeds the phase machine; each branch has distinct cleanup { _schema = _table.BuildVariableLengthSchema(); _engine = _table.GetOrCreateStorageEngine(); diff --git a/src/SharpCoreDB/DataStructures/Table.cs b/src/SharpCoreDB/DataStructures/Table.cs index b3cac515..eeacc478 100644 --- a/src/SharpCoreDB/DataStructures/Table.cs +++ b/src/SharpCoreDB/DataStructures/Table.cs @@ -266,7 +266,7 @@ private Dictionary GetColumnIndexCache() /// Gets or sets whether this table uses the fixed-width record layout (out-of-line overflow). /// Persisted in table metadata so a database created with the flag reopens correctly. /// - public bool IsFixedWidthRecords + public bool IsFixedWidthRecords // NOSONAR:S2292 - backing field is read/written directly across the Table.* partial files and metadata round-trip; auto-property would not remove the field { get => _fixedWidthRecords; set => _fixedWidthRecords = value; diff --git a/src/SharpCoreDB/Database/Execution/Database.Batch.cs b/src/SharpCoreDB/Database/Execution/Database.Batch.cs index 20562f8b..155cdf8a 100644 --- a/src/SharpCoreDB/Database/Execution/Database.Batch.cs +++ b/src/SharpCoreDB/Database/Execution/Database.Batch.cs @@ -523,7 +523,7 @@ private static bool IsInsertStatement(string sql) /// back to the general regex path. Returns raw literal text (quotes included) so the caller /// still converts via . /// - private static bool TryScanCanonicalDml( + private static bool TryScanCanonicalDml( // NOSONAR:S3776 - defensive canonical-shape scanner; each guard rejects a deviation to the regex fallback and must stay sequential to stay allocation-free string sql, out string table, out string setCol, @@ -965,7 +965,7 @@ private bool TryParseDeleteForBatch(string sql, out string tableName, out string /// ✅ FIX: Always use outer transaction to prevent concurrent write corruption. /// [MethodImpl(MethodImplOptions.AggressiveOptimization)] - public void ExecuteBatchSQL(IEnumerable sqlStatements) + public void ExecuteBatchSQL(IEnumerable sqlStatements) // NOSONAR:S3776 - grouped multi-table batch dispatcher (INSERT fast path / UPDATE / DELETE / fallback) under one transaction; extraction would fragment the single-lock contract { ArgumentNullException.ThrowIfNull(sqlStatements); diff --git a/src/SharpCoreDB/Services/SqlParser.Core.cs b/src/SharpCoreDB/Services/SqlParser.Core.cs index 52387934..ffbcca77 100644 --- a/src/SharpCoreDB/Services/SqlParser.Core.cs +++ b/src/SharpCoreDB/Services/SqlParser.Core.cs @@ -296,7 +296,7 @@ public List> ExecuteQuery(CachedQueryPlan plan, Dicti /// Returns false (falling back to the full parser) for any condition that cannot be /// handled with exact parity to the legacy string-based path. /// - private bool TryExecuteSimpleSelect( + private bool TryExecuteSimpleSelect( // NOSONAR:S3776 - guarded fast-path cascade (indexed point lookup -> legacy WHERE-string fallback); each guard preserves exact parity with the parser and shares the fall-through SimpleSelectPlan simple, Dictionary? parameters, out List> results) diff --git a/src/SharpCoreDB/Services/Storage.Append.cs b/src/SharpCoreDB/Services/Storage.Append.cs index cb3b9e98..5e2c5281 100644 --- a/src/SharpCoreDB/Services/Storage.Append.cs +++ b/src/SharpCoreDB/Services/Storage.Append.cs @@ -422,8 +422,6 @@ public bool OverwriteRecordAt(string path, long offset, byte[] data) { ArgumentNullException.ThrowIfNull(data); - bool inTransaction = IsInTransaction; - bool encryptWrites = ShouldEncryptWrites(path); byte[] record = EncryptRecord(data, encryptWrites); int recordLength = record.Length; @@ -821,20 +819,17 @@ private void FlushBufferedOverwrites() if (!bufferedOverwrites.IsEmpty && bufferedOverwrites.TryGetValue(path, out var buffered) && buffered.TryGetValue(offset, out var newRecord) && - newRecord.Length > 0) + newRecord.Length is > 0 and <= MaxRecordSize) { - if (newRecord.Length <= MaxRecordSize) - { - byte[] bufferedPayload = new byte[newRecord.Length]; - Buffer.BlockCopy(newRecord, 0, bufferedPayload, 0, newRecord.Length); - - if (UseRecordEncryption && FileHasEncryptedHeader(path)) - { - return DecryptRecord(bufferedPayload); - } + byte[] bufferedPayload = new byte[newRecord.Length]; + Buffer.BlockCopy(newRecord, 0, bufferedPayload, 0, newRecord.Length); - return bufferedPayload; + if (UseRecordEncryption && FileHasEncryptedHeader(path)) + { + return DecryptRecord(bufferedPayload); } + + return bufferedPayload; } // PERF: Use cached SafeFileHandle + RandomAccess instead of opening a new diff --git a/src/SharpCoreDB/SingleFileTable.cs b/src/SharpCoreDB/SingleFileTable.cs index 325307e1..7db343c9 100644 --- a/src/SharpCoreDB/SingleFileTable.cs +++ b/src/SharpCoreDB/SingleFileTable.cs @@ -29,6 +29,9 @@ namespace SharpCoreDB; /// public sealed class SingleFileTable(string tableName, IStorageProvider storageProvider) : ITable, ITableSchemaApplicator { + /// Leading WHERE keyword used when normalizing a WHERE condition for lookup. + private const string WhereKeywordPrefix = "WHERE "; + /// /// AOT-safe JSON options for the row cache: source-generated resolver plus the /// polymorphic object converter (issue #343 / single-file support under Native AOT). @@ -347,7 +350,7 @@ private bool TryGetPkLookupResults(string? where, string? orderBy, bool asc, out { // Strip leading WHERE keyword if present var condition = where?.Trim(); - if (condition is not null && condition.StartsWith("WHERE ", StringComparison.OrdinalIgnoreCase)) + if (condition is not null && condition.StartsWith(WhereKeywordPrefix, StringComparison.OrdinalIgnoreCase)) { condition = condition[6..].Trim(); } @@ -390,14 +393,14 @@ private static IEnumerable> ApplyOrderBy( public void Update(string? where, Dictionary updates) => UpdateAffectedCount(where, updates); /// - public int UpdateAffectedCount(string? where, Dictionary updates) + public int UpdateAffectedCount(string? where, Dictionary updates) // NOSONAR:S3776 - single-pass single-file UPDATE with PK/hash/scan resolution + change bookkeeping; the SQL row store shares this path { ArgumentNullException.ThrowIfNull(updates); EnsureCacheLoaded(); // Strip leading WHERE keyword if present var condition = where?.Trim(); - if (condition is not null && condition.StartsWith("WHERE ", StringComparison.OrdinalIgnoreCase)) + if (condition is not null && condition.StartsWith(WhereKeywordPrefix, StringComparison.OrdinalIgnoreCase)) { condition = condition[6..].Trim(); } @@ -448,7 +451,7 @@ public int UpdateAffectedCount(string? where, Dictionary updates /// Executes batch updates keyed by primary key value. /// /// Dictionary of primary key to update values. - public void UpdateBatch(Dictionary> updates) + public void UpdateBatch(Dictionary> updates) // NOSONAR:S3776 - per-row PK update loop with per-type patch/serialize fallback and index bookkeeping { ArgumentNullException.ThrowIfNull(updates); EnsureCacheLoaded(); @@ -507,7 +510,7 @@ public void Delete(string? where) // Strip leading WHERE keyword if present var condition = where?.Trim(); - if (condition is not null && condition.StartsWith("WHERE ", StringComparison.OrdinalIgnoreCase)) + if (condition is not null && condition.StartsWith(WhereKeywordPrefix, StringComparison.OrdinalIgnoreCase)) { condition = condition[6..].Trim(); } @@ -551,7 +554,7 @@ public List> DeleteAffectedRows(string? where) // Strip leading WHERE keyword if present var condition = where?.Trim(); - if (condition is not null && condition.StartsWith("WHERE ", StringComparison.OrdinalIgnoreCase)) + if (condition is not null && condition.StartsWith(WhereKeywordPrefix, StringComparison.OrdinalIgnoreCase)) { condition = condition[6..].Trim(); } @@ -910,7 +913,7 @@ public int MigrateToFixedWidth() private readonly Dictionary _columnUsage = new(StringComparer.OrdinalIgnoreCase); - private void EnsureCacheLoaded() + private void EnsureCacheLoaded() // NOSONAR:S3776 - row-cache warm-up with per-region schema guards; must stay sequential to keep the JSON parse inside one lock { if (_cacheLoaded) { diff --git a/src/SharpCoreDB/Storage/ColumnStore.Aggregates.cs b/src/SharpCoreDB/Storage/ColumnStore.Aggregates.cs index e73128f4..8f8345d3 100644 --- a/src/SharpCoreDB/Storage/ColumnStore.Aggregates.cs +++ b/src/SharpCoreDB/Storage/ColumnStore.Aggregates.cs @@ -208,7 +208,7 @@ private static decimal MaxDecimal(DecimalColumnBuffer buffer) #region Parallel SIMD Implementations - private static int SumInt32ParallelSIMD(int[] data) + private static int SumInt32ParallelSIMD(int[] data) // NOSONAR:S3776 - sum-int SIMD kernel with per-width guarded fallbacks { int partitionCount = Math.Min(BufferConstants.MAX_PARALLEL_PARTITIONS, data.Length / BufferConstants.MIN_PARALLEL_PARTITION_SIZE); @@ -623,7 +623,7 @@ private static double SumDoubleSIMDDirect(double[] data) return sum; } - private static int MinInt32SIMDDirect(int[] data) + private static int MinInt32SIMDDirect(int[] data) // NOSONAR:S3776 - min-int32 SIMD kernel with per-width guarded fallbacks { if (data.Length == 0) return 0; int min = int.MaxValue; @@ -651,7 +651,7 @@ private static int MinInt32SIMDDirect(int[] data) return min; } - private static long MinInt64SIMDDirect(long[] data) + private static long MinInt64SIMDDirect(long[] data) // NOSONAR:S3776 - min-int64 SIMD kernel with per-width guarded fallbacks { if (data.Length == 0) return 0; long min = long.MaxValue; @@ -679,7 +679,7 @@ private static long MinInt64SIMDDirect(long[] data) return min; } - private static double MinDoubleSIMDDirect(double[] data) + private static double MinDoubleSIMDDirect(double[] data) // NOSONAR:S3776 - min-double SIMD kernel with per-width guarded fallbacks { if (data.Length == 0) return 0; double min = double.MaxValue; @@ -707,7 +707,7 @@ private static double MinDoubleSIMDDirect(double[] data) return min; } - private static int MaxInt32SIMDDirect(int[] data) + private static int MaxInt32SIMDDirect(int[] data) // NOSONAR:S3776 - max-int32 SIMD kernel with per-width guarded fallbacks { if (data.Length == 0) return 0; int max = int.MinValue; @@ -735,7 +735,7 @@ private static int MaxInt32SIMDDirect(int[] data) return max; } - private static long MaxInt64SIMDDirect(long[] data) + private static long MaxInt64SIMDDirect(long[] data) // NOSONAR:S3776 - max-int64 SIMD kernel with per-width guarded fallbacks { if (data.Length == 0) return 0; long max = long.MinValue; @@ -763,7 +763,7 @@ private static long MaxInt64SIMDDirect(long[] data) return max; } - private static double MaxDoubleSIMDDirect(double[] data) + private static double MaxDoubleSIMDDirect(double[] data) // NOSONAR:S3776 - max-double SIMD kernel with per-width guarded fallbacks { if (data.Length == 0) return 0; double max = double.MinValue; diff --git a/src/SharpCoreDB/Storage/Scdb/SingleFileOverflowArena.cs b/src/SharpCoreDB/Storage/Scdb/SingleFileOverflowArena.cs index 01ed3a13..55fe52ea 100644 --- a/src/SharpCoreDB/Storage/Scdb/SingleFileOverflowArena.cs +++ b/src/SharpCoreDB/Storage/Scdb/SingleFileOverflowArena.cs @@ -71,12 +71,9 @@ public int LiveCount public void FreeUnreferenced(IReadOnlyCollection liveOffsets) { var live = liveOffsets as HashSet ?? new HashSet(liveOffsets); - foreach (var offset in _blocks.Keys.ToList()) + foreach (var offset in _blocks.Keys.Where(k => !live.Contains(k)).ToList()) { - if (!live.Contains(offset)) - { - Free(offset); - } + Free(offset); } } @@ -95,22 +92,19 @@ public long Write(byte[] payload) return dedupedOffset; } - if (_freeByLength.TryGetValue(payload.Length, out var offsets)) + if (_freeByLength.TryGetValue(payload.Length, out var offsets) && offsets.Count > 0) { - while (offsets.Count > 0) + var offset = offsets[^1]; + offsets.RemoveAt(offsets.Count - 1); + if (offsets.Count == 0) { - var offset = offsets[^1]; - offsets.RemoveAt(offsets.Count - 1); - if (offsets.Count == 0) - { - _freeByLength.Remove(payload.Length); - } - - _blocks[offset] = payload; - _contentIndex[contentKey] = offset; - _blockReuses++; - return offset; + _freeByLength.Remove(payload.Length); } + + _blocks[offset] = payload; + _contentIndex[contentKey] = offset; + _blockReuses++; + return offset; } var newOffset = _nextOffset; diff --git a/tests/SharpCoreDB.Tests/SingleFileFixedWidthTests.cs b/tests/SharpCoreDB.Tests/SingleFileFixedWidthTests.cs index d8c86668..c7e32dbe 100644 --- a/tests/SharpCoreDB.Tests/SingleFileFixedWidthTests.cs +++ b/tests/SharpCoreDB.Tests/SingleFileFixedWidthTests.cs @@ -75,7 +75,7 @@ public void RoundTrip_AllColumnTypes_Reopen() Assert.Single(row); Assert.Equal("beta", row[0]["name"]); Assert.Equal(2.5, Convert.ToDouble(row[0]["score"])); - Assert.Equal(false, Convert.ToBoolean(row[0]["flag"])); + Assert.False(Convert.ToBoolean(row[0]["flag"])); } finally { (db as IDisposable)?.Dispose(); }