From e6af5bd99c3424e3013459900803b9e8e5ac7855 Mon Sep 17 00:00:00 2001
From: Peter Kese <peter.kese@viidea.com>
Date: Fri, 22 Mar 2019 16:52:20 +0100
Subject: [PATCH 1/2] Fix Column.ToArray<T> typecast error #4

---
 FeatherDotNet/Column.cs    |  6 +++++-
 FeatherDotNet/DataFrame.cs | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/FeatherDotNet/Column.cs b/FeatherDotNet/Column.cs
index 9ec80e7..f002299 100644
--- a/FeatherDotNet/Column.cs
+++ b/FeatherDotNet/Column.cs
@@ -288,7 +288,11 @@ public void GetRange<T>(long rowSourceIndex, int length, ref T[] array, int dest
 
             if (CanBeBlitted<T>())
             {
-                Parent.UnsafeFastGetRowRange<T>(translatedIndex, TranslatedColumnIndex, array, destinationIndex, length);
+                if (typeof(T) == Type) {
+                    Parent.UnsafeFastGetRowRange<T>(translatedIndex, TranslatedColumnIndex, array, destinationIndex, length);
+                } else {
+                    Parent.GetRowRangeWithTypeCast<T>(translatedIndex, TranslatedColumnIndex, array, destinationIndex, length);
+                }
                 return;
             }
 
diff --git a/FeatherDotNet/DataFrame.cs b/FeatherDotNet/DataFrame.cs
index 3e778e5..af1d260 100644
--- a/FeatherDotNet/DataFrame.cs
+++ b/FeatherDotNet/DataFrame.cs
@@ -427,6 +427,38 @@ internal void UnsafeFastGetRowRange<T>(long translatedRowIndex, long translatedC
             UnsafeArrayReader<T>.ReadArray(View, byteIndex, array, 0, length);
         }
 
+        private Array ReadNativeArrayUnsafe<T>(long byteIndex, int length) {
+            T[] array = new T[length];
+            UnsafeArrayReader<T>.ReadArray(View, byteIndex, array, 0, length);
+            return array;
+        }
+
+        internal void GetRowRangeWithTypeCast<T>(long translatedRowIndex, long translatedColumnIndex, T[] array, int destinationIndex, int length)
+        {
+            var columnMetadata = Metadata.Columns[translatedColumnIndex];
+            var entrySize = columnMetadata.Type.GetAlignment();
+            var dataStart = columnMetadata.DataOffset;
+            var byteOffset = translatedRowIndex * entrySize;
+
+            var byteIndex = dataStart + byteOffset;
+
+            Array uncastedArray;
+            switch (columnMetadata.Type) {
+                case ColumnType.Int8:   uncastedArray = ReadNativeArrayUnsafe<System.SByte> (byteIndex, length); break;
+                case ColumnType.Int16:  uncastedArray = ReadNativeArrayUnsafe<System.Int16> (byteIndex, length); break;
+                case ColumnType.Int32:  uncastedArray = ReadNativeArrayUnsafe<System.Int32> (byteIndex, length); break;
+                case ColumnType.Int64:  uncastedArray = ReadNativeArrayUnsafe<System.Int64> (byteIndex, length); break;
+                case ColumnType.Uint8:  uncastedArray = ReadNativeArrayUnsafe<System.Byte>  (byteIndex, length); break;
+                case ColumnType.Uint16: uncastedArray = ReadNativeArrayUnsafe<System.UInt16>(byteIndex, length); break;
+                case ColumnType.Uint32: uncastedArray = ReadNativeArrayUnsafe<System.UInt32>(byteIndex, length); break;
+                case ColumnType.Uint64: uncastedArray = ReadNativeArrayUnsafe<System.UInt64>(byteIndex, length); break;
+                case ColumnType.Float:  uncastedArray = ReadNativeArrayUnsafe<System.Single>(byteIndex, length); break;
+                case ColumnType.Double: uncastedArray = ReadNativeArrayUnsafe<System.Double>(byteIndex, length); break;
+                default: throw new InvalidOperationException($"Invalid cast {columnMetadata.Name}: {columnMetadata.Type} -> {typeof(T)}");
+            }
+            Array.Copy(uncastedArray, array, length);
+        }
+
         internal bool IsNullTranslated(long translatedRowIndex, long translatedColumnIndex)
         {
             var columnMetadata = Metadata.Columns[translatedColumnIndex];

From 20b7fc7302b396f6c93add1a7da640f60c2a8294 Mon Sep 17 00:00:00 2001
From: Peter Kese <peter.kese@viidea.com>
Date: Fri, 22 Mar 2019 17:08:10 +0100
Subject: [PATCH 2/2] Respect destinationIndex parameter

---
 FeatherDotNet/DataFrame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FeatherDotNet/DataFrame.cs b/FeatherDotNet/DataFrame.cs
index af1d260..2c921e5 100644
--- a/FeatherDotNet/DataFrame.cs
+++ b/FeatherDotNet/DataFrame.cs
@@ -456,7 +456,7 @@ internal void GetRowRangeWithTypeCast<T>(long translatedRowIndex, long translate
                 case ColumnType.Double: uncastedArray = ReadNativeArrayUnsafe<System.Double>(byteIndex, length); break;
                 default: throw new InvalidOperationException($"Invalid cast {columnMetadata.Name}: {columnMetadata.Type} -> {typeof(T)}");
             }
-            Array.Copy(uncastedArray, array, length);
+            Array.Copy(uncastedArray, 0, array, destinationIndex, length);
         }
 
         internal bool IsNullTranslated(long translatedRowIndex, long translatedColumnIndex)