manuzhang commented on PR #17967: URL: https://github.com/apache/iceberg/pull/17967#issuecomment-5563898844
@szehon-ho @huaxingao @nssalian This is to fix the Spark 4.2 commit history and should be `Rebase and merge`. Here are the detailed changes. We'd better move fast to avoid further conflicts and complexity. Please take a look. Thanks! > ## Summary > - Revert the squashed Spark 4.2 merge (`031135677395a3fbc90a2e33f58a9fa3983335f5`) and its follow-up cleanup (`e76d63584d7f83b102026749e1ae0f91813cb78e`). > - Replay the changes from #14984 as three commits: move `spark/v4.1` to `spark/v4.2`, copy it back, and add Spark 4.2 support. The support commit includes all follow-up fixes. > - Carry compatible Spark 4.1 changes that landed after the original branch point into Spark 4.2: executor-side delete-file caching for rewrite actions (#17868) and try-with-resources for `StreamingOffset` JSON generation (#17931). > - Keep the Spark 4.1-only `TableInfo` API changes from #16028 out of Spark 4.2, where the required `CatalogV2Util` signatures are unavailable. > The cleanup from #17952 remains present because the replay starts from the current Spark 4.1 sources. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
