[SPARK-52799][TESTS] Fix ThriftServerQueryTestSuite result comparison #51488
Conversation
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
This reverts commit 16b2c03.
yaooqinn
changed the title
yaooqinn
commented
Jul 15, 2025
| val splits = originalOut.split("\n") | ||
| if (splits.length > rowCounts(i)) { | ||
| // the result is multiline | ||
| val step = splits.length / rowCounts(i) |
There was a problem hiding this comment.
Assuming \ns are added equivalently to each row according to the schema
|
Thank you @dongjoon-hyun, SPARK-52799 is filed |
peter-toth
approved these changes
Jul 15, 2025
| if (splits.length > rowCounts(i)) { | ||
| // the result is multiline | ||
| val step = splits.length / rowCounts(i) | ||
| splits.sliding(step, step).map(_.mkString("\n")).toSeq.sorted.mkString("\n") |
There was a problem hiding this comment.
.sliding(step, step) -> .grouped(step)?
yaooqinn
added a commit
that referenced
this pull request
Jul 15, 2025
### What changes were proposed in this pull request? This PR fixes ThriftServerQueryTestSuite result comparison. When re-reading the Golden Files, if the result lines exceed the row size, we assume they contain multiple lines for a single row. In this case, we group these lines into rows first to avoid line-by-line sorting. ### Why are the changes needed? For a multiline result of a single row, it might get malformed, for example ``` [info] Expected "[ <birth>2018</birth> [info] <name>[45 61 73 6F 6E]</name> [info] <org>[4B 69 6E 64 65 72 67 61 72 74 65 6E 20 43 6F 70]</org> [info] </ROW> [info] <]ROW>", but got "[<ROW> [info] <name>[45 61 73 6F 6E]</name> [info] <birth>2018</birth> [info] <org>[4B 69 6E 64 65 72 67 61 72 74 65 6E 20 43 6F 70]</org> [info] </]ROW>" ``` ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Tested with #51470 locally ### Was this patch authored or co-authored using generative AI tooling? No Closes #51488 from yaooqinn/ThriftServerQueryTestSuite. Authored-by: Kent Yao <[email protected]> Signed-off-by: Kent Yao <[email protected]> (cherry picked from commit 9565d16) Signed-off-by: Kent Yao <[email protected]>
|
Merged to master and 4.0, thank you @dongjoon-hyun and @peter-toth for the review |
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.
What changes were proposed in this pull request?
This PR fixes ThriftServerQueryTestSuite result comparison. When re-reading the Golden Files, if the result lines exceed the row size, we assume they contain multiple lines for a single row. In this case, we group these lines into rows first to avoid line-by-line sorting.
Why are the changes needed?
For a multiline result of a single row, it might get malformed, for example
Does this PR introduce any user-facing change?
No
How was this patch tested?
Tested with #51470 locally
Was this patch authored or co-authored using generative AI tooling?
No