TableQueryBuilder ref fix

Author: dlmelendez

src/ElCamino.Azure.Data.Tables/ElCamino.Azure.Data.Tables.csproj

@@ -20,7 +20,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/dlmelendez/identityazuretable.git</RepositoryUrl>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>9.0.3</Version>
+    <Version>9.0.4</Version>
     <PackageProjectUrl>https://dlmelendez.github.io/identityazuretable</PackageProjectUrl>
     <!--<DebugType>Full</DebugType>-->
     <!-- DebugType Full is needed for test code coverage, but .nuget symbols doesn't like it-->

src/ElCamino.Azure.Data.Tables/TableQueryBuilder.cs

@@ -1,5 +1,4 @@
-#if NET9_0_OR_GREATER
-
+
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -10,15 +9,15 @@ namespace ElCamino.Azure.Data.Tables
     /// <summary>
     /// This class allows for a fluent query builder for Azure Table Storage using OData.
     /// </summary>
-    public ref struct TableQueryBuilder
+    public class TableQueryBuilder
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TableQueryBuilder"/> class for fluent query building for Azure Table Storage using OData.
         /// </summary>
         public TableQueryBuilder() { }
 
         private const int BufferSize = 1024;
-        private Span<char> _bufferQuery = new(new char[BufferSize]);
+        private char[] _bufferQuery = new char[BufferSize];
         private int _currentQueryLength = 0;
         private uint _filterCount = 0;
         private uint _beginGroupCount = 0;
@@ -32,15 +31,15 @@ public TableQueryBuilder() { }
         /// <summary>
         /// Gets the current query filter.
         /// </summary>
-        public ReadOnlySpan<char> QueryFilter => _bufferQuery.Slice(0, _currentQueryLength);
+        public ReadOnlySpan<char> QueryFilter => _bufferQuery.AsSpan().Slice(0, _currentQueryLength);
 
         private void AllocateBuffer(int lengthToAdd)
         {
             if ((_currentQueryLength + lengthToAdd > _bufferQuery.Length))
             {
                 Span<char> newBuffer = stackalloc char[_bufferQuery.Length + BufferSize];
                 QueryFilter.CopyTo(newBuffer);
-                _bufferQuery = new Span<char>([..newBuffer]);
+                _bufferQuery = [..newBuffer];
             }
         }
 
@@ -51,7 +50,7 @@ private void AppendCondition(ReadOnlySpan<char> condition)
             if (_currentQueryLength <= 0)
             {
                 _bufferQuery[0] = '(';
-                condition.CopyTo(_bufferQuery[1..]);
+                condition.CopyTo(_bufferQuery.AsSpan()[1..]);
                 _bufferQuery[condition.Length + 1] = ')';
             }
             else
@@ -352,4 +351,3 @@ public override string ToString()
         }
     }
 }
-#endif

tests/ElCamino.Azure.Data.Tables.Tests/TableQueryBuilderTests.cs

@@ -1,5 +1,4 @@
 // MIT License Copyright 2020 (c) David Melendez. All rights reserved. See License.txt in the project root for license information.
-#if NET9_0_OR_GREATER
 
 using System;
 using System.Collections.Concurrent;
@@ -431,15 +430,16 @@ public async Task QueryBuilderNullPropertyBool()
 
             sw.Start();
             TableQueryBuilder queryBuilderNull = new TableQueryBuilder();
-            string filterNullBuilder = queryBuilderNull
+            string filterNullBuilder = string.Empty;
+            queryBuilderNull
                 .BeginGroup()
                 .AddFilter(nameof(TableEntity.PartitionKey), QueryComparison.Equal, addedEntity.PartitionKey)
                 .CombineFilters(TableOperator.And)
                 .AddFilter(nameof(TableEntity.RowKey), QueryComparison.Equal, addedEntity.RowKey)
-                .EndGroup()
-                .CombineFilters(TableOperator.And)
-                .AddFilterBool(propertyName, QueryComparison.Equal, null)
-                .ToString();
+                .EndGroup().ToString();
+            queryBuilderNull.CombineFilters(TableOperator.And)
+                .AddFilterBool(propertyName, QueryComparison.Equal, null);
+            filterNullBuilder = queryBuilderNull.ToString();
             sw.Stop();
             _output.WriteLine($"{nameof(filterNullBuilder)}: {sw.Elapsed.TotalMilliseconds}ms");
             _output.WriteLine($"{nameof(filterNullBuilder)}:{filterNullBuilder}");
@@ -550,4 +550,3 @@ public async Task QueryBuilderPropertyDate()
 
     }
 }
-#endif