PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument#6822

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
JakeRadMSFT merged 12 commits into from
Sep 27, 2023
Merged

PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument #6822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4e0cf30
Split Test for AppendMany into 4 different tests
asmirnov82 Sep 13, 2023
cb236bf
Block init of null validity buffer instead of setting individual bits
asmirnov82 Sep 13, 2023
095cb83
Add unit tests for PrimitiveDataFrameColumn.Clone
asmirnov82 Sep 13, 2023
0f78092
Fixes #6821
asmirnov82 Sep 13, 2023
f5e9aaa
Fix
asmirnov82 Sep 13, 2023
c44c628
Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…
asmirnov82 Sep 18, 2023
33a29b0
Fix bug with AppendMany values to not empty column
asmirnov82 Sep 19, 2023
7548dc4
Restart unit tests
asmirnov82 Sep 19, 2023
b80e8a0
Add more unit tests
asmirnov82 Sep 20, 2023
83b5cca
Fix failing unit test
asmirnov82 Sep 20, 2023
dfe8d12
Fix code review findings
asmirnov82 Sep 27, 2023
9654516
Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…
asmirnov82 Sep 27, 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
124 changes: 106 additions & 18 deletions src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ namespace Microsoft.Data.Analysis
{
internal static class BitmapHelper
{
private static ReadOnlySpan<byte> BitMask => new byte[] {
1, 2, 4, 8, 16, 32, 64, 128
};

// Faster to use when we already have a span since it avoids indexing
public static bool IsValid(ReadOnlySpan<byte> bitMapBufferSpan, int index)
{
Expand All@@ -26,6 +30,98 @@ public static bool IsBitSet(byte curBitMap, int index)
{
return ((curBitMap >> (index & 7)) & 1) != 0;
}

public static bool IsBitClear(byte curBitMap, int index)
{
return ((curBitMap >> (index & 7)) & 1) == 0;
}

public static bool GetBit(byte data, int index) =>
((data >> index) & 1) != 0;

public static bool GetBit(ReadOnlySpan<byte> data, int index) =>
(data[index / 8] & BitMask[index % 8]) != 0;

public static void ClearBit(Span<byte> data, int index)
{
data[index / 8] &= (byte)~BitMask[index % 8];
}

public static void SetBit(Span<byte> data, int index)
{
data[index / 8] |= BitMask[index % 8];
}

public static void SetBit(Span<byte> data, int index, bool value)
{
int idx = index / 8;
int mod = index % 8;
data[idx] = value
? (byte)(data[idx] | BitMask[mod])
: (byte)(data[idx] & ~BitMask[mod]);
}

/// <summary>
/// Set the number of bits in a span of bytes starting
/// at a specific index, and limiting to length.
/// </summary>
/// <param name="data">Span to set bits value.</param>
/// <param name="index">Bit index to start counting from.</param>
/// <param name="length">Maximum of bits in the span to consider.</param>
/// <param name="value">Bit value.</param>
internal static void SetBits(Span<byte> data, int index, int length, bool value)
{
if (length == 0)
return;

int endBitIndex = checked(index + length - 1);

// Use simpler method if there aren't many values
if (length < 20)
{
for (int i = index; i <= endBitIndex; i++)
{
SetBit(data, i, value);
}
return;
}

// Otherwise do the work to figure out how to copy whole bytes
int startByteIndex = index / 8;
int startBitOffset = index % 8;
int endByteIndex = endBitIndex / 8;
int endBitOffset = endBitIndex % 8;

// If the starting index and ending index are not byte-aligned,
// we'll need to set bits the slow way. If they are
// byte-aligned, and for all other bytes in the 'middle', we
// can use a faster byte-aligned set.
int fullByteStartIndex = startBitOffset == 0 ? startByteIndex : startByteIndex + 1;
int fullByteEndIndex = endBitOffset == 7 ? endByteIndex : endByteIndex - 1;

// Bits we will be using to finish up the first byte
if (startBitOffset != 0)
{
Span<byte> slice = data.Slice(startByteIndex, 1);
for (int i = startBitOffset; i <= 7; i++)
SetBit(slice, i, value);
}

if (fullByteEndIndex >= fullByteStartIndex)
{
Span<byte> slice = data.Slice(fullByteStartIndex, fullByteEndIndex - fullByteStartIndex + 1);
byte fill = (byte)(value ? 0xFF : 0x00);

slice.Fill(fill);
}

if (endBitOffset != 7)
{
Span<byte> slice = data.Slice(endByteIndex, 1);
for (int i = 0; i <= endBitOffset; i++)
SetBit(slice, i, value);
}
}
}

/// <summary>
Expand All@@ -41,9 +137,6 @@ internal partial class PrimitiveColumnContainer<T> : IEnumerable<T?>
// A set bit implies a valid value. An unset bit => null value
public IList<ReadOnlyDataFrameBuffer<byte>> NullBitMapBuffers = new List<ReadOnlyDataFrameBuffer<byte>>();

// Need a way to differentiate between columns initialized with default values and those with null values in SetValidityBit
internal bool _modifyNullCountWhileIndexing = true;

public PrimitiveColumnContainer(IEnumerable<T> values)
{
values = values ?? throw new ArgumentNullException(nameof(values));
Expand DownExpand Up@@ -168,27 +261,22 @@ public void AppendMany(T? value, long count)
}

DataFrameBuffer<T> mutableLastBuffer = Buffers.GetOrCreateMutable(Buffers.Count - 1);
DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);

//Calculate how many values we can additionaly allocate and not exceed the MaxCapacity
int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - mutableLastBuffer.Length);
int originalBufferLength = mutableLastBuffer.Length;
int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - originalBufferLength);
mutableLastBuffer.IncreaseSize(allocatable);

DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);
int nullBufferAllocatable = (allocatable + 7) / 8;
//Calculate how many bytes we have additionaly allocate to store allocatable number of bits (need to take into account unused bits inside already allocated bytes)
int nullBufferAllocatable = (originalBufferLength + allocatable + 7) / 8 - lastNullBitMapBuffer.Length;
lastNullBitMapBuffer.IncreaseSize(nullBufferAllocatable);

Length += allocatable;

if (value.HasValue)
{
mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value ?? default);

_modifyNullCountWhileIndexing = false;
for (long i = Length - allocatable; i < Length; i++)
{
SetValidityBit(i, value.HasValue);
}
_modifyNullCountWhileIndexing = true;
mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value.Value);
BitmapHelper.SetBits(lastNullBitMapBuffer.RawSpan, originalBufferLength, allocatable, true);
}

remaining -= allocatable;
Expand DownExpand Up@@ -247,20 +335,20 @@ private byte SetBit(byte curBitMap, int index, bool value)
if (value)
{
newBitMap = (byte)(curBitMap | (byte)(1 << (index & 7))); //bit hack for index % 8
if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 0 && index < Length && NullCount > 0)
if (BitmapHelper.IsBitClear(curBitMap, index) && index < Length && NullCount > 0)
{
// Old value was null.
NullCount--;
}
}
else
{
if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 1 && index < Length)
if (BitmapHelper.IsBitSet(curBitMap, index) && index < Length)
{
// old value was NOT null and new value is null
NullCount++;
}
else if (_modifyNullCountWhileIndexing && index == Length)
else if (index == Length)
{
// New entry from an append
NullCount++;
Expand Down
18 changes: 10 additions & 8 deletions src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using Apache.Arrow;
using Apache.Arrow.Types;
Expand DownExpand Up@@ -473,22 +474,23 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<int> mapIndice
public PrimitiveDataFrameColumn<T> Clone(IEnumerable<long> mapIndices)
{
IEnumerator<long> rows = mapIndices.GetEnumerator();
PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
ret._columnContainer._modifyNullCountWhileIndexing = false;
PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
long numberOfRows = 0;
while (rows.MoveNext() && numberOfRows < Length)
{
numberOfRows++;
long curRow = rows.Current;
T? value = _columnContainer[curRow];
ret[curRow] = value;
if (!value.HasValue)
ret._columnContainer.NullCount++;
var curRow = rows.Current;
var value = _columnContainer[curRow];
ret.Append(value);
}
ret._columnContainer._modifyNullCountWhileIndexing = true;
return ret;
}

public PrimitiveDataFrameColumn<T> Clone(IEnumerable<int> mapIndices)
{
return Clone(mapIndices.Select(x => (long)x));
}

internal BooleanDataFrameColumn CloneAsBooleanColumn()
{
PrimitiveColumnContainer<bool> newColumnContainer = _columnContainer.CloneAsBoolContainer();
Expand Down
Loading
, '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
PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument#6822

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

JakeRadMSFT
merged 12 commits into

from

Sep 27, 2023
 Merged


PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument
#6822
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
4e0cf30

Split Test for AppendMany into 4 different tests


asmirnov82 Sep 13, 2023
cb236bf

Block init of null validity buffer instead of setting individual bits


asmirnov82 Sep 13, 2023
095cb83

Add unit tests for PrimitiveDataFrameColumn.Clone


asmirnov82 Sep 13, 2023
0f78092

Fixes #6821


asmirnov82 Sep 13, 2023
f5e9aaa

Fix


asmirnov82 Sep 13, 2023
c44c628

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 18, 2023
33a29b0

Fix bug with AppendMany values to not empty column


asmirnov82 Sep 19, 2023
7548dc4

Restart unit tests


asmirnov82 Sep 19, 2023
b80e8a0

Add more unit tests


asmirnov82 Sep 20, 2023
83b5cca

Fix failing unit test


asmirnov82 Sep 20, 2023
dfe8d12

Fix code review findings


asmirnov82 Sep 27, 2023
9654516

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 27, 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


124 changes: 106 additions & 18 deletions
src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ namespace Microsoft.Data.Analysis
{
 internal static class BitmapHelper
 {
 private static ReadOnlySpan<byte> BitMask => new byte[] {
 1, 2, 4, 8, 16, 32, 64, 128
 };

 // Faster to use when we already have a span since it avoids indexing
 public static bool IsValid(ReadOnlySpan<byte> bitMapBufferSpan, int index)
 {
Expand All@@ -26,6 +30,98 @@ public static bool IsBitSet(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) != 0;
 }

 public static bool IsBitClear(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) == 0;
 }

 public static bool GetBit(byte data, int index) =>
 ((data >> index) & 1) != 0;

 public static bool GetBit(ReadOnlySpan<byte> data, int index) =>
 (data[index / 8] & BitMask[index % 8]) != 0;

 public static void ClearBit(Span<byte> data, int index)
 {
 data[index / 8] &= (byte)~BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index)
 {
 data[index / 8] |= BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index, bool value)
 {
 int idx = index / 8;
 int mod = index % 8;
 data[idx] = value
 ? (byte)(data[idx] | BitMask[mod])
 : (byte)(data[idx] & ~BitMask[mod]);
 }

 /// <summary>
 /// Set the number of bits in a span of bytes starting
 /// at a specific index, and limiting to length.
 /// </summary>
 /// <param name="data">Span to set bits value.</param>
 /// <param name="index">Bit index to start counting from.</param>
 /// <param name="length">Maximum of bits in the span to consider.</param>
 /// <param name="value">Bit value.</param>
 internal static void SetBits(Span<byte> data, int index, int length, bool value)
 {
 if (length == 0)
 return;

 int endBitIndex = checked(index + length - 1);

 // Use simpler method if there aren't many values
 if (length < 20)
 {
 for (int i = index; i <= endBitIndex; i++)
 {
 SetBit(data, i, value);
 }
 return;
 }

 // Otherwise do the work to figure out how to copy whole bytes
 int startByteIndex = index / 8;
 int startBitOffset = index % 8;
 int endByteIndex = endBitIndex / 8;
 int endBitOffset = endBitIndex % 8;

 // If the starting index and ending index are not byte-aligned,
 // we'll need to set bits the slow way. If they are
 // byte-aligned, and for all other bytes in the 'middle', we
 // can use a faster byte-aligned set.
 int fullByteStartIndex = startBitOffset == 0 ? startByteIndex : startByteIndex + 1;
 int fullByteEndIndex = endBitOffset == 7 ? endByteIndex : endByteIndex - 1;

 // Bits we will be using to finish up the first byte
 if (startBitOffset != 0)
 {
 Span<byte> slice = data.Slice(startByteIndex, 1);
 for (int i = startBitOffset; i <= 7; i++)
 SetBit(slice, i, value);
 }

 if (fullByteEndIndex >= fullByteStartIndex)
 {
 Span<byte> slice = data.Slice(fullByteStartIndex, fullByteEndIndex - fullByteStartIndex + 1);
 byte fill = (byte)(value ? 0xFF : 0x00);

 slice.Fill(fill);
 }

 if (endBitOffset != 7)
 {
 Span<byte> slice = data.Slice(endByteIndex, 1);
 for (int i = 0; i <= endBitOffset; i++)
 SetBit(slice, i, value);
 }
 }
 }

 /// <summary>
Expand All@@ -41,9 +137,6 @@ internal partial class PrimitiveColumnContainer<T> : IEnumerable<T?>
 // A set bit implies a valid value. An unset bit => null value
 public IList<ReadOnlyDataFrameBuffer<byte>> NullBitMapBuffers = new List<ReadOnlyDataFrameBuffer<byte>>();

 // Need a way to differentiate between columns initialized with default values and those with null values in SetValidityBit
 internal bool _modifyNullCountWhileIndexing = true;

 public PrimitiveColumnContainer(IEnumerable<T> values)
 {
 values = values ?? throw new ArgumentNullException(nameof(values));
Expand DownExpand Up@@ -168,27 +261,22 @@ public void AppendMany(T? value, long count)
 }

 DataFrameBuffer<T> mutableLastBuffer = Buffers.GetOrCreateMutable(Buffers.Count - 1);
 DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);

 //Calculate how many values we can additionaly allocate and not exceed the MaxCapacity
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - mutableLastBuffer.Length);
 int originalBufferLength = mutableLastBuffer.Length;
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - originalBufferLength);
 mutableLastBuffer.IncreaseSize(allocatable);

DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);
 int nullBufferAllocatable = (allocatable + 7) / 8;
//Calculate how many bytes we have additionaly allocate to store allocatable number of bits (need to take into account unused bits inside already allocated bytes)
 int nullBufferAllocatable = (originalBufferLength + allocatable + 7) / 8 - lastNullBitMapBuffer.Length;
 lastNullBitMapBuffer.IncreaseSize(nullBufferAllocatable);

 Length += allocatable;

 if (value.HasValue)
 {
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value ?? default);

 _modifyNullCountWhileIndexing = false;
 for (long i = Length - allocatable; i < Length; i++)
 {
 SetValidityBit(i, value.HasValue);
 }
 _modifyNullCountWhileIndexing = true;
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value.Value);
 BitmapHelper.SetBits(lastNullBitMapBuffer.RawSpan, originalBufferLength, allocatable, true);
 }

 remaining -= allocatable;
Expand DownExpand Up@@ -247,20 +335,20 @@ private byte SetBit(byte curBitMap, int index, bool value)
 if (value)
 {
 newBitMap = (byte)(curBitMap | (byte)(1 << (index & 7))); //bit hack for index % 8
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 0 && index < Length && NullCount > 0)
 if (BitmapHelper.IsBitClear(curBitMap, index) && index < Length && NullCount > 0)
 {
 // Old value was null.
 NullCount--;
 }
 }
 else
 {
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 1 && index < Length)
 if (BitmapHelper.IsBitSet(curBitMap, index) && index < Length)
 {
 // old value was NOT null and new value is null
 NullCount++;
 }
 else if (_modifyNullCountWhileIndexing && index == Length)
 else if (index == Length)
 {
 // New entry from an append
 NullCount++;
Expand Down

18 changes: 10 additions & 8 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using Apache.Arrow;
using Apache.Arrow.Types;
Expand DownExpand Up@@ -473,22 +474,23 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<int> mapIndice
 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<long> mapIndices)
 {
 IEnumerator<long> rows = mapIndices.GetEnumerator();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 ret._columnContainer._modifyNullCountWhileIndexing = false;
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 long numberOfRows = 0;
 while (rows.MoveNext() && numberOfRows < Length)
 {
 numberOfRows++;
 long curRow = rows.Current;
 T? value = _columnContainer[curRow];
 ret[curRow] = value;
 if (!value.HasValue)
 ret._columnContainer.NullCount++;
 var curRow = rows.Current;
 var value = _columnContainer[curRow];
 ret.Append(value);
 }
 ret._columnContainer._modifyNullCountWhileIndexing = true;
 return ret;
 }

 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<int> mapIndices)
 {
 return Clone(mapIndices.Select(x => (long)x));
 }

 internal BooleanDataFrameColumn CloneAsBooleanColumn()
 {
 PrimitiveColumnContainer<bool> newColumnContainer = _columnContainer.CloneAsBoolContainer();
Expand Down
Loading

, '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
PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument#6822

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

JakeRadMSFT
merged 12 commits into

from

Sep 27, 2023
 Merged


PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument
#6822
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
4e0cf30

Split Test for AppendMany into 4 different tests


asmirnov82 Sep 13, 2023
cb236bf

Block init of null validity buffer instead of setting individual bits


asmirnov82 Sep 13, 2023
095cb83

Add unit tests for PrimitiveDataFrameColumn.Clone


asmirnov82 Sep 13, 2023
0f78092

Fixes #6821


asmirnov82 Sep 13, 2023
f5e9aaa

Fix


asmirnov82 Sep 13, 2023
c44c628

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 18, 2023
33a29b0

Fix bug with AppendMany values to not empty column


asmirnov82 Sep 19, 2023
7548dc4

Restart unit tests


asmirnov82 Sep 19, 2023
b80e8a0

Add more unit tests


asmirnov82 Sep 20, 2023
83b5cca

Fix failing unit test


asmirnov82 Sep 20, 2023
dfe8d12

Fix code review findings


asmirnov82 Sep 27, 2023
9654516

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 27, 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


124 changes: 106 additions & 18 deletions
src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ namespace Microsoft.Data.Analysis
{
 internal static class BitmapHelper
 {
 private static ReadOnlySpan<byte> BitMask => new byte[] {
 1, 2, 4, 8, 16, 32, 64, 128
 };

 // Faster to use when we already have a span since it avoids indexing
 public static bool IsValid(ReadOnlySpan<byte> bitMapBufferSpan, int index)
 {
Expand All@@ -26,6 +30,98 @@ public static bool IsBitSet(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) != 0;
 }

 public static bool IsBitClear(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) == 0;
 }

 public static bool GetBit(byte data, int index) =>
 ((data >> index) & 1) != 0;

 public static bool GetBit(ReadOnlySpan<byte> data, int index) =>
 (data[index / 8] & BitMask[index % 8]) != 0;

 public static void ClearBit(Span<byte> data, int index)
 {
 data[index / 8] &= (byte)~BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index)
 {
 data[index / 8] |= BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index, bool value)
 {
 int idx = index / 8;
 int mod = index % 8;
 data[idx] = value
 ? (byte)(data[idx] | BitMask[mod])
 : (byte)(data[idx] & ~BitMask[mod]);
 }

 /// <summary>
 /// Set the number of bits in a span of bytes starting
 /// at a specific index, and limiting to length.
 /// </summary>
 /// <param name="data">Span to set bits value.</param>
 /// <param name="index">Bit index to start counting from.</param>
 /// <param name="length">Maximum of bits in the span to consider.</param>
 /// <param name="value">Bit value.</param>
 internal static void SetBits(Span<byte> data, int index, int length, bool value)
 {
 if (length == 0)
 return;

 int endBitIndex = checked(index + length - 1);

 // Use simpler method if there aren't many values
 if (length < 20)
 {
 for (int i = index; i <= endBitIndex; i++)
 {
 SetBit(data, i, value);
 }
 return;
 }

 // Otherwise do the work to figure out how to copy whole bytes
 int startByteIndex = index / 8;
 int startBitOffset = index % 8;
 int endByteIndex = endBitIndex / 8;
 int endBitOffset = endBitIndex % 8;

 // If the starting index and ending index are not byte-aligned,
 // we'll need to set bits the slow way. If they are
 // byte-aligned, and for all other bytes in the 'middle', we
 // can use a faster byte-aligned set.
 int fullByteStartIndex = startBitOffset == 0 ? startByteIndex : startByteIndex + 1;
 int fullByteEndIndex = endBitOffset == 7 ? endByteIndex : endByteIndex - 1;

 // Bits we will be using to finish up the first byte
 if (startBitOffset != 0)
 {
 Span<byte> slice = data.Slice(startByteIndex, 1);
 for (int i = startBitOffset; i <= 7; i++)
 SetBit(slice, i, value);
 }

 if (fullByteEndIndex >= fullByteStartIndex)
 {
 Span<byte> slice = data.Slice(fullByteStartIndex, fullByteEndIndex - fullByteStartIndex + 1);
 byte fill = (byte)(value ? 0xFF : 0x00);

 slice.Fill(fill);
 }

 if (endBitOffset != 7)
 {
 Span<byte> slice = data.Slice(endByteIndex, 1);
 for (int i = 0; i <= endBitOffset; i++)
 SetBit(slice, i, value);
 }
 }
 }

 /// <summary>
Expand All@@ -41,9 +137,6 @@ internal partial class PrimitiveColumnContainer<T> : IEnumerable<T?>
 // A set bit implies a valid value. An unset bit => null value
 public IList<ReadOnlyDataFrameBuffer<byte>> NullBitMapBuffers = new List<ReadOnlyDataFrameBuffer<byte>>();

 // Need a way to differentiate between columns initialized with default values and those with null values in SetValidityBit
 internal bool _modifyNullCountWhileIndexing = true;

 public PrimitiveColumnContainer(IEnumerable<T> values)
 {
 values = values ?? throw new ArgumentNullException(nameof(values));
Expand DownExpand Up@@ -168,27 +261,22 @@ public void AppendMany(T? value, long count)
 }

 DataFrameBuffer<T> mutableLastBuffer = Buffers.GetOrCreateMutable(Buffers.Count - 1);
 DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);

 //Calculate how many values we can additionaly allocate and not exceed the MaxCapacity
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - mutableLastBuffer.Length);
 int originalBufferLength = mutableLastBuffer.Length;
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - originalBufferLength);
 mutableLastBuffer.IncreaseSize(allocatable);

DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);
 int nullBufferAllocatable = (allocatable + 7) / 8;
//Calculate how many bytes we have additionaly allocate to store allocatable number of bits (need to take into account unused bits inside already allocated bytes)
 int nullBufferAllocatable = (originalBufferLength + allocatable + 7) / 8 - lastNullBitMapBuffer.Length;
 lastNullBitMapBuffer.IncreaseSize(nullBufferAllocatable);

 Length += allocatable;

 if (value.HasValue)
 {
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value ?? default);

 _modifyNullCountWhileIndexing = false;
 for (long i = Length - allocatable; i < Length; i++)
 {
 SetValidityBit(i, value.HasValue);
 }
 _modifyNullCountWhileIndexing = true;
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value.Value);
 BitmapHelper.SetBits(lastNullBitMapBuffer.RawSpan, originalBufferLength, allocatable, true);
 }

 remaining -= allocatable;
Expand DownExpand Up@@ -247,20 +335,20 @@ private byte SetBit(byte curBitMap, int index, bool value)
 if (value)
 {
 newBitMap = (byte)(curBitMap | (byte)(1 << (index & 7))); //bit hack for index % 8
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 0 && index < Length && NullCount > 0)
 if (BitmapHelper.IsBitClear(curBitMap, index) && index < Length && NullCount > 0)
 {
 // Old value was null.
 NullCount--;
 }
 }
 else
 {
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 1 && index < Length)
 if (BitmapHelper.IsBitSet(curBitMap, index) && index < Length)
 {
 // old value was NOT null and new value is null
 NullCount++;
 }
 else if (_modifyNullCountWhileIndexing && index == Length)
 else if (index == Length)
 {
 // New entry from an append
 NullCount++;
Expand Down

18 changes: 10 additions & 8 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using Apache.Arrow;
using Apache.Arrow.Types;
Expand DownExpand Up@@ -473,22 +474,23 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<int> mapIndice
 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<long> mapIndices)
 {
 IEnumerator<long> rows = mapIndices.GetEnumerator();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 ret._columnContainer._modifyNullCountWhileIndexing = false;
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 long numberOfRows = 0;
 while (rows.MoveNext() && numberOfRows < Length)
 {
 numberOfRows++;
 long curRow = rows.Current;
 T? value = _columnContainer[curRow];
 ret[curRow] = value;
 if (!value.HasValue)
 ret._columnContainer.NullCount++;
 var curRow = rows.Current;
 var value = _columnContainer[curRow];
 ret.Append(value);
 }
 ret._columnContainer._modifyNullCountWhileIndexing = true;
 return ret;
 }

 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<int> mapIndices)
 {
 return Clone(mapIndices.Select(x => (long)x));
 }

 internal BooleanDataFrameColumn CloneAsBooleanColumn()
 {
 PrimitiveColumnContainer<bool> newColumnContainer = _columnContainer.CloneAsBoolContainer();
Expand Down
Loading

, '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
PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument#6822

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

JakeRadMSFT
merged 12 commits into

from

Sep 27, 2023
 Merged


PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument
#6822
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
4e0cf30

Split Test for AppendMany into 4 different tests


asmirnov82 Sep 13, 2023
cb236bf

Block init of null validity buffer instead of setting individual bits


asmirnov82 Sep 13, 2023
095cb83

Add unit tests for PrimitiveDataFrameColumn.Clone


asmirnov82 Sep 13, 2023
0f78092

Fixes #6821


asmirnov82 Sep 13, 2023
f5e9aaa

Fix


asmirnov82 Sep 13, 2023
c44c628

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 18, 2023
33a29b0

Fix bug with AppendMany values to not empty column


asmirnov82 Sep 19, 2023
7548dc4

Restart unit tests


asmirnov82 Sep 19, 2023
b80e8a0

Add more unit tests


asmirnov82 Sep 20, 2023
83b5cca

Fix failing unit test


asmirnov82 Sep 20, 2023
dfe8d12

Fix code review findings


asmirnov82 Sep 27, 2023
9654516

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 27, 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


124 changes: 106 additions & 18 deletions
src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ namespace Microsoft.Data.Analysis
{
 internal static class BitmapHelper
 {
 private static ReadOnlySpan<byte> BitMask => new byte[] {
 1, 2, 4, 8, 16, 32, 64, 128
 };

 // Faster to use when we already have a span since it avoids indexing
 public static bool IsValid(ReadOnlySpan<byte> bitMapBufferSpan, int index)
 {
Expand All@@ -26,6 +30,98 @@ public static bool IsBitSet(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) != 0;
 }

 public static bool IsBitClear(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) == 0;
 }

 public static bool GetBit(byte data, int index) =>
 ((data >> index) & 1) != 0;

 public static bool GetBit(ReadOnlySpan<byte> data, int index) =>
 (data[index / 8] & BitMask[index % 8]) != 0;

 public static void ClearBit(Span<byte> data, int index)
 {
 data[index / 8] &= (byte)~BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index)
 {
 data[index / 8] |= BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index, bool value)
 {
 int idx = index / 8;
 int mod = index % 8;
 data[idx] = value
 ? (byte)(data[idx] | BitMask[mod])
 : (byte)(data[idx] & ~BitMask[mod]);
 }

 /// <summary>
 /// Set the number of bits in a span of bytes starting
 /// at a specific index, and limiting to length.
 /// </summary>
 /// <param name="data">Span to set bits value.</param>
 /// <param name="index">Bit index to start counting from.</param>
 /// <param name="length">Maximum of bits in the span to consider.</param>
 /// <param name="value">Bit value.</param>
 internal static void SetBits(Span<byte> data, int index, int length, bool value)
 {
 if (length == 0)
 return;

 int endBitIndex = checked(index + length - 1);

 // Use simpler method if there aren't many values
 if (length < 20)
 {
 for (int i = index; i <= endBitIndex; i++)
 {
 SetBit(data, i, value);
 }
 return;
 }

 // Otherwise do the work to figure out how to copy whole bytes
 int startByteIndex = index / 8;
 int startBitOffset = index % 8;
 int endByteIndex = endBitIndex / 8;
 int endBitOffset = endBitIndex % 8;

 // If the starting index and ending index are not byte-aligned,
 // we'll need to set bits the slow way. If they are
 // byte-aligned, and for all other bytes in the 'middle', we
 // can use a faster byte-aligned set.
 int fullByteStartIndex = startBitOffset == 0 ? startByteIndex : startByteIndex + 1;
 int fullByteEndIndex = endBitOffset == 7 ? endByteIndex : endByteIndex - 1;

 // Bits we will be using to finish up the first byte
 if (startBitOffset != 0)
 {
 Span<byte> slice = data.Slice(startByteIndex, 1);
 for (int i = startBitOffset; i <= 7; i++)
 SetBit(slice, i, value);
 }

 if (fullByteEndIndex >= fullByteStartIndex)
 {
 Span<byte> slice = data.Slice(fullByteStartIndex, fullByteEndIndex - fullByteStartIndex + 1);
 byte fill = (byte)(value ? 0xFF : 0x00);

 slice.Fill(fill);
 }

 if (endBitOffset != 7)
 {
 Span<byte> slice = data.Slice(endByteIndex, 1);
 for (int i = 0; i <= endBitOffset; i++)
 SetBit(slice, i, value);
 }
 }
 }

 /// <summary>
Expand All@@ -41,9 +137,6 @@ internal partial class PrimitiveColumnContainer<T> : IEnumerable<T?>
 // A set bit implies a valid value. An unset bit => null value
 public IList<ReadOnlyDataFrameBuffer<byte>> NullBitMapBuffers = new List<ReadOnlyDataFrameBuffer<byte>>();

 // Need a way to differentiate between columns initialized with default values and those with null values in SetValidityBit
 internal bool _modifyNullCountWhileIndexing = true;

 public PrimitiveColumnContainer(IEnumerable<T> values)
 {
 values = values ?? throw new ArgumentNullException(nameof(values));
Expand DownExpand Up@@ -168,27 +261,22 @@ public void AppendMany(T? value, long count)
 }

 DataFrameBuffer<T> mutableLastBuffer = Buffers.GetOrCreateMutable(Buffers.Count - 1);
 DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);

 //Calculate how many values we can additionaly allocate and not exceed the MaxCapacity
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - mutableLastBuffer.Length);
 int originalBufferLength = mutableLastBuffer.Length;
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - originalBufferLength);
 mutableLastBuffer.IncreaseSize(allocatable);

DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);
 int nullBufferAllocatable = (allocatable + 7) / 8;
//Calculate how many bytes we have additionaly allocate to store allocatable number of bits (need to take into account unused bits inside already allocated bytes)
 int nullBufferAllocatable = (originalBufferLength + allocatable + 7) / 8 - lastNullBitMapBuffer.Length;
 lastNullBitMapBuffer.IncreaseSize(nullBufferAllocatable);

 Length += allocatable;

 if (value.HasValue)
 {
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value ?? default);

 _modifyNullCountWhileIndexing = false;
 for (long i = Length - allocatable; i < Length; i++)
 {
 SetValidityBit(i, value.HasValue);
 }
 _modifyNullCountWhileIndexing = true;
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value.Value);
 BitmapHelper.SetBits(lastNullBitMapBuffer.RawSpan, originalBufferLength, allocatable, true);
 }

 remaining -= allocatable;
Expand DownExpand Up@@ -247,20 +335,20 @@ private byte SetBit(byte curBitMap, int index, bool value)
 if (value)
 {
 newBitMap = (byte)(curBitMap | (byte)(1 << (index & 7))); //bit hack for index % 8
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 0 && index < Length && NullCount > 0)
 if (BitmapHelper.IsBitClear(curBitMap, index) && index < Length && NullCount > 0)
 {
 // Old value was null.
 NullCount--;
 }
 }
 else
 {
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 1 && index < Length)
 if (BitmapHelper.IsBitSet(curBitMap, index) && index < Length)
 {
 // old value was NOT null and new value is null
 NullCount++;
 }
 else if (_modifyNullCountWhileIndexing && index == Length)
 else if (index == Length)
 {
 // New entry from an append
 NullCount++;
Expand Down

18 changes: 10 additions & 8 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using Apache.Arrow;
using Apache.Arrow.Types;
Expand DownExpand Up@@ -473,22 +474,23 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<int> mapIndice
 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<long> mapIndices)
 {
 IEnumerator<long> rows = mapIndices.GetEnumerator();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 ret._columnContainer._modifyNullCountWhileIndexing = false;
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 long numberOfRows = 0;
 while (rows.MoveNext() && numberOfRows < Length)
 {
 numberOfRows++;
 long curRow = rows.Current;
 T? value = _columnContainer[curRow];
 ret[curRow] = value;
 if (!value.HasValue)
 ret._columnContainer.NullCount++;
 var curRow = rows.Current;
 var value = _columnContainer[curRow];
 ret.Append(value);
 }
 ret._columnContainer._modifyNullCountWhileIndexing = true;
 return ret;
 }

 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<int> mapIndices)
 {
 return Clone(mapIndices.Select(x => (long)x));
 }

 internal BooleanDataFrameColumn CloneAsBooleanColumn()
 {
 PrimitiveColumnContainer<bool> newColumnContainer = _columnContainer.CloneAsBoolContainer();
Expand Down
Loading

, '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
PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument#6822

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

JakeRadMSFT
merged 12 commits into

from

Sep 27, 2023
 Merged


PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument
#6822
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
4e0cf30

Split Test for AppendMany into 4 different tests


asmirnov82 Sep 13, 2023
cb236bf

Block init of null validity buffer instead of setting individual bits


asmirnov82 Sep 13, 2023
095cb83

Add unit tests for PrimitiveDataFrameColumn.Clone


asmirnov82 Sep 13, 2023
0f78092

Fixes #6821


asmirnov82 Sep 13, 2023
f5e9aaa

Fix


asmirnov82 Sep 13, 2023
c44c628

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 18, 2023
33a29b0

Fix bug with AppendMany values to not empty column


asmirnov82 Sep 19, 2023
7548dc4

Restart unit tests


asmirnov82 Sep 19, 2023
b80e8a0

Add more unit tests


asmirnov82 Sep 20, 2023
83b5cca

Fix failing unit test


asmirnov82 Sep 20, 2023
dfe8d12

Fix code review findings


asmirnov82 Sep 27, 2023
9654516

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 27, 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


124 changes: 106 additions & 18 deletions
src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ namespace Microsoft.Data.Analysis
{
 internal static class BitmapHelper
 {
 private static ReadOnlySpan<byte> BitMask => new byte[] {
 1, 2, 4, 8, 16, 32, 64, 128
 };

 // Faster to use when we already have a span since it avoids indexing
 public static bool IsValid(ReadOnlySpan<byte> bitMapBufferSpan, int index)
 {
Expand All@@ -26,6 +30,98 @@ public static bool IsBitSet(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) != 0;
 }

 public static bool IsBitClear(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) == 0;
 }

 public static bool GetBit(byte data, int index) =>
 ((data >> index) & 1) != 0;

 public static bool GetBit(ReadOnlySpan<byte> data, int index) =>
 (data[index / 8] & BitMask[index % 8]) != 0;

 public static void ClearBit(Span<byte> data, int index)
 {
 data[index / 8] &= (byte)~BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index)
 {
 data[index / 8] |= BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index, bool value)
 {
 int idx = index / 8;
 int mod = index % 8;
 data[idx] = value
 ? (byte)(data[idx] | BitMask[mod])
 : (byte)(data[idx] & ~BitMask[mod]);
 }

 /// <summary>
 /// Set the number of bits in a span of bytes starting
 /// at a specific index, and limiting to length.
 /// </summary>
 /// <param name="data">Span to set bits value.</param>
 /// <param name="index">Bit index to start counting from.</param>
 /// <param name="length">Maximum of bits in the span to consider.</param>
 /// <param name="value">Bit value.</param>
 internal static void SetBits(Span<byte> data, int index, int length, bool value)
 {
 if (length == 0)
 return;

 int endBitIndex = checked(index + length - 1);

 // Use simpler method if there aren't many values
 if (length < 20)
 {
 for (int i = index; i <= endBitIndex; i++)
 {
 SetBit(data, i, value);
 }
 return;
 }

 // Otherwise do the work to figure out how to copy whole bytes
 int startByteIndex = index / 8;
 int startBitOffset = index % 8;
 int endByteIndex = endBitIndex / 8;
 int endBitOffset = endBitIndex % 8;

 // If the starting index and ending index are not byte-aligned,
 // we'll need to set bits the slow way. If they are
 // byte-aligned, and for all other bytes in the 'middle', we
 // can use a faster byte-aligned set.
 int fullByteStartIndex = startBitOffset == 0 ? startByteIndex : startByteIndex + 1;
 int fullByteEndIndex = endBitOffset == 7 ? endByteIndex : endByteIndex - 1;

 // Bits we will be using to finish up the first byte
 if (startBitOffset != 0)
 {
 Span<byte> slice = data.Slice(startByteIndex, 1);
 for (int i = startBitOffset; i <= 7; i++)
 SetBit(slice, i, value);
 }

 if (fullByteEndIndex >= fullByteStartIndex)
 {
 Span<byte> slice = data.Slice(fullByteStartIndex, fullByteEndIndex - fullByteStartIndex + 1);
 byte fill = (byte)(value ? 0xFF : 0x00);

 slice.Fill(fill);
 }

 if (endBitOffset != 7)
 {
 Span<byte> slice = data.Slice(endByteIndex, 1);
 for (int i = 0; i <= endBitOffset; i++)
 SetBit(slice, i, value);
 }
 }
 }

 /// <summary>
Expand All@@ -41,9 +137,6 @@ internal partial class PrimitiveColumnContainer<T> : IEnumerable<T?>
 // A set bit implies a valid value. An unset bit => null value
 public IList<ReadOnlyDataFrameBuffer<byte>> NullBitMapBuffers = new List<ReadOnlyDataFrameBuffer<byte>>();

 // Need a way to differentiate between columns initialized with default values and those with null values in SetValidityBit
 internal bool _modifyNullCountWhileIndexing = true;

 public PrimitiveColumnContainer(IEnumerable<T> values)
 {
 values = values ?? throw new ArgumentNullException(nameof(values));
Expand DownExpand Up@@ -168,27 +261,22 @@ public void AppendMany(T? value, long count)
 }

 DataFrameBuffer<T> mutableLastBuffer = Buffers.GetOrCreateMutable(Buffers.Count - 1);
 DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);

 //Calculate how many values we can additionaly allocate and not exceed the MaxCapacity
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - mutableLastBuffer.Length);
 int originalBufferLength = mutableLastBuffer.Length;
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - originalBufferLength);
 mutableLastBuffer.IncreaseSize(allocatable);

DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);
 int nullBufferAllocatable = (allocatable + 7) / 8;
//Calculate how many bytes we have additionaly allocate to store allocatable number of bits (need to take into account unused bits inside already allocated bytes)
 int nullBufferAllocatable = (originalBufferLength + allocatable + 7) / 8 - lastNullBitMapBuffer.Length;
 lastNullBitMapBuffer.IncreaseSize(nullBufferAllocatable);

 Length += allocatable;

 if (value.HasValue)
 {
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value ?? default);

 _modifyNullCountWhileIndexing = false;
 for (long i = Length - allocatable; i < Length; i++)
 {
 SetValidityBit(i, value.HasValue);
 }
 _modifyNullCountWhileIndexing = true;
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value.Value);
 BitmapHelper.SetBits(lastNullBitMapBuffer.RawSpan, originalBufferLength, allocatable, true);
 }

 remaining -= allocatable;
Expand DownExpand Up@@ -247,20 +335,20 @@ private byte SetBit(byte curBitMap, int index, bool value)
 if (value)
 {
 newBitMap = (byte)(curBitMap | (byte)(1 << (index & 7))); //bit hack for index % 8
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 0 && index < Length && NullCount > 0)
 if (BitmapHelper.IsBitClear(curBitMap, index) && index < Length && NullCount > 0)
 {
 // Old value was null.
 NullCount--;
 }
 }
 else
 {
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 1 && index < Length)
 if (BitmapHelper.IsBitSet(curBitMap, index) && index < Length)
 {
 // old value was NOT null and new value is null
 NullCount++;
 }
 else if (_modifyNullCountWhileIndexing && index == Length)
 else if (index == Length)
 {
 // New entry from an append
 NullCount++;
Expand Down

18 changes: 10 additions & 8 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using Apache.Arrow;
using Apache.Arrow.Types;
Expand DownExpand Up@@ -473,22 +474,23 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<int> mapIndice
 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<long> mapIndices)
 {
 IEnumerator<long> rows = mapIndices.GetEnumerator();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 ret._columnContainer._modifyNullCountWhileIndexing = false;
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 long numberOfRows = 0;
 while (rows.MoveNext() && numberOfRows < Length)
 {
 numberOfRows++;
 long curRow = rows.Current;
 T? value = _columnContainer[curRow];
 ret[curRow] = value;
 if (!value.HasValue)
 ret._columnContainer.NullCount++;
 var curRow = rows.Current;
 var value = _columnContainer[curRow];
 ret.Append(value);
 }
 ret._columnContainer._modifyNullCountWhileIndexing = true;
 return ret;
 }

 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<int> mapIndices)
 {
 return Clone(mapIndices.Select(x => (long)x));
 }

 internal BooleanDataFrameColumn CloneAsBooleanColumn()
 {
 PrimitiveColumnContainer<bool> newColumnContainer = _columnContainer.CloneAsBoolContainer();
Expand Down
Loading

, '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
PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument#6822

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

JakeRadMSFT
merged 12 commits into

from

Sep 27, 2023
 Merged


PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument
#6822
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
4e0cf30

Split Test for AppendMany into 4 different tests


asmirnov82 Sep 13, 2023
cb236bf

Block init of null validity buffer instead of setting individual bits


asmirnov82 Sep 13, 2023
095cb83

Add unit tests for PrimitiveDataFrameColumn.Clone


asmirnov82 Sep 13, 2023
0f78092

Fixes #6821


asmirnov82 Sep 13, 2023
f5e9aaa

Fix


asmirnov82 Sep 13, 2023
c44c628

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 18, 2023
33a29b0

Fix bug with AppendMany values to not empty column


asmirnov82 Sep 19, 2023
7548dc4

Restart unit tests


asmirnov82 Sep 19, 2023
b80e8a0

Add more unit tests


asmirnov82 Sep 20, 2023
83b5cca

Fix failing unit test


asmirnov82 Sep 20, 2023
dfe8d12

Fix code review findings


asmirnov82 Sep 27, 2023
9654516

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 27, 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


124 changes: 106 additions & 18 deletions
src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ namespace Microsoft.Data.Analysis
{
 internal static class BitmapHelper
 {
 private static ReadOnlySpan<byte> BitMask => new byte[] {
 1, 2, 4, 8, 16, 32, 64, 128
 };

 // Faster to use when we already have a span since it avoids indexing
 public static bool IsValid(ReadOnlySpan<byte> bitMapBufferSpan, int index)
 {
Expand All@@ -26,6 +30,98 @@ public static bool IsBitSet(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) != 0;
 }

 public static bool IsBitClear(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) == 0;
 }

 public static bool GetBit(byte data, int index) =>
 ((data >> index) & 1) != 0;

 public static bool GetBit(ReadOnlySpan<byte> data, int index) =>
 (data[index / 8] & BitMask[index % 8]) != 0;

 public static void ClearBit(Span<byte> data, int index)
 {
 data[index / 8] &= (byte)~BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index)
 {
 data[index / 8] |= BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index, bool value)
 {
 int idx = index / 8;
 int mod = index % 8;
 data[idx] = value
 ? (byte)(data[idx] | BitMask[mod])
 : (byte)(data[idx] & ~BitMask[mod]);
 }

 /// <summary>
 /// Set the number of bits in a span of bytes starting
 /// at a specific index, and limiting to length.
 /// </summary>
 /// <param name="data">Span to set bits value.</param>
 /// <param name="index">Bit index to start counting from.</param>
 /// <param name="length">Maximum of bits in the span to consider.</param>
 /// <param name="value">Bit value.</param>
 internal static void SetBits(Span<byte> data, int index, int length, bool value)
 {
 if (length == 0)
 return;

 int endBitIndex = checked(index + length - 1);

 // Use simpler method if there aren't many values
 if (length < 20)
 {
 for (int i = index; i <= endBitIndex; i++)
 {
 SetBit(data, i, value);
 }
 return;
 }

 // Otherwise do the work to figure out how to copy whole bytes
 int startByteIndex = index / 8;
 int startBitOffset = index % 8;
 int endByteIndex = endBitIndex / 8;
 int endBitOffset = endBitIndex % 8;

 // If the starting index and ending index are not byte-aligned,
 // we'll need to set bits the slow way. If they are
 // byte-aligned, and for all other bytes in the 'middle', we
 // can use a faster byte-aligned set.
 int fullByteStartIndex = startBitOffset == 0 ? startByteIndex : startByteIndex + 1;
 int fullByteEndIndex = endBitOffset == 7 ? endByteIndex : endByteIndex - 1;

 // Bits we will be using to finish up the first byte
 if (startBitOffset != 0)
 {
 Span<byte> slice = data.Slice(startByteIndex, 1);
 for (int i = startBitOffset; i <= 7; i++)
 SetBit(slice, i, value);
 }

 if (fullByteEndIndex >= fullByteStartIndex)
 {
 Span<byte> slice = data.Slice(fullByteStartIndex, fullByteEndIndex - fullByteStartIndex + 1);
 byte fill = (byte)(value ? 0xFF : 0x00);

 slice.Fill(fill);
 }

 if (endBitOffset != 7)
 {
 Span<byte> slice = data.Slice(endByteIndex, 1);
 for (int i = 0; i <= endBitOffset; i++)
 SetBit(slice, i, value);
 }
 }
 }

 /// <summary>
Expand All@@ -41,9 +137,6 @@ internal partial class PrimitiveColumnContainer<T> : IEnumerable<T?>
 // A set bit implies a valid value. An unset bit => null value
 public IList<ReadOnlyDataFrameBuffer<byte>> NullBitMapBuffers = new List<ReadOnlyDataFrameBuffer<byte>>();

 // Need a way to differentiate between columns initialized with default values and those with null values in SetValidityBit
 internal bool _modifyNullCountWhileIndexing = true;

 public PrimitiveColumnContainer(IEnumerable<T> values)
 {
 values = values ?? throw new ArgumentNullException(nameof(values));
Expand DownExpand Up@@ -168,27 +261,22 @@ public void AppendMany(T? value, long count)
 }

 DataFrameBuffer<T> mutableLastBuffer = Buffers.GetOrCreateMutable(Buffers.Count - 1);
 DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);

 //Calculate how many values we can additionaly allocate and not exceed the MaxCapacity
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - mutableLastBuffer.Length);
 int originalBufferLength = mutableLastBuffer.Length;
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - originalBufferLength);
 mutableLastBuffer.IncreaseSize(allocatable);

DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);
 int nullBufferAllocatable = (allocatable + 7) / 8;
//Calculate how many bytes we have additionaly allocate to store allocatable number of bits (need to take into account unused bits inside already allocated bytes)
 int nullBufferAllocatable = (originalBufferLength + allocatable + 7) / 8 - lastNullBitMapBuffer.Length;
 lastNullBitMapBuffer.IncreaseSize(nullBufferAllocatable);

 Length += allocatable;

 if (value.HasValue)
 {
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value ?? default);

 _modifyNullCountWhileIndexing = false;
 for (long i = Length - allocatable; i < Length; i++)
 {
 SetValidityBit(i, value.HasValue);
 }
 _modifyNullCountWhileIndexing = true;
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value.Value);
 BitmapHelper.SetBits(lastNullBitMapBuffer.RawSpan, originalBufferLength, allocatable, true);
 }

 remaining -= allocatable;
Expand DownExpand Up@@ -247,20 +335,20 @@ private byte SetBit(byte curBitMap, int index, bool value)
 if (value)
 {
 newBitMap = (byte)(curBitMap | (byte)(1 << (index & 7))); //bit hack for index % 8
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 0 && index < Length && NullCount > 0)
 if (BitmapHelper.IsBitClear(curBitMap, index) && index < Length && NullCount > 0)
 {
 // Old value was null.
 NullCount--;
 }
 }
 else
 {
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 1 && index < Length)
 if (BitmapHelper.IsBitSet(curBitMap, index) && index < Length)
 {
 // old value was NOT null and new value is null
 NullCount++;
 }
 else if (_modifyNullCountWhileIndexing && index == Length)
 else if (index == Length)
 {
 // New entry from an append
 NullCount++;
Expand Down

18 changes: 10 additions & 8 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using Apache.Arrow;
using Apache.Arrow.Types;
Expand DownExpand Up@@ -473,22 +474,23 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<int> mapIndice
 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<long> mapIndices)
 {
 IEnumerator<long> rows = mapIndices.GetEnumerator();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 ret._columnContainer._modifyNullCountWhileIndexing = false;
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 long numberOfRows = 0;
 while (rows.MoveNext() && numberOfRows < Length)
 {
 numberOfRows++;
 long curRow = rows.Current;
 T? value = _columnContainer[curRow];
 ret[curRow] = value;
 if (!value.HasValue)
 ret._columnContainer.NullCount++;
 var curRow = rows.Current;
 var value = _columnContainer[curRow];
 ret.Append(value);
 }
 ret._columnContainer._modifyNullCountWhileIndexing = true;
 return ret;
 }

 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<int> mapIndices)
 {
 return Clone(mapIndices.Select(x => (long)x));
 }

 internal BooleanDataFrameColumn CloneAsBooleanColumn()
 {
 PrimitiveColumnContainer<bool> newColumnContainer = _columnContainer.CloneAsBoolContainer();
Expand Down
Loading

, '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
PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument#6822

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

JakeRadMSFT
merged 12 commits into

from

Sep 27, 2023
 Merged


PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument
#6822
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
4e0cf30

Split Test for AppendMany into 4 different tests


asmirnov82 Sep 13, 2023
cb236bf

Block init of null validity buffer instead of setting individual bits


asmirnov82 Sep 13, 2023
095cb83

Add unit tests for PrimitiveDataFrameColumn.Clone


asmirnov82 Sep 13, 2023
0f78092

Fixes #6821


asmirnov82 Sep 13, 2023
f5e9aaa

Fix


asmirnov82 Sep 13, 2023
c44c628

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 18, 2023
33a29b0

Fix bug with AppendMany values to not empty column


asmirnov82 Sep 19, 2023
7548dc4

Restart unit tests


asmirnov82 Sep 19, 2023
b80e8a0

Add more unit tests


asmirnov82 Sep 20, 2023
83b5cca

Fix failing unit test


asmirnov82 Sep 20, 2023
dfe8d12

Fix code review findings


asmirnov82 Sep 27, 2023
9654516

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 27, 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


124 changes: 106 additions & 18 deletions
src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ namespace Microsoft.Data.Analysis
{
 internal static class BitmapHelper
 {
 private static ReadOnlySpan<byte> BitMask => new byte[] {
 1, 2, 4, 8, 16, 32, 64, 128
 };

 // Faster to use when we already have a span since it avoids indexing
 public static bool IsValid(ReadOnlySpan<byte> bitMapBufferSpan, int index)
 {
Expand All@@ -26,6 +30,98 @@ public static bool IsBitSet(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) != 0;
 }

 public static bool IsBitClear(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) == 0;
 }

 public static bool GetBit(byte data, int index) =>
 ((data >> index) & 1) != 0;

 public static bool GetBit(ReadOnlySpan<byte> data, int index) =>
 (data[index / 8] & BitMask[index % 8]) != 0;

 public static void ClearBit(Span<byte> data, int index)
 {
 data[index / 8] &= (byte)~BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index)
 {
 data[index / 8] |= BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index, bool value)
 {
 int idx = index / 8;
 int mod = index % 8;
 data[idx] = value
 ? (byte)(data[idx] | BitMask[mod])
 : (byte)(data[idx] & ~BitMask[mod]);
 }

 /// <summary>
 /// Set the number of bits in a span of bytes starting
 /// at a specific index, and limiting to length.
 /// </summary>
 /// <param name="data">Span to set bits value.</param>
 /// <param name="index">Bit index to start counting from.</param>
 /// <param name="length">Maximum of bits in the span to consider.</param>
 /// <param name="value">Bit value.</param>
 internal static void SetBits(Span<byte> data, int index, int length, bool value)
 {
 if (length == 0)
 return;

 int endBitIndex = checked(index + length - 1);

 // Use simpler method if there aren't many values
 if (length < 20)
 {
 for (int i = index; i <= endBitIndex; i++)
 {
 SetBit(data, i, value);
 }
 return;
 }

 // Otherwise do the work to figure out how to copy whole bytes
 int startByteIndex = index / 8;
 int startBitOffset = index % 8;
 int endByteIndex = endBitIndex / 8;
 int endBitOffset = endBitIndex % 8;

 // If the starting index and ending index are not byte-aligned,
 // we'll need to set bits the slow way. If they are
 // byte-aligned, and for all other bytes in the 'middle', we
 // can use a faster byte-aligned set.
 int fullByteStartIndex = startBitOffset == 0 ? startByteIndex : startByteIndex + 1;
 int fullByteEndIndex = endBitOffset == 7 ? endByteIndex : endByteIndex - 1;

 // Bits we will be using to finish up the first byte
 if (startBitOffset != 0)
 {
 Span<byte> slice = data.Slice(startByteIndex, 1);
 for (int i = startBitOffset; i <= 7; i++)
 SetBit(slice, i, value);
 }

 if (fullByteEndIndex >= fullByteStartIndex)
 {
 Span<byte> slice = data.Slice(fullByteStartIndex, fullByteEndIndex - fullByteStartIndex + 1);
 byte fill = (byte)(value ? 0xFF : 0x00);

 slice.Fill(fill);
 }

 if (endBitOffset != 7)
 {
 Span<byte> slice = data.Slice(endByteIndex, 1);
 for (int i = 0; i <= endBitOffset; i++)
 SetBit(slice, i, value);
 }
 }
 }

 /// <summary>
Expand All@@ -41,9 +137,6 @@ internal partial class PrimitiveColumnContainer<T> : IEnumerable<T?>
 // A set bit implies a valid value. An unset bit => null value
 public IList<ReadOnlyDataFrameBuffer<byte>> NullBitMapBuffers = new List<ReadOnlyDataFrameBuffer<byte>>();

 // Need a way to differentiate between columns initialized with default values and those with null values in SetValidityBit
 internal bool _modifyNullCountWhileIndexing = true;

 public PrimitiveColumnContainer(IEnumerable<T> values)
 {
 values = values ?? throw new ArgumentNullException(nameof(values));
Expand DownExpand Up@@ -168,27 +261,22 @@ public void AppendMany(T? value, long count)
 }

 DataFrameBuffer<T> mutableLastBuffer = Buffers.GetOrCreateMutable(Buffers.Count - 1);
 DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);

 //Calculate how many values we can additionaly allocate and not exceed the MaxCapacity
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - mutableLastBuffer.Length);
 int originalBufferLength = mutableLastBuffer.Length;
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - originalBufferLength);
 mutableLastBuffer.IncreaseSize(allocatable);

DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);
 int nullBufferAllocatable = (allocatable + 7) / 8;
//Calculate how many bytes we have additionaly allocate to store allocatable number of bits (need to take into account unused bits inside already allocated bytes)
 int nullBufferAllocatable = (originalBufferLength + allocatable + 7) / 8 - lastNullBitMapBuffer.Length;
 lastNullBitMapBuffer.IncreaseSize(nullBufferAllocatable);

 Length += allocatable;

 if (value.HasValue)
 {
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value ?? default);

 _modifyNullCountWhileIndexing = false;
 for (long i = Length - allocatable; i < Length; i++)
 {
 SetValidityBit(i, value.HasValue);
 }
 _modifyNullCountWhileIndexing = true;
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value.Value);
 BitmapHelper.SetBits(lastNullBitMapBuffer.RawSpan, originalBufferLength, allocatable, true);
 }

 remaining -= allocatable;
Expand DownExpand Up@@ -247,20 +335,20 @@ private byte SetBit(byte curBitMap, int index, bool value)
 if (value)
 {
 newBitMap = (byte)(curBitMap | (byte)(1 << (index & 7))); //bit hack for index % 8
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 0 && index < Length && NullCount > 0)
 if (BitmapHelper.IsBitClear(curBitMap, index) && index < Length && NullCount > 0)
 {
 // Old value was null.
 NullCount--;
 }
 }
 else
 {
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 1 && index < Length)
 if (BitmapHelper.IsBitSet(curBitMap, index) && index < Length)
 {
 // old value was NOT null and new value is null
 NullCount++;
 }
 else if (_modifyNullCountWhileIndexing && index == Length)
 else if (index == Length)
 {
 // New entry from an append
 NullCount++;
Expand Down

18 changes: 10 additions & 8 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using Apache.Arrow;
using Apache.Arrow.Types;
Expand DownExpand Up@@ -473,22 +474,23 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<int> mapIndice
 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<long> mapIndices)
 {
 IEnumerator<long> rows = mapIndices.GetEnumerator();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 ret._columnContainer._modifyNullCountWhileIndexing = false;
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 long numberOfRows = 0;
 while (rows.MoveNext() && numberOfRows < Length)
 {
 numberOfRows++;
 long curRow = rows.Current;
 T? value = _columnContainer[curRow];
 ret[curRow] = value;
 if (!value.HasValue)
 ret._columnContainer.NullCount++;
 var curRow = rows.Current;
 var value = _columnContainer[curRow];
 ret.Append(value);
 }
 ret._columnContainer._modifyNullCountWhileIndexing = true;
 return ret;
 }

 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<int> mapIndices)
 {
 return Clone(mapIndices.Select(x => (long)x));
 }

 internal BooleanDataFrameColumn CloneAsBooleanColumn()
 {
 PrimitiveColumnContainer<bool> newColumnContainer = _columnContainer.CloneAsBoolContainer();
Expand Down
Loading

, '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
PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument#6822

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

JakeRadMSFT
merged 12 commits into

from

Sep 27, 2023
 Merged


PrimitiveDataFrameColumn.Clone method crashes when is used with IEnumerable mapIndices argument
#6822
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
4e0cf30

Split Test for AppendMany into 4 different tests


asmirnov82 Sep 13, 2023
cb236bf

Block init of null validity buffer instead of setting individual bits


asmirnov82 Sep 13, 2023
095cb83

Add unit tests for PrimitiveDataFrameColumn.Clone


asmirnov82 Sep 13, 2023
0f78092

Fixes #6821


asmirnov82 Sep 13, 2023
f5e9aaa

Fix


asmirnov82 Sep 13, 2023
c44c628

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 18, 2023
33a29b0

Fix bug with AppendMany values to not empty column


asmirnov82 Sep 19, 2023
7548dc4

Restart unit tests


asmirnov82 Sep 19, 2023
b80e8a0

Add more unit tests


asmirnov82 Sep 20, 2023
83b5cca

Fix failing unit test


asmirnov82 Sep 20, 2023
dfe8d12

Fix code review findings


asmirnov82 Sep 27, 2023
9654516

Merge remote-tracking branch 'origin/main' into dataframe_primitiveco…


asmirnov82 Sep 27, 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


124 changes: 106 additions & 18 deletions
src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,10 @@ namespace Microsoft.Data.Analysis
{
 internal static class BitmapHelper
 {
 private static ReadOnlySpan<byte> BitMask => new byte[] {
 1, 2, 4, 8, 16, 32, 64, 128
 };

 // Faster to use when we already have a span since it avoids indexing
 public static bool IsValid(ReadOnlySpan<byte> bitMapBufferSpan, int index)
 {
Expand All@@ -26,6 +30,98 @@ public static bool IsBitSet(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) != 0;
 }

 public static bool IsBitClear(byte curBitMap, int index)
 {
 return ((curBitMap >> (index & 7)) & 1) == 0;
 }

 public static bool GetBit(byte data, int index) =>
 ((data >> index) & 1) != 0;

 public static bool GetBit(ReadOnlySpan<byte> data, int index) =>
 (data[index / 8] & BitMask[index % 8]) != 0;

 public static void ClearBit(Span<byte> data, int index)
 {
 data[index / 8] &= (byte)~BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index)
 {
 data[index / 8] |= BitMask[index % 8];
 }

 public static void SetBit(Span<byte> data, int index, bool value)
 {
 int idx = index / 8;
 int mod = index % 8;
 data[idx] = value
 ? (byte)(data[idx] | BitMask[mod])
 : (byte)(data[idx] & ~BitMask[mod]);
 }

 /// <summary>
 /// Set the number of bits in a span of bytes starting
 /// at a specific index, and limiting to length.
 /// </summary>
 /// <param name="data">Span to set bits value.</param>
 /// <param name="index">Bit index to start counting from.</param>
 /// <param name="length">Maximum of bits in the span to consider.</param>
 /// <param name="value">Bit value.</param>
 internal static void SetBits(Span<byte> data, int index, int length, bool value)
 {
 if (length == 0)
 return;

 int endBitIndex = checked(index + length - 1);

 // Use simpler method if there aren't many values
 if (length < 20)
 {
 for (int i = index; i <= endBitIndex; i++)
 {
 SetBit(data, i, value);
 }
 return;
 }

 // Otherwise do the work to figure out how to copy whole bytes
 int startByteIndex = index / 8;
 int startBitOffset = index % 8;
 int endByteIndex = endBitIndex / 8;
 int endBitOffset = endBitIndex % 8;

 // If the starting index and ending index are not byte-aligned,
 // we'll need to set bits the slow way. If they are
 // byte-aligned, and for all other bytes in the 'middle', we
 // can use a faster byte-aligned set.
 int fullByteStartIndex = startBitOffset == 0 ? startByteIndex : startByteIndex + 1;
 int fullByteEndIndex = endBitOffset == 7 ? endByteIndex : endByteIndex - 1;

 // Bits we will be using to finish up the first byte
 if (startBitOffset != 0)
 {
 Span<byte> slice = data.Slice(startByteIndex, 1);
 for (int i = startBitOffset; i <= 7; i++)
 SetBit(slice, i, value);
 }

 if (fullByteEndIndex >= fullByteStartIndex)
 {
 Span<byte> slice = data.Slice(fullByteStartIndex, fullByteEndIndex - fullByteStartIndex + 1);
 byte fill = (byte)(value ? 0xFF : 0x00);

 slice.Fill(fill);
 }

 if (endBitOffset != 7)
 {
 Span<byte> slice = data.Slice(endByteIndex, 1);
 for (int i = 0; i <= endBitOffset; i++)
 SetBit(slice, i, value);
 }
 }
 }

 /// <summary>
Expand All@@ -41,9 +137,6 @@ internal partial class PrimitiveColumnContainer<T> : IEnumerable<T?>
 // A set bit implies a valid value. An unset bit => null value
 public IList<ReadOnlyDataFrameBuffer<byte>> NullBitMapBuffers = new List<ReadOnlyDataFrameBuffer<byte>>();

 // Need a way to differentiate between columns initialized with default values and those with null values in SetValidityBit
 internal bool _modifyNullCountWhileIndexing = true;

 public PrimitiveColumnContainer(IEnumerable<T> values)
 {
 values = values ?? throw new ArgumentNullException(nameof(values));
Expand DownExpand Up@@ -168,27 +261,22 @@ public void AppendMany(T? value, long count)
 }

 DataFrameBuffer<T> mutableLastBuffer = Buffers.GetOrCreateMutable(Buffers.Count - 1);
 DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);

 //Calculate how many values we can additionaly allocate and not exceed the MaxCapacity
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - mutableLastBuffer.Length);
 int originalBufferLength = mutableLastBuffer.Length;
 int allocatable = (int)Math.Min(remaining, ReadOnlyDataFrameBuffer<T>.MaxCapacity - originalBufferLength);
 mutableLastBuffer.IncreaseSize(allocatable);

DataFrameBuffer<byte> lastNullBitMapBuffer = NullBitMapBuffers.GetOrCreateMutable(NullBitMapBuffers.Count - 1);
 int nullBufferAllocatable = (allocatable + 7) / 8;
//Calculate how many bytes we have additionaly allocate to store allocatable number of bits (need to take into account unused bits inside already allocated bytes)
 int nullBufferAllocatable = (originalBufferLength + allocatable + 7) / 8 - lastNullBitMapBuffer.Length;
 lastNullBitMapBuffer.IncreaseSize(nullBufferAllocatable);

 Length += allocatable;

 if (value.HasValue)
 {
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value ?? default);

 _modifyNullCountWhileIndexing = false;
 for (long i = Length - allocatable; i < Length; i++)
 {
 SetValidityBit(i, value.HasValue);
 }
 _modifyNullCountWhileIndexing = true;
 mutableLastBuffer.RawSpan.Slice(mutableLastBuffer.Length - allocatable, allocatable).Fill(value.Value);
 BitmapHelper.SetBits(lastNullBitMapBuffer.RawSpan, originalBufferLength, allocatable, true);
 }

 remaining -= allocatable;
Expand DownExpand Up@@ -247,20 +335,20 @@ private byte SetBit(byte curBitMap, int index, bool value)
 if (value)
 {
 newBitMap = (byte)(curBitMap | (byte)(1 << (index & 7))); //bit hack for index % 8
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 0 && index < Length && NullCount > 0)
 if (BitmapHelper.IsBitClear(curBitMap, index) && index < Length && NullCount > 0)
 {
 // Old value was null.
 NullCount--;
 }
 }
 else
 {
 if (_modifyNullCountWhileIndexing && ((curBitMap >> (index & 7)) & 1) == 1 && index < Length)
 if (BitmapHelper.IsBitSet(curBitMap, index) && index < Length)
 {
 // old value was NOT null and new value is null
 NullCount++;
 }
 else if (_modifyNullCountWhileIndexing && index == Length)
 else if (index == Length)
 {
 // New entry from an append
 NullCount++;
Expand Down

18 changes: 10 additions & 8 deletions
src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using Apache.Arrow;
using Apache.Arrow.Types;
Expand DownExpand Up@@ -473,22 +474,23 @@ public PrimitiveDataFrameColumn<T> Clone(PrimitiveDataFrameColumn<int> mapIndice
 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<long> mapIndices)
 {
 IEnumerator<long> rows = mapIndices.GetEnumerator();
 PrimitiveDataFrameColumn<T> ret = new PrimitiveDataFrameColumn<T>(Name);
 ret._columnContainer._modifyNullCountWhileIndexing = false;
 PrimitiveDataFrameColumn<T> ret = CreateNewColumn(Name);
 long numberOfRows = 0;
 while (rows.MoveNext() && numberOfRows < Length)
 {
 numberOfRows++;
 long curRow = rows.Current;
 T? value = _columnContainer[curRow];
 ret[curRow] = value;
 if (!value.HasValue)
 ret._columnContainer.NullCount++;
 var curRow = rows.Current;
 var value = _columnContainer[curRow];
 ret.Append(value);
 }
 ret._columnContainer._modifyNullCountWhileIndexing = true;
 return ret;
 }

 public PrimitiveDataFrameColumn<T> Clone(IEnumerable<int> mapIndices)
 {
 return Clone(mapIndices.Select(x => (long)x));
 }

 internal BooleanDataFrameColumn CloneAsBooleanColumn()
 {
 PrimitiveColumnContainer<bool> newColumnContainer = _columnContainer.CloneAsBoolContainer();
Expand Down
Loading