From ac14f288afa893ddbe2e34d8659385af747646cb Mon Sep 17 00:00:00 2001 From: cyan-zheng Date: Thu, 16 Jul 2026 12:54:18 +1000 Subject: [PATCH 1/2] HIVE-29397: Apply masking to TestBeeLineDriver qtest goldens when overwrite enabled Mask output before overwriteResults in CoreBeeLineDriver, matching QTestUtil.checkCliDriverResults(). --- .../org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java index 9bdd63d675a6..a8c7ac3a8b4b 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java @@ -237,9 +237,10 @@ private void runTest(QFile qFile, List> preCommands) throws Excep long filterEndTime = System.currentTimeMillis(); System.err.println(">>> FILTERED " + qFile.getName() + ": " + (filterEndTime - queryEndTime) + "ms"); + qOutProcessor.maskPatterns(qFile.getOutputFile().getPath()); + if (!overwrite) { - qOutProcessor.maskPatterns(qFile.getOutputFile().getPath()); QTestProcessExecResult result = qFile.compareResults(); long compareEndTime = System.currentTimeMillis(); From 8db5e6c2443a39d03747d78877f76513f54694cd Mon Sep 17 00:00:00 2001 From: cyan-zheng Date: Thu, 23 Jul 2026 16:31:24 +1000 Subject: [PATCH 2/2] HIVE-29397: removed extra new line under CoreBeeLineDriver.java --- .../org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java | 1 - 1 file changed, 1 deletion(-) diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java index a8c7ac3a8b4b..dd66d5f0cdfa 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java @@ -239,7 +239,6 @@ private void runTest(QFile qFile, List> preCommands) throws Excep + "ms"); qOutProcessor.maskPatterns(qFile.getOutputFile().getPath()); - if (!overwrite) { QTestProcessExecResult result = qFile.compareResults();