Skip to content

[WIP] Fix E2E DataFrameTests for Spark 3.0. #365

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

Closed
elvaliuliuliu wants to merge 1 commit into from
Closed

[WIP] Fix E2E DataFrameTests for Spark 3.0. #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/csharp/Microsoft.Spark.E2ETest/IpcTests/Sql/DataFrameTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,11 @@ public void TestSignaturesV2_3_X()

Assert.IsType<Row[]>(_df.Collect().ToArray());

Assert.IsType<Row[]>(_df.ToLocalIterator().ToArray());
if (SparkSettings.Version < new Version(Versions.V3_0_0))
{
// The following APIs are removed in Spark 3.0.
Assert.IsType<Row[]>(_df.ToLocalIterator().ToArray());
}

Assert.IsType<long>(_df.Count());

Expand Down
4 changes: 4 additions & 0 deletions src/csharp/Microsoft.Spark/Sql/DataFrame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,11 @@ public IEnumerable<Row> Collect()
/// Returns an iterator that contains all of the rows in this `DataFrame`.
/// The iterator will consume as much memory as the largest partition in this `DataFrame`.
/// </summary>
/// <remarks>
/// This API is removed in Spark 3.0.
/// </remarks>
/// <returns>Row objects</returns>
[Removed(Versions.V3_0_0)]
Copy link
Contributor

@imback82 imback82 Dec 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not removed. They changed the contract. We should follow this: https://github.com/apache/spark/blob/0a7095156bdb565133f7dcc74546c51a5e5d2414/python/pyspark/rdd.py#L175

public IEnumerable<Row> ToLocalIterator()
{
return GetRows("toPythonIterator");
Expand Down