Skip to content

Conversation

@slfan1989
Copy link
Contributor

@slfan1989 slfan1989 commented Mar 19, 2025

@github-actions github-actions bot added the spark label Mar 19, 2025
@slfan1989
Copy link
Contributor Author

@szehon-ho Could you please help review this PR? Thank you very much! We are currently dealing with a large-scale migration from Hive tables to Iceberg tables in our internal environment, and this feature has been very helpful to us. During the code cherry-pick process, I noticed some differences between the code of Spark 3.5 and Spark 3.4. Therefore, I cherry-picked the latest changes from Spark 3.5 into the Spark 3.4.

.isEqualTo(manifestFileCount);
assertThat(filesToMove.size()).withFailMessage("Wrong total file count").isEqualTo(totalCount);
assertThat(filesToMove.stream().filter(f -> f.endsWith(".stats")).count())
.withFailMessage("Wrong rebuilt Statistic file count")
Copy link
Contributor

@nastra nastra Mar 19, 2025

Choose a reason for hiding this comment

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

can you please update all of the places in this test class (and in Spark 3.5's version of it) that use withFailMessage() to as()? Using withFailMessage() is typically not what's desired as it will only show the message but not the values of expected/actual, thus making it more difficult to debug when tests fail

Copy link
Contributor

Choose a reason for hiding this comment

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

in fact I went ahead and created #12569, so you might want to wait until this is in and port that over as part of this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@nastra Thank you for reviewing and providing valuable feedback! I can wait until your PR is merged, and then further improve this PR based on your changes.

@szehon-ho
Copy link
Member

should we also backport #12282?

@slfan1989
Copy link
Contributor Author

should we also backport #12282?

@szehon-ho Thank you for helping review the code! I will backport #12282.

@slfan1989 slfan1989 changed the title Spark 3.4: Backport Spark actions changes in Spark rewrite_table_path procedure (#12006 #12172 #11929) Spark 3.4: Backport Spark actions changes in Spark rewrite_table_path procedure (#12006 #12172 #11929 #12282 #12569) Mar 23, 2025
@slfan1989 slfan1989 force-pushed the backport-rewrite-table-path branch from d41482c to c2f00b4 Compare March 23, 2025 01:48
@slfan1989 slfan1989 force-pushed the backport-rewrite-table-path branch from c2f00b4 to 643ce48 Compare March 23, 2025 01:51
@slfan1989
Copy link
Contributor Author

slfan1989 commented Mar 23, 2025

@nastra @szehon-ho Could you please help review this PR again? Thank you very much! The latest commit includes #12282 and #12569.

@nastra nastra merged commit f12d200 into apache:main Mar 24, 2025
27 checks passed
@slfan1989
Copy link
Contributor Author

@nastra Thank you very much for reviewing this pr!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants