Relocate DataHeaderDevice to the corresponding disk segments.

koculu · May 27, 2023 · d32418a · d32418a
1 parent 5d1b505
commit d32418a
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 24 deletions.
diff --git a/src/ZoneTree/GlobalSuppressions.cs b/src/ZoneTree/GlobalSuppressions.cs
@@ -24,6 +24,22 @@
     Scope = "namespaceanddescendants",
     Target = "Tenray.ZoneTree.Comparers")]
 
+[assembly: SuppressMessage(
+    "\tUsage",
+    "CA2213: Disposable fields should be disposed",
+    Justification = "False warning: Device is disposed on ReleaseResources method.",
+    Scope = "namespaceanddescendants",
+    Target = "Tenray.ZoneTree.Segments.DiskSegmentVariations")]
+
+[assembly: SuppressMessage(
+    "\tUsage",
+    "CA2213: Disposable fields should be disposed",
+    Justification = "False warning: Device is disposed on ReleaseResources method.",
+    Scope = "member",
+    Target = "Tenray.ZoneTree.Segments.Disk.DiskSegment.DataDevice")]
+
+#pragma warning disable CA2213 // False warning: Device is disposed on ReleaseResources.
+
 [assembly: SuppressMessage(
     "Naming",
     "CA1711: Identifiers should not have incorrect suffix",

diff --git a/src/ZoneTree/Segments/Disk/DiskSegment.cs b/src/ZoneTree/Segments/Disk/DiskSegment.cs
@@ -18,8 +18,6 @@ public abstract class DiskSegment<TKey, TValue> : IDiskSegment<TKey, TValue>
 
     protected readonly ISerializer<TValue> ValueSerializer;
 
-    protected IRandomAccessDevice DataHeaderDevice;
-
     protected IRandomAccessDevice DataDevice;
 
     protected int KeySize;
@@ -48,9 +46,7 @@ public abstract class DiskSegment<TKey, TValue> : IDiskSegment<TKey, TValue>
 
     public bool IsIterativeIndexReader => false;
 
-    public int ReadBufferCount =>
-                    (DataDevice?.ReadBufferCount ?? 0) +
-                    (DataHeaderDevice?.ReadBufferCount ?? 0);
+    public abstract int ReadBufferCount { get; }
 
     public Action<IDiskSegment<TKey, TValue>, Exception> DropFailureReporter { get; set; }
 
@@ -66,11 +62,9 @@ public abstract class DiskSegment<TKey, TValue> : IDiskSegment<TKey, TValue>
 
     protected unsafe DiskSegment(long segmentId,
         ZoneTreeOptions<TKey, TValue> options,
-        IRandomAccessDevice dataHeaderDevice,
         IRandomAccessDevice dataDevice)
     {
         SegmentId = segmentId;
-        DataHeaderDevice = dataHeaderDevice;
         DataDevice = dataDevice;
 
         Comparer = options.Comparer;
@@ -351,12 +345,13 @@ public void Drop()
             // No active reads remaining.
             // Safe to drop.
 
-            DataHeaderDevice?.Delete();
-            DataDevice.Delete();
+            DeleteDevices();
             IsDropped = true;
         }
     }
 
+    protected abstract void DeleteDevices();
+
     public IIndexedReader<TKey, TValue> GetIndexedReader()
     {
         return this;
@@ -465,18 +460,12 @@ public long GetFirstGreaterOrEqualPosition(in TKey key)
         return GetFirstGreaterOrEqualPosition(in key, lower, upper);
     }
 
-    public void ReleaseResources()
+    public virtual void ReleaseResources()
     {
-        DataHeaderDevice?.Dispose();
-        DataDevice.Dispose();
+        DataDevice?.Dispose();
     }
 
-    public int ReleaseReadBuffers(long ticks)
-    {
-        var a = DataHeaderDevice?.ReleaseReadBuffers(ticks) ?? 0;
-        var b = DataDevice?.ReleaseReadBuffers(ticks) ?? 0;
-        return a + b;
-    }
+    public abstract int ReleaseReadBuffers(long ticks);
 
     public void Drop(HashSet<long> excludedPartIds)
     {

diff --git a/src/ZoneTree/Segments/Disk/DiskSegmentConstants.cs b/src/ZoneTree/Segments/Disk/DiskSegmentConstants.cs
@@ -3,6 +3,8 @@
 public static class DiskSegmentConstants
 {
     public const string DataHeaderCategory = ".head";
+
     public const string DataCategory = ".data";
+
     public const string MultiPartDiskSegmentCategory = ".multi";
 }
diff --git a/src/ZoneTree/Segments/Disk/DiskSegmentFactory.cs b/src/ZoneTree/Segments/Disk/DiskSegmentFactory.cs
@@ -35,7 +35,7 @@ public static class DiskSegmentFactory
         var hasFixedSizeKey = !RuntimeHelpers.IsReferenceOrContainsReferences<TKey>();
         var hasFixedSizeValue = !RuntimeHelpers.IsReferenceOrContainsReferences<TValue>();
         if (hasFixedSizeKey && hasFixedSizeValue)
-            return new FixedSizeKeyAndValueDiskSegment<TKey, TValue>(segmentId, options, dataHeaderDevice, dataDevice);
+            return new FixedSizeKeyAndValueDiskSegment<TKey, TValue>(segmentId, options, dataDevice);
         if (hasFixedSizeKey)
             return new FixedSizeKeyDiskSegment<TKey, TValue>(segmentId, options, dataHeaderDevice, dataDevice);
         if (hasFixedSizeValue)

diff --git a/src/ZoneTree/Segments/DiskSegmentVariations/FixedSizeKeyAndValueDiskSegment.cs b/src/ZoneTree/Segments/DiskSegmentVariations/FixedSizeKeyAndValueDiskSegment.cs
@@ -9,6 +9,9 @@ namespace Tenray.ZoneTree.Segments.DiskSegmentVariations;
 
 public sealed class FixedSizeKeyAndValueDiskSegment<TKey, TValue> : DiskSegment<TKey, TValue>
 {
+    public override int ReadBufferCount =>
+        (DataDevice?.ReadBufferCount ?? 0);
+
     public unsafe FixedSizeKeyAndValueDiskSegment(
         long segmentId,
         ZoneTreeOptions<TKey, TValue> options) : base(segmentId, options)
@@ -31,8 +34,7 @@ public sealed class FixedSizeKeyAndValueDiskSegment<TKey, TValue> : DiskSegment<
 
     public unsafe FixedSizeKeyAndValueDiskSegment(long segmentId,
         ZoneTreeOptions<TKey, TValue> options,
-        IRandomAccessDevice dataHeaderDevice,
-        IRandomAccessDevice dataDevice) : base(segmentId, options, dataHeaderDevice, dataDevice)
+        IRandomAccessDevice dataDevice) : base(segmentId, options, dataDevice)
     {
         EnsureKeyAndValueTypesAreSupported();
         InitKeyAndValueSizeAndDataLength();
@@ -92,4 +94,19 @@ protected override unsafe TValue ReadValue(long index)
             Interlocked.Decrement(ref ReadCount);
         }
     }
+
+    protected override void DeleteDevices()
+    {
+        DataDevice?.Delete();
+    }
+
+    public override void ReleaseResources()
+    {
+        DataDevice?.Dispose();
+    }
+
+    public override int ReleaseReadBuffers(long ticks)
+    {
+        return DataDevice?.ReleaseReadBuffers(ticks) ?? 0;
+    }
 }
diff --git a/src/ZoneTree/Segments/DiskSegmentVariations/FixedSizeKeyDiskSegment.cs b/src/ZoneTree/Segments/DiskSegmentVariations/FixedSizeKeyDiskSegment.cs
@@ -12,6 +12,11 @@ namespace Tenray.ZoneTree.Segments.DiskSegmentVariations;
 
 public sealed class FixedSizeKeyDiskSegment<TKey, TValue> : DiskSegment<TKey, TValue>
 {
+    readonly IRandomAccessDevice DataHeaderDevice;
+
+    public override int ReadBufferCount =>
+        (DataDevice?.ReadBufferCount ?? 0) + (DataHeaderDevice?.ReadBufferCount ?? 0);
+
     public unsafe FixedSizeKeyDiskSegment(
         long segmentId,
         ZoneTreeOptions<TKey, TValue> options) : base(segmentId, options)
@@ -46,8 +51,9 @@ public sealed class FixedSizeKeyDiskSegment<TKey, TValue> : DiskSegment<TKey, TV
     public unsafe FixedSizeKeyDiskSegment(long segmentId,
         ZoneTreeOptions<TKey, TValue> options,
         IRandomAccessDevice dataHeaderDevice,
-        IRandomAccessDevice dataDevice) : base(segmentId, options, dataHeaderDevice, dataDevice)
+        IRandomAccessDevice dataDevice) : base(segmentId, options, dataDevice)
     {
+        DataHeaderDevice = dataHeaderDevice;
         EnsureKeyAndValueTypesAreSupported();
         InitKeySizeAndDataLength();
     }
@@ -109,4 +115,23 @@ protected override unsafe TValue ReadValue(long index)
             Interlocked.Decrement(ref ReadCount);
         }
     }
+
+    protected override void DeleteDevices()
+    {
+        DataHeaderDevice?.Delete();
+        DataDevice?.Delete();
+    }
+
+    public override void ReleaseResources()
+    {
+        DataHeaderDevice?.Dispose();
+        DataDevice?.Dispose();
+    }
+
+    public override int ReleaseReadBuffers(long ticks)
+    {
+        var a = DataHeaderDevice?.ReleaseReadBuffers(ticks) ?? 0;
+        var b = DataDevice?.ReleaseReadBuffers(ticks) ?? 0;
+        return a + b;
+    }
 }
diff --git a/src/ZoneTree/Segments/DiskSegmentVariations/FixedSizeValueDiskSegment.cs b/src/ZoneTree/Segments/DiskSegmentVariations/FixedSizeValueDiskSegment.cs
@@ -10,6 +10,11 @@ namespace Tenray.ZoneTree.Segments.DiskSegmentVariations;
 
 public sealed class FixedSizeValueDiskSegment<TKey, TValue> : DiskSegment<TKey, TValue>
 {
+    readonly IRandomAccessDevice DataHeaderDevice;
+
+    public override int ReadBufferCount =>
+        (DataDevice?.ReadBufferCount ?? 0) + (DataHeaderDevice?.ReadBufferCount ?? 0);
+
     public unsafe FixedSizeValueDiskSegment(
         long segmentId,
         ZoneTreeOptions<TKey, TValue> options) : base(segmentId, options)
@@ -44,8 +49,9 @@ public sealed class FixedSizeValueDiskSegment<TKey, TValue> : DiskSegment<TKey,
     public unsafe FixedSizeValueDiskSegment(long segmentId,
         ZoneTreeOptions<TKey, TValue> options,
         IRandomAccessDevice dataHeaderDevice,
-        IRandomAccessDevice dataDevice) : base(segmentId, options, dataHeaderDevice, dataDevice)
+        IRandomAccessDevice dataDevice) : base(segmentId, options, dataDevice)
     {
+        DataHeaderDevice = dataHeaderDevice;
         EnsureKeyAndValueTypesAreSupported();
         InitKeySizeAndDataLength();
     }
@@ -107,4 +113,23 @@ protected override unsafe TValue ReadValue(long index)
             Interlocked.Decrement(ref ReadCount);
         }
     }
+
+    protected override void DeleteDevices()
+    {
+        DataHeaderDevice?.Delete();
+        DataDevice?.Delete();
+    }
+
+    public override void ReleaseResources()
+    {
+        DataHeaderDevice?.Dispose();
+        DataDevice?.Dispose();
+    }
+
+    public override int ReleaseReadBuffers(long ticks)
+    {
+        var a = DataHeaderDevice?.ReleaseReadBuffers(ticks) ?? 0;
+        var b = DataDevice?.ReleaseReadBuffers(ticks) ?? 0;
+        return a + b;
+    }
 }
diff --git a/src/ZoneTree/Segments/DiskSegmentVariations/VariableSizeDiskSegment.cs b/src/ZoneTree/Segments/DiskSegmentVariations/VariableSizeDiskSegment.cs
@@ -10,6 +10,11 @@ namespace Tenray.ZoneTree.Segments.DiskSegmentVariations;
 
 public sealed class VariableSizeDiskSegment<TKey, TValue> : DiskSegment<TKey, TValue>
 {
+    readonly IRandomAccessDevice DataHeaderDevice;
+
+    public override int ReadBufferCount =>
+        (DataDevice?.ReadBufferCount ?? 0) + (DataHeaderDevice?.ReadBufferCount ?? 0);
+
     public unsafe VariableSizeDiskSegment(
         long segmentId,
         ZoneTreeOptions<TKey, TValue> options) : base(segmentId, options)
@@ -44,8 +49,9 @@ public sealed class VariableSizeDiskSegment<TKey, TValue> : DiskSegment<TKey, TV
     public unsafe VariableSizeDiskSegment(long segmentId,
         ZoneTreeOptions<TKey, TValue> options,
         IRandomAccessDevice dataHeaderDevice,
-        IRandomAccessDevice dataDevice) : base(segmentId, options, dataHeaderDevice, dataDevice)
+        IRandomAccessDevice dataDevice) : base(segmentId, options, dataDevice)
     {
+        DataHeaderDevice = dataHeaderDevice;
         EnsureKeyAndValueTypesAreSupported();
         InitDataLength();
     }
@@ -104,4 +110,23 @@ protected override unsafe TValue ReadValue(long index)
             Interlocked.Decrement(ref ReadCount);
         }
     }
+
+    protected override void DeleteDevices()
+    {
+        DataHeaderDevice?.Delete();
+        DataDevice?.Delete();
+    }
+
+    public override void ReleaseResources()
+    {
+        DataHeaderDevice?.Dispose();
+        DataDevice?.Dispose();
+    }
+
+    public override int ReleaseReadBuffers(long ticks)
+    {
+        var a = DataHeaderDevice?.ReleaseReadBuffers(ticks) ?? 0;
+        var b = DataDevice?.ReleaseReadBuffers(ticks) ?? 0;
+        return a + b;
+    }
 }