Remove T : unmanaged constraint from DataFrameColumn.BinaryOperatio…

…ns (dotnet#2801) * Remove T : unmanaged constraint from DataFrameColumn.BinaryOperations * Address feedback * Rename the value version of the APIs * sq * Fix build * Address feedback * Remove Value from the APIs * sq * Address feedback
pgovind · Dec 12, 2019 · dc4f9b0 · dc4f9b0
1 parent 303ba62
commit dc4f9b0
Show file tree

Hide file tree

Showing 11 changed files with 219 additions and 157 deletions.
diff --git a/src/Microsoft.Data.Analysis/ArrowStringDataFrameColumn.cs b/src/Microsoft.Data.Analysis/ArrowStringDataFrameColumn.cs
@@ -497,6 +497,10 @@ public PrimitiveDataFrameColumn<bool> ElementwiseEquals(string value)
 
         public override PrimitiveDataFrameColumn<bool> ElementwiseEquals<T>(T value)
         {
+            if (value is DataFrameColumn column)
+            {
+                return ElementwiseEquals(column);
+            }
             return ElementwiseEquals(value.ToString());
         }
 
@@ -532,6 +536,10 @@ public PrimitiveDataFrameColumn<bool> ElementwiseNotEquals(string value)
 
         public override PrimitiveDataFrameColumn<bool> ElementwiseNotEquals<T>(T value)
         {
+            if (value is DataFrameColumn column)
+            {
+                return ElementwiseNotEquals(column);
+            }
             return ElementwiseNotEquals(value.ToString());
         }
 

diff --git a/src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs b/src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.cs
@@ -21,7 +21,6 @@ public virtual DataFrameColumn Add(DataFrameColumn column, bool inPlace = false)
         /// Performs an element wise addition on each value in the column
         /// </summary>
         public virtual DataFrameColumn Add<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -30,7 +29,6 @@ public virtual DataFrameColumn Add<T>(T value, bool inPlace = false)
         /// Performs a reversed element wise addition on each value in the column
         /// </summary>
         public virtual DataFrameColumn ReverseAdd<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -44,7 +42,6 @@ public virtual DataFrameColumn Subtract(DataFrameColumn column, bool inPlace = f
         /// Performs an element wise subtraction on each value in the column
         /// </summary>
         public virtual DataFrameColumn Subtract<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -53,7 +50,6 @@ public virtual DataFrameColumn Subtract<T>(T value, bool inPlace = false)
         /// Performs a reversed element wise subtraction on each value in the column
         /// </summary>
         public virtual DataFrameColumn ReverseSubtract<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -67,7 +63,6 @@ public virtual DataFrameColumn Multiply(DataFrameColumn column, bool inPlace = f
         /// Performs an element wise multiplication on each value in the column
         /// </summary>
         public virtual DataFrameColumn Multiply<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -76,7 +71,6 @@ public virtual DataFrameColumn Multiply<T>(T value, bool inPlace = false)
         /// Performs a reversed element wise multiplication on each value in the column
         /// </summary>
         public virtual DataFrameColumn ReverseMultiply<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -90,7 +84,6 @@ public virtual DataFrameColumn Divide(DataFrameColumn column, bool inPlace = fal
         /// Performs an element wise division on each value in the column
         /// </summary>
         public virtual DataFrameColumn Divide<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -99,7 +92,6 @@ public virtual DataFrameColumn Divide<T>(T value, bool inPlace = false)
         /// Performs a reversed element wise division on each value in the column
         /// </summary>
         public virtual DataFrameColumn ReverseDivide<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -113,7 +105,6 @@ public virtual DataFrameColumn Modulo(DataFrameColumn column, bool inPlace = fal
         /// Performs an element wise modulus operation on each value in the column
         /// </summary>
         public virtual DataFrameColumn Modulo<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -122,7 +113,6 @@ public virtual DataFrameColumn Modulo<T>(T value, bool inPlace = false)
         /// Performs a reversed element wise modulus operation on each value in the column
         /// </summary>
         public virtual DataFrameColumn ReverseModulo<T>(T value, bool inPlace = false)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -215,7 +205,6 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseEquals(DataFrameColumn
         /// Performs an element wise equals on each value in the column
         /// </summary>
         public virtual PrimitiveDataFrameColumn<bool> ElementwiseEquals<T>(T value)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -229,7 +218,6 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseNotEquals(DataFrameColu
         /// Performs an element wise not-equals on each value in the column
         /// </summary>
         public virtual PrimitiveDataFrameColumn<bool> ElementwiseNotEquals<T>(T value)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -243,7 +231,6 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseGreaterThanOrEqual(Data
         /// Performs an element wise greater than or equal on each value in the column
         /// </summary>
         public virtual PrimitiveDataFrameColumn<bool> ElementwiseGreaterThanOrEqual<T>(T value)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -257,7 +244,6 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseLessThanOrEqual(DataFra
         /// Performs an element wise less than or equal on each value in the column
         /// </summary>
         public virtual PrimitiveDataFrameColumn<bool> ElementwiseLessThanOrEqual<T>(T value)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -271,7 +257,6 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseGreaterThan(DataFrameCo
         /// Performs an element wise greater than on each value in the column
         /// </summary>
         public virtual PrimitiveDataFrameColumn<bool> ElementwiseGreaterThan<T>(T value)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }
@@ -285,7 +270,6 @@ public virtual PrimitiveDataFrameColumn<bool> ElementwiseLessThan(DataFrameColum
         /// Performs an element wise less than on each value in the column
         /// </summary>
         public virtual PrimitiveDataFrameColumn<bool> ElementwiseLessThan<T>(T value)
-            where T : unmanaged
         {
             throw new NotImplementedException();
         }

diff --git a/src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.tt b/src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.tt
@@ -30,15 +30,13 @@ namespace Microsoft.Data.Analysis
         /// <#=method.GetColumnSpecificMethodComments()#>
         /// </summary>
         public virtual DataFrameColumn <#=method.MethodName#><T>(T value, bool inPlace = false)
-            where T : unmanaged
 <# } #>
 <# } #>
 <# if (method.MethodType == MethodType.ComparisonScalar) { #>
         /// <summary>
         /// <#=method.GetColumnSpecificMethodComments()#>
         /// </summary>
         public virtual PrimitiveDataFrameColumn<bool> <#=method.MethodName#><T>(T value)
-            where T : unmanaged
 <# } #>
 <# if (method.MethodType == MethodType.Binary) {#>
         public virtual DataFrameColumn <#=method.MethodName#>(DataFrameColumn column, bool inPlace = false)
@@ -67,7 +65,6 @@ namespace Microsoft.Data.Analysis
         /// <#=method.GetColumnSpecificReverseMethodComments()#>
         /// </summary>
         public virtual DataFrameColumn Reverse<#=method.MethodName#><T>(T value, bool inPlace = false)
-            where T : unmanaged
 <# } #>
         {
             throw new NotImplementedException();

diff --git a/src/Microsoft.Data.Analysis/DecimalConverter.cs b/src/Microsoft.Data.Analysis/DecimalConverter.cs
@@ -5,19 +5,16 @@
 namespace Microsoft.Data.Analysis
 {
     internal interface IDecimalConverter<T>
-        where T : struct
     {
         decimal GetDecimal(T value);
     }
     internal static class DecimalConverter<T>
-        where T : struct
     {
         public static IDecimalConverter<T> Instance { get; } = DecimalConverter.GetDecimalConverter<T>();
     }
     internal static class DecimalConverter
     {
         public static IDecimalConverter<T> GetDecimalConverter<T>()
-            where T : struct
         {
             if (typeof(T) == typeof(bool))
             {

diff --git a/src/Microsoft.Data.Analysis/DoubleConverter.cs b/src/Microsoft.Data.Analysis/DoubleConverter.cs
@@ -5,19 +5,16 @@
 namespace Microsoft.Data.Analysis
 {
     internal interface IDoubleConverter<T>
-        where T : struct
     {
         double GetDouble(T value);
     }
     internal static class DoubleConverter<T>
-        where T : struct
     {
         public static IDoubleConverter<T> Instance { get; } = DoubleConverter.GetDoubleConverter<T>();
     }
     internal static class DoubleConverter
     {
         public static IDoubleConverter<T> GetDoubleConverter<T>()
-            where T : struct
         {
             if (typeof(T) == typeof(bool))
             {