Revert buffer changes to fix issue with concurrent writes

aloneguid · Oct 12, 2021 · 637e06e · 637e06e
1 parent 058d409
commit 637e06e
Showing 1 changed file with 4 additions and 20 deletions.
diff --git a/src/Parquet/Data/Concrete/StringDataTypeHandler.cs b/src/Parquet/Data/Concrete/StringDataTypeHandler.cs
@@ -7,11 +7,9 @@ namespace Parquet.Data.Concrete
 {
    class StringDataTypeHandler : BasicDataTypeHandler<string>
    {
-      private static readonly UTF8Encoding E = new UTF8Encoding();
+      private static readonly Encoding E = Encoding.UTF8;
       private static readonly ArrayPool<byte> _bytePool = ArrayPool<byte>.Shared;
       private static readonly ArrayPool<string> _stringPool = ArrayPool<string>.Shared;
-
-      private static byte[] _encodingBuf;
 
       public StringDataTypeHandler() : base(DataType.String, Thrift.Type.BYTE_ARRAY, Thrift.ConvertedType.UTF8)
       {
@@ -118,26 +116,12 @@ private static void WriteOne(BinaryWriter writer, string value, bool includeLeng
          else
          {
             //transofrm to byte array first, as we need the length of the byte buffer, not string length
-
-            int needLength = value.Length * 3;
-            if(_encodingBuf == null || _encodingBuf.Length < needLength)
-            {
-               if(_encodingBuf != null)
-               {
-                  _bytePool.Return(_encodingBuf);
-               }
-
-               _encodingBuf = _bytePool.Rent(needLength);
-            }
-
-            // this can write directly to buffer after I kill binarystream
-            int bytesWritten = E.GetBytes(value, 0, value.Length, _encodingBuf, 0);
-
+            byte[] data = E.GetBytes(value);
             if (includeLengthPrefix)
             {
-               writer.Write(bytesWritten);
+               writer.Write(data.Length);
             }
-            writer.Write(_encodingBuf, 0, bytesWritten);
+            writer.Write(data);
          }
       }