Repository navigation
Conversation
Member
Author
|
Closing in favor of #7014, which has all five of these moves in a single PR. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Part of #6979.
Rationale for this change
PhysicalPlanner::create_planbuilds most operators inline, which makesplanner.rsthe most frequently edited file in the native code and a regular source of merge conflicts. #6979 proposes finishing the move ontoOperatorRegistry, one operator family per PR. This is the first of five PRs for its first sub-task, which moves the largestcreate_planarms.What changes are included in this PR?
MergeRowsarm ofcreate_planinto aMergeRowsBuilderin a newplanner/merge_rows.rs, along withmerge_output_type_compatible, which only it uses.OperatorType::MergeRowsand register the builder.The moved code is unchanged apart from
selfbecomingplannerin the builder and rustfmt reflowing the dedented lines.git show --color-moved=zebra --color-moved-ws=allow-indentation-changemarks almost all of the removed lines as moved.How are these changes tested?
This moves code without changing behavior, so it relies on the existing tests:
cargo fmt --all -- --checkcargo clippy --color=never --all-targets --workspace -- -D warningscargo test -p datafusion-comet --lib(874 passed, 5 ignored)./mvnw test -Dtest=none -Dsuites="org.apache.comet.exec.CometMergeRowsSuite"with-Pspark-4.0, whose version of the suite runs the native MERGE tests (10 passed), and on the default Spark 4.1 profile (3 passed, 1 canceled because it needs Spark 4.2)