Fix DataFrame Merge issue#6677

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
michaelgsharp merged 3 commits into from
Jun 13, 2023
Merged

Fix DataFrame Merge issue #6677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b52b31c
Fix DataFrame Merge issue
asmirnov82 May 14, 2023
2522d8c
Return commented test
asmirnov82 May 17, 2023
580f010
Merge remote-tracking branch 'origin/main' into 6127_dataframe_merge_…
asmirnov82 May 17, 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
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public BooleanDataFrameColumn(string name, long length = 0) : base(name, length)
public BooleanDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal BooleanDataFrameColumn(string name, PrimitiveColumnContainer<bool> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, long length = 0)
{
return new BooleanDataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, PrimitiveColumnContainer<bool> container)
{
return new BooleanDataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public ByteDataFrameColumn(string name, long length = 0) : base(name, length) {
public ByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal ByteDataFrameColumn(string name, PrimitiveColumnContainer<byte> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, long length = 0)
{
return new ByteDataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, PrimitiveColumnContainer<byte> container)
{
return new ByteDataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/CharDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public CharDataFrameColumn(string name, long length = 0) : base(name, length) {
public CharDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal CharDataFrameColumn(string name, PrimitiveColumnContainer<char> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, long length = 0)
{
return new CharDataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, PrimitiveColumnContainer<char> container)
{
return new CharDataFrameColumn(name, container);
}
}
}
17 changes: 17 additions & 0 deletions src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,23 @@ public PrimitiveDataFrameColumn<T> GetPrimitiveColumn<T>(string name)
throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(T)), nameof(T));
}

/// <summary>
/// Gets the <see cref="DateTimeDataFrameColumn"/> with the specified <paramref name="name"/>.
/// </summary>
/// <param name="name">The name of the column</param>
/// <returns><see cref="DateTimeDataFrameColumn"/>.</returns>
/// <exception cref="ArgumentException">A column named <paramref name="name"/> cannot be found, or if the column's type doesn't match.</exception>
public DateTimeDataFrameColumn GetDateTimeColumn(string name)
{
DataFrameColumn column = this[name];
if (column is DateTimeDataFrameColumn ret)
{
return ret;
}

throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(DateTime)));
}

/// <summary>
/// Gets the <see cref="ArrowStringDataFrameColumn"/> with the specified <paramref name="name"/>.
/// </summary>
Expand Down
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DateTimeDataFrameColumn(string name, long length = 0) : base(name, length
public DateTimeDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal DateTimeDataFrameColumn(string name, PrimitiveColumnContainer<DateTime> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, long length = 0)
{
return new DateTimeDataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, PrimitiveColumnContainer<DateTime> container)
{
return new DateTimeDataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DecimalDataFrameColumn(string name, long length = 0) : base(name, length)
public DecimalDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal DecimalDataFrameColumn(string name, PrimitiveColumnContainer<decimal> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, long length = 0)
{
return new DecimalDataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, PrimitiveColumnContainer<decimal> container)
{
return new DecimalDataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DoubleDataFrameColumn(string name, long length = 0) : base(name, length)
public DoubleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal DoubleDataFrameColumn(string name, PrimitiveColumnContainer<double> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, long length = 0)
{
return new DoubleDataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, PrimitiveColumnContainer<double> container)
{
return new DoubleDataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int16DataFrameColumn(string name, long length = 0) : base(name, length) {
public Int16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal Int16DataFrameColumn(string name, PrimitiveColumnContainer<short> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, long length = 0)
{
return new Int16DataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, PrimitiveColumnContainer<short> container)
{
return new Int16DataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int32DataFrameColumn(string name, long length = 0) : base(name, length) {
public Int32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal Int32DataFrameColumn(string name, PrimitiveColumnContainer<int> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, long length = 0)
{
return new Int32DataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, PrimitiveColumnContainer<int> container)
{
return new Int32DataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int64DataFrameColumn(string name, long length = 0) : base(name, length) {
public Int64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal Int64DataFrameColumn(string name, PrimitiveColumnContainer<long> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, long length = 0)
{
return new Int64DataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, PrimitiveColumnContainer<long> container)
{
return new Int64DataFrameColumn(name, container);
}
}
}
17 changes: 14 additions & 3 deletions src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,6 +188,16 @@ protected override IReadOnlyList<object> GetValues(long startIndex, int length)
return ret;
}

internal virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, PrimitiveColumnContainer<T> container)
{
return new PrimitiveDataFrameColumn<T>(name, container);
}

protected virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, long length = 0)
{
return new PrimitiveDataFrameColumn<T>(name, length);
}

internal T? GetTypedValue(long rowIndex) => _columnContainer[rowIndex];

protected override object GetValue(long rowIndex) => GetTypedValue(rowIndex);
Expand DownExpand Up@@ -379,7 +389,7 @@ private PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<bool> boolCol
{
if (boolColumn.Length > Length)
throw new ArgumentException(Strings.MapIndicesExceedsColumnLenth, nameof(boolColumn));
PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
for (long i = 0; i < boolColumn.Length; i++)
{
bool? value = boolColumn[i];
Expand All@@ -406,7 +416,8 @@ private PrimitiveDataFrameColumn<T> CloneImplementation<U>(PrimitiveDataFrameCol
}
else
throw new NotImplementedException();
PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name, retContainer);

PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name, retContainer);
return ret;
}

Expand All@@ -415,7 +426,7 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<long> mapIndic
if (mapIndices is null)
{
PrimitiveColumnContainer<T> newColumnContainer = _columnContainer.Clone();
return new PrimitiveDataFrameColumn<T>(Name, newColumnContainer);
return CreateNewColumn(Name, newColumnContainer);
}
else
{
Expand Down
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SByteDataFrameColumn(string name, long length = 0) : base(name, length) {
public SByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal SByteDataFrameColumn(string name, PrimitiveColumnContainer<sbyte> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, long length = 0)
{
return new SByteDataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, PrimitiveColumnContainer<sbyte> container)
{
return new SByteDataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SingleDataFrameColumn(string name, long length = 0) : base(name, length)
public SingleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal SingleDataFrameColumn(string name, PrimitiveColumnContainer<float> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, long length = 0)
{
return new SingleDataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, PrimitiveColumnContainer<float> container)
{
return new SingleDataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt16DataFrameColumn(string name, long length = 0) : base(name, length)
public UInt16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal UInt16DataFrameColumn(string name, PrimitiveColumnContainer<ushort> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, long length = 0)
{
return new UInt16DataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, PrimitiveColumnContainer<ushort> container)
{
return new UInt16DataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt32DataFrameColumn(string name, long length = 0) : base(name, length)
public UInt32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal UInt32DataFrameColumn(string name, PrimitiveColumnContainer<uint> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, long length = 0)
{
return new UInt32DataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, PrimitiveColumnContainer<uint> container)
{
return new UInt32DataFrameColumn(name, container);
}
}
}
10 changes: 10 additions & 0 deletions src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt64DataFrameColumn(string name, long length = 0) : base(name, length)
public UInt64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

internal UInt64DataFrameColumn(string name, PrimitiveColumnContainer<ulong> values) : base(name, values) { }

protected override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, long length = 0)
{
return new UInt64DataFrameColumn(name, length);
}

internal override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, PrimitiveColumnContainer<ulong> container)
{
return new UInt64DataFrameColumn(name, container);
}
}
}
50 changes: 50 additions & 0 deletions test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2659,6 +2659,56 @@ public void TestMerge_Issue5778()
MatchRowsOnMergedDataFrame(merge, left, right, 1, 1, 0);
}

[Fact]
//Issue 6127
public void TestMerge_CorrectColumnTypes()
{
DataFrame left = MakeDataFrameWithAllMutableColumnTypes(2, false);
DataFrame right = MakeDataFrameWithAllMutableColumnTypes(1);

DataFrame merge = left.Merge<int>(right, "Int", "Int");

Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_left"));
Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_right"));

Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_left"));
Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_right"));

Assert.NotNull(merge.Columns.GetSingleColumn("Float_left"));
Assert.NotNull(merge.Columns.GetSingleColumn("Float_right"));

Assert.NotNull(merge.Columns.GetDoubleColumn("Double_left"));
Assert.NotNull(merge.Columns.GetDoubleColumn("Double_right"));

Assert.NotNull(merge.Columns.GetByteColumn("Byte_left"));
Assert.NotNull(merge.Columns.GetByteColumn("Byte_right"));

Assert.NotNull(merge.Columns.GetCharColumn("Char_left"));
Assert.NotNull(merge.Columns.GetCharColumn("Char_right"));

Assert.NotNull(merge.Columns.GetInt16Column("Short_left"));
Assert.NotNull(merge.Columns.GetInt16Column("Short_right"));

Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_left"));
Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_right"));

Assert.NotNull(merge.Columns.GetInt32Column("Int_left"));
Assert.NotNull(merge.Columns.GetInt32Column("Int_right"));

Assert.NotNull(merge.Columns.GetUInt32Column("Uint_left"));
Assert.NotNull(merge.Columns.GetUInt32Column("Uint_right"));

Assert.NotNull(merge.Columns.GetInt64Column("Long_left"));
Assert.NotNull(merge.Columns.GetInt64Column("Long_right"));

Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_left"));
Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_right"));

Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_left"));
Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_right"));

}

[Fact]
public void TestDescription()
{
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix DataFrame Merge issue#6677

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

michaelgsharp
merged 3 commits into

from

Jun 13, 2023
 Merged


Fix DataFrame Merge issue
#6677
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b52b31c

Fix DataFrame Merge issue


asmirnov82 May 14, 2023
2522d8c

Return commented test


asmirnov82 May 17, 2023
580f010

Merge remote-tracking branch 'origin/main' into 6127_dataframe_merge_…


asmirnov82 May 17, 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


10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public BooleanDataFrameColumn(string name, long length = 0) : base(name, length)
 public BooleanDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal BooleanDataFrameColumn(string name, PrimitiveColumnContainer<bool> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, long length = 0)
 {
 return new BooleanDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, PrimitiveColumnContainer<bool> container)
 {
 return new BooleanDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public ByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public ByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal ByteDataFrameColumn(string name, PrimitiveColumnContainer<byte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, long length = 0)
 {
 return new ByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, PrimitiveColumnContainer<byte> container)
 {
 return new ByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/CharDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public CharDataFrameColumn(string name, long length = 0) : base(name, length) {
 public CharDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal CharDataFrameColumn(string name, PrimitiveColumnContainer<char> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, long length = 0)
 {
 return new CharDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, PrimitiveColumnContainer<char> container)
 {
 return new CharDataFrameColumn(name, container);
 }
 }
}

17 changes: 17 additions & 0 deletions
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,23 @@ public PrimitiveDataFrameColumn<T> GetPrimitiveColumn<T>(string name)
 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(T)), nameof(T));
 }

 /// <summary>
 /// Gets the <see cref="DateTimeDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
 /// <param name="name">The name of the column</param>
 /// <returns><see cref="DateTimeDataFrameColumn"/>.</returns>
 /// <exception cref="ArgumentException">A column named <paramref name="name"/> cannot be found, or if the column's type doesn't match.</exception>
 public DateTimeDataFrameColumn GetDateTimeColumn(string name)
 {
 DataFrameColumn column = this[name];
 if (column is DateTimeDataFrameColumn ret)
 {
 return ret;
 }

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(DateTime)));
 }

 /// <summary>
 /// Gets the <see cref="ArrowStringDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DateTimeDataFrameColumn(string name, long length = 0) : base(name, length
 public DateTimeDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DateTimeDataFrameColumn(string name, PrimitiveColumnContainer<DateTime> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, long length = 0)
 {
 return new DateTimeDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, PrimitiveColumnContainer<DateTime> container)
 {
 return new DateTimeDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DecimalDataFrameColumn(string name, long length = 0) : base(name, length)
 public DecimalDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DecimalDataFrameColumn(string name, PrimitiveColumnContainer<decimal> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, long length = 0)
 {
 return new DecimalDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, PrimitiveColumnContainer<decimal> container)
 {
 return new DecimalDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DoubleDataFrameColumn(string name, long length = 0) : base(name, length)
 public DoubleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DoubleDataFrameColumn(string name, PrimitiveColumnContainer<double> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, long length = 0)
 {
 return new DoubleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, PrimitiveColumnContainer<double> container)
 {
 return new DoubleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int16DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int16DataFrameColumn(string name, PrimitiveColumnContainer<short> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, long length = 0)
 {
 return new Int16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, PrimitiveColumnContainer<short> container)
 {
 return new Int16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int32DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int32DataFrameColumn(string name, PrimitiveColumnContainer<int> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, long length = 0)
 {
 return new Int32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, PrimitiveColumnContainer<int> container)
 {
 return new Int32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int64DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int64DataFrameColumn(string name, PrimitiveColumnContainer<long> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, long length = 0)
 {
 return new Int64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, PrimitiveColumnContainer<long> container)
 {
 return new Int64DataFrameColumn(name, container);
 }
 }
}

17 changes: 14 additions & 3 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,6 +188,16 @@ protected override IReadOnlyList<object> GetValues(long startIndex, int length)
 return ret;
 }

 internal virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, PrimitiveColumnContainer<T> container)
 {
 return new PrimitiveDataFrameColumn<T>(name, container);
 }

 protected virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, long length = 0)
 {
 return new PrimitiveDataFrameColumn<T>(name, length);
 }

 internal T? GetTypedValue(long rowIndex) => _columnContainer[rowIndex];

 protected override object GetValue(long rowIndex) => GetTypedValue(rowIndex);
Expand DownExpand Up@@ -379,7 +389,7 @@ private PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<bool> boolCol
 {
 if (boolColumn.Length > Length)
 throw new ArgumentException(Strings.MapIndicesExceedsColumnLenth, nameof(boolColumn));
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 for (long i = 0; i < boolColumn.Length; i++)
 {
 bool? value = boolColumn[i];
Expand All@@ -406,7 +416,8 @@ private PrimitiveDataFrameColumn<T> CloneImplementation<U>(PrimitiveDataFrameCol
 }
 else
 throw new NotImplementedException();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name, retContainer);

 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name, retContainer);
 return ret;
 }

Expand All@@ -415,7 +426,7 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<long> mapIndic
 if (mapIndices is null)
 {
 PrimitiveColumnContainer<T> newColumnContainer = _columnContainer.Clone();
 return new PrimitiveDataFrameColumn<T>(Name, newColumnContainer);
 return CreateNewColumn(Name, newColumnContainer);
 }
 else
 {
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public SByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SByteDataFrameColumn(string name, PrimitiveColumnContainer<sbyte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, long length = 0)
 {
 return new SByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, PrimitiveColumnContainer<sbyte> container)
 {
 return new SByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SingleDataFrameColumn(string name, long length = 0) : base(name, length)
 public SingleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SingleDataFrameColumn(string name, PrimitiveColumnContainer<float> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, long length = 0)
 {
 return new SingleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, PrimitiveColumnContainer<float> container)
 {
 return new SingleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt16DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt16DataFrameColumn(string name, PrimitiveColumnContainer<ushort> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, long length = 0)
 {
 return new UInt16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, PrimitiveColumnContainer<ushort> container)
 {
 return new UInt16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt32DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt32DataFrameColumn(string name, PrimitiveColumnContainer<uint> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, long length = 0)
 {
 return new UInt32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, PrimitiveColumnContainer<uint> container)
 {
 return new UInt32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt64DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt64DataFrameColumn(string name, PrimitiveColumnContainer<ulong> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, long length = 0)
 {
 return new UInt64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, PrimitiveColumnContainer<ulong> container)
 {
 return new UInt64DataFrameColumn(name, container);
 }
 }
}

50 changes: 50 additions & 0 deletions
test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2659,6 +2659,56 @@ public void TestMerge_Issue5778()
 MatchRowsOnMergedDataFrame(merge, left, right, 1, 1, 0);
 }

 [Fact]
 //Issue 6127
 public void TestMerge_CorrectColumnTypes()
 {
 DataFrame left = MakeDataFrameWithAllMutableColumnTypes(2, false);
 DataFrame right = MakeDataFrameWithAllMutableColumnTypes(1);

 DataFrame merge = left.Merge<int>(right, "Int", "Int");

 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_left"));
 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_right"));

 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_left"));
 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_right"));

 Assert.NotNull(merge.Columns.GetSingleColumn("Float_left"));
 Assert.NotNull(merge.Columns.GetSingleColumn("Float_right"));

 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_left"));
 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_right"));

 Assert.NotNull(merge.Columns.GetByteColumn("Byte_left"));
 Assert.NotNull(merge.Columns.GetByteColumn("Byte_right"));

 Assert.NotNull(merge.Columns.GetCharColumn("Char_left"));
 Assert.NotNull(merge.Columns.GetCharColumn("Char_right"));

 Assert.NotNull(merge.Columns.GetInt16Column("Short_left"));
 Assert.NotNull(merge.Columns.GetInt16Column("Short_right"));

 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_left"));
 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_right"));

 Assert.NotNull(merge.Columns.GetInt32Column("Int_left"));
 Assert.NotNull(merge.Columns.GetInt32Column("Int_right"));

 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_left"));
 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_right"));

 Assert.NotNull(merge.Columns.GetInt64Column("Long_left"));
 Assert.NotNull(merge.Columns.GetInt64Column("Long_right"));

 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_left"));
 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_right"));

 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_left"));
 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_right"));

 }

 [Fact]
 public void TestDescription()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix DataFrame Merge issue#6677

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

michaelgsharp
merged 3 commits into

from

Jun 13, 2023
 Merged


Fix DataFrame Merge issue
#6677
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b52b31c

Fix DataFrame Merge issue


asmirnov82 May 14, 2023
2522d8c

Return commented test


asmirnov82 May 17, 2023
580f010

Merge remote-tracking branch 'origin/main' into 6127_dataframe_merge_…


asmirnov82 May 17, 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


10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public BooleanDataFrameColumn(string name, long length = 0) : base(name, length)
 public BooleanDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal BooleanDataFrameColumn(string name, PrimitiveColumnContainer<bool> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, long length = 0)
 {
 return new BooleanDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, PrimitiveColumnContainer<bool> container)
 {
 return new BooleanDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public ByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public ByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal ByteDataFrameColumn(string name, PrimitiveColumnContainer<byte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, long length = 0)
 {
 return new ByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, PrimitiveColumnContainer<byte> container)
 {
 return new ByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/CharDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public CharDataFrameColumn(string name, long length = 0) : base(name, length) {
 public CharDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal CharDataFrameColumn(string name, PrimitiveColumnContainer<char> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, long length = 0)
 {
 return new CharDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, PrimitiveColumnContainer<char> container)
 {
 return new CharDataFrameColumn(name, container);
 }
 }
}

17 changes: 17 additions & 0 deletions
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,23 @@ public PrimitiveDataFrameColumn<T> GetPrimitiveColumn<T>(string name)
 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(T)), nameof(T));
 }

 /// <summary>
 /// Gets the <see cref="DateTimeDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
 /// <param name="name">The name of the column</param>
 /// <returns><see cref="DateTimeDataFrameColumn"/>.</returns>
 /// <exception cref="ArgumentException">A column named <paramref name="name"/> cannot be found, or if the column's type doesn't match.</exception>
 public DateTimeDataFrameColumn GetDateTimeColumn(string name)
 {
 DataFrameColumn column = this[name];
 if (column is DateTimeDataFrameColumn ret)
 {
 return ret;
 }

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(DateTime)));
 }

 /// <summary>
 /// Gets the <see cref="ArrowStringDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DateTimeDataFrameColumn(string name, long length = 0) : base(name, length
 public DateTimeDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DateTimeDataFrameColumn(string name, PrimitiveColumnContainer<DateTime> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, long length = 0)
 {
 return new DateTimeDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, PrimitiveColumnContainer<DateTime> container)
 {
 return new DateTimeDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DecimalDataFrameColumn(string name, long length = 0) : base(name, length)
 public DecimalDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DecimalDataFrameColumn(string name, PrimitiveColumnContainer<decimal> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, long length = 0)
 {
 return new DecimalDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, PrimitiveColumnContainer<decimal> container)
 {
 return new DecimalDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DoubleDataFrameColumn(string name, long length = 0) : base(name, length)
 public DoubleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DoubleDataFrameColumn(string name, PrimitiveColumnContainer<double> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, long length = 0)
 {
 return new DoubleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, PrimitiveColumnContainer<double> container)
 {
 return new DoubleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int16DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int16DataFrameColumn(string name, PrimitiveColumnContainer<short> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, long length = 0)
 {
 return new Int16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, PrimitiveColumnContainer<short> container)
 {
 return new Int16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int32DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int32DataFrameColumn(string name, PrimitiveColumnContainer<int> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, long length = 0)
 {
 return new Int32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, PrimitiveColumnContainer<int> container)
 {
 return new Int32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int64DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int64DataFrameColumn(string name, PrimitiveColumnContainer<long> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, long length = 0)
 {
 return new Int64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, PrimitiveColumnContainer<long> container)
 {
 return new Int64DataFrameColumn(name, container);
 }
 }
}

17 changes: 14 additions & 3 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,6 +188,16 @@ protected override IReadOnlyList<object> GetValues(long startIndex, int length)
 return ret;
 }

 internal virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, PrimitiveColumnContainer<T> container)
 {
 return new PrimitiveDataFrameColumn<T>(name, container);
 }

 protected virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, long length = 0)
 {
 return new PrimitiveDataFrameColumn<T>(name, length);
 }

 internal T? GetTypedValue(long rowIndex) => _columnContainer[rowIndex];

 protected override object GetValue(long rowIndex) => GetTypedValue(rowIndex);
Expand DownExpand Up@@ -379,7 +389,7 @@ private PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<bool> boolCol
 {
 if (boolColumn.Length > Length)
 throw new ArgumentException(Strings.MapIndicesExceedsColumnLenth, nameof(boolColumn));
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 for (long i = 0; i < boolColumn.Length; i++)
 {
 bool? value = boolColumn[i];
Expand All@@ -406,7 +416,8 @@ private PrimitiveDataFrameColumn<T> CloneImplementation<U>(PrimitiveDataFrameCol
 }
 else
 throw new NotImplementedException();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name, retContainer);

 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name, retContainer);
 return ret;
 }

Expand All@@ -415,7 +426,7 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<long> mapIndic
 if (mapIndices is null)
 {
 PrimitiveColumnContainer<T> newColumnContainer = _columnContainer.Clone();
 return new PrimitiveDataFrameColumn<T>(Name, newColumnContainer);
 return CreateNewColumn(Name, newColumnContainer);
 }
 else
 {
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public SByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SByteDataFrameColumn(string name, PrimitiveColumnContainer<sbyte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, long length = 0)
 {
 return new SByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, PrimitiveColumnContainer<sbyte> container)
 {
 return new SByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SingleDataFrameColumn(string name, long length = 0) : base(name, length)
 public SingleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SingleDataFrameColumn(string name, PrimitiveColumnContainer<float> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, long length = 0)
 {
 return new SingleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, PrimitiveColumnContainer<float> container)
 {
 return new SingleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt16DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt16DataFrameColumn(string name, PrimitiveColumnContainer<ushort> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, long length = 0)
 {
 return new UInt16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, PrimitiveColumnContainer<ushort> container)
 {
 return new UInt16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt32DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt32DataFrameColumn(string name, PrimitiveColumnContainer<uint> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, long length = 0)
 {
 return new UInt32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, PrimitiveColumnContainer<uint> container)
 {
 return new UInt32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt64DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt64DataFrameColumn(string name, PrimitiveColumnContainer<ulong> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, long length = 0)
 {
 return new UInt64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, PrimitiveColumnContainer<ulong> container)
 {
 return new UInt64DataFrameColumn(name, container);
 }
 }
}

50 changes: 50 additions & 0 deletions
test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2659,6 +2659,56 @@ public void TestMerge_Issue5778()
 MatchRowsOnMergedDataFrame(merge, left, right, 1, 1, 0);
 }

 [Fact]
 //Issue 6127
 public void TestMerge_CorrectColumnTypes()
 {
 DataFrame left = MakeDataFrameWithAllMutableColumnTypes(2, false);
 DataFrame right = MakeDataFrameWithAllMutableColumnTypes(1);

 DataFrame merge = left.Merge<int>(right, "Int", "Int");

 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_left"));
 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_right"));

 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_left"));
 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_right"));

 Assert.NotNull(merge.Columns.GetSingleColumn("Float_left"));
 Assert.NotNull(merge.Columns.GetSingleColumn("Float_right"));

 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_left"));
 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_right"));

 Assert.NotNull(merge.Columns.GetByteColumn("Byte_left"));
 Assert.NotNull(merge.Columns.GetByteColumn("Byte_right"));

 Assert.NotNull(merge.Columns.GetCharColumn("Char_left"));
 Assert.NotNull(merge.Columns.GetCharColumn("Char_right"));

 Assert.NotNull(merge.Columns.GetInt16Column("Short_left"));
 Assert.NotNull(merge.Columns.GetInt16Column("Short_right"));

 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_left"));
 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_right"));

 Assert.NotNull(merge.Columns.GetInt32Column("Int_left"));
 Assert.NotNull(merge.Columns.GetInt32Column("Int_right"));

 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_left"));
 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_right"));

 Assert.NotNull(merge.Columns.GetInt64Column("Long_left"));
 Assert.NotNull(merge.Columns.GetInt64Column("Long_right"));

 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_left"));
 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_right"));

 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_left"));
 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_right"));

 }

 [Fact]
 public void TestDescription()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix DataFrame Merge issue#6677

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

michaelgsharp
merged 3 commits into

from

Jun 13, 2023
 Merged


Fix DataFrame Merge issue
#6677
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b52b31c

Fix DataFrame Merge issue


asmirnov82 May 14, 2023
2522d8c

Return commented test


asmirnov82 May 17, 2023
580f010

Merge remote-tracking branch 'origin/main' into 6127_dataframe_merge_…


asmirnov82 May 17, 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


10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public BooleanDataFrameColumn(string name, long length = 0) : base(name, length)
 public BooleanDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal BooleanDataFrameColumn(string name, PrimitiveColumnContainer<bool> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, long length = 0)
 {
 return new BooleanDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, PrimitiveColumnContainer<bool> container)
 {
 return new BooleanDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public ByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public ByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal ByteDataFrameColumn(string name, PrimitiveColumnContainer<byte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, long length = 0)
 {
 return new ByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, PrimitiveColumnContainer<byte> container)
 {
 return new ByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/CharDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public CharDataFrameColumn(string name, long length = 0) : base(name, length) {
 public CharDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal CharDataFrameColumn(string name, PrimitiveColumnContainer<char> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, long length = 0)
 {
 return new CharDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, PrimitiveColumnContainer<char> container)
 {
 return new CharDataFrameColumn(name, container);
 }
 }
}

17 changes: 17 additions & 0 deletions
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,23 @@ public PrimitiveDataFrameColumn<T> GetPrimitiveColumn<T>(string name)
 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(T)), nameof(T));
 }

 /// <summary>
 /// Gets the <see cref="DateTimeDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
 /// <param name="name">The name of the column</param>
 /// <returns><see cref="DateTimeDataFrameColumn"/>.</returns>
 /// <exception cref="ArgumentException">A column named <paramref name="name"/> cannot be found, or if the column's type doesn't match.</exception>
 public DateTimeDataFrameColumn GetDateTimeColumn(string name)
 {
 DataFrameColumn column = this[name];
 if (column is DateTimeDataFrameColumn ret)
 {
 return ret;
 }

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(DateTime)));
 }

 /// <summary>
 /// Gets the <see cref="ArrowStringDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DateTimeDataFrameColumn(string name, long length = 0) : base(name, length
 public DateTimeDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DateTimeDataFrameColumn(string name, PrimitiveColumnContainer<DateTime> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, long length = 0)
 {
 return new DateTimeDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, PrimitiveColumnContainer<DateTime> container)
 {
 return new DateTimeDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DecimalDataFrameColumn(string name, long length = 0) : base(name, length)
 public DecimalDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DecimalDataFrameColumn(string name, PrimitiveColumnContainer<decimal> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, long length = 0)
 {
 return new DecimalDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, PrimitiveColumnContainer<decimal> container)
 {
 return new DecimalDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DoubleDataFrameColumn(string name, long length = 0) : base(name, length)
 public DoubleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DoubleDataFrameColumn(string name, PrimitiveColumnContainer<double> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, long length = 0)
 {
 return new DoubleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, PrimitiveColumnContainer<double> container)
 {
 return new DoubleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int16DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int16DataFrameColumn(string name, PrimitiveColumnContainer<short> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, long length = 0)
 {
 return new Int16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, PrimitiveColumnContainer<short> container)
 {
 return new Int16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int32DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int32DataFrameColumn(string name, PrimitiveColumnContainer<int> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, long length = 0)
 {
 return new Int32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, PrimitiveColumnContainer<int> container)
 {
 return new Int32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int64DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int64DataFrameColumn(string name, PrimitiveColumnContainer<long> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, long length = 0)
 {
 return new Int64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, PrimitiveColumnContainer<long> container)
 {
 return new Int64DataFrameColumn(name, container);
 }
 }
}

17 changes: 14 additions & 3 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,6 +188,16 @@ protected override IReadOnlyList<object> GetValues(long startIndex, int length)
 return ret;
 }

 internal virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, PrimitiveColumnContainer<T> container)
 {
 return new PrimitiveDataFrameColumn<T>(name, container);
 }

 protected virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, long length = 0)
 {
 return new PrimitiveDataFrameColumn<T>(name, length);
 }

 internal T? GetTypedValue(long rowIndex) => _columnContainer[rowIndex];

 protected override object GetValue(long rowIndex) => GetTypedValue(rowIndex);
Expand DownExpand Up@@ -379,7 +389,7 @@ private PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<bool> boolCol
 {
 if (boolColumn.Length > Length)
 throw new ArgumentException(Strings.MapIndicesExceedsColumnLenth, nameof(boolColumn));
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 for (long i = 0; i < boolColumn.Length; i++)
 {
 bool? value = boolColumn[i];
Expand All@@ -406,7 +416,8 @@ private PrimitiveDataFrameColumn<T> CloneImplementation<U>(PrimitiveDataFrameCol
 }
 else
 throw new NotImplementedException();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name, retContainer);

 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name, retContainer);
 return ret;
 }

Expand All@@ -415,7 +426,7 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<long> mapIndic
 if (mapIndices is null)
 {
 PrimitiveColumnContainer<T> newColumnContainer = _columnContainer.Clone();
 return new PrimitiveDataFrameColumn<T>(Name, newColumnContainer);
 return CreateNewColumn(Name, newColumnContainer);
 }
 else
 {
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public SByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SByteDataFrameColumn(string name, PrimitiveColumnContainer<sbyte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, long length = 0)
 {
 return new SByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, PrimitiveColumnContainer<sbyte> container)
 {
 return new SByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SingleDataFrameColumn(string name, long length = 0) : base(name, length)
 public SingleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SingleDataFrameColumn(string name, PrimitiveColumnContainer<float> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, long length = 0)
 {
 return new SingleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, PrimitiveColumnContainer<float> container)
 {
 return new SingleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt16DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt16DataFrameColumn(string name, PrimitiveColumnContainer<ushort> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, long length = 0)
 {
 return new UInt16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, PrimitiveColumnContainer<ushort> container)
 {
 return new UInt16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt32DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt32DataFrameColumn(string name, PrimitiveColumnContainer<uint> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, long length = 0)
 {
 return new UInt32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, PrimitiveColumnContainer<uint> container)
 {
 return new UInt32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt64DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt64DataFrameColumn(string name, PrimitiveColumnContainer<ulong> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, long length = 0)
 {
 return new UInt64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, PrimitiveColumnContainer<ulong> container)
 {
 return new UInt64DataFrameColumn(name, container);
 }
 }
}

50 changes: 50 additions & 0 deletions
test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2659,6 +2659,56 @@ public void TestMerge_Issue5778()
 MatchRowsOnMergedDataFrame(merge, left, right, 1, 1, 0);
 }

 [Fact]
 //Issue 6127
 public void TestMerge_CorrectColumnTypes()
 {
 DataFrame left = MakeDataFrameWithAllMutableColumnTypes(2, false);
 DataFrame right = MakeDataFrameWithAllMutableColumnTypes(1);

 DataFrame merge = left.Merge<int>(right, "Int", "Int");

 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_left"));
 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_right"));

 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_left"));
 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_right"));

 Assert.NotNull(merge.Columns.GetSingleColumn("Float_left"));
 Assert.NotNull(merge.Columns.GetSingleColumn("Float_right"));

 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_left"));
 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_right"));

 Assert.NotNull(merge.Columns.GetByteColumn("Byte_left"));
 Assert.NotNull(merge.Columns.GetByteColumn("Byte_right"));

 Assert.NotNull(merge.Columns.GetCharColumn("Char_left"));
 Assert.NotNull(merge.Columns.GetCharColumn("Char_right"));

 Assert.NotNull(merge.Columns.GetInt16Column("Short_left"));
 Assert.NotNull(merge.Columns.GetInt16Column("Short_right"));

 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_left"));
 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_right"));

 Assert.NotNull(merge.Columns.GetInt32Column("Int_left"));
 Assert.NotNull(merge.Columns.GetInt32Column("Int_right"));

 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_left"));
 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_right"));

 Assert.NotNull(merge.Columns.GetInt64Column("Long_left"));
 Assert.NotNull(merge.Columns.GetInt64Column("Long_right"));

 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_left"));
 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_right"));

 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_left"));
 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_right"));

 }

 [Fact]
 public void TestDescription()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix DataFrame Merge issue#6677

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

michaelgsharp
merged 3 commits into

from

Jun 13, 2023
 Merged


Fix DataFrame Merge issue
#6677
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b52b31c

Fix DataFrame Merge issue


asmirnov82 May 14, 2023
2522d8c

Return commented test


asmirnov82 May 17, 2023
580f010

Merge remote-tracking branch 'origin/main' into 6127_dataframe_merge_…


asmirnov82 May 17, 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


10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public BooleanDataFrameColumn(string name, long length = 0) : base(name, length)
 public BooleanDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal BooleanDataFrameColumn(string name, PrimitiveColumnContainer<bool> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, long length = 0)
 {
 return new BooleanDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, PrimitiveColumnContainer<bool> container)
 {
 return new BooleanDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public ByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public ByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal ByteDataFrameColumn(string name, PrimitiveColumnContainer<byte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, long length = 0)
 {
 return new ByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, PrimitiveColumnContainer<byte> container)
 {
 return new ByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/CharDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public CharDataFrameColumn(string name, long length = 0) : base(name, length) {
 public CharDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal CharDataFrameColumn(string name, PrimitiveColumnContainer<char> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, long length = 0)
 {
 return new CharDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, PrimitiveColumnContainer<char> container)
 {
 return new CharDataFrameColumn(name, container);
 }
 }
}

17 changes: 17 additions & 0 deletions
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,23 @@ public PrimitiveDataFrameColumn<T> GetPrimitiveColumn<T>(string name)
 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(T)), nameof(T));
 }

 /// <summary>
 /// Gets the <see cref="DateTimeDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
 /// <param name="name">The name of the column</param>
 /// <returns><see cref="DateTimeDataFrameColumn"/>.</returns>
 /// <exception cref="ArgumentException">A column named <paramref name="name"/> cannot be found, or if the column's type doesn't match.</exception>
 public DateTimeDataFrameColumn GetDateTimeColumn(string name)
 {
 DataFrameColumn column = this[name];
 if (column is DateTimeDataFrameColumn ret)
 {
 return ret;
 }

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(DateTime)));
 }

 /// <summary>
 /// Gets the <see cref="ArrowStringDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DateTimeDataFrameColumn(string name, long length = 0) : base(name, length
 public DateTimeDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DateTimeDataFrameColumn(string name, PrimitiveColumnContainer<DateTime> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, long length = 0)
 {
 return new DateTimeDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, PrimitiveColumnContainer<DateTime> container)
 {
 return new DateTimeDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DecimalDataFrameColumn(string name, long length = 0) : base(name, length)
 public DecimalDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DecimalDataFrameColumn(string name, PrimitiveColumnContainer<decimal> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, long length = 0)
 {
 return new DecimalDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, PrimitiveColumnContainer<decimal> container)
 {
 return new DecimalDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DoubleDataFrameColumn(string name, long length = 0) : base(name, length)
 public DoubleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DoubleDataFrameColumn(string name, PrimitiveColumnContainer<double> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, long length = 0)
 {
 return new DoubleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, PrimitiveColumnContainer<double> container)
 {
 return new DoubleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int16DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int16DataFrameColumn(string name, PrimitiveColumnContainer<short> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, long length = 0)
 {
 return new Int16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, PrimitiveColumnContainer<short> container)
 {
 return new Int16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int32DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int32DataFrameColumn(string name, PrimitiveColumnContainer<int> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, long length = 0)
 {
 return new Int32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, PrimitiveColumnContainer<int> container)
 {
 return new Int32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int64DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int64DataFrameColumn(string name, PrimitiveColumnContainer<long> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, long length = 0)
 {
 return new Int64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, PrimitiveColumnContainer<long> container)
 {
 return new Int64DataFrameColumn(name, container);
 }
 }
}

17 changes: 14 additions & 3 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,6 +188,16 @@ protected override IReadOnlyList<object> GetValues(long startIndex, int length)
 return ret;
 }

 internal virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, PrimitiveColumnContainer<T> container)
 {
 return new PrimitiveDataFrameColumn<T>(name, container);
 }

 protected virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, long length = 0)
 {
 return new PrimitiveDataFrameColumn<T>(name, length);
 }

 internal T? GetTypedValue(long rowIndex) => _columnContainer[rowIndex];

 protected override object GetValue(long rowIndex) => GetTypedValue(rowIndex);
Expand DownExpand Up@@ -379,7 +389,7 @@ private PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<bool> boolCol
 {
 if (boolColumn.Length > Length)
 throw new ArgumentException(Strings.MapIndicesExceedsColumnLenth, nameof(boolColumn));
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 for (long i = 0; i < boolColumn.Length; i++)
 {
 bool? value = boolColumn[i];
Expand All@@ -406,7 +416,8 @@ private PrimitiveDataFrameColumn<T> CloneImplementation<U>(PrimitiveDataFrameCol
 }
 else
 throw new NotImplementedException();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name, retContainer);

 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name, retContainer);
 return ret;
 }

Expand All@@ -415,7 +426,7 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<long> mapIndic
 if (mapIndices is null)
 {
 PrimitiveColumnContainer<T> newColumnContainer = _columnContainer.Clone();
 return new PrimitiveDataFrameColumn<T>(Name, newColumnContainer);
 return CreateNewColumn(Name, newColumnContainer);
 }
 else
 {
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public SByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SByteDataFrameColumn(string name, PrimitiveColumnContainer<sbyte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, long length = 0)
 {
 return new SByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, PrimitiveColumnContainer<sbyte> container)
 {
 return new SByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SingleDataFrameColumn(string name, long length = 0) : base(name, length)
 public SingleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SingleDataFrameColumn(string name, PrimitiveColumnContainer<float> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, long length = 0)
 {
 return new SingleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, PrimitiveColumnContainer<float> container)
 {
 return new SingleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt16DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt16DataFrameColumn(string name, PrimitiveColumnContainer<ushort> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, long length = 0)
 {
 return new UInt16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, PrimitiveColumnContainer<ushort> container)
 {
 return new UInt16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt32DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt32DataFrameColumn(string name, PrimitiveColumnContainer<uint> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, long length = 0)
 {
 return new UInt32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, PrimitiveColumnContainer<uint> container)
 {
 return new UInt32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt64DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt64DataFrameColumn(string name, PrimitiveColumnContainer<ulong> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, long length = 0)
 {
 return new UInt64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, PrimitiveColumnContainer<ulong> container)
 {
 return new UInt64DataFrameColumn(name, container);
 }
 }
}

50 changes: 50 additions & 0 deletions
test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2659,6 +2659,56 @@ public void TestMerge_Issue5778()
 MatchRowsOnMergedDataFrame(merge, left, right, 1, 1, 0);
 }

 [Fact]
 //Issue 6127
 public void TestMerge_CorrectColumnTypes()
 {
 DataFrame left = MakeDataFrameWithAllMutableColumnTypes(2, false);
 DataFrame right = MakeDataFrameWithAllMutableColumnTypes(1);

 DataFrame merge = left.Merge<int>(right, "Int", "Int");

 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_left"));
 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_right"));

 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_left"));
 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_right"));

 Assert.NotNull(merge.Columns.GetSingleColumn("Float_left"));
 Assert.NotNull(merge.Columns.GetSingleColumn("Float_right"));

 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_left"));
 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_right"));

 Assert.NotNull(merge.Columns.GetByteColumn("Byte_left"));
 Assert.NotNull(merge.Columns.GetByteColumn("Byte_right"));

 Assert.NotNull(merge.Columns.GetCharColumn("Char_left"));
 Assert.NotNull(merge.Columns.GetCharColumn("Char_right"));

 Assert.NotNull(merge.Columns.GetInt16Column("Short_left"));
 Assert.NotNull(merge.Columns.GetInt16Column("Short_right"));

 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_left"));
 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_right"));

 Assert.NotNull(merge.Columns.GetInt32Column("Int_left"));
 Assert.NotNull(merge.Columns.GetInt32Column("Int_right"));

 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_left"));
 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_right"));

 Assert.NotNull(merge.Columns.GetInt64Column("Long_left"));
 Assert.NotNull(merge.Columns.GetInt64Column("Long_right"));

 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_left"));
 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_right"));

 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_left"));
 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_right"));

 }

 [Fact]
 public void TestDescription()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix DataFrame Merge issue#6677

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

michaelgsharp
merged 3 commits into

from

Jun 13, 2023
 Merged


Fix DataFrame Merge issue
#6677
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b52b31c

Fix DataFrame Merge issue


asmirnov82 May 14, 2023
2522d8c

Return commented test


asmirnov82 May 17, 2023
580f010

Merge remote-tracking branch 'origin/main' into 6127_dataframe_merge_…


asmirnov82 May 17, 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


10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public BooleanDataFrameColumn(string name, long length = 0) : base(name, length)
 public BooleanDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal BooleanDataFrameColumn(string name, PrimitiveColumnContainer<bool> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, long length = 0)
 {
 return new BooleanDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, PrimitiveColumnContainer<bool> container)
 {
 return new BooleanDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public ByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public ByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal ByteDataFrameColumn(string name, PrimitiveColumnContainer<byte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, long length = 0)
 {
 return new ByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, PrimitiveColumnContainer<byte> container)
 {
 return new ByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/CharDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public CharDataFrameColumn(string name, long length = 0) : base(name, length) {
 public CharDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal CharDataFrameColumn(string name, PrimitiveColumnContainer<char> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, long length = 0)
 {
 return new CharDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, PrimitiveColumnContainer<char> container)
 {
 return new CharDataFrameColumn(name, container);
 }
 }
}

17 changes: 17 additions & 0 deletions
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,23 @@ public PrimitiveDataFrameColumn<T> GetPrimitiveColumn<T>(string name)
 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(T)), nameof(T));
 }

 /// <summary>
 /// Gets the <see cref="DateTimeDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
 /// <param name="name">The name of the column</param>
 /// <returns><see cref="DateTimeDataFrameColumn"/>.</returns>
 /// <exception cref="ArgumentException">A column named <paramref name="name"/> cannot be found, or if the column's type doesn't match.</exception>
 public DateTimeDataFrameColumn GetDateTimeColumn(string name)
 {
 DataFrameColumn column = this[name];
 if (column is DateTimeDataFrameColumn ret)
 {
 return ret;
 }

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(DateTime)));
 }

 /// <summary>
 /// Gets the <see cref="ArrowStringDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DateTimeDataFrameColumn(string name, long length = 0) : base(name, length
 public DateTimeDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DateTimeDataFrameColumn(string name, PrimitiveColumnContainer<DateTime> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, long length = 0)
 {
 return new DateTimeDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, PrimitiveColumnContainer<DateTime> container)
 {
 return new DateTimeDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DecimalDataFrameColumn(string name, long length = 0) : base(name, length)
 public DecimalDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DecimalDataFrameColumn(string name, PrimitiveColumnContainer<decimal> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, long length = 0)
 {
 return new DecimalDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, PrimitiveColumnContainer<decimal> container)
 {
 return new DecimalDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DoubleDataFrameColumn(string name, long length = 0) : base(name, length)
 public DoubleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DoubleDataFrameColumn(string name, PrimitiveColumnContainer<double> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, long length = 0)
 {
 return new DoubleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, PrimitiveColumnContainer<double> container)
 {
 return new DoubleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int16DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int16DataFrameColumn(string name, PrimitiveColumnContainer<short> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, long length = 0)
 {
 return new Int16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, PrimitiveColumnContainer<short> container)
 {
 return new Int16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int32DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int32DataFrameColumn(string name, PrimitiveColumnContainer<int> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, long length = 0)
 {
 return new Int32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, PrimitiveColumnContainer<int> container)
 {
 return new Int32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int64DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int64DataFrameColumn(string name, PrimitiveColumnContainer<long> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, long length = 0)
 {
 return new Int64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, PrimitiveColumnContainer<long> container)
 {
 return new Int64DataFrameColumn(name, container);
 }
 }
}

17 changes: 14 additions & 3 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,6 +188,16 @@ protected override IReadOnlyList<object> GetValues(long startIndex, int length)
 return ret;
 }

 internal virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, PrimitiveColumnContainer<T> container)
 {
 return new PrimitiveDataFrameColumn<T>(name, container);
 }

 protected virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, long length = 0)
 {
 return new PrimitiveDataFrameColumn<T>(name, length);
 }

 internal T? GetTypedValue(long rowIndex) => _columnContainer[rowIndex];

 protected override object GetValue(long rowIndex) => GetTypedValue(rowIndex);
Expand DownExpand Up@@ -379,7 +389,7 @@ private PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<bool> boolCol
 {
 if (boolColumn.Length > Length)
 throw new ArgumentException(Strings.MapIndicesExceedsColumnLenth, nameof(boolColumn));
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 for (long i = 0; i < boolColumn.Length; i++)
 {
 bool? value = boolColumn[i];
Expand All@@ -406,7 +416,8 @@ private PrimitiveDataFrameColumn<T> CloneImplementation<U>(PrimitiveDataFrameCol
 }
 else
 throw new NotImplementedException();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name, retContainer);

 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name, retContainer);
 return ret;
 }

Expand All@@ -415,7 +426,7 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<long> mapIndic
 if (mapIndices is null)
 {
 PrimitiveColumnContainer<T> newColumnContainer = _columnContainer.Clone();
 return new PrimitiveDataFrameColumn<T>(Name, newColumnContainer);
 return CreateNewColumn(Name, newColumnContainer);
 }
 else
 {
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public SByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SByteDataFrameColumn(string name, PrimitiveColumnContainer<sbyte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, long length = 0)
 {
 return new SByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, PrimitiveColumnContainer<sbyte> container)
 {
 return new SByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SingleDataFrameColumn(string name, long length = 0) : base(name, length)
 public SingleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SingleDataFrameColumn(string name, PrimitiveColumnContainer<float> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, long length = 0)
 {
 return new SingleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, PrimitiveColumnContainer<float> container)
 {
 return new SingleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt16DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt16DataFrameColumn(string name, PrimitiveColumnContainer<ushort> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, long length = 0)
 {
 return new UInt16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, PrimitiveColumnContainer<ushort> container)
 {
 return new UInt16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt32DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt32DataFrameColumn(string name, PrimitiveColumnContainer<uint> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, long length = 0)
 {
 return new UInt32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, PrimitiveColumnContainer<uint> container)
 {
 return new UInt32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt64DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt64DataFrameColumn(string name, PrimitiveColumnContainer<ulong> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, long length = 0)
 {
 return new UInt64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, PrimitiveColumnContainer<ulong> container)
 {
 return new UInt64DataFrameColumn(name, container);
 }
 }
}

50 changes: 50 additions & 0 deletions
test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2659,6 +2659,56 @@ public void TestMerge_Issue5778()
 MatchRowsOnMergedDataFrame(merge, left, right, 1, 1, 0);
 }

 [Fact]
 //Issue 6127
 public void TestMerge_CorrectColumnTypes()
 {
 DataFrame left = MakeDataFrameWithAllMutableColumnTypes(2, false);
 DataFrame right = MakeDataFrameWithAllMutableColumnTypes(1);

 DataFrame merge = left.Merge<int>(right, "Int", "Int");

 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_left"));
 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_right"));

 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_left"));
 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_right"));

 Assert.NotNull(merge.Columns.GetSingleColumn("Float_left"));
 Assert.NotNull(merge.Columns.GetSingleColumn("Float_right"));

 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_left"));
 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_right"));

 Assert.NotNull(merge.Columns.GetByteColumn("Byte_left"));
 Assert.NotNull(merge.Columns.GetByteColumn("Byte_right"));

 Assert.NotNull(merge.Columns.GetCharColumn("Char_left"));
 Assert.NotNull(merge.Columns.GetCharColumn("Char_right"));

 Assert.NotNull(merge.Columns.GetInt16Column("Short_left"));
 Assert.NotNull(merge.Columns.GetInt16Column("Short_right"));

 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_left"));
 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_right"));

 Assert.NotNull(merge.Columns.GetInt32Column("Int_left"));
 Assert.NotNull(merge.Columns.GetInt32Column("Int_right"));

 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_left"));
 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_right"));

 Assert.NotNull(merge.Columns.GetInt64Column("Long_left"));
 Assert.NotNull(merge.Columns.GetInt64Column("Long_right"));

 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_left"));
 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_right"));

 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_left"));
 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_right"));

 }

 [Fact]
 public void TestDescription()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix DataFrame Merge issue#6677

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

michaelgsharp
merged 3 commits into

from

Jun 13, 2023
 Merged


Fix DataFrame Merge issue
#6677
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b52b31c

Fix DataFrame Merge issue


asmirnov82 May 14, 2023
2522d8c

Return commented test


asmirnov82 May 17, 2023
580f010

Merge remote-tracking branch 'origin/main' into 6127_dataframe_merge_…


asmirnov82 May 17, 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


10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public BooleanDataFrameColumn(string name, long length = 0) : base(name, length)
 public BooleanDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal BooleanDataFrameColumn(string name, PrimitiveColumnContainer<bool> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, long length = 0)
 {
 return new BooleanDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, PrimitiveColumnContainer<bool> container)
 {
 return new BooleanDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public ByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public ByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal ByteDataFrameColumn(string name, PrimitiveColumnContainer<byte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, long length = 0)
 {
 return new ByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, PrimitiveColumnContainer<byte> container)
 {
 return new ByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/CharDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public CharDataFrameColumn(string name, long length = 0) : base(name, length) {
 public CharDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal CharDataFrameColumn(string name, PrimitiveColumnContainer<char> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, long length = 0)
 {
 return new CharDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, PrimitiveColumnContainer<char> container)
 {
 return new CharDataFrameColumn(name, container);
 }
 }
}

17 changes: 17 additions & 0 deletions
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,23 @@ public PrimitiveDataFrameColumn<T> GetPrimitiveColumn<T>(string name)
 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(T)), nameof(T));
 }

 /// <summary>
 /// Gets the <see cref="DateTimeDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
 /// <param name="name">The name of the column</param>
 /// <returns><see cref="DateTimeDataFrameColumn"/>.</returns>
 /// <exception cref="ArgumentException">A column named <paramref name="name"/> cannot be found, or if the column's type doesn't match.</exception>
 public DateTimeDataFrameColumn GetDateTimeColumn(string name)
 {
 DataFrameColumn column = this[name];
 if (column is DateTimeDataFrameColumn ret)
 {
 return ret;
 }

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(DateTime)));
 }

 /// <summary>
 /// Gets the <see cref="ArrowStringDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DateTimeDataFrameColumn(string name, long length = 0) : base(name, length
 public DateTimeDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DateTimeDataFrameColumn(string name, PrimitiveColumnContainer<DateTime> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, long length = 0)
 {
 return new DateTimeDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, PrimitiveColumnContainer<DateTime> container)
 {
 return new DateTimeDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DecimalDataFrameColumn(string name, long length = 0) : base(name, length)
 public DecimalDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DecimalDataFrameColumn(string name, PrimitiveColumnContainer<decimal> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, long length = 0)
 {
 return new DecimalDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, PrimitiveColumnContainer<decimal> container)
 {
 return new DecimalDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DoubleDataFrameColumn(string name, long length = 0) : base(name, length)
 public DoubleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DoubleDataFrameColumn(string name, PrimitiveColumnContainer<double> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, long length = 0)
 {
 return new DoubleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, PrimitiveColumnContainer<double> container)
 {
 return new DoubleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int16DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int16DataFrameColumn(string name, PrimitiveColumnContainer<short> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, long length = 0)
 {
 return new Int16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, PrimitiveColumnContainer<short> container)
 {
 return new Int16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int32DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int32DataFrameColumn(string name, PrimitiveColumnContainer<int> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, long length = 0)
 {
 return new Int32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, PrimitiveColumnContainer<int> container)
 {
 return new Int32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int64DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int64DataFrameColumn(string name, PrimitiveColumnContainer<long> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, long length = 0)
 {
 return new Int64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, PrimitiveColumnContainer<long> container)
 {
 return new Int64DataFrameColumn(name, container);
 }
 }
}

17 changes: 14 additions & 3 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,6 +188,16 @@ protected override IReadOnlyList<object> GetValues(long startIndex, int length)
 return ret;
 }

 internal virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, PrimitiveColumnContainer<T> container)
 {
 return new PrimitiveDataFrameColumn<T>(name, container);
 }

 protected virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, long length = 0)
 {
 return new PrimitiveDataFrameColumn<T>(name, length);
 }

 internal T? GetTypedValue(long rowIndex) => _columnContainer[rowIndex];

 protected override object GetValue(long rowIndex) => GetTypedValue(rowIndex);
Expand DownExpand Up@@ -379,7 +389,7 @@ private PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<bool> boolCol
 {
 if (boolColumn.Length > Length)
 throw new ArgumentException(Strings.MapIndicesExceedsColumnLenth, nameof(boolColumn));
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 for (long i = 0; i < boolColumn.Length; i++)
 {
 bool? value = boolColumn[i];
Expand All@@ -406,7 +416,8 @@ private PrimitiveDataFrameColumn<T> CloneImplementation<U>(PrimitiveDataFrameCol
 }
 else
 throw new NotImplementedException();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name, retContainer);

 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name, retContainer);
 return ret;
 }

Expand All@@ -415,7 +426,7 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<long> mapIndic
 if (mapIndices is null)
 {
 PrimitiveColumnContainer<T> newColumnContainer = _columnContainer.Clone();
 return new PrimitiveDataFrameColumn<T>(Name, newColumnContainer);
 return CreateNewColumn(Name, newColumnContainer);
 }
 else
 {
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public SByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SByteDataFrameColumn(string name, PrimitiveColumnContainer<sbyte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, long length = 0)
 {
 return new SByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, PrimitiveColumnContainer<sbyte> container)
 {
 return new SByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SingleDataFrameColumn(string name, long length = 0) : base(name, length)
 public SingleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SingleDataFrameColumn(string name, PrimitiveColumnContainer<float> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, long length = 0)
 {
 return new SingleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, PrimitiveColumnContainer<float> container)
 {
 return new SingleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt16DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt16DataFrameColumn(string name, PrimitiveColumnContainer<ushort> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, long length = 0)
 {
 return new UInt16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, PrimitiveColumnContainer<ushort> container)
 {
 return new UInt16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt32DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt32DataFrameColumn(string name, PrimitiveColumnContainer<uint> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, long length = 0)
 {
 return new UInt32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, PrimitiveColumnContainer<uint> container)
 {
 return new UInt32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt64DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt64DataFrameColumn(string name, PrimitiveColumnContainer<ulong> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, long length = 0)
 {
 return new UInt64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, PrimitiveColumnContainer<ulong> container)
 {
 return new UInt64DataFrameColumn(name, container);
 }
 }
}

50 changes: 50 additions & 0 deletions
test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2659,6 +2659,56 @@ public void TestMerge_Issue5778()
 MatchRowsOnMergedDataFrame(merge, left, right, 1, 1, 0);
 }

 [Fact]
 //Issue 6127
 public void TestMerge_CorrectColumnTypes()
 {
 DataFrame left = MakeDataFrameWithAllMutableColumnTypes(2, false);
 DataFrame right = MakeDataFrameWithAllMutableColumnTypes(1);

 DataFrame merge = left.Merge<int>(right, "Int", "Int");

 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_left"));
 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_right"));

 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_left"));
 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_right"));

 Assert.NotNull(merge.Columns.GetSingleColumn("Float_left"));
 Assert.NotNull(merge.Columns.GetSingleColumn("Float_right"));

 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_left"));
 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_right"));

 Assert.NotNull(merge.Columns.GetByteColumn("Byte_left"));
 Assert.NotNull(merge.Columns.GetByteColumn("Byte_right"));

 Assert.NotNull(merge.Columns.GetCharColumn("Char_left"));
 Assert.NotNull(merge.Columns.GetCharColumn("Char_right"));

 Assert.NotNull(merge.Columns.GetInt16Column("Short_left"));
 Assert.NotNull(merge.Columns.GetInt16Column("Short_right"));

 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_left"));
 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_right"));

 Assert.NotNull(merge.Columns.GetInt32Column("Int_left"));
 Assert.NotNull(merge.Columns.GetInt32Column("Int_right"));

 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_left"));
 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_right"));

 Assert.NotNull(merge.Columns.GetInt64Column("Long_left"));
 Assert.NotNull(merge.Columns.GetInt64Column("Long_right"));

 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_left"));
 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_right"));

 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_left"));
 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_right"));

 }

 [Fact]
 public void TestDescription()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix DataFrame Merge issue#6677

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

michaelgsharp
merged 3 commits into

from

Jun 13, 2023
 Merged


Fix DataFrame Merge issue
#6677
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b52b31c

Fix DataFrame Merge issue


asmirnov82 May 14, 2023
2522d8c

Return commented test


asmirnov82 May 17, 2023
580f010

Merge remote-tracking branch 'origin/main' into 6127_dataframe_merge_…


asmirnov82 May 17, 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


10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public BooleanDataFrameColumn(string name, long length = 0) : base(name, length)
 public BooleanDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal BooleanDataFrameColumn(string name, PrimitiveColumnContainer<bool> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, long length = 0)
 {
 return new BooleanDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<bool> CreateNewColumn(string name, PrimitiveColumnContainer<bool> container)
 {
 return new BooleanDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public ByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public ByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal ByteDataFrameColumn(string name, PrimitiveColumnContainer<byte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, long length = 0)
 {
 return new ByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<byte> CreateNewColumn(string name, PrimitiveColumnContainer<byte> container)
 {
 return new ByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/CharDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public CharDataFrameColumn(string name, long length = 0) : base(name, length) {
 public CharDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal CharDataFrameColumn(string name, PrimitiveColumnContainer<char> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, long length = 0)
 {
 return new CharDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<char> CreateNewColumn(string name, PrimitiveColumnContainer<char> container)
 {
 return new CharDataFrameColumn(name, container);
 }
 }
}

17 changes: 17 additions & 0 deletions
src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,23 @@ public PrimitiveDataFrameColumn<T> GetPrimitiveColumn<T>(string name)
 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(T)), nameof(T));
 }

 /// <summary>
 /// Gets the <see cref="DateTimeDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
 /// <param name="name">The name of the column</param>
 /// <returns><see cref="DateTimeDataFrameColumn"/>.</returns>
 /// <exception cref="ArgumentException">A column named <paramref name="name"/> cannot be found, or if the column's type doesn't match.</exception>
 public DateTimeDataFrameColumn GetDateTimeColumn(string name)
 {
 DataFrameColumn column = this[name];
 if (column is DateTimeDataFrameColumn ret)
 {
 return ret;
 }

 throw new ArgumentException(string.Format(Strings.BadColumnCast, column.DataType, typeof(DateTime)));
 }

 /// <summary>
 /// Gets the <see cref="ArrowStringDataFrameColumn"/> with the specified <paramref name="name"/>.
 /// </summary>
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DateTimeDataFrameColumn(string name, long length = 0) : base(name, length
 public DateTimeDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DateTimeDataFrameColumn(string name, PrimitiveColumnContainer<DateTime> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, long length = 0)
 {
 return new DateTimeDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<DateTime> CreateNewColumn(string name, PrimitiveColumnContainer<DateTime> container)
 {
 return new DateTimeDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DecimalDataFrameColumn(string name, long length = 0) : base(name, length)
 public DecimalDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DecimalDataFrameColumn(string name, PrimitiveColumnContainer<decimal> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, long length = 0)
 {
 return new DecimalDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<decimal> CreateNewColumn(string name, PrimitiveColumnContainer<decimal> container)
 {
 return new DecimalDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public DoubleDataFrameColumn(string name, long length = 0) : base(name, length)
 public DoubleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal DoubleDataFrameColumn(string name, PrimitiveColumnContainer<double> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, long length = 0)
 {
 return new DoubleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<double> CreateNewColumn(string name, PrimitiveColumnContainer<double> container)
 {
 return new DoubleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int16DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int16DataFrameColumn(string name, PrimitiveColumnContainer<short> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, long length = 0)
 {
 return new Int16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<short> CreateNewColumn(string name, PrimitiveColumnContainer<short> container)
 {
 return new Int16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int32DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int32DataFrameColumn(string name, PrimitiveColumnContainer<int> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, long length = 0)
 {
 return new Int32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<int> CreateNewColumn(string name, PrimitiveColumnContainer<int> container)
 {
 return new Int32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public Int64DataFrameColumn(string name, long length = 0) : base(name, length) {
 public Int64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal Int64DataFrameColumn(string name, PrimitiveColumnContainer<long> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, long length = 0)
 {
 return new Int64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<long> CreateNewColumn(string name, PrimitiveColumnContainer<long> container)
 {
 return new Int64DataFrameColumn(name, container);
 }
 }
}

17 changes: 14 additions & 3 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,6 +188,16 @@ protected override IReadOnlyList<object> GetValues(long startIndex, int length)
 return ret;
 }

 internal virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, PrimitiveColumnContainer<T> container)
 {
 return new PrimitiveDataFrameColumn<T>(name, container);
 }

 protected virtual PrimitiveDataFrameColumn<T> CreateNewColumn(string name, long length = 0)
 {
 return new PrimitiveDataFrameColumn<T>(name, length);
 }

 internal T? GetTypedValue(long rowIndex) => _columnContainer[rowIndex];

 protected override object GetValue(long rowIndex) => GetTypedValue(rowIndex);
Expand DownExpand Up@@ -379,7 +389,7 @@ private PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<bool> boolCol
 {
 if (boolColumn.Length > Length)
 throw new ArgumentException(Strings.MapIndicesExceedsColumnLenth, nameof(boolColumn));
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 for (long i = 0; i < boolColumn.Length; i++)
 {
 bool? value = boolColumn[i];
Expand All@@ -406,7 +416,8 @@ private PrimitiveDataFrameColumn<T> CloneImplementation<U>(PrimitiveDataFrameCol
 }
 else
 throw new NotImplementedException();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name, retContainer);

 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name, retContainer);
 return ret;
 }

Expand All@@ -415,7 +426,7 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<long> mapIndic
 if (mapIndices is null)
 {
 PrimitiveColumnContainer<T> newColumnContainer = _columnContainer.Clone();
 return new PrimitiveDataFrameColumn<T>(Name, newColumnContainer);
 return CreateNewColumn(Name, newColumnContainer);
 }
 else
 {
Expand Down

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SByteDataFrameColumn(string name, long length = 0) : base(name, length) {
 public SByteDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SByteDataFrameColumn(string name, PrimitiveColumnContainer<sbyte> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, long length = 0)
 {
 return new SByteDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<sbyte> CreateNewColumn(string name, PrimitiveColumnContainer<sbyte> container)
 {
 return new SByteDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public SingleDataFrameColumn(string name, long length = 0) : base(name, length)
 public SingleDataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal SingleDataFrameColumn(string name, PrimitiveColumnContainer<float> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, long length = 0)
 {
 return new SingleDataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<float> CreateNewColumn(string name, PrimitiveColumnContainer<float> container)
 {
 return new SingleDataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt16DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt16DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt16DataFrameColumn(string name, PrimitiveColumnContainer<ushort> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, long length = 0)
 {
 return new UInt16DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ushort> CreateNewColumn(string name, PrimitiveColumnContainer<ushort> container)
 {
 return new UInt16DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt32DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt32DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt32DataFrameColumn(string name, PrimitiveColumnContainer<uint> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, long length = 0)
 {
 return new UInt32DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<uint> CreateNewColumn(string name, PrimitiveColumnContainer<uint> container)
 {
 return new UInt32DataFrameColumn(name, container);
 }
 }
}

10 changes: 10 additions & 0 deletions
src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,5 +19,15 @@ public UInt64DataFrameColumn(string name, long length = 0) : base(name, length)
 public UInt64DataFrameColumn(string name, ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte> nullBitMap, int length = 0, int nullCount = 0) : base(name, buffer, nullBitMap, length, nullCount) { }

 internal UInt64DataFrameColumn(string name, PrimitiveColumnContainer<ulong> values) : base(name, values) { }

 protected override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, long length = 0)
 {
 return new UInt64DataFrameColumn(name, length);
 }

 internal override PrimitiveDataFrameColumn<ulong> CreateNewColumn(string name, PrimitiveColumnContainer<ulong> container)
 {
 return new UInt64DataFrameColumn(name, container);
 }
 }
}

50 changes: 50 additions & 0 deletions
test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2659,6 +2659,56 @@ public void TestMerge_Issue5778()
 MatchRowsOnMergedDataFrame(merge, left, right, 1, 1, 0);
 }

 [Fact]
 //Issue 6127
 public void TestMerge_CorrectColumnTypes()
 {
 DataFrame left = MakeDataFrameWithAllMutableColumnTypes(2, false);
 DataFrame right = MakeDataFrameWithAllMutableColumnTypes(1);

 DataFrame merge = left.Merge<int>(right, "Int", "Int");

 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_left"));
 Assert.NotNull(merge.Columns.GetBooleanColumn("Bool_right"));

 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_left"));
 Assert.NotNull(merge.Columns.GetDecimalColumn("Decimal_right"));

 Assert.NotNull(merge.Columns.GetSingleColumn("Float_left"));
 Assert.NotNull(merge.Columns.GetSingleColumn("Float_right"));

 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_left"));
 Assert.NotNull(merge.Columns.GetDoubleColumn("Double_right"));

 Assert.NotNull(merge.Columns.GetByteColumn("Byte_left"));
 Assert.NotNull(merge.Columns.GetByteColumn("Byte_right"));

 Assert.NotNull(merge.Columns.GetCharColumn("Char_left"));
 Assert.NotNull(merge.Columns.GetCharColumn("Char_right"));

 Assert.NotNull(merge.Columns.GetInt16Column("Short_left"));
 Assert.NotNull(merge.Columns.GetInt16Column("Short_right"));

 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_left"));
 Assert.NotNull(merge.Columns.GetUInt16Column("Ushort_right"));

 Assert.NotNull(merge.Columns.GetInt32Column("Int_left"));
 Assert.NotNull(merge.Columns.GetInt32Column("Int_right"));

 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_left"));
 Assert.NotNull(merge.Columns.GetUInt32Column("Uint_right"));

 Assert.NotNull(merge.Columns.GetInt64Column("Long_left"));
 Assert.NotNull(merge.Columns.GetInt64Column("Long_right"));

 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_left"));
 Assert.NotNull(merge.Columns.GetUInt64Column("Ulong_right"));

 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_left"));
 Assert.NotNull(merge.Columns.GetDateTimeColumn("DateTime_right"));

 }

 [Fact]
 public void TestDescription()
 {
Expand Down