HIVE-29227: Apply masking in memory instead of rewriting the file in QOutProcessor#maskPatterns - #6632
Open
cyanzheng2926 wants to merge 2 commits into
Open
HIVE-29227: Apply masking in memory instead of rewriting the file in QOutProcessor#maskPatterns#6632cyanzheng2926 wants to merge 2 commits into
cyanzheng2926 wants to merge 2 commits into
Conversation
…QOutProcessor#maskPatterns Refactored masking from QOutProcessor#maskPatterns that involves file rewrite to in-memory implementation for CliDriver and BeeLine.
…iffs Apply processLine on stdout before SORT_QUERY_RESULTS (HIVE-29226) and run maskAndFoldLine via maskOutputFile() before diff so stderr folding matches master. Keep CachingPrintStream as the outer stderr wrapper for hook tests, and skip multiline splitting in QTestFetchConverter during active query fetch.
|
Contributor
Author
|
metadata_delete.q failure on split-01 (TestIcebergCliDriver) |
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
2 participants
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.
Refactored masking from QOutProcessor#maskPatterns that involves file rewrite to in-memory implementation for CliDriver and BeeLine.
What changes were proposed in this pull request?
Removed
QOutProcessor#maskPatterns()which rewrites the whole file when masking.Added in-stream masking methods and states, including
maskAndFoldLine(),maskLines(),maskContent(), andMaskingFoldStatewhile retaining the original semantics. Splitted multilineprintln()on \n for PREHOOK/POSTHOOK textWrapped both stdout and stderr with QTestFetchConverter to perform mask before sort for CliDriver. For BeeLine retained original sort before mask behaviour and applied masking on the
!recordstream.Why are the changes needed?
Currently masking is scattered across multiple locations and also involves re-writing the q.out files after test execution. This change centralises rules in
QOutProcessor, applies them in memory on thecapture path where possible, and preserves existing golden semantics.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Tested and validated with multiple existing qfiles with
TestMiniLlapLocalCliDriver,TestMiniLlapCliDriver,TestCliDriver,TestMiniTezCliDriver,TestBeeLineDriverAlso added unit test under
TestQOutProcessor