This is an automated email from the ASF dual-hosted git repository.
dkuzmenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 746247baec2 HIVE-27281: Add ability of masking to Beeline q-tests
(Dmitriy Fingerman, reviewed by Denys Kuzmenko)
746247baec2 is described below
commit 746247baec206df3d58eb6f3a9e36d9a604a5135
Author: Dmitriy Fingerman <[email protected]>
AuthorDate: Mon May 1 04:08:30 2023 -0400
HIVE-27281: Add ability of masking to Beeline q-tests (Dmitriy Fingerman,
reviewed by Denys Kuzmenko)
Closes #4254
---
.../org/apache/hadoop/hive/cli/control/CoreBeeLineDriver.java | 8 ++++++++
.../results/clientpositive/beeline/desc_table_formatted.q.out | 1 -
ql/src/test/results/clientpositive/beeline/escape_comments.q.out | 2 --
ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out | 1 -
4 files changed, 8 insertions(+), 4 deletions(-)
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 292e7abf168..4196133025c 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
@@ -38,11 +38,13 @@ import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConfUtil;
import org.apache.hadoop.hive.ql.QTestProcessExecResult;
import org.apache.hadoop.hive.ql.QTestUtil;
+import org.apache.hadoop.hive.ql.QOutProcessor;
import org.apache.hadoop.hive.ql.dataset.Dataset;
import org.apache.hadoop.hive.ql.dataset.DatasetCollection;
import org.apache.hadoop.hive.ql.dataset.QTestDatasetHandler;
import org.apache.hadoop.hive.ql.hooks.PreExecutePrinter;
import org.apache.hadoop.hive.ql.qoption.QTestOptionDispatcher;
+import org.apache.hadoop.hive.ql.qoption.QTestReplaceHandler;
import org.apache.hive.beeline.ConvertedOutputFile.Converter;
import org.apache.hive.beeline.QFile;
import org.apache.hive.beeline.QFile.QFileBuilder;
@@ -71,6 +73,8 @@ public class CoreBeeLineDriver extends CliAdapter {
private QFileClientBuilder clientBuilder;
private QFileBuilder fileBuilder;
private final Map<String, Set<String>> datasets = new HashMap<String,
Set<String>>();
+ protected QTestReplaceHandler replaceHandler;
+ private final QOutProcessor qOutProcessor;
public CoreBeeLineDriver(AbstractCliConfig testCliConfig) {
super(testCliConfig);
@@ -97,6 +101,8 @@ public class CoreBeeLineDriver extends CliAdapter {
initScript = new File(testScriptDirectory,
testCliConfig.getInitScript());
}
cleanupScript = new File(testScriptDirectory,
testCliConfig.getCleanupScript());
+ this.replaceHandler = new QTestReplaceHandler();
+ this.qOutProcessor = new QOutProcessor(null, replaceHandler);
}
private static MiniHS2 createMiniServer() throws Exception {
@@ -230,6 +236,7 @@ public class CoreBeeLineDriver extends CliAdapter {
+ "ms");
if (!overwrite) {
+ qOutProcessor.maskPatterns(qFile.getOutputFile().getPath());
QTestProcessExecResult result = qFile.compareResults();
long compareEndTime = System.currentTimeMillis();
@@ -280,6 +287,7 @@ public class CoreBeeLineDriver extends CliAdapter {
QTestOptionDispatcher dispatcher = new QTestOptionDispatcher();
QTestDatasetHandler datasetHandler = new
QTestDatasetHandler(miniHS2.getHiveConf());
dispatcher.register("dataset", datasetHandler);
+ dispatcher.register("replace", replaceHandler);
dispatcher.process(qFile.getInputFile());
List<Callable<Void>> commands = new ArrayList<>();
diff --git
a/ql/src/test/results/clientpositive/beeline/desc_table_formatted.q.out
b/ql/src/test/results/clientpositive/beeline/desc_table_formatted.q.out
index 2f7478d06d0..e327e0879ef 100644
--- a/ql/src/test/results/clientpositive/beeline/desc_table_formatted.q.out
+++ b/ql/src/test/results/clientpositive/beeline/desc_table_formatted.q.out
@@ -390,7 +390,6 @@ bin binary
# Detailed Table Information NULL NULL
Database: test_db_desc_table_formatted NULL
#### A masked pattern was here ####
-LastAccessTime: UNKNOWN NULL
Retention: 0 NULL
#### A masked pattern was here ####
Table Type: MANAGED_TABLE NULL
diff --git a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
index 69fd771541d..7b927b0dfdc 100644
--- a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
+++ b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
@@ -87,7 +87,6 @@ p1 string a\nb
# Detailed Table Information NULL NULL
Database: escape_comments_db NULL
#### A masked pattern was here ####
-LastAccessTime: UNKNOWN NULL
Retention: 0 NULL
#### A masked pattern was here ####
Table Type: MANAGED_TABLE NULL
@@ -142,7 +141,6 @@ col1 string a\nb
# Detailed Table Information NULL NULL
Database: escape_comments_db NULL
#### A masked pattern was here ####
-LastAccessTime: UNKNOWN NULL
Retention: 0 NULL
Table Type: VIRTUAL_VIEW NULL
Table Parameters: NULL NULL
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
index 1c444d546d2..87e8006076b 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
@@ -69,7 +69,6 @@ Compressed: No NULL
#### A masked pattern was here ####
Database: test_db_smb_mapjoin_1 NULL
InputFormat: org.apache.hadoop.hive.ql.io.RCFileInputFormat NULL
-LastAccessTime: UNKNOWN NULL
#### A masked pattern was here ####
Num Buckets: 1 NULL
OutputFormat: org.apache.hadoop.hive.ql.io.RCFileOutputFormat NULL
