data store fixes

Author: Jack Dermody

BrightData/Buffer/ByteDataProviders/ByteDataBlock.cs

@@ -9,7 +9,7 @@ namespace BrightData.Buffer.ByteDataProviders;
 /// <summary>
 /// A block of byte data
 /// </summary>
-public ref struct ByteDataBlock(ReadOnlySpan<byte> data, IDisposable? disposable) : IHaveByteData
+public ref struct ByteDataBlock(ReadOnlySpan<byte> data, IDisposable? disposable)
 {
     readonly ReadOnlySpan<byte> _data = data;
 

BrightData/Helper/DataStore.cs

@@ -1,7 +1,8 @@
 using BrightData.Buffer;
+using BrightData.Buffer.ByteDataProviders;
 using BrightData.Types;
-using System;
 using CommunityToolkit.HighPerformance;
+using System;
 
 namespace BrightData.Helper
 {
@@ -37,7 +38,8 @@ interface IResolveData<out T>
         public DataStore(OffsetAndSize dataTypes, IByteDataProvider dataProvider)
         {
             _dataProvider = dataProvider;
-            _dataTypes = dataProvider.GetDataSpan(dataTypes).Cast<byte, DataType>().ToArray();
+            using var dataTypesBlock = dataProvider.GetDataSpan(dataTypes);
+            _dataTypes = dataTypesBlock.ByteData.Cast<byte, DataType>().ToArray();
 
             // create the data types
             var index = 0;
@@ -54,9 +56,9 @@ public T Get<T>(uint index)
             return default;
         }
 
-        ReadOnlySpan<byte> GetData(uint index)
+        ByteDataBlock GetData(uint index)
         {
-            var (type, offset, size) = _dataTypes.Span[(int)index];
+            var (_, offset, size) = _dataTypes.Span[(int)index];
             return _dataProvider.GetDataSpan(offset, size);
         }
     }