Skip to content

Improvements to the Merge routine #5778

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 6, 2021
Merged

Improvements to the Merge routine #5778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
657b488
Handle nulls better in Merge
Apr 30, 2021
f0c0daa
sq
Apr 30, 2021
a3d211f
sq
Apr 30, 2021
822385c
Add unit test
May 5, 2021
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
Prev Previous commit
Next Next commit
sq
  • Loading branch information
Prashanth Govindarajan committed Apr 30, 2021
commit a3d211f65f8b9f538678219da778b63d0e3c4902
31 changes: 0 additions & 31 deletions src/Microsoft.Data.Analysis/DataFrame.Join.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,37 +345,6 @@ public DataFrame Merge<TKey>(DataFrame other, string leftJoinColumn, string righ
rightRowIndices.Append(otherColumnNullIndex);
}
}

//// Now handle the null rows
//IEnumerator<long?> thisColumnNullIndicesEnumerator = thisColumnNullIndices.GetEnumerator();
//HashSet<long>.Enumerator otherColumnNullIndicesEnumerator = otherColumnNullIndices.GetEnumerator();
//while (thisColumnNullIndicesEnumerator.MoveNext() && otherColumnNullIndicesEnumerator.MoveNext())
//{
// long? thisColumnNullIndex = thisColumnNullIndicesEnumerator.Current;
// long otherColumnNullIndex = otherColumnNullIndicesEnumerator.Current;
// leftRowIndices.Append(thisColumnNullIndex);
// rightRowIndices.Append(otherColumnNullIndex);
//}
//while (!otherColumnNullIndicesEnumerator.MoveNext())
//{
// long? thisColumnNullIndex = thisColumnNullIndicesEnumerator.Current;
// leftRowIndices.Append(thisColumnNullIndex);
// rightRowIndices.Append(null);
// if (!thisColumnNullIndicesEnumerator.MoveNext())
// {
// break;
// }
//}
//while (!thisColumnNullIndicesEnumerator.MoveNext())
//{
// long otherColumnNullIndex = otherColumnNullIndicesEnumerator.Current;
// leftRowIndices.Append(null);
// rightRowIndices.Append(otherColumnNullIndex);
// if (!otherColumnNullIndicesEnumerator.MoveNext())
// {
// break;
// }
//}
}
else
throw new NotImplementedException(nameof(joinAlgorithm));
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ public override Dictionary<TKey, ICollection<long>> GroupColumnValues<TKey>(out
else
{
nullIndices.Add(currentLength);
}
}
}
}
return multimap as Dictionary<TKey, ICollection<long>>;
Expand Down