ARROW-7514_make_getvalueoffset_obsolete

Make BinaryArray.GetValueOffset obsolete
DataDog · Feb 1, 2020 · 07d106c · 07d106c
1 parent bd08d0e
commit 07d106c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/csharp/src/Apache.Arrow/Arrays/BinaryArray.cs b/csharp/src/Apache.Arrow/Arrays/BinaryArray.cs
@@ -171,6 +171,7 @@ public TBuilder Clear()
         public ReadOnlySpan<byte> Values => ValueBuffer.Span.CastTo<byte>();
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [Obsolete]
         public int GetValueOffset(int index)
         {
             if (index < 0 || index > Length)
@@ -193,10 +194,12 @@ public int GetValueLength(int index)
 
         public ReadOnlySpan<byte> GetBytes(int index)
         {
-            var offset = GetValueOffset(index);
-            var length = GetValueLength(index);
+            if (index < 0 || index >= Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
 
-            return ValueBuffer.Span.Slice(offset, length);
+            return ValueBuffer.Span.Slice(ValueOffsets[index], GetValueLength(index));
         }
 
     }

diff --git a/csharp/test/Apache.Arrow.Tests/ArrowArrayTests.cs b/csharp/test/Apache.Arrow.Tests/ArrowArrayTests.cs
@@ -46,6 +46,12 @@ public void ThrowsWhenGetValueAndOffsetIndexOutOfBounds()
             Assert.Equal(2, array.GetValueOffset(2));
             Assert.Throws<ArgumentOutOfRangeException>(() => array.GetValueOffset(3));
 
+            Assert.Throws<IndexOutOfRangeException>(() => array.ValueOffsets[-1]);
+            Assert.Equal(0, array.ValueOffsets[0]);
+            Assert.Equal(1, array.ValueOffsets[1]);
+            Assert.Equal(2, array.ValueOffsets[2]);
+            Assert.Throws<IndexOutOfRangeException>(() => array.ValueOffsets[3]);
+
         }
 
         [Fact]