Remove the alias types for now and get all tests pass.

Author: JakeRadMSFT

src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs

@@ -22,43 +22,43 @@ private static void AppendDataFrameColumnFromArrowArray(Field field, IArrowArray
                     BooleanArray arrowBooleanArray = (BooleanArray)arrowArray;
                     ReadOnlyMemory<byte> valueBuffer = arrowBooleanArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> nullBitMapBuffer = arrowBooleanArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new BooleanDataFrameColumn(fieldName, valueBuffer, nullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<bool>(fieldName, valueBuffer, nullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.Double:
                     PrimitiveArray<double> arrowDoubleArray = (PrimitiveArray<double>)arrowArray;
                     ReadOnlyMemory<byte> doubleValueBuffer = arrowDoubleArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> doubleNullBitMapBuffer = arrowDoubleArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new DoubleDataFrameColumn(fieldName, doubleValueBuffer, doubleNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<double>(fieldName, doubleValueBuffer, doubleNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.Float:
                     PrimitiveArray<float> arrowFloatArray = (PrimitiveArray<float>)arrowArray;
                     ReadOnlyMemory<byte> floatValueBuffer = arrowFloatArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> floatNullBitMapBuffer = arrowFloatArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new SingleDataFrameColumn(fieldName, floatValueBuffer, floatNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<float>(fieldName, floatValueBuffer, floatNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.Int8:
                     PrimitiveArray<sbyte> arrowsbyteArray = (PrimitiveArray<sbyte>)arrowArray;
                     ReadOnlyMemory<byte> sbyteValueBuffer = arrowsbyteArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> sbyteNullBitMapBuffer = arrowsbyteArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new SByteDataFrameColumn(fieldName, sbyteValueBuffer, sbyteNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<sbyte>(fieldName, sbyteValueBuffer, sbyteNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.Int16:
                     PrimitiveArray<short> arrowshortArray = (PrimitiveArray<short>)arrowArray;
                     ReadOnlyMemory<byte> shortValueBuffer = arrowshortArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> shortNullBitMapBuffer = arrowshortArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new Int16DataFrameColumn(fieldName, shortValueBuffer, shortNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<short>(fieldName, shortValueBuffer, shortNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.Int32:
                     PrimitiveArray<int> arrowIntArray = (PrimitiveArray<int>)arrowArray;
                     ReadOnlyMemory<byte> intValueBuffer = arrowIntArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> intNullBitMapBuffer = arrowIntArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new Int32DataFrameColumn(fieldName, intValueBuffer, intNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<int>(fieldName, intValueBuffer, intNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.Int64:
                     PrimitiveArray<long> arrowLongArray = (PrimitiveArray<long>)arrowArray;
                     ReadOnlyMemory<byte> longValueBuffer = arrowLongArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> longNullBitMapBuffer = arrowLongArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new Int64DataFrameColumn(fieldName, longValueBuffer, longNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<long>(fieldName, longValueBuffer, longNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.String:
                     StringArray stringArray = (StringArray)arrowArray;
@@ -71,25 +71,25 @@ private static void AppendDataFrameColumnFromArrowArray(Field field, IArrowArray
                     PrimitiveArray<byte> arrowbyteArray = (PrimitiveArray<byte>)arrowArray;
                     ReadOnlyMemory<byte> byteValueBuffer = arrowbyteArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> byteNullBitMapBuffer = arrowbyteArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new ByteDataFrameColumn(fieldName, byteValueBuffer, byteNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<byte>(fieldName, byteValueBuffer, byteNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.UInt16:
                     PrimitiveArray<ushort> arrowUshortArray = (PrimitiveArray<ushort>)arrowArray;
                     ReadOnlyMemory<byte> ushortValueBuffer = arrowUshortArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> ushortNullBitMapBuffer = arrowUshortArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new UInt16DataFrameColumn(fieldName, ushortValueBuffer, ushortNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<ushort>(fieldName, ushortValueBuffer, ushortNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.UInt32:
                     PrimitiveArray<uint> arrowUintArray = (PrimitiveArray<uint>)arrowArray;
                     ReadOnlyMemory<byte> uintValueBuffer = arrowUintArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> uintNullBitMapBuffer = arrowUintArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new UInt32DataFrameColumn(fieldName, uintValueBuffer, uintNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<uint>(fieldName, uintValueBuffer, uintNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.UInt64:
                     PrimitiveArray<ulong> arrowUlongArray = (PrimitiveArray<ulong>)arrowArray;
                     ReadOnlyMemory<byte> ulongValueBuffer = arrowUlongArray.ValueBuffer.Memory;
                     ReadOnlyMemory<byte> ulongNullBitMapBuffer = arrowUlongArray.NullBitmapBuffer.Memory;
-                    dataFrameColumn = new UInt64DataFrameColumn(fieldName, ulongValueBuffer, ulongNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
+                    dataFrameColumn = new PrimitiveDataFrameColumn<ulong>(fieldName, ulongValueBuffer, ulongNullBitMapBuffer, arrowArray.Length, arrowArray.NullCount);
                     break;
                 case ArrowTypeId.Struct:
                     StructArray structArray = (StructArray)arrowArray;

src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs

@@ -131,59 +131,59 @@ private static DataFrameColumn CreateColumn(Type kind, string[] columnNames, int
             DataFrameColumn ret;
             if (kind == typeof(bool))
             {
-                ret = new BooleanDataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<bool>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(int))
             {
-                ret = new Int32DataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<int>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(float))
             {
-                ret = new SingleDataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<float>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(string))
             {
                 ret = new StringDataFrameColumn(GetColumnName(columnNames, columnIndex), 0);
             }
             else if (kind == typeof(long))
             {
-                ret = new Int64DataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<long>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(decimal))
             {
-                ret = new DecimalDataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<decimal>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(byte))
             {
-                ret = new ByteDataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<byte>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(char))
             {
-                ret = new CharDataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<char>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(double))
             {
-                ret = new DoubleDataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<double>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(sbyte))
             {
-                ret = new SByteDataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<sbyte>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(short))
             {
-                ret = new Int16DataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<short>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(uint))
             {
-                ret = new UInt32DataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<uint>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(ulong))
             {
-                ret = new UInt64DataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<ulong>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(ushort))
             {
-                ret = new UInt16DataFrameColumn(GetColumnName(columnNames, columnIndex));
+                ret = new PrimitiveDataFrameColumn<ushort>(GetColumnName(columnNames, columnIndex));
             }
             else if (kind == typeof(DateTime))
             {

src/Microsoft.Data.Analysis/CharDataFrameColumn.cs

@@ -221,7 +221,7 @@ private static Dictionary<long, ICollection<long>> GetOccurences(DataFrame retai
 
                     retainedIndicesReverseMapping = newRetainedIndicesReverseMapping;
 
-                    var indices = new Int64DataFrameColumn("Indices", shrinkedRetainedIndices);
+                    var indices = new PrimitiveDataFrameColumn<long>("Indices", shrinkedRetainedIndices);
                     shrinkedRetainedColumn = shrinkedRetainedColumn.Clone(indices);
                 }
 
@@ -277,8 +277,8 @@ private static HashSet<long> PerformMerging(DataFrame retainedDataFrame, string[
             out PrimitiveDataFrameColumn<long> retainedRowIndices, out PrimitiveDataFrameColumn<long> supplementaryRowIndices,
             bool isInner, bool calculateIntersection)
         {
-            retainedRowIndices = new Int64DataFrameColumn("RetainedIndices");
-            supplementaryRowIndices = new Int64DataFrameColumn("SupplementaryIndices");
+            retainedRowIndices = new PrimitiveDataFrameColumn<long>("RetainedIndices");
+            supplementaryRowIndices = new PrimitiveDataFrameColumn<long>("SupplementaryIndices");
 
             HashSet<long> intersection = calculateIntersection ? new HashSet<long>() : null;
 

src/Microsoft.Data.Analysis/DataFrame.Arrow.cs

@@ -643,7 +643,7 @@ private void OnColumnsChanged()
         private DataFrame Sort(string columnName, bool isAscending)
         {
             DataFrameColumn column = Columns[columnName];
-            PrimitiveDataFrameColumn<long> sortIndices = column.GetAscendingSortIndices(out Int64DataFrameColumn nullIndices);
+            PrimitiveDataFrameColumn<long> sortIndices = column.GetAscendingSortIndices(out PrimitiveDataFrameColumn<long> nullIndices);
             for (long i = 0; i < nullIndices.Length; i++)
             {
                 sortIndices.Append(nullIndices[i]);

src/Microsoft.Data.Analysis/DataFrame.IO.cs

@@ -199,7 +199,7 @@ public object this[long rowIndex]
         /// <param name="ascending"></param>
         public virtual DataFrameColumn Sort(bool ascending = true)
         {
-            PrimitiveDataFrameColumn<long> sortIndices = GetAscendingSortIndices(out Int64DataFrameColumn _);
+            PrimitiveDataFrameColumn<long> sortIndices = GetAscendingSortIndices(out PrimitiveDataFrameColumn<long> _);
             return Clone(sortIndices, !ascending, NullCount);
         }
 
@@ -378,7 +378,7 @@ public virtual StringDataFrameColumn Info()
         /// Returns the indices of non-null values that, when applied, result in this column being sorted in ascending order. Also returns the indices of null values in <paramref name="nullIndices"/>.
         /// </summary>
         /// <param name="nullIndices">Indices of values that are <see langword="null"/>.</param>
-        internal virtual PrimitiveDataFrameColumn<long> GetAscendingSortIndices(out Int64DataFrameColumn nullIndices) => throw new NotImplementedException();
+        internal virtual PrimitiveDataFrameColumn<long> GetAscendingSortIndices(out PrimitiveDataFrameColumn<long> nullIndices) => throw new NotImplementedException();
 
         internal delegate long GetBufferSortIndex(int bufferIndex, int sortIndex);
         internal delegate ValueTuple<T, int> GetValueAndBufferSortIndexAtBuffer<T>(int bufferIndex, int valueIndex);