Skip to content

Fix wrong type conversion on PrimitiveDataFrameColumn #6834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 25, 2023
Merged

Fix wrong type conversion on PrimitiveDataFrameColumn #6834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a340937
Fix wrong type conversion on PrimitiveDataFrameColumn
novelhawk Sep 20, 2023
efa6162
Added tests for #6829
novelhawk Sep 20, 2023
055c9a8
Fix test
novelhawk Sep 20, 2023
93e3682
Merge pull request #3 from novelhawk/main
asmirnov82 Sep 24, 2023
b3f5534
Add file generated from tt template and fix unit tests
asmirnov82 Sep 24, 2023
7c07dc9
Merge pull request #1 from asmirnov82/novelhawk_6829
novelhawk Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.BinaryOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,7 +1955,7 @@ internal PrimitiveDataFrameColumn<bool> ElementwiseEqualsImplementation<U>(U val
{
throw new NotSupportedException();
}
return new BooleanDataFrameColumn(Name, (this as PrimitiveDataFrameColumn<bool>)._columnContainer.ElementwiseEquals(Unsafe.As<U, bool>(ref value)));
return new BooleanDataFrameColumn(Name, (this as PrimitiveDataFrameColumn<DateTime>)._columnContainer.ElementwiseEquals(Unsafe.As<U, DateTime>(ref value)));
case Type byteType when byteType == typeof(byte):
case Type charType when charType == typeof(char):
case Type doubleType when doubleType == typeof(double):
Expand Down Expand Up @@ -2102,7 +2102,7 @@ internal PrimitiveDataFrameColumn<bool> ElementwiseNotEqualsImplementation<U>(U
{
throw new NotSupportedException();
}
return new BooleanDataFrameColumn(Name, (this as PrimitiveDataFrameColumn<bool>)._columnContainer.ElementwiseNotEquals(Unsafe.As<U, bool>(ref value)));
return new BooleanDataFrameColumn(Name, (this as PrimitiveDataFrameColumn<DateTime>)._columnContainer.ElementwiseNotEquals(Unsafe.As<U, DateTime>(ref value)));
case Type byteType when byteType == typeof(byte):
case Type charType when charType == typeof(char):
case Type doubleType when doubleType == typeof(double):
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.BinaryOperations.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ namespace Microsoft.Data.Analysis
throw new NotSupportedException();
}
<# if (method.MethodType == MethodType.ComparisonScalar) { #>
return new BooleanDataFrameColumn(Name, (this as PrimitiveDataFrameColumn<bool>)._columnContainer.<#=method.MethodName#>(Unsafe.As<U, bool>(ref value)));
return new BooleanDataFrameColumn(Name, (this as PrimitiveDataFrameColumn<<#=type.TypeName#>>)._columnContainer.<#=method.MethodName#>(Unsafe.As<U, <#=type.TypeName#>>(ref value)));
<# } else if (method.MethodType == MethodType.Comparison) { #>
return new BooleanDataFrameColumn(Name, (this as PrimitiveDataFrameColumn<U>)._columnContainer.<#=method.MethodName#>(column._columnContainer));
<# } else if (method.MethodType == MethodType.BinaryScalar) {#>
Expand Down
8 changes: 8 additions & 0 deletions test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,9 +625,17 @@ public void TestBinaryOperationsOnDateTimeColumn()
Assert.True(equalsResult[0]);
Assert.False(equalsResult[4]);

var equalsToScalarResult = df["DateTime1"].ElementwiseEquals(SampleDateTime);
Assert.True(equalsToScalarResult[0]);
Assert.False(equalsToScalarResult[1]);

var notEqualsResult = dataFrameColumn1.ElementwiseNotEquals(dataFrameColumn2);
Assert.False(notEqualsResult[0]);
Assert.True(notEqualsResult[4]);

var notEqualsToScalarResult = df["DateTime1"].ElementwiseNotEquals(SampleDateTime);
Assert.False(notEqualsToScalarResult[0]);
Assert.True(notEqualsToScalarResult[1]);
}

[Fact]
Expand Down