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 0d669ce0a4c HIVE-29226: Make order of qfile query results
deterministic when masking and sorting (#6105)
0d669ce0a4c is described below
commit 0d669ce0a4c4f7d38d2dc62a838209de44e3b4c3
Author: Thomas Rebele <[email protected]>
AuthorDate: Tue Sep 30 17:16:11 2025 +0200
HIVE-29226: Make order of qfile query results deterministic when masking
and sorting (#6105)
---
.../java/org/apache/hadoop/hive/cli/CliDriver.java | 10 +-
.../hadoop/hive/common/io/FetchCallback.java | 42 +
.../hadoop/hive/common/io/FetchConverter.java | 3 +-
...etchConverter.java => QTestFetchConverter.java} | 63 +-
...n_partition_evolution_w_dyn_spec_w_filter.q.out | 60 +-
...y_iceberg_metadata_of_unpartitioned_table.q.out | 16 +-
.../apache/hadoop/hive/ql/TestLocationQueries.java | 48 +-
.../java/org/apache/hadoop/hive/ql/QTestUtil.java | 19 +-
.../apache/hive/beeline/ConvertedOutputFile.java | 20 +-
.../hadoop/hive/ql/hooks/PreExecutePrinter.java | 6 +-
.../encryption_join_unencrypted_tbl.q | 2 +-
...ncryption_join_with_different_encryption_keys.q | 2 +-
ql/src/test/queries/clientpositive/prepare_plan.q | 2 +-
.../prepare_plan_partition_pruning.q | 2 +-
.../vectorization_numeric_overflows.q | 2 +-
.../encrypted/encryption_auto_purge_tables.q.out | 1 +
.../encrypted/encryption_drop_table.q.out | 1 +
.../encryption_drop_table_in_encrypted_db.q.out | 1 +
.../encrypted/encryption_insert_values.q.out | 1 +
.../encryption_join_unencrypted_tbl.q.out | 912 +++++-----
...ption_join_with_different_encryption_keys.q.out | 276 +--
.../encrypted/encryption_move_tbl.q.out | 4 +
...encryption_select_read_only_encrypted_tbl.q.out | 1 +
.../clientpositive/llap/rfc5424_parser.q.out | 2 -
.../test/results/clientpositive/llap/sysdb.q.out | 8 -
.../clientpositive/llap/unionDistinct_1.q.out | 1816 ++++++++++----------
.../llap/vectorization_numeric_overflows.q.out | 10 +-
27 files changed, 1689 insertions(+), 1641 deletions(-)
diff --git a/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
b/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
index 90bcb128f91..2ac3d425b70 100644
--- a/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
+++ b/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
@@ -48,7 +48,7 @@
import org.apache.hadoop.hive.common.cli.EscapeCRLFHelper;
import org.apache.hadoop.hive.common.cli.ShellCmdExecutor;
import org.apache.hadoop.hive.common.io.CachingPrintStream;
-import org.apache.hadoop.hive.common.io.FetchConverter;
+import org.apache.hadoop.hive.common.io.FetchCallback;
import org.apache.hadoop.hive.common.io.SessionStream;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
@@ -275,8 +275,8 @@ CommandProcessorResponse processLocalCmd(String cmd,
CommandProcessor proc, CliS
// print the results
int counter = 0;
try {
- if (out instanceof FetchConverter) {
- ((FetchConverter) out).fetchStarted();
+ if (out instanceof FetchCallback callback) {
+ callback.fetchStarted();
}
while (qp.getResults(res)) {
for (String r : res) {
@@ -300,8 +300,8 @@ CommandProcessorResponse processLocalCmd(String cmd,
CommandProcessor proc, CliS
ShimLoader.getHadoopShims()
.setHadoopSessionContext(String.format(USER_ID,
ss.getSessionId(), ss.getUserName()));
- if (out instanceof FetchConverter) {
- ((FetchConverter) out).fetchFinished();
+ if (out instanceof FetchCallback callback) {
+ callback.fetchFinished();
}
console.printInfo(
diff --git
a/common/src/java/org/apache/hadoop/hive/common/io/FetchCallback.java
b/common/src/java/org/apache/hadoop/hive/common/io/FetchCallback.java
new file mode 100644
index 00000000000..d0b2989e781
--- /dev/null
+++ b/common/src/java/org/apache/hadoop/hive/common/io/FetchCallback.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.common.io;
+
+/**
+ * Callers will use this interface to notify the class that processes the
stream
+ * about the content that will be processed. mark the beginning/end
+ * of the output of an executed command, and whether
+ * the command has been a query.
+ */
+public interface FetchCallback {
+ /**
+ * Marks the beginning of the output of an executed command.
+ */
+ void fetchStarted();
+
+ /**
+ * Marks the beginning of the output of an executed command.
+ */
+ void fetchFinished();
+
+ /**
+ * Whether the executed command is a query.
+ * The method has to be called before processing the output of the command.
+ */
+ void foundQuery(boolean foundQuery);
+}
diff --git
a/common/src/java/org/apache/hadoop/hive/common/io/FetchConverter.java
b/common/src/java/org/apache/hadoop/hive/common/io/FetchConverter.java
index 62b3d2d286c..73298d9bdb2 100644
--- a/common/src/java/org/apache/hadoop/hive/common/io/FetchConverter.java
+++ b/common/src/java/org/apache/hadoop/hive/common/io/FetchConverter.java
@@ -21,7 +21,7 @@
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-public abstract class FetchConverter extends SessionStream {
+public abstract class FetchConverter extends SessionStream implements
FetchCallback {
protected volatile boolean queryfound;
protected volatile boolean fetchStarted;
@@ -39,6 +39,7 @@ public void fetchStarted() {
fetchStarted = true;
}
+ @Override
public void println(String out) {
if (byPass()) {
printDirect(out);
diff --git
a/common/src/java/org/apache/hadoop/hive/common/io/FetchConverter.java
b/common/src/java/org/apache/hadoop/hive/common/io/QTestFetchConverter.java
similarity index 53%
copy from common/src/java/org/apache/hadoop/hive/common/io/FetchConverter.java
copy to
common/src/java/org/apache/hadoop/hive/common/io/QTestFetchConverter.java
index 62b3d2d286c..59fc47060fe 100644
--- a/common/src/java/org/apache/hadoop/hive/common/io/FetchConverter.java
+++ b/common/src/java/org/apache/hadoop/hive/common/io/QTestFetchConverter.java
@@ -19,58 +19,53 @@
package org.apache.hadoop.hive.common.io;
import java.io.OutputStream;
+import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
+import java.util.function.UnaryOperator;
-public abstract class FetchConverter extends SessionStream {
+/**
+ * Applies a function to the processed lines, before passing it to the wrapped
output stream.
+ */
+public class QTestFetchConverter extends SessionStream implements
FetchCallback {
+
+ private final UnaryOperator<String> transformation;
- protected volatile boolean queryfound;
- protected volatile boolean fetchStarted;
+ private final PrintStream inner;
+ private final boolean hasFetchCallback;
- public FetchConverter(OutputStream out, boolean autoFlush, String encoding)
+ public QTestFetchConverter(OutputStream out, boolean autoFlush, String
encoding, UnaryOperator<String> transformation)
throws UnsupportedEncodingException {
super(out, autoFlush, encoding);
+ inner = out instanceof PrintStream ps ? ps : new PrintStream(out);
+ hasFetchCallback = out instanceof FetchCallback;
+ this.transformation = transformation;
}
- public void foundQuery(boolean queryfound) {
- this.queryfound = queryfound;
- }
-
- public void fetchStarted() {
- fetchStarted = true;
+ @Override
+ public void println(String str) {
+ inner.println(transformation.apply(str));
}
- public void println(String out) {
- if (byPass()) {
- printDirect(out);
- } else {
- process(out);
+ @Override
+ public void foundQuery(boolean queryfound) {
+ if (hasFetchCallback) {
+ ((FetchCallback)inner).foundQuery(queryfound);
}
}
- protected final void printDirect(String out) {
- super.println(out);
- }
-
- protected final boolean byPass() {
- return !queryfound || !fetchStarted;
- }
-
- protected abstract void process(String out);
-
- protected abstract void processFinal();
-
@Override
- public void flush() {
- if (byPass()) {
- super.flush();
+ public void fetchStarted() {
+ if (hasFetchCallback) {
+ ((FetchCallback)inner).fetchStarted();
}
}
+ @Override
public void fetchFinished() {
- if (!byPass()) {
- processFinal();
+ if (hasFetchCallback) {
+ ((FetchCallback)inner).fetchFinished();
}
- super.flush();
- fetchStarted = false;
+ flush();
}
}
+
diff --git
a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution_w_dyn_spec_w_filter.q.out
b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution_w_dyn_spec_w_filter.q.out
index 587bd56bd78..e5ae9faca15 100644
---
a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution_w_dyn_spec_w_filter.q.out
+++
b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution_w_dyn_spec_w_filter.q.out
@@ -192,31 +192,31 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
#### A masked pattern was here ####
#Masked# 2023-07-20 00:00:00.0 US/Pacific AAA_1
+#Masked# 2023-07-21 00:00:00.0 US/Pacific AAA_2
+#Masked# 2023-07-23 00:00:00.0 US/Pacific AAA_1
+#Masked# 2023-07-24 00:00:00.0 US/Pacific AAA_2
+#Masked# 2023-08-04 00:00:00.0 US/Pacific BBB_1
+#Masked# 2023-08-05 00:00:00.0 US/Pacific BBB_2
+#Masked# 2023-08-06 00:00:00.0 US/Pacific BBB_1
+#Masked# 2023-08-27 00:00:00.0 US/Pacific BBB_2
+#Masked# 2024-07-20 00:00:00.0 US/Pacific AAA_1
+#Masked#0 2024-07-04 00:00:00.0 US/Pacific BBB_2
#Masked#0 2024-07-21 00:00:00.0 US/Pacific AAA_2
+#Masked#1 2024-08-03 00:00:00.0 US/Pacific BBB_1
#Masked#1 2024-08-22 00:00:00.0 US/Pacific AAA_1
+#Masked#2 2024-08-04 00:00:00.0 US/Pacific BBB_2
#Masked#2 2024-08-23 00:00:00.0 US/Pacific AAA_2
+#Masked#3 2024-08-05 00:00:00.0 US/Pacific BBB_1
#Masked#3 2024-08-24 00:00:00.0 US/Pacific AAA_1
+#Masked#4 2024-08-06 00:00:00.0 US/Pacific BBB_2
#Masked#4 2024-08-25 00:00:00.0 US/Pacific AAA_2
+#Masked#5 2024-09-05 00:00:00.0 US/Pacific BBB_1
#Masked#5 2024-09-24 00:00:00.0 US/Pacific AAA_1
+#Masked#6 2024-09-06 00:00:00.0 US/Pacific BBB_2
#Masked#6 2024-09-25 00:00:00.0 US/Pacific AAA_2
#Masked#7 2024-07-01 00:00:00.0 US/Pacific BBB_1
#Masked#8 2024-07-02 00:00:00.0 US/Pacific BBB_2
#Masked#9 2024-07-03 00:00:00.0 US/Pacific BBB_1
-#Masked# 2023-07-21 00:00:00.0 US/Pacific AAA_2
-#Masked#0 2024-07-04 00:00:00.0 US/Pacific BBB_2
-#Masked#1 2024-08-03 00:00:00.0 US/Pacific BBB_1
-#Masked#2 2024-08-04 00:00:00.0 US/Pacific BBB_2
-#Masked#3 2024-08-05 00:00:00.0 US/Pacific BBB_1
-#Masked#4 2024-08-06 00:00:00.0 US/Pacific BBB_2
-#Masked#5 2024-09-05 00:00:00.0 US/Pacific BBB_1
-#Masked#6 2024-09-06 00:00:00.0 US/Pacific BBB_2
-#Masked# 2023-07-23 00:00:00.0 US/Pacific AAA_1
-#Masked# 2023-07-24 00:00:00.0 US/Pacific AAA_2
-#Masked# 2023-08-04 00:00:00.0 US/Pacific BBB_1
-#Masked# 2023-08-05 00:00:00.0 US/Pacific BBB_2
-#Masked# 2023-08-06 00:00:00.0 US/Pacific BBB_1
-#Masked# 2023-08-27 00:00:00.0 US/Pacific BBB_2
-#Masked# 2024-07-20 00:00:00.0 US/Pacific AAA_1
PREHOOK: query: describe formatted ice_orc
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@ice_orc
@@ -297,31 +297,31 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
#### A masked pattern was here ####
#Masked# 2023-07-20 00:00:00.0 US/Pacific AAA_1
+#Masked# 2023-07-21 00:00:00.0 US/Pacific AAA_2
+#Masked# 2023-07-23 00:00:00.0 US/Pacific AAA_1
+#Masked# 2023-07-24 00:00:00.0 US/Pacific AAA_2
+#Masked# 2023-08-04 00:00:00.0 US/Pacific BBB_1
+#Masked# 2023-08-05 00:00:00.0 US/Pacific BBB_2
+#Masked# 2023-08-06 00:00:00.0 US/Pacific BBB_1
+#Masked# 2023-08-27 00:00:00.0 US/Pacific BBB_2
+#Masked# 2024-07-20 00:00:00.0 US/Pacific AAA_1
+#Masked#0 2024-07-04 00:00:00.0 US/Pacific BBB_2
#Masked#0 2024-07-21 00:00:00.0 US/Pacific AAA_2
+#Masked#1 2024-08-03 00:00:00.0 US/Pacific BBB_1
#Masked#1 2024-08-22 00:00:00.0 US/Pacific AAA_1
+#Masked#2 2024-08-04 00:00:00.0 US/Pacific BBB_2
#Masked#2 2024-08-23 00:00:00.0 US/Pacific AAA_2
+#Masked#3 2024-08-05 00:00:00.0 US/Pacific BBB_1
#Masked#3 2024-08-24 00:00:00.0 US/Pacific AAA_1
+#Masked#4 2024-08-06 00:00:00.0 US/Pacific BBB_2
#Masked#4 2024-08-25 00:00:00.0 US/Pacific AAA_2
+#Masked#5 2024-09-05 00:00:00.0 US/Pacific BBB_1
#Masked#5 2024-09-24 00:00:00.0 US/Pacific AAA_1
+#Masked#6 2024-09-06 00:00:00.0 US/Pacific BBB_2
#Masked#6 2024-09-25 00:00:00.0 US/Pacific AAA_2
#Masked#7 2024-07-01 00:00:00.0 US/Pacific BBB_1
#Masked#8 2024-07-02 00:00:00.0 US/Pacific BBB_2
#Masked#9 2024-07-03 00:00:00.0 US/Pacific BBB_1
-#Masked# 2023-07-21 00:00:00.0 US/Pacific AAA_2
-#Masked#0 2024-07-04 00:00:00.0 US/Pacific BBB_2
-#Masked#1 2024-08-03 00:00:00.0 US/Pacific BBB_1
-#Masked#2 2024-08-04 00:00:00.0 US/Pacific BBB_2
-#Masked#3 2024-08-05 00:00:00.0 US/Pacific BBB_1
-#Masked#4 2024-08-06 00:00:00.0 US/Pacific BBB_2
-#Masked#5 2024-09-05 00:00:00.0 US/Pacific BBB_1
-#Masked#6 2024-09-06 00:00:00.0 US/Pacific BBB_2
-#Masked# 2023-07-23 00:00:00.0 US/Pacific AAA_1
-#Masked# 2023-07-24 00:00:00.0 US/Pacific AAA_2
-#Masked# 2023-08-04 00:00:00.0 US/Pacific BBB_1
-#Masked# 2023-08-05 00:00:00.0 US/Pacific BBB_2
-#Masked# 2023-08-06 00:00:00.0 US/Pacific BBB_1
-#Masked# 2023-08-27 00:00:00.0 US/Pacific BBB_2
-#Masked# 2024-07-20 00:00:00.0 US/Pacific AAA_1
PREHOOK: query: describe formatted ice_orc
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@ice_orc
diff --git
a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_unpartitioned_table.q.out
b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_unpartitioned_table.q.out
index fc4c7a1acc0..5499ea98753 100644
---
a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_unpartitioned_table.q.out
+++
b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_unpartitioned_table.q.out
@@ -101,10 +101,10 @@ POSTHOOK: query: select * from default.ice_meta_1.files
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_meta_1
POSTHOOK: Output: hdfs://### HDFS PATH ###
-0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 365
{1:6,2:17} {1:2,2:2} {1:0,2:0} {} {1:���,2:seven}
{1:���,2:six} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":6,"value_count":2,"null_value_count":0,"nan_value_count":null,"lower_bound":6,"upper_bound":7},"value":{"column_size":17,"value_count":2,"null_value_count":0,"nan_value_count":null,"lower_bound":"seven","upper_bound":"six"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 374
{1:8,2:22} {1:3,2:3} {1:0,2:0} {} {1:���,2:eight}
{1:
���,2:ten} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":8,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":8,"upper_bound":10},"value":{"column_size":22,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":"eight","upper_bound":"ten"}}
+0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 381
{1:12,2:20} {1:3,2:3} {1:1,2:2} {} {1: ���,2:eleven}
{1:
���,2:eleven} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":12,"value_count":3,"null_value_count":1,"nan_value_count":null,"lower_bound":12,"upper_bound":13},"value":{"column_size":20,"value_count":3,"null_value_count":2,"nan_value_count":null,"lower_bound":"eleven","upper_bound":"eleven"}}
PREHOOK: query: select status, sequence_number, data_file from
default.ice_meta_1.entries
@@ -163,12 +163,12 @@ POSTHOOK: query: select * from
default.ice_meta_1.all_data_files
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_meta_1
POSTHOOK: Output: hdfs://### HDFS PATH ###
-0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
-0 hdfs://### HDFS PATH ### ORC 0 #Masked# 377
{1:7,2:23} {1:3,2:3} {1:0,2:0} {} {1:���,2:five}
{1:���,2:three} NULL [3] NULL 0 NULL NULL NULL
NULL
{"id":{"column_size":7,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":3,"upper_bound":5},"value":{"column_size":23,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"three"}}
-0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 365
{1:6,2:17} {1:2,2:2} {1:0,2:0} {} {1:���,2:seven}
{1:���,2:six} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":6,"value_count":2,"null_value_count":0,"nan_value_count":null,"lower_bound":6,"upper_bound":7},"value":{"column_size":17,"value_count":2,"null_value_count":0,"nan_value_count":null,"lower_bound":"seven","upper_bound":"six"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 374
{1:8,2:22} {1:3,2:3} {1:0,2:0} {} {1:���,2:eight}
{1:
���,2:ten} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":8,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":8,"upper_bound":10},"value":{"column_size":22,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":"eight","upper_bound":"ten"}}
+0 hdfs://### HDFS PATH ### ORC 0 #Masked# 377
{1:7,2:23} {1:3,2:3} {1:0,2:0} {} {1:���,2:five}
{1:���,2:three} NULL [3] NULL 0 NULL NULL NULL
NULL
{"id":{"column_size":7,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":3,"upper_bound":5},"value":{"column_size":23,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"three"}}
+0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
+0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 381
{1:12,2:20} {1:3,2:3} {1:1,2:2} {} {1: ���,2:eleven}
{1:
���,2:eleven} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":12,"value_count":3,"null_value_count":1,"nan_value_count":null,"lower_bound":12,"upper_bound":13},"value":{"column_size":20,"value_count":3,"null_value_count":2,"nan_value_count":null,"lower_bound":"eleven","upper_bound":"eleven"}}
PREHOOK: query: select status, sequence_number, data_file from
default.ice_meta_1.all_entries
@@ -409,10 +409,10 @@ POSTHOOK: query: select * from default.ice_meta_1.files
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_meta_1
POSTHOOK: Output: hdfs://### HDFS PATH ###
-0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 365
{1:6,2:17} {1:2,2:2} {1:0,2:0} {} {1:���,2:seven}
{1:���,2:six} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":6,"value_count":2,"null_value_count":0,"nan_value_count":null,"lower_bound":6,"upper_bound":7},"value":{"column_size":17,"value_count":2,"null_value_count":0,"nan_value_count":null,"lower_bound":"seven","upper_bound":"six"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 374
{1:8,2:22} {1:3,2:3} {1:0,2:0} {} {1:���,2:eight}
{1:
���,2:ten} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":8,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":8,"upper_bound":10},"value":{"column_size":22,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":"eight","upper_bound":"ten"}}
+0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 381
{1:12,2:20} {1:3,2:3} {1:1,2:2} {} {1: ���,2:eleven}
{1:
���,2:eleven} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":12,"value_count":3,"null_value_count":1,"nan_value_count":null,"lower_bound":12,"upper_bound":13},"value":{"column_size":20,"value_count":3,"null_value_count":2,"nan_value_count":null,"lower_bound":"eleven","upper_bound":"eleven"}}
PREHOOK: query: select status, sequence_number, data_file from
default.ice_meta_1.entries
@@ -471,12 +471,12 @@ POSTHOOK: query: select * from
default.ice_meta_1.all_data_files
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_meta_1
POSTHOOK: Output: hdfs://### HDFS PATH ###
-0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
-0 hdfs://### HDFS PATH ### ORC 0 #Masked# 377
{1:7,2:23} {1:3,2:3} {1:0,2:0} {} {1:���,2:five}
{1:���,2:three} NULL [3] NULL 0 NULL NULL NULL
NULL
{"id":{"column_size":7,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":3,"upper_bound":5},"value":{"column_size":23,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"three"}}
-0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 365
{1:6,2:17} {1:2,2:2} {1:0,2:0} {} {1:���,2:seven}
{1:���,2:six} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":6,"value_count":2,"null_value_count":0,"nan_value_count":null,"lower_bound":6,"upper_bound":7},"value":{"column_size":17,"value_count":2,"null_value_count":0,"nan_value_count":null,"lower_bound":"seven","upper_bound":"six"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 374
{1:8,2:22} {1:3,2:3} {1:0,2:0} {} {1:���,2:eight}
{1:
���,2:ten} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":8,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":8,"upper_bound":10},"value":{"column_size":22,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":"eight","upper_bound":"ten"}}
+0 hdfs://### HDFS PATH ### ORC 0 #Masked# 377
{1:7,2:23} {1:3,2:3} {1:0,2:0} {} {1:���,2:five}
{1:���,2:three} NULL [3] NULL 0 NULL NULL NULL
NULL
{"id":{"column_size":7,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":3,"upper_bound":5},"value":{"column_size":23,"value_count":3,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"three"}}
+0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
+0 hdfs://### HDFS PATH ### ORC 0 #Masked# 378
{1:7,2:30} {1:5,2:5} {1:0,2:0} {} {1:���,2:five}
{1:���,2:two} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":7,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":1,"upper_bound":5},"value":{"column_size":30,"value_count":5,"null_value_count":0,"nan_value_count":null,"lower_bound":"five","upper_bound":"two"}}
0 hdfs://### HDFS PATH ### ORC 0 #Masked# 381
{1:12,2:20} {1:3,2:3} {1:1,2:2} {} {1: ���,2:eleven}
{1:
���,2:eleven} NULL [3] NULL 0 NULL NULL NULL NULL
{"id":{"column_size":12,"value_count":3,"null_value_count":1,"nan_value_count":null,"lower_bound":12,"upper_bound":13},"value":{"column_size":20,"value_count":3,"null_value_count":2,"nan_value_count":null,"lower_bound":"eleven","upper_bound":"eleven"}}
PREHOOK: query: select status, sequence_number, data_file from
default.ice_meta_1.all_entries
diff --git
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestLocationQueries.java
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestLocationQueries.java
index 0371ced6250..d44178b97ba 100644
---
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestLocationQueries.java
+++
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestLocationQueries.java
@@ -18,9 +18,9 @@
package org.apache.hadoop.hive.ql;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -58,6 +58,7 @@ public TestLocationQueries() {
*/
public static class CheckResults extends QTestUtil {
private final String locationSubdir;
+ private final List<String> outputLines = new ArrayList<>();
/**
* Validate only that the location is correct.
@@ -65,34 +66,24 @@ public static class CheckResults extends QTestUtil {
*/
@Override
public QTestProcessExecResult checkCliDriverResults() throws Exception {
- String tname = getInputFile().getName();
- File logFile = new File(logDir, tname + ".out");
-
int failedCount = 0;
StringBuilder fileNames = new StringBuilder("Files failing the location
check:");
- FileReader fr = new FileReader(logFile);
- BufferedReader in = new BufferedReader(fr);
- try {
- String line;
- int locationCount = 0;
- Pattern p = Pattern.compile("location:([^,)]+)");
- while((line = in.readLine()) != null) {
- Matcher m = p.matcher(line);
- if (m.find()) {
- File f = new File(m.group(1));
- if (!f.getName().equals(locationSubdir)) {
- failedCount++;
- fileNames.append(f.getName()).append("\r\n");
- }
- locationCount++;
+ int locationCount = 0;
+ Pattern p = Pattern.compile("location:([^,)]+)");
+ for (String line : outputLines) {
+ Matcher m = p.matcher(line);
+ if (m.find()) {
+ File f = new File(m.group(1));
+ if (!f.getName().equals(locationSubdir)) {
+ failedCount++;
+ fileNames.append(f.getName()).append("\r\n");
}
+ locationCount++;
}
- // we always have to find at least one location, otw the test is
useless
- if (locationCount == 0) {
- return QTestProcessExecResult.create(Integer.MAX_VALUE, "0 locations
tested");
- }
- } finally {
- in.close();
+ }
+ // we always have to find at least one location, otw the test is useless
+ if (locationCount == 0) {
+ return QTestProcessExecResult.create(Integer.MAX_VALUE, "0 locations
tested");
}
return QTestProcessExecResult.create(failedCount, fileNames.toString());
@@ -114,6 +105,11 @@ public CheckResults(String outDir, String logDir,
MiniClusterType miniMr, String
this.locationSubdir = locationSubdir;
}
+
+ @Override
+ protected void notifyOutputLine(String line) {
+ outputLines.add(line);
+ }
}
/**
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index ed06ee925a8..64a106e08a7 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -52,11 +52,11 @@
import org.apache.hadoop.hive.cli.control.AbstractCliConfig;
import org.apache.hadoop.hive.common.io.CachingPrintStream;
import org.apache.hadoop.hive.common.io.SessionStream;
+import org.apache.hadoop.hive.common.io.QTestFetchConverter;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.ql.metadata.HiveMetaStoreClientWithLocalCache;
import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
-import org.apache.hadoop.hive.ql.DriverContext;
import org.apache.hadoop.hive.ql.QTestMiniClusters.FsType;
import org.apache.hadoop.hive.ql.cache.results.QueryResultsCache;
import org.apache.hadoop.hive.ql.dataset.QTestDatasetHandler;
@@ -313,8 +313,8 @@ public void setInputFile(File qf) throws IOException {
String query = FileUtils.readFileToString(qf, StandardCharsets.UTF_8);
inputFile = qf;
inputContent = query;
- qTestResultProcessor.init(query);
qOutProcessor.initMasks(query);
+ qTestResultProcessor.init(query);
}
public final File getInputFile() {
@@ -658,11 +658,25 @@ private void setSessionOutputs(CliSessionState ss, File
outf) throws Exception {
qTestResultProcessor.setOutputs(ss, fo);
+ ss.out = new QTestFetchConverter(ss.out, false, "UTF-8", line -> {
+ notifyOutputLine(line);
+ if (qOutProcessor != null) {
+ // ensure that the masking is done before the sorting of the query
results
+ return qOutProcessor.processLine(line).get();
+ }
+ return line;
+ });
+
ss.err = new CachingPrintStream(fo, true, "UTF-8");
ss.setIsSilent(true);
ss.setIsQtestLogging(true);
}
+ /** Lets the implementor know that a new line has been produced in the
output */
+ protected void notifyOutputLine(String line) {
+ // by default do nothing
+ }
+
public CliSessionState startSessionState(boolean canReuseSession) throws
IOException {
HiveConf.setVar(conf,
@@ -802,6 +816,7 @@ private CommandProcessorResponse executeTestCommand(String
command) throws Comma
if (proc != null) {
try {
CommandProcessorResponse response = proc.run(commandArgs.trim());
+ SessionState.get().out.flush();
return response;
} catch (CommandProcessorException e) {
SessionState.getConsole().printError(e.toString(),
diff --git
a/itests/util/src/main/java/org/apache/hive/beeline/ConvertedOutputFile.java
b/itests/util/src/main/java/org/apache/hive/beeline/ConvertedOutputFile.java
index fbff900e007..2c5b1605c2c 100644
--- a/itests/util/src/main/java/org/apache/hive/beeline/ConvertedOutputFile.java
+++ b/itests/util/src/main/java/org/apache/hive/beeline/ConvertedOutputFile.java
@@ -19,7 +19,7 @@
package org.apache.hive.beeline;
import org.apache.hadoop.hive.common.io.DigestPrintStream;
-import org.apache.hadoop.hive.common.io.FetchConverter;
+import org.apache.hadoop.hive.common.io.FetchCallback;
import org.apache.hadoop.hive.common.io.SortAndDigestPrintStream;
import org.apache.hadoop.hive.common.io.SortPrintStream;
@@ -30,36 +30,36 @@
* FetchConverters.
*/
public class ConvertedOutputFile extends OutputFile {
- private final boolean isActiveFetchConverter;
+ private final boolean hasFetchCallback;
public ConvertedOutputFile(OutputFile inner, Converter converter) throws
Exception {
super(converter.getConvertedPrintStream(inner.getOut()),
inner.getFilename());
- isActiveFetchConverter = (getOut() instanceof FetchConverter);
+ hasFetchCallback = (getOut() instanceof FetchCallback);
}
@Override
boolean isActiveConverter() {
- return isActiveFetchConverter;
+ return hasFetchCallback;
}
@Override
void fetchStarted() {
- if (isActiveFetchConverter) {
- ((FetchConverter) getOut()).fetchStarted();
+ if (hasFetchCallback) {
+ ((FetchCallback) getOut()).fetchStarted();
}
}
@Override
void foundQuery(boolean foundQuery) {
- if (isActiveFetchConverter) {
- ((FetchConverter) getOut()).foundQuery(foundQuery);
+ if (hasFetchCallback) {
+ ((FetchCallback) getOut()).foundQuery(foundQuery);
}
}
@Override
void fetchFinished() {
- if (isActiveFetchConverter) {
- ((FetchConverter) getOut()).fetchFinished();
+ if (hasFetchCallback) {
+ ((FetchCallback) getOut()).fetchFinished();
}
}
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PreExecutePrinter.java
b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PreExecutePrinter.java
index 238881cc250..d8b657478bd 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PreExecutePrinter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PreExecutePrinter.java
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Set;
-import org.apache.hadoop.hive.common.io.FetchConverter;
+import org.apache.hadoop.hive.common.io.FetchCallback;
import org.apache.hadoop.hive.ql.QueryState;
import org.apache.hadoop.hive.ql.hooks.HookContext.HookType;
import org.apache.hadoop.hive.ql.plan.HiveOperation;
@@ -42,10 +42,10 @@ public void run(HookContext hookContext) throws Exception {
assert(hookContext.getHookType() == HookType.PRE_EXEC_HOOK);
SessionState ss = SessionState.get();
QueryState queryState = hookContext.getQueryState();
- if (ss != null && ss.out instanceof FetchConverter) {
+ if (ss != null && ss.out instanceof FetchCallback callback) {
boolean foundQuery = queryState.getHiveOperation() ==
HiveOperation.QUERY &&
!hookContext.getQueryPlan().isForExplain();
- ((FetchConverter)ss.out).foundQuery(foundQuery);
+ callback.foundQuery(foundQuery);
}
Set<ReadEntity> inputs = hookContext.getInputs();
diff --git
a/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
b/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
index d2f27e37de5..ebab5fd091a 100644
--- a/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
+++ b/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
@@ -1,5 +1,5 @@
--! qt:dataset:src
---SORT_QUERY_RESULTS
+-- SORT_QUERY_RESULTS
DROP TABLE IF EXISTS encrypted_table PURGE;
CREATE TABLE encrypted_table (key INT, value STRING) LOCATION
'${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table';
diff --git
a/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q
b/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q
index b8fa56f0e5b..d4028560e86 100644
---
a/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q
+++
b/ql/src/test/queries/clientpositive/encryption_join_with_different_encryption_keys.q
@@ -1,6 +1,6 @@
--! qt:dataset:src
set hive.stats.column.autogather=false;
---SORT_QUERY_RESULTS
+-- SORT_QUERY_RESULTS
-- Java JCE must be installed in order to hava a key length of 256 bits
DROP TABLE IF EXISTS table_key_1 PURGE;
diff --git a/ql/src/test/queries/clientpositive/prepare_plan.q
b/ql/src/test/queries/clientpositive/prepare_plan.q
index 5b727d415d9..6c827a6f724 100644
--- a/ql/src/test/queries/clientpositive/prepare_plan.q
+++ b/ql/src/test/queries/clientpositive/prepare_plan.q
@@ -1,6 +1,6 @@
--! qt:dataset:src
--! qt:dataset:alltypesorc
---SORT_QUERY_RESULTS
+-- SORT_QUERY_RESULTS
set hive.explain.user=false;
diff --git
a/ql/src/test/queries/clientpositive/prepare_plan_partition_pruning.q
b/ql/src/test/queries/clientpositive/prepare_plan_partition_pruning.q
index 49cecd6ebff..969b4d966f6 100644
--- a/ql/src/test/queries/clientpositive/prepare_plan_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/prepare_plan_partition_pruning.q
@@ -1,4 +1,4 @@
---SORT_QUERY_RESULTS
+-- SORT_QUERY_RESULTS
set hive.explain.user=false;
-- partitioned table
diff --git
a/ql/src/test/queries/clientpositive/vectorization_numeric_overflows.q
b/ql/src/test/queries/clientpositive/vectorization_numeric_overflows.q
index 828a029df40..1a24f9b76f2 100644
--- a/ql/src/test/queries/clientpositive/vectorization_numeric_overflows.q
+++ b/ql/src/test/queries/clientpositive/vectorization_numeric_overflows.q
@@ -4,7 +4,7 @@ set hive.fetch.task.conversion=none;
set hive.cbo.enable=false;
set hive.vectorized.use.checked.expressions=true;
---SORT_QUERY_RESULTS
+-- SORT_QUERY_RESULTS
CREATE TABLE test_overflow (
ctinyint1 TINYINT,
diff --git
a/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
b/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
index da07bfa72f1..ceb77127159 100644
---
a/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
+++
b/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
@@ -165,3 +165,4 @@ PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_ext_table_n0 PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Output: database:default
+Encryption key deleted: 'key_128'
diff --git
a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
index b850344c733..7147181b787 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
@@ -173,3 +173,4 @@ PREHOOK: Input: database:default
POSTHOOK: query: SHOW TABLES LIKE "encrypted_%"
POSTHOOK: type: SHOWTABLES
POSTHOOK: Input: database:default
+Encryption key deleted: 'key_128'
diff --git
a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table_in_encrypted_db.q.out
b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table_in_encrypted_db.q.out
index 87292d97b69..71038747702 100644
---
a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table_in_encrypted_db.q.out
+++
b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table_in_encrypted_db.q.out
@@ -56,3 +56,4 @@ POSTHOOK: query: DROP DATABASE encrypted_db
POSTHOOK: type: DROPDATABASE
POSTHOOK: Input: database:encrypted_db
POSTHOOK: Output: database:encrypted_db
+Encryption key deleted: 'key_128'
diff --git
a/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
b/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
index 893ce9b70f8..e6cc6ebc1f0 100644
---
a/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
+++
b/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
@@ -36,3 +36,4 @@ POSTHOOK: Input: default@encrypted_table_n3
#### A PARTIAL masked pattern was here ####
data/warehouse/default/encrypted_table/.hive-staging
1 foo
2 bar
+Encryption key deleted: 'key_128'
diff --git
a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
index 9ad7433814b..b949f6823c9 100644
---
a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
+++
b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
@@ -34,506 +34,506 @@ POSTHOOK: query: SELECT * FROM encrypted_table
POSTHOOK: type: QUERY
POSTHOOK: Input: default@encrypted_table
#### A PARTIAL masked pattern was here ####
data/warehouse/default/encrypted_table/.hive-staging
-238 val_238
-86 val_86
-311 val_311
-27 val_27
-165 val_165
-409 val_409
-255 val_255
-278 val_278
-98 val_98
-484 val_484
-265 val_265
-193 val_193
-401 val_401
-150 val_150
-273 val_273
-224 val_224
-369 val_369
-66 val_66
+0 val_0
+0 val_0
+0 val_0
+10 val_10
+100 val_100
+100 val_100
+103 val_103
+103 val_103
+104 val_104
+104 val_104
+105 val_105
+11 val_11
+111 val_111
+113 val_113
+113 val_113
+114 val_114
+116 val_116
+118 val_118
+118 val_118
+119 val_119
+119 val_119
+119 val_119
+12 val_12
+12 val_12
+120 val_120
+120 val_120
+125 val_125
+125 val_125
+126 val_126
128 val_128
-213 val_213
-146 val_146
-406 val_406
-429 val_429
-374 val_374
-152 val_152
-469 val_469
+128 val_128
+128 val_128
+129 val_129
+129 val_129
+131 val_131
+133 val_133
+134 val_134
+134 val_134
+136 val_136
+137 val_137
+137 val_137
+138 val_138
+138 val_138
+138 val_138
+138 val_138
+143 val_143
145 val_145
-495 val_495
-37 val_37
-327 val_327
-281 val_281
-277 val_277
-209 val_209
+146 val_146
+146 val_146
+149 val_149
+149 val_149
15 val_15
-82 val_82
-403 val_403
-166 val_166
-417 val_417
-430 val_430
-252 val_252
-292 val_292
-219 val_219
-287 val_287
+15 val_15
+150 val_150
+152 val_152
+152 val_152
153 val_153
-193 val_193
-338 val_338
-446 val_446
-459 val_459
-394 val_394
-237 val_237
-482 val_482
-174 val_174
-413 val_413
-494 val_494
-207 val_207
-199 val_199
-466 val_466
-208 val_208
-174 val_174
-399 val_399
-396 val_396
-247 val_247
-417 val_417
-489 val_489
+155 val_155
+156 val_156
+157 val_157
+158 val_158
+160 val_160
162 val_162
-377 val_377
-397 val_397
-309 val_309
-365 val_365
-266 val_266
-439 val_439
-342 val_342
-367 val_367
-325 val_325
+163 val_163
+164 val_164
+164 val_164
+165 val_165
+165 val_165
+166 val_166
167 val_167
-195 val_195
-475 val_475
+167 val_167
+167 val_167
+168 val_168
+169 val_169
+169 val_169
+169 val_169
+169 val_169
17 val_17
-113 val_113
-155 val_155
-203 val_203
-339 val_339
-0 val_0
-455 val_455
-128 val_128
-311 val_311
-316 val_316
-57 val_57
-302 val_302
-205 val_205
-149 val_149
-438 val_438
-345 val_345
-129 val_129
170 val_170
+172 val_172
+172 val_172
+174 val_174
+174 val_174
+175 val_175
+175 val_175
+176 val_176
+176 val_176
+177 val_177
+178 val_178
+179 val_179
+179 val_179
+18 val_18
+18 val_18
+180 val_180
+181 val_181
+183 val_183
+186 val_186
+187 val_187
+187 val_187
+187 val_187
+189 val_189
+19 val_19
+190 val_190
+191 val_191
+191 val_191
+192 val_192
+193 val_193
+193 val_193
+193 val_193
+194 val_194
+195 val_195
+195 val_195
+196 val_196
+197 val_197
+197 val_197
+199 val_199
+199 val_199
+199 val_199
+2 val_2
20 val_20
-489 val_489
-157 val_157
-378 val_378
-221 val_221
-92 val_92
-111 val_111
-47 val_47
-72 val_72
-4 val_4
-280 val_280
-35 val_35
-427 val_427
-277 val_277
+200 val_200
+200 val_200
+201 val_201
+202 val_202
+203 val_203
+203 val_203
+205 val_205
+205 val_205
+207 val_207
+207 val_207
208 val_208
-356 val_356
-399 val_399
-169 val_169
-382 val_382
-498 val_498
-125 val_125
-386 val_386
-437 val_437
-469 val_469
-192 val_192
-286 val_286
-187 val_187
-176 val_176
-54 val_54
-459 val_459
-51 val_51
-138 val_138
-103 val_103
-239 val_239
+208 val_208
+208 val_208
+209 val_209
+209 val_209
213 val_213
+213 val_213
+214 val_214
216 val_216
-430 val_430
-278 val_278
-176 val_176
-289 val_289
+216 val_216
+217 val_217
+217 val_217
+218 val_218
+219 val_219
+219 val_219
221 val_221
-65 val_65
-318 val_318
-332 val_332
-311 val_311
-275 val_275
-137 val_137
-241 val_241
-83 val_83
-333 val_333
-180 val_180
-284 val_284
-12 val_12
+221 val_221
+222 val_222
+223 val_223
+223 val_223
+224 val_224
+224 val_224
+226 val_226
+228 val_228
+229 val_229
+229 val_229
230 val_230
-181 val_181
-67 val_67
-260 val_260
-404 val_404
-384 val_384
-489 val_489
-353 val_353
-373 val_373
-272 val_272
-138 val_138
-217 val_217
-84 val_84
-348 val_348
-466 val_466
-58 val_58
-8 val_8
-411 val_411
230 val_230
-208 val_208
-348 val_348
+230 val_230
+230 val_230
+230 val_230
+233 val_233
+233 val_233
+235 val_235
+237 val_237
+237 val_237
+238 val_238
+238 val_238
+239 val_239
+239 val_239
24 val_24
-463 val_463
-431 val_431
-179 val_179
-172 val_172
-42 val_42
-129 val_129
-158 val_158
-119 val_119
-496 val_496
-0 val_0
-322 val_322
-197 val_197
-468 val_468
-393 val_393
-454 val_454
-100 val_100
-298 val_298
-199 val_199
-191 val_191
-418 val_418
-96 val_96
+24 val_24
+241 val_241
+242 val_242
+242 val_242
+244 val_244
+247 val_247
+248 val_248
+249 val_249
+252 val_252
+255 val_255
+255 val_255
+256 val_256
+256 val_256
+257 val_257
+258 val_258
26 val_26
-165 val_165
-327 val_327
-230 val_230
-205 val_205
-120 val_120
-131 val_131
-51 val_51
-404 val_404
-43 val_43
-436 val_436
-156 val_156
-469 val_469
-468 val_468
-308 val_308
-95 val_95
-196 val_196
-288 val_288
-481 val_481
-457 val_457
-98 val_98
+26 val_26
+260 val_260
+262 val_262
+263 val_263
+265 val_265
+265 val_265
+266 val_266
+27 val_27
+272 val_272
+272 val_272
+273 val_273
+273 val_273
+273 val_273
+274 val_274
+275 val_275
+277 val_277
+277 val_277
+277 val_277
+277 val_277
+278 val_278
+278 val_278
+28 val_28
+280 val_280
+280 val_280
+281 val_281
+281 val_281
282 val_282
-197 val_197
-187 val_187
-318 val_318
-318 val_318
-409 val_409
-470 val_470
-137 val_137
-369 val_369
-316 val_316
-169 val_169
-413 val_413
-85 val_85
-77 val_77
-0 val_0
-490 val_490
-87 val_87
-364 val_364
-179 val_179
-118 val_118
-134 val_134
-395 val_395
282 val_282
-138 val_138
-238 val_238
-419 val_419
-15 val_15
-118 val_118
-72 val_72
-90 val_90
-307 val_307
-19 val_19
-435 val_435
-10 val_10
-277 val_277
-273 val_273
+283 val_283
+284 val_284
+285 val_285
+286 val_286
+287 val_287
+288 val_288
+288 val_288
+289 val_289
+291 val_291
+292 val_292
+296 val_296
+298 val_298
+298 val_298
+298 val_298
+30 val_30
+302 val_302
+305 val_305
306 val_306
-224 val_224
+307 val_307
+307 val_307
+308 val_308
309 val_309
-389 val_389
+309 val_309
+310 val_310
+311 val_311
+311 val_311
+311 val_311
+315 val_315
+316 val_316
+316 val_316
+316 val_316
+317 val_317
+317 val_317
+318 val_318
+318 val_318
+318 val_318
+321 val_321
+321 val_321
+322 val_322
+322 val_322
+323 val_323
+325 val_325
+325 val_325
327 val_327
-242 val_242
-369 val_369
-392 val_392
-272 val_272
+327 val_327
+327 val_327
+33 val_33
331 val_331
-401 val_401
-242 val_242
-452 val_452
-177 val_177
-226 val_226
-5 val_5
-497 val_497
-402 val_402
-396 val_396
-317 val_317
-395 val_395
-58 val_58
-35 val_35
+331 val_331
+332 val_332
+333 val_333
+333 val_333
+335 val_335
336 val_336
-95 val_95
-11 val_11
-168 val_168
+338 val_338
+339 val_339
34 val_34
-229 val_229
-233 val_233
-143 val_143
-472 val_472
-322 val_322
-498 val_498
-160 val_160
-195 val_195
-42 val_42
-321 val_321
-430 val_430
-119 val_119
-489 val_489
-458 val_458
-78 val_78
-76 val_76
-41 val_41
-223 val_223
-492 val_492
-149 val_149
-449 val_449
-218 val_218
-228 val_228
-138 val_138
-453 val_453
-30 val_30
-209 val_209
-64 val_64
-468 val_468
-76 val_76
-74 val_74
+341 val_341
+342 val_342
342 val_342
-69 val_69
-230 val_230
-33 val_33
-368 val_368
-103 val_103
-296 val_296
-113 val_113
-216 val_216
-367 val_367
344 val_344
-167 val_167
-274 val_274
-219 val_219
-239 val_239
-485 val_485
-116 val_116
-223 val_223
-256 val_256
-263 val_263
-70 val_70
-487 val_487
-480 val_480
-401 val_401
-288 val_288
-191 val_191
-5 val_5
-244 val_244
-438 val_438
-128 val_128
-467 val_467
-432 val_432
-202 val_202
-316 val_316
-229 val_229
-469 val_469
-463 val_463
-280 val_280
-2 val_2
+344 val_344
+345 val_345
+348 val_348
+348 val_348
+348 val_348
+348 val_348
+348 val_348
35 val_35
-283 val_283
-331 val_331
-235 val_235
-80 val_80
-44 val_44
-193 val_193
-321 val_321
-335 val_335
-104 val_104
-466 val_466
+35 val_35
+35 val_35
+351 val_351
+353 val_353
+353 val_353
+356 val_356
+360 val_360
+362 val_362
+364 val_364
+365 val_365
366 val_366
-175 val_175
-403 val_403
-483 val_483
-53 val_53
-105 val_105
-257 val_257
-406 val_406
-409 val_409
-190 val_190
-406 val_406
+367 val_367
+367 val_367
+368 val_368
+369 val_369
+369 val_369
+369 val_369
+37 val_37
+37 val_37
+373 val_373
+374 val_374
+375 val_375
+377 val_377
+378 val_378
+379 val_379
+382 val_382
+382 val_382
+384 val_384
+384 val_384
+384 val_384
+386 val_386
+389 val_389
+392 val_392
+393 val_393
+394 val_394
+395 val_395
+395 val_395
+396 val_396
+396 val_396
+396 val_396
+397 val_397
+397 val_397
+399 val_399
+399 val_399
+4 val_4
+400 val_400
401 val_401
-114 val_114
-258 val_258
-90 val_90
-203 val_203
-262 val_262
-348 val_348
+401 val_401
+401 val_401
+401 val_401
+401 val_401
+402 val_402
+403 val_403
+403 val_403
+403 val_403
+404 val_404
+404 val_404
+406 val_406
+406 val_406
+406 val_406
+406 val_406
+407 val_407
+409 val_409
+409 val_409
+409 val_409
+41 val_41
+411 val_411
+413 val_413
+413 val_413
+414 val_414
+414 val_414
+417 val_417
+417 val_417
+417 val_417
+418 val_418
+419 val_419
+42 val_42
+42 val_42
+421 val_421
424 val_424
-12 val_12
-396 val_396
-201 val_201
-217 val_217
-164 val_164
+424 val_424
+427 val_427
+429 val_429
+429 val_429
+43 val_43
+430 val_430
+430 val_430
+430 val_430
431 val_431
-454 val_454
-478 val_478
-298 val_298
-125 val_125
431 val_431
-164 val_164
-424 val_424
-187 val_187
-382 val_382
-5 val_5
-70 val_70
-397 val_397
-480 val_480
-291 val_291
-24 val_24
-351 val_351
-255 val_255
-104 val_104
-70 val_70
-163 val_163
+431 val_431
+432 val_432
+435 val_435
+436 val_436
+437 val_437
+438 val_438
+438 val_438
438 val_438
-119 val_119
-414 val_414
-200 val_200
-491 val_491
-237 val_237
439 val_439
-360 val_360
-248 val_248
-479 val_479
-305 val_305
-417 val_417
-199 val_199
-444 val_444
-120 val_120
-429 val_429
-169 val_169
+439 val_439
+44 val_44
443 val_443
-323 val_323
-325 val_325
-277 val_277
-230 val_230
-478 val_478
-178 val_178
-468 val_468
-310 val_310
-317 val_317
-333 val_333
-493 val_493
+444 val_444
+446 val_446
+448 val_448
+449 val_449
+452 val_452
+453 val_453
+454 val_454
+454 val_454
+454 val_454
+455 val_455
+457 val_457
+458 val_458
+458 val_458
+459 val_459
+459 val_459
460 val_460
-207 val_207
-249 val_249
-265 val_265
-480 val_480
-83 val_83
-136 val_136
-353 val_353
-172 val_172
-214 val_214
462 val_462
-233 val_233
-406 val_406
-133 val_133
-175 val_175
-189 val_189
-454 val_454
-375 val_375
-401 val_401
-421 val_421
-407 val_407
-384 val_384
-256 val_256
-26 val_26
-134 val_134
-67 val_67
-384 val_384
-379 val_379
-18 val_18
462 val_462
+463 val_463
+463 val_463
+466 val_466
+466 val_466
+466 val_466
+467 val_467
+468 val_468
+468 val_468
+468 val_468
+468 val_468
+469 val_469
+469 val_469
+469 val_469
+469 val_469
+469 val_469
+47 val_47
+470 val_470
+472 val_472
+475 val_475
+477 val_477
+478 val_478
+478 val_478
+479 val_479
+480 val_480
+480 val_480
+480 val_480
+481 val_481
+482 val_482
+483 val_483
+484 val_484
+485 val_485
+487 val_487
+489 val_489
+489 val_489
+489 val_489
+489 val_489
+490 val_490
+491 val_491
492 val_492
-100 val_100
-298 val_298
-9 val_9
-341 val_341
+492 val_492
+493 val_493
+494 val_494
+495 val_495
+496 val_496
+497 val_497
498 val_498
-146 val_146
-458 val_458
-362 val_362
-186 val_186
-285 val_285
-348 val_348
-167 val_167
-18 val_18
-273 val_273
-183 val_183
-281 val_281
-344 val_344
-97 val_97
-469 val_469
-315 val_315
+498 val_498
+498 val_498
+5 val_5
+5 val_5
+5 val_5
+51 val_51
+51 val_51
+53 val_53
+54 val_54
+57 val_57
+58 val_58
+58 val_58
+64 val_64
+65 val_65
+66 val_66
+67 val_67
+67 val_67
+69 val_69
+70 val_70
+70 val_70
+70 val_70
+72 val_72
+72 val_72
+74 val_74
+76 val_76
+76 val_76
+77 val_77
+78 val_78
+8 val_8
+80 val_80
+82 val_82
+83 val_83
+83 val_83
84 val_84
-28 val_28
-37 val_37
-448 val_448
-152 val_152
-348 val_348
-307 val_307
-194 val_194
-414 val_414
-477 val_477
-222 val_222
-126 val_126
+84 val_84
+85 val_85
+86 val_86
+87 val_87
+9 val_9
90 val_90
-169 val_169
-403 val_403
-400 val_400
-200 val_200
+90 val_90
+90 val_90
+92 val_92
+95 val_95
+95 val_95
+96 val_96
+97 val_97
97 val_97
+98 val_98
+98 val_98
PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM src t1 JOIN encrypted_table t2
WHERE t1.key = t2.key
PREHOOK: type: QUERY
PREHOOK: Input: default@encrypted_table
diff --git
a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
index e633d0fc811..f45e10b8b99 100644
---
a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
+++
b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
@@ -262,145 +262,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
0 val_0 0 val_0
0 val_0 0 val_0
0 val_0 0 val_0
-2 val_2 2 val_2
-4 val_4 4 val_4
-5 val_5 5 val_5
-5 val_5 5 val_5
-5 val_5 5 val_5
-5 val_5 5 val_5
-5 val_5 5 val_5
-5 val_5 5 val_5
-5 val_5 5 val_5
-5 val_5 5 val_5
-5 val_5 5 val_5
-8 val_8 8 val_8
-9 val_9 9 val_9
10 val_10 10 val_10
-11 val_11 11 val_11
-12 val_12 12 val_12
-12 val_12 12 val_12
-12 val_12 12 val_12
-12 val_12 12 val_12
-15 val_15 15 val_15
-15 val_15 15 val_15
-15 val_15 15 val_15
-15 val_15 15 val_15
-17 val_17 17 val_17
-18 val_18 18 val_18
-18 val_18 18 val_18
-18 val_18 18 val_18
-18 val_18 18 val_18
-19 val_19 19 val_19
-20 val_20 20 val_20
-24 val_24 24 val_24
-24 val_24 24 val_24
-24 val_24 24 val_24
-24 val_24 24 val_24
-26 val_26 26 val_26
-26 val_26 26 val_26
-26 val_26 26 val_26
-26 val_26 26 val_26
-27 val_27 27 val_27
-28 val_28 28 val_28
-30 val_30 30 val_30
-33 val_33 33 val_33
-34 val_34 34 val_34
-35 val_35 35 val_35
-35 val_35 35 val_35
-35 val_35 35 val_35
-35 val_35 35 val_35
-35 val_35 35 val_35
-35 val_35 35 val_35
-35 val_35 35 val_35
-35 val_35 35 val_35
-35 val_35 35 val_35
-37 val_37 37 val_37
-37 val_37 37 val_37
-37 val_37 37 val_37
-37 val_37 37 val_37
-41 val_41 41 val_41
-42 val_42 42 val_42
-42 val_42 42 val_42
-42 val_42 42 val_42
-42 val_42 42 val_42
-43 val_43 43 val_43
-44 val_44 44 val_44
-47 val_47 47 val_47
-51 val_51 51 val_51
-51 val_51 51 val_51
-51 val_51 51 val_51
-51 val_51 51 val_51
-53 val_53 53 val_53
-54 val_54 54 val_54
-57 val_57 57 val_57
-58 val_58 58 val_58
-58 val_58 58 val_58
-58 val_58 58 val_58
-58 val_58 58 val_58
-64 val_64 64 val_64
-65 val_65 65 val_65
-66 val_66 66 val_66
-67 val_67 67 val_67
-67 val_67 67 val_67
-67 val_67 67 val_67
-67 val_67 67 val_67
-69 val_69 69 val_69
-70 val_70 70 val_70
-70 val_70 70 val_70
-70 val_70 70 val_70
-70 val_70 70 val_70
-70 val_70 70 val_70
-70 val_70 70 val_70
-70 val_70 70 val_70
-70 val_70 70 val_70
-70 val_70 70 val_70
-72 val_72 72 val_72
-72 val_72 72 val_72
-72 val_72 72 val_72
-72 val_72 72 val_72
-74 val_74 74 val_74
-76 val_76 76 val_76
-76 val_76 76 val_76
-76 val_76 76 val_76
-76 val_76 76 val_76
-77 val_77 77 val_77
-78 val_78 78 val_78
-80 val_80 80 val_80
-82 val_82 82 val_82
-83 val_83 83 val_83
-83 val_83 83 val_83
-83 val_83 83 val_83
-83 val_83 83 val_83
-84 val_84 84 val_84
-84 val_84 84 val_84
-84 val_84 84 val_84
-84 val_84 84 val_84
-85 val_85 85 val_85
-86 val_86 86 val_86
-87 val_87 87 val_87
-90 val_90 90 val_90
-90 val_90 90 val_90
-90 val_90 90 val_90
-90 val_90 90 val_90
-90 val_90 90 val_90
-90 val_90 90 val_90
-90 val_90 90 val_90
-90 val_90 90 val_90
-90 val_90 90 val_90
-92 val_92 92 val_92
-95 val_95 95 val_95
-95 val_95 95 val_95
-95 val_95 95 val_95
-95 val_95 95 val_95
-96 val_96 96 val_96
-97 val_97 97 val_97
-97 val_97 97 val_97
-97 val_97 97 val_97
-97 val_97 97 val_97
-98 val_98 98 val_98
-98 val_98 98 val_98
-98 val_98 98 val_98
-98 val_98 98 val_98
100 val_100 100 val_100
100 val_100 100 val_100
100 val_100 100 val_100
@@ -414,6 +276,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
104 val_104 104 val_104
104 val_104 104 val_104
105 val_105 105 val_105
+11 val_11 11 val_11
111 val_111 111 val_111
113 val_113 113 val_113
113 val_113 113 val_113
@@ -434,6 +297,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
119 val_119 119 val_119
119 val_119 119 val_119
119 val_119 119 val_119
+12 val_12 12 val_12
+12 val_12 12 val_12
+12 val_12 12 val_12
+12 val_12 12 val_12
120 val_120 120 val_120
120 val_120 120 val_120
120 val_120 120 val_120
@@ -493,6 +360,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
149 val_149 149 val_149
149 val_149 149 val_149
149 val_149 149 val_149
+15 val_15 15 val_15
+15 val_15 15 val_15
+15 val_15 15 val_15
+15 val_15 15 val_15
150 val_150 150 val_150
152 val_152 152 val_152
152 val_152 152 val_152
@@ -541,6 +412,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
169 val_169 169 val_169
169 val_169 169 val_169
169 val_169 169 val_169
+17 val_17 17 val_17
170 val_170 170 val_170
172 val_172 172 val_172
172 val_172 172 val_172
@@ -564,6 +436,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
179 val_179 179 val_179
179 val_179 179 val_179
179 val_179 179 val_179
+18 val_18 18 val_18
+18 val_18 18 val_18
+18 val_18 18 val_18
+18 val_18 18 val_18
180 val_180 180 val_180
181 val_181 181 val_181
183 val_183 183 val_183
@@ -578,6 +454,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
187 val_187 187 val_187
187 val_187 187 val_187
189 val_189 189 val_189
+19 val_19 19 val_19
190 val_190 190 val_190
191 val_191 191 val_191
191 val_191 191 val_191
@@ -612,6 +489,8 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
199 val_199 199 val_199
199 val_199 199 val_199
199 val_199 199 val_199
+2 val_2 2 val_2
+20 val_20 20 val_20
200 val_200 200 val_200
200 val_200 200 val_200
200 val_200 200 val_200
@@ -722,6 +601,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
239 val_239 239 val_239
239 val_239 239 val_239
239 val_239 239 val_239
+24 val_24 24 val_24
+24 val_24 24 val_24
+24 val_24 24 val_24
+24 val_24 24 val_24
241 val_241 241 val_241
242 val_242 242 val_242
242 val_242 242 val_242
@@ -742,6 +625,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
256 val_256 256 val_256
257 val_257 257 val_257
258 val_258 258 val_258
+26 val_26 26 val_26
+26 val_26 26 val_26
+26 val_26 26 val_26
+26 val_26 26 val_26
260 val_260 260 val_260
262 val_262 262 val_262
263 val_263 263 val_263
@@ -750,6 +637,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
265 val_265 265 val_265
265 val_265 265 val_265
266 val_266 266 val_266
+27 val_27 27 val_27
272 val_272 272 val_272
272 val_272 272 val_272
272 val_272 272 val_272
@@ -785,6 +673,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
278 val_278 278 val_278
278 val_278 278 val_278
278 val_278 278 val_278
+28 val_28 28 val_28
280 val_280 280 val_280
280 val_280 280 val_280
280 val_280 280 val_280
@@ -819,6 +708,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
298 val_298 298 val_298
298 val_298 298 val_298
298 val_298 298 val_298
+30 val_30 30 val_30
302 val_302 302 val_302
305 val_305 305 val_305
306 val_306 306 val_306
@@ -886,6 +776,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
327 val_327 327 val_327
327 val_327 327 val_327
327 val_327 327 val_327
+33 val_33 33 val_33
331 val_331 331 val_331
331 val_331 331 val_331
331 val_331 331 val_331
@@ -899,6 +790,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
336 val_336 336 val_336
338 val_338 338 val_338
339 val_339 339 val_339
+34 val_34 34 val_34
341 val_341 341 val_341
342 val_342 342 val_342
342 val_342 342 val_342
@@ -934,6 +826,15 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
348 val_348 348 val_348
348 val_348 348 val_348
348 val_348 348 val_348
+35 val_35 35 val_35
+35 val_35 35 val_35
+35 val_35 35 val_35
+35 val_35 35 val_35
+35 val_35 35 val_35
+35 val_35 35 val_35
+35 val_35 35 val_35
+35 val_35 35 val_35
+35 val_35 35 val_35
351 val_351 351 val_351
353 val_353 353 val_353
353 val_353 353 val_353
@@ -959,6 +860,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
369 val_369 369 val_369
369 val_369 369 val_369
369 val_369 369 val_369
+37 val_37 37 val_37
+37 val_37 37 val_37
+37 val_37 37 val_37
+37 val_37 37 val_37
373 val_373 373 val_373
374 val_374 374 val_374
375 val_375 375 val_375
@@ -1004,6 +909,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
399 val_399 399 val_399
399 val_399 399 val_399
399 val_399 399 val_399
+4 val_4 4 val_4
400 val_400 400 val_400
401 val_401 401 val_401
401 val_401 401 val_401
@@ -1070,6 +976,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
409 val_409 409 val_409
409 val_409 409 val_409
409 val_409 409 val_409
+41 val_41 41 val_41
411 val_411 411 val_411
413 val_413 413 val_413
413 val_413 413 val_413
@@ -1090,6 +997,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
417 val_417 417 val_417
418 val_418 418 val_418
419 val_419 419 val_419
+42 val_42 42 val_42
+42 val_42 42 val_42
+42 val_42 42 val_42
+42 val_42 42 val_42
421 val_421 421 val_421
424 val_424 424 val_424
424 val_424 424 val_424
@@ -1100,6 +1011,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
429 val_429 429 val_429
429 val_429 429 val_429
429 val_429 429 val_429
+43 val_43 43 val_43
430 val_430 430 val_430
430 val_430 430 val_430
430 val_430 430 val_430
@@ -1135,6 +1047,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
439 val_439 439 val_439
439 val_439 439 val_439
439 val_439 439 val_439
+44 val_44 44 val_44
443 val_443 443 val_443
444 val_444 444 val_444
446 val_446 446 val_446
@@ -1221,6 +1134,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
469 val_469 469 val_469
469 val_469 469 val_469
469 val_469 469 val_469
+47 val_47 47 val_47
470 val_470 470 val_470
472 val_472 472 val_472
475 val_475 475 val_475
@@ -1281,6 +1195,92 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
498 val_498 498 val_498
498 val_498 498 val_498
498 val_498 498 val_498
+5 val_5 5 val_5
+5 val_5 5 val_5
+5 val_5 5 val_5
+5 val_5 5 val_5
+5 val_5 5 val_5
+5 val_5 5 val_5
+5 val_5 5 val_5
+5 val_5 5 val_5
+5 val_5 5 val_5
+51 val_51 51 val_51
+51 val_51 51 val_51
+51 val_51 51 val_51
+51 val_51 51 val_51
+53 val_53 53 val_53
+54 val_54 54 val_54
+57 val_57 57 val_57
+58 val_58 58 val_58
+58 val_58 58 val_58
+58 val_58 58 val_58
+58 val_58 58 val_58
+64 val_64 64 val_64
+65 val_65 65 val_65
+66 val_66 66 val_66
+67 val_67 67 val_67
+67 val_67 67 val_67
+67 val_67 67 val_67
+67 val_67 67 val_67
+69 val_69 69 val_69
+70 val_70 70 val_70
+70 val_70 70 val_70
+70 val_70 70 val_70
+70 val_70 70 val_70
+70 val_70 70 val_70
+70 val_70 70 val_70
+70 val_70 70 val_70
+70 val_70 70 val_70
+70 val_70 70 val_70
+72 val_72 72 val_72
+72 val_72 72 val_72
+72 val_72 72 val_72
+72 val_72 72 val_72
+74 val_74 74 val_74
+76 val_76 76 val_76
+76 val_76 76 val_76
+76 val_76 76 val_76
+76 val_76 76 val_76
+77 val_77 77 val_77
+78 val_78 78 val_78
+8 val_8 8 val_8
+80 val_80 80 val_80
+82 val_82 82 val_82
+83 val_83 83 val_83
+83 val_83 83 val_83
+83 val_83 83 val_83
+83 val_83 83 val_83
+84 val_84 84 val_84
+84 val_84 84 val_84
+84 val_84 84 val_84
+84 val_84 84 val_84
+85 val_85 85 val_85
+86 val_86 86 val_86
+87 val_87 87 val_87
+9 val_9 9 val_9
+90 val_90 90 val_90
+90 val_90 90 val_90
+90 val_90 90 val_90
+90 val_90 90 val_90
+90 val_90 90 val_90
+90 val_90 90 val_90
+90 val_90 90 val_90
+90 val_90 90 val_90
+90 val_90 90 val_90
+92 val_92 92 val_92
+95 val_95 95 val_95
+95 val_95 95 val_95
+95 val_95 95 val_95
+95 val_95 95 val_95
+96 val_96 96 val_96
+97 val_97 97 val_97
+97 val_97 97 val_97
+97 val_97 97 val_97
+97 val_97 97 val_97
+98 val_98 98 val_98
+98 val_98 98 val_98
+98 val_98 98 val_98
+98 val_98 98 val_98
PREHOOK: query: DROP TABLE table_key_1 PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table_key_1
diff --git
a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
index bb55e6a7df1..d172db1c1e2 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
@@ -268,3 +268,7 @@ POSTHOOK: query: DROP DATABASE encrypted_db_outloc
POSTHOOK: type: DROPDATABASE
POSTHOOK: Input: database:encrypted_db_outloc
POSTHOOK: Output: database:encrypted_db_outloc
+Encryption key deleted: 'key_128'
+Encryption key deleted: 'key_128_2'
+Encryption key deleted: 'key_128_3'
+Encryption key deleted: 'key_128_4'
diff --git
a/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
b/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
index 4fbd3a8dbc0..3da486a1904 100644
---
a/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
+++
b/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
@@ -43,3 +43,4 @@ POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_table_n4
POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_table_n4
+Encryption key deleted: 'key_128'
diff --git a/ql/src/test/results/clientpositive/llap/rfc5424_parser.q.out
b/ql/src/test/results/clientpositive/llap/rfc5424_parser.q.out
index cdeceecf600..ed9de7f8924 100644
--- a/ql/src/test/results/clientpositive/llap/rfc5424_parser.q.out
+++ b/ql/src/test/results/clientpositive/llap/rfc5424_parser.q.out
@@ -218,7 +218,6 @@ POSTHOOK: Input: default@logs
+ . /fluentd-utils.sh
+ return
+ start_fluentd
-#### A masked pattern was here ####
++ set -x
PREHOOK: query: CREATE EXTERNAL TABLE logs2(
facility STRING,
@@ -501,7 +500,6 @@ POSTHOOK: Input: default@logs
+ . /fluentd-utils.sh
+ return
+ start_fluentd
-#### A masked pattern was here ####
++ set -x
PREHOOK: query: drop table logs
PREHOOK: type: DROPTABLE
diff --git a/ql/src/test/results/clientpositive/llap/sysdb.q.out
b/ql/src/test/results/clientpositive/llap/sysdb.q.out
index 87736f78294..cbbbfc95a54 100644
--- a/ql/src/test/results/clientpositive/llap/sysdb.q.out
+++ b/ql/src/test/results/clientpositive/llap/sysdb.q.out
@@ -510,7 +510,6 @@ compaction_queue cq_commit_time
compaction_queue cq_database
compaction_queue cq_enqueue_time
compaction_queue cq_error_message
-#### A masked pattern was here ####
compaction_queue cq_highest_write_id
compaction_queue cq_id
compaction_queue cq_initiator_id
@@ -542,7 +541,6 @@ compactions c_enqueue_time
compactions c_enqueue_time
compactions c_error_message
compactions c_error_message
-#### A masked pattern was here ####
compactions c_highest_write_id
compactions c_highest_write_id
compactions c_id
@@ -586,7 +584,6 @@ completed_compactions cc_database
completed_compactions cc_end
completed_compactions cc_enqueue_time
completed_compactions cc_error_message
-#### A masked pattern was here ####
completed_compactions cc_highest_write_id
completed_compactions cc_id
completed_compactions cc_initiator_id
@@ -623,14 +620,12 @@ db_version version_comment
dbs db_id
dbs db_location_uri
dbs name
-#### A masked pattern was here ####
funcs class_name
funcs create_time
funcs db_id
funcs func_id
funcs func_name
funcs func_type
-#### A masked pattern was here ####
global_privs authorizer
global_privs create_time
global_privs grant_option
@@ -859,7 +854,6 @@ role_map principal_type
role_map role_grant_id
role_map role_id
roles create_time
-#### A masked pattern was here ####
roles role_id
roles role_name
scheduled_executions elapsed
@@ -903,7 +897,6 @@ schemata default_character_set_catalog
schemata default_character_set_name
schemata default_character_set_schema
schemata schema_name
-#### A masked pattern was here ####
schemata sql_path
scr_txn key
scr_txn value
@@ -1026,7 +1019,6 @@ tbls create_time
tbls db_id
tbls is_rewrite_enabled
tbls last_access_time
-#### A masked pattern was here ####
tbls retention
tbls sd_id
tbls tbl_id
diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
index 12552aca9e1..353fd64f6f9 100644
--- a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
@@ -710,6 +710,7 @@ POSTHOOK: query: select unionsrc.key, unionsrc.value FROM
(select s1.key as key,
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
POSTHOOK: Output: hdfs://### HDFS PATH ###
+0 val_0
10 val_10
100 val_100
103 val_103
@@ -717,34 +718,58 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
105 val_105
11 val_11
111 val_111
+113 val_113
114 val_114
116 val_116
118 val_118
+119 val_119
+12 val_12
+120 val_120
125 val_125
126 val_126
+128 val_128
+129 val_129
131 val_131
133 val_133
134 val_134
+136 val_136
+137 val_137
+138 val_138
143 val_143
+145 val_145
+146 val_146
+149 val_149
15 val_15
150 val_150
152 val_152
+153 val_153
155 val_155
+156 val_156
157 val_157
+158 val_158
+160 val_160
+162 val_162
163 val_163
164 val_164
+165 val_165
+166 val_166
167 val_167
168 val_168
169 val_169
17 val_17
170 val_170
+172 val_172
174 val_174
175 val_175
176 val_176
177 val_177
+178 val_178
+179 val_179
18 val_18
180 val_180
+181 val_181
183 val_183
+186 val_186
187 val_187
189 val_189
19 val_19
@@ -752,7 +777,9 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
191 val_191
192 val_192
193 val_193
+194 val_194
195 val_195
+196 val_196
197 val_197
199 val_199
2 val_2
@@ -764,250 +791,221 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
205 val_205
207 val_207
208 val_208
+209 val_209
213 val_213
214 val_214
216 val_216
217 val_217
+218 val_218
+219 val_219
221 val_221
+222 val_222
+223 val_223
+224 val_224
+226 val_226
+228 val_228
229 val_229
230 val_230
+233 val_233
+235 val_235
237 val_237
238 val_238
239 val_239
24 val_24
241 val_241
+242 val_242
244 val_244
+247 val_247
248 val_248
+249 val_249
252 val_252
+255 val_255
+256 val_256
+257 val_257
258 val_258
26 val_26
+260 val_260
+262 val_262
263 val_263
+265 val_265
+266 val_266
27 val_27
272 val_272
273 val_273
274 val_274
+275 val_275
+277 val_277
278 val_278
+28 val_28
+280 val_280
281 val_281
282 val_282
283 val_283
+284 val_284
285 val_285
286 val_286
287 val_287
288 val_288
+289 val_289
291 val_291
+292 val_292
+296 val_296
298 val_298
30 val_30
302 val_302
305 val_305
306 val_306
307 val_307
+308 val_308
309 val_309
+310 val_310
+311 val_311
315 val_315
316 val_316
+317 val_317
+318 val_318
321 val_321
322 val_322
323 val_323
325 val_325
+327 val_327
33 val_33
+331 val_331
332 val_332
333 val_333
335 val_335
336 val_336
338 val_338
+339 val_339
34 val_34
+341 val_341
+342 val_342
344 val_344
+345 val_345
348 val_348
35 val_35
+351 val_351
353 val_353
+356 val_356
360 val_360
362 val_362
+364 val_364
+365 val_365
366 val_366
367 val_367
+368 val_368
+369 val_369
+37 val_37
373 val_373
+374 val_374
+375 val_375
+377 val_377
+378 val_378
379 val_379
+382 val_382
+384 val_384
386 val_386
+389 val_389
+392 val_392
+393 val_393
394 val_394
+395 val_395
+396 val_396
+397 val_397
399 val_399
4 val_4
+400 val_400
401 val_401
402 val_402
+403 val_403
404 val_404
406 val_406
+407 val_407
409 val_409
41 val_41
411 val_411
413 val_413
+414 val_414
+417 val_417
418 val_418
419 val_419
+42 val_42
421 val_421
424 val_424
427 val_427
429 val_429
+43 val_43
+430 val_430
431 val_431
432 val_432
435 val_435
436 val_436
437 val_437
438 val_438
-444 val_444
-452 val_452
-453 val_453
-455 val_455
-457 val_457
-459 val_459
-463 val_463
-466 val_466
-47 val_47
-472 val_472
-475 val_475
-478 val_478
-479 val_479
-482 val_482
-483 val_483
-484 val_484
-492 val_492
-494 val_494
-498 val_498
-5 val_5
-54 val_54
-57 val_57
-65 val_65
-69 val_69
-72 val_72
-76 val_76
-78 val_78
-8 val_8
-80 val_80
-90 val_90
-98 val_98
-0 val_0
-113 val_113
-119 val_119
-12 val_12
-120 val_120
-128 val_128
-129 val_129
-136 val_136
-137 val_137
-138 val_138
-145 val_145
-146 val_146
-149 val_149
-153 val_153
-156 val_156
-158 val_158
-160 val_160
-162 val_162
-165 val_165
-166 val_166
-172 val_172
-178 val_178
-179 val_179
-181 val_181
-186 val_186
-194 val_194
-196 val_196
-209 val_209
-218 val_218
-219 val_219
-222 val_222
-223 val_223
-224 val_224
-226 val_226
-228 val_228
-233 val_233
-235 val_235
-242 val_242
-247 val_247
-249 val_249
-255 val_255
-256 val_256
-257 val_257
-260 val_260
-262 val_262
-265 val_265
-266 val_266
-275 val_275
-277 val_277
-28 val_28
-280 val_280
-284 val_284
-289 val_289
-292 val_292
-296 val_296
-308 val_308
-310 val_310
-311 val_311
-317 val_317
-318 val_318
-327 val_327
-331 val_331
-339 val_339
-341 val_341
-342 val_342
-345 val_345
-351 val_351
-356 val_356
-364 val_364
-365 val_365
-368 val_368
-369 val_369
-37 val_37
-374 val_374
-375 val_375
-377 val_377
-378 val_378
-382 val_382
-384 val_384
-389 val_389
-392 val_392
-393 val_393
-395 val_395
-396 val_396
-397 val_397
-400 val_400
-403 val_403
-407 val_407
-414 val_414
-417 val_417
-42 val_42
-43 val_43
-430 val_430
439 val_439
44 val_44
443 val_443
+444 val_444
446 val_446
448 val_448
449 val_449
+452 val_452
+453 val_453
454 val_454
+455 val_455
+457 val_457
458 val_458
+459 val_459
460 val_460
462 val_462
+463 val_463
+466 val_466
467 val_467
468 val_468
469 val_469
+47 val_47
470 val_470
+472 val_472
+475 val_475
477 val_477
+478 val_478
+479 val_479
480 val_480
481 val_481
+482 val_482
+483 val_483
+484 val_484
485 val_485
487 val_487
489 val_489
490 val_490
491 val_491
+492 val_492
493 val_493
+494 val_494
495 val_495
496 val_496
497 val_497
+498 val_498
+5 val_5
51 val_51
53 val_53
+54 val_54
+57 val_57
58 val_58
64 val_64
+65 val_65
66 val_66
67 val_67
+69 val_69
70 val_70
+72 val_72
74 val_74
+76 val_76
77 val_77
+78 val_78
+8 val_8
+80 val_80
82 val_82
83 val_83
84 val_84
@@ -1015,10 +1013,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
86 val_86
87 val_87
9 val_9
+90 val_90
92 val_92
95 val_95
96 val_96
97 val_97
+98 val_98
PREHOOK: query: CREATE TABLE DEST1_n96(key STRING, value STRING) STORED AS
TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -4359,325 +4359,325 @@ POSTHOOK: Input: default@dst_union22_n0
POSTHOOK: Input: default@dst_union22_n0@ds=2
POSTHOOK: Output: hdfs://### HDFS PATH ###
0 val_0 0 val_0 2
+10 val_10 10 val_10 2
+100 val_100 100 val_100 2
103 val_103 103 val_103 2
104 val_104 104 val_104 2
105 val_105 105 val_105 2
+11 val_11 11 val_11 2
111 val_111 111 val_111 2
+113 val_113 113 val_113 2
+114 val_114 114 val_114 2
116 val_116 116 val_116 2
+118 val_118 118 val_118 2
119 val_119 119 val_119 2
12 val_12 12 val_12 2
120 val_120 120 val_120 2
+125 val_125 125 val_125 2
126 val_126 126 val_126 2
128 val_128 128 val_128 2
129 val_129 129 val_129 2
131 val_131 131 val_131 2
+133 val_133 133 val_133 2
134 val_134 134 val_134 2
136 val_136 136 val_136 2
+137 val_137 137 val_137 2
138 val_138 138 val_138 2
+143 val_143 143 val_143 2
+145 val_145 145 val_145 2
+146 val_146 146 val_146 2
+149 val_149 149 val_149 2
+15 val_15 15 val_15 2
150 val_150 150 val_150 2
+152 val_152 152 val_152 2
+153 val_153 153 val_153 2
155 val_155 155 val_155 2
+156 val_156 156 val_156 2
157 val_157 157 val_157 2
158 val_158 158 val_158 2
160 val_160 160 val_160 2
+162 val_162 162 val_162 2
+163 val_163 163 val_163 2
164 val_164 164 val_164 2
+165 val_165 165 val_165 2
+166 val_166 166 val_166 2
167 val_167 167 val_167 2
+168 val_168 168 val_168 2
169 val_169 169 val_169 2
+17 val_17 17 val_17 2
170 val_170 170 val_170 2
+172 val_172 172 val_172 2
174 val_174 174 val_174 2
175 val_175 175 val_175 2
+176 val_176 176 val_176 2
177 val_177 177 val_177 2
178 val_178 178 val_178 2
179 val_179 179 val_179 2
18 val_18 18 val_18 2
+180 val_180 180 val_180 2
+181 val_181 181 val_181 2
+183 val_183 183 val_183 2
+186 val_186 186 val_186 2
187 val_187 187 val_187 2
+189 val_189 189 val_189 2
+19 val_19 19 val_19 2
+190 val_190 190 val_190 2
191 val_191 191 val_191 2
+192 val_192 192 val_192 2
193 val_193 193 val_193 2
194 val_194 194 val_194 2
+195 val_195 195 val_195 2
+196 val_196 196 val_196 2
197 val_197 197 val_197 2
199 val_199 199 val_199 2
2 val_2 2 val_2 2
+20 val_20 20 val_20 2
200 val_200 200 val_200 2
201 val_201 201 val_201 2
202 val_202 202 val_202 2
+203 val_203 203 val_203 2
205 val_205 205 val_205 2
+207 val_207 207 val_207 2
208 val_208 208 val_208 2
+209 val_209 209 val_209 2
+213 val_213 213 val_213 2
+214 val_214 214 val_214 2
216 val_216 216 val_216 2
217 val_217 217 val_217 2
218 val_218 218 val_218 2
219 val_219 219 val_219 2
221 val_221 221 val_221 2
+222 val_222 222 val_222 2
+223 val_223 223 val_223 2
+224 val_224 224 val_224 2
+226 val_226 226 val_226 2
+228 val_228 228 val_228 2
229 val_229 229 val_229 2
230 val_230 230 val_230 2
233 val_233 233 val_233 2
235 val_235 235 val_235 2
237 val_237 237 val_237 2
238 val_238 238 val_238 2
+239 val_239 239 val_239 2
24 val_24 24 val_24 2
+24 val_24 NULL NULL 2
241 val_241 241 val_241 2
+242 val_242 242 val_242 2
244 val_244 244 val_244 2
+247 val_247 247 val_247 2
+248 val_248 248 val_248 2
+249 val_249 249 val_249 2
252 val_252 252 val_252 2
+255 val_255 255 val_255 2
256 val_256 256 val_256 2
257 val_257 257 val_257 2
+258 val_258 258 val_258 2
+26 val_26 26 val_26 2
26 val_26 NULL NULL 2
260 val_260 260 val_260 2
+262 val_262 262 val_262 2
+263 val_263 263 val_263 2
+265 val_265 265 val_265 2
266 val_266 266 val_266 2
+27 val_27 27 val_27 2
+27 val_27 NULL NULL 2
+272 val_272 272 val_272 2
+273 val_273 273 val_273 2
274 val_274 274 val_274 2
+275 val_275 275 val_275 2
277 val_277 277 val_277 2
+278 val_278 278 val_278 2
+28 val_28 28 val_28 2
28 val_28 NULL NULL 2
280 val_280 280 val_280 2
281 val_281 281 val_281 2
282 val_282 282 val_282 2
+283 val_283 283 val_283 2
+284 val_284 284 val_284 2
285 val_285 285 val_285 2
+286 val_286 286 val_286 2
287 val_287 287 val_287 2
288 val_288 288 val_288 2
+289 val_289 289 val_289 2
291 val_291 291 val_291 2
+292 val_292 292 val_292 2
+296 val_296 296 val_296 2
+298 val_298 298 val_298 2
+30 val_30 30 val_30 2
+30 val_30 NULL NULL 2
302 val_302 302 val_302 2
305 val_305 305 val_305 2
306 val_306 306 val_306 2
+307 val_307 307 val_307 2
308 val_308 308 val_308 2
+309 val_309 309 val_309 2
+310 val_310 310 val_310 2
311 val_311 311 val_311 2
+315 val_315 315 val_315 2
316 val_316 316 val_316 2
+317 val_317 317 val_317 2
318 val_318 318 val_318 2
321 val_321 321 val_321 2
+322 val_322 322 val_322 2
+323 val_323 323 val_323 2
+325 val_325 325 val_325 2
327 val_327 327 val_327 2
33 val_33 33 val_33 2
33 val_33 NULL NULL 2
331 val_331 331 val_331 2
+332 val_332 332 val_332 2
333 val_333 333 val_333 2
335 val_335 335 val_335 2
336 val_336 336 val_336 2
+338 val_338 338 val_338 2
+339 val_339 339 val_339 2
+34 val_34 34 val_34 2
+34 val_34 NULL NULL 2
+341 val_341 341 val_341 2
+342 val_342 342 val_342 2
344 val_344 344 val_344 2
345 val_345 345 val_345 2
+348 val_348 348 val_348 2
+35 val_35 35 val_35 2
+35 val_35 NULL NULL 2
+351 val_351 351 val_351 2
+353 val_353 353 val_353 2
356 val_356 356 val_356 2
360 val_360 360 val_360 2
362 val_362 362 val_362 2
364 val_364 364 val_364 2
+365 val_365 365 val_365 2
366 val_366 366 val_366 2
367 val_367 367 val_367 2
+368 val_368 368 val_368 2
+369 val_369 369 val_369 2
+37 val_37 37 val_37 2
+37 val_37 NULL NULL 2
373 val_373 373 val_373 2
+374 val_374 374 val_374 2
+375 val_375 375 val_375 2
+377 val_377 377 val_377 2
378 val_378 378 val_378 2
379 val_379 379 val_379 2
+382 val_382 382 val_382 2
384 val_384 384 val_384 2
386 val_386 386 val_386 2
389 val_389 389 val_389 2
+392 val_392 392 val_392 2
393 val_393 393 val_393 2
394 val_394 394 val_394 2
395 val_395 395 val_395 2
+396 val_396 396 val_396 2
397 val_397 397 val_397 2
+399 val_399 399 val_399 2
4 val_4 4 val_4 2
+400 val_400 400 val_400 2
+401 val_401 401 val_401 2
402 val_402 402 val_402 2
403 val_403 403 val_403 2
+404 val_404 404 val_404 2
406 val_406 406 val_406 2
407 val_407 407 val_407 2
+409 val_409 409 val_409 2
41 val_41 41 val_41 2
41 val_41 NULL NULL 2
+411 val_411 411 val_411 2
413 val_413 413 val_413 2
+414 val_414 414 val_414 2
+417 val_417 417 val_417 2
418 val_418 418 val_418 2
419 val_419 419 val_419 2
+42 val_42 42 val_42 2
+42 val_42 NULL NULL 2
+421 val_421 421 val_421 2
424 val_424 424 val_424 2
+427 val_427 427 val_427 2
+429 val_429 429 val_429 2
+43 val_43 43 val_43 2
+43 val_43 NULL NULL 2
+430 val_430 430 val_430 2
+431 val_431 431 val_431 2
+432 val_432 432 val_432 2
+435 val_435 435 val_435 2
436 val_436 436 val_436 2
+437 val_437 437 val_437 2
+438 val_438 438 val_438 2
+439 val_439 439 val_439 2
44 val_44 44 val_44 2
44 val_44 NULL NULL 2
+443 val_443 443 val_443 2
+444 val_444 444 val_444 2
+446 val_446 446 val_446 2
448 val_448 448 val_448 2
449 val_449 449 val_449 2
452 val_452 452 val_452 2
453 val_453 453 val_453 2
+454 val_454 454 val_454 2
+455 val_455 455 val_455 2
+457 val_457 457 val_457 2
+458 val_458 458 val_458 2
+459 val_459 459 val_459 2
460 val_460 460 val_460 2
+462 val_462 462 val_462 2
+463 val_463 463 val_463 2
466 val_466 466 val_466 2
467 val_467 467 val_467 2
468 val_468 468 val_468 2
469 val_469 469 val_469 2
+47 val_47 47 val_47 2
47 val_47 NULL NULL 2
470 val_470 470 val_470 2
+472 val_472 472 val_472 2
475 val_475 475 val_475 2
+477 val_477 477 val_477 2
+478 val_478 478 val_478 2
479 val_479 479 val_479 2
480 val_480 480 val_480 2
481 val_481 481 val_481 2
+482 val_482 482 val_482 2
+483 val_483 483 val_483 2
+484 val_484 484 val_484 2
+485 val_485 485 val_485 2
487 val_487 487 val_487 2
+489 val_489 489 val_489 2
490 val_490 490 val_490 2
+491 val_491 491 val_491 2
+492 val_492 492 val_492 2
493 val_493 493 val_493 2
494 val_494 494 val_494 2
495 val_495 495 val_495 2
496 val_496 496 val_496 2
+497 val_497 497 val_497 2
+498 val_498 498 val_498 2
5 val_5 5 val_5 2
51 val_51 51 val_51 2
53 val_53 53 val_53 2
+54 val_54 54 val_54 2
+57 val_57 57 val_57 2
+58 val_58 58 val_58 2
64 val_64 64 val_64 2
+65 val_65 65 val_65 2
66 val_66 66 val_66 2
+67 val_67 67 val_67 2
69 val_69 69 val_69 2
+70 val_70 70 val_70 2
+72 val_72 72 val_72 2
74 val_74 74 val_74 2
76 val_76 76 val_76 2
+77 val_77 77 val_77 2
+78 val_78 78 val_78 2
8 val_8 8 val_8 2
+80 val_80 80 val_80 2
82 val_82 82 val_82 2
+83 val_83 83 val_83 2
+84 val_84 84 val_84 2
+85 val_85 85 val_85 2
+86 val_86 86 val_86 2
+87 val_87 87 val_87 2
9 val_9 9 val_9 2
90 val_90 90 val_90 2
92 val_92 92 val_92 2
95 val_95 95 val_95 2
-10 val_10 10 val_10 2
-100 val_100 100 val_100 2
-11 val_11 11 val_11 2
-113 val_113 113 val_113 2
-114 val_114 114 val_114 2
-118 val_118 118 val_118 2
-125 val_125 125 val_125 2
-133 val_133 133 val_133 2
-137 val_137 137 val_137 2
-143 val_143 143 val_143 2
-145 val_145 145 val_145 2
-146 val_146 146 val_146 2
-149 val_149 149 val_149 2
-15 val_15 15 val_15 2
-152 val_152 152 val_152 2
-153 val_153 153 val_153 2
-156 val_156 156 val_156 2
-162 val_162 162 val_162 2
-163 val_163 163 val_163 2
-165 val_165 165 val_165 2
-166 val_166 166 val_166 2
-168 val_168 168 val_168 2
-17 val_17 17 val_17 2
-172 val_172 172 val_172 2
-176 val_176 176 val_176 2
-180 val_180 180 val_180 2
-181 val_181 181 val_181 2
-183 val_183 183 val_183 2
-186 val_186 186 val_186 2
-189 val_189 189 val_189 2
-19 val_19 19 val_19 2
-190 val_190 190 val_190 2
-192 val_192 192 val_192 2
-195 val_195 195 val_195 2
-196 val_196 196 val_196 2
-20 val_20 20 val_20 2
-203 val_203 203 val_203 2
-207 val_207 207 val_207 2
-209 val_209 209 val_209 2
-213 val_213 213 val_213 2
-214 val_214 214 val_214 2
-222 val_222 222 val_222 2
-223 val_223 223 val_223 2
-224 val_224 224 val_224 2
-226 val_226 226 val_226 2
-228 val_228 228 val_228 2
-239 val_239 239 val_239 2
-24 val_24 NULL NULL 2
-242 val_242 242 val_242 2
-247 val_247 247 val_247 2
-248 val_248 248 val_248 2
-249 val_249 249 val_249 2
-255 val_255 255 val_255 2
-258 val_258 258 val_258 2
-26 val_26 26 val_26 2
-262 val_262 262 val_262 2
-263 val_263 263 val_263 2
-265 val_265 265 val_265 2
-27 val_27 27 val_27 2
-27 val_27 NULL NULL 2
-272 val_272 272 val_272 2
-273 val_273 273 val_273 2
-275 val_275 275 val_275 2
-278 val_278 278 val_278 2
-28 val_28 28 val_28 2
-283 val_283 283 val_283 2
-284 val_284 284 val_284 2
-286 val_286 286 val_286 2
-289 val_289 289 val_289 2
-292 val_292 292 val_292 2
-296 val_296 296 val_296 2
-298 val_298 298 val_298 2
-30 val_30 30 val_30 2
-30 val_30 NULL NULL 2
-307 val_307 307 val_307 2
-309 val_309 309 val_309 2
-310 val_310 310 val_310 2
-315 val_315 315 val_315 2
-317 val_317 317 val_317 2
-322 val_322 322 val_322 2
-323 val_323 323 val_323 2
-325 val_325 325 val_325 2
-332 val_332 332 val_332 2
-338 val_338 338 val_338 2
-339 val_339 339 val_339 2
-34 val_34 34 val_34 2
-34 val_34 NULL NULL 2
-341 val_341 341 val_341 2
-342 val_342 342 val_342 2
-348 val_348 348 val_348 2
-35 val_35 35 val_35 2
-35 val_35 NULL NULL 2
-351 val_351 351 val_351 2
-353 val_353 353 val_353 2
-365 val_365 365 val_365 2
-368 val_368 368 val_368 2
-369 val_369 369 val_369 2
-37 val_37 37 val_37 2
-37 val_37 NULL NULL 2
-374 val_374 374 val_374 2
-375 val_375 375 val_375 2
-377 val_377 377 val_377 2
-382 val_382 382 val_382 2
-392 val_392 392 val_392 2
-396 val_396 396 val_396 2
-399 val_399 399 val_399 2
-400 val_400 400 val_400 2
-401 val_401 401 val_401 2
-404 val_404 404 val_404 2
-409 val_409 409 val_409 2
-411 val_411 411 val_411 2
-414 val_414 414 val_414 2
-417 val_417 417 val_417 2
-42 val_42 42 val_42 2
-42 val_42 NULL NULL 2
-421 val_421 421 val_421 2
-427 val_427 427 val_427 2
-429 val_429 429 val_429 2
-43 val_43 43 val_43 2
-43 val_43 NULL NULL 2
-430 val_430 430 val_430 2
-431 val_431 431 val_431 2
-432 val_432 432 val_432 2
-435 val_435 435 val_435 2
-437 val_437 437 val_437 2
-438 val_438 438 val_438 2
-439 val_439 439 val_439 2
-443 val_443 443 val_443 2
-444 val_444 444 val_444 2
-446 val_446 446 val_446 2
-454 val_454 454 val_454 2
-455 val_455 455 val_455 2
-457 val_457 457 val_457 2
-458 val_458 458 val_458 2
-459 val_459 459 val_459 2
-462 val_462 462 val_462 2
-463 val_463 463 val_463 2
-47 val_47 47 val_47 2
-472 val_472 472 val_472 2
-477 val_477 477 val_477 2
-478 val_478 478 val_478 2
-482 val_482 482 val_482 2
-483 val_483 483 val_483 2
-484 val_484 484 val_484 2
-485 val_485 485 val_485 2
-489 val_489 489 val_489 2
-491 val_491 491 val_491 2
-492 val_492 492 val_492 2
-497 val_497 497 val_497 2
-498 val_498 498 val_498 2
-54 val_54 54 val_54 2
-57 val_57 57 val_57 2
-58 val_58 58 val_58 2
-65 val_65 65 val_65 2
-67 val_67 67 val_67 2
-70 val_70 70 val_70 2
-72 val_72 72 val_72 2
-77 val_77 77 val_77 2
-78 val_78 78 val_78 2
-80 val_80 80 val_80 2
-83 val_83 83 val_83 2
-84 val_84 84 val_84 2
-85 val_85 85 val_85 2
-86 val_86 86 val_86 2
-87 val_87 87 val_87 2
96 val_96 96 val_96 2
97 val_97 97 val_97 2
98 val_98 98 val_98 2
@@ -4807,6 +4807,7 @@ from (
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
POSTHOOK: Output: hdfs://### HDFS PATH ###
+0 val_0
10 val_10
100 val_100
103 val_103
@@ -4814,34 +4815,58 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
105 val_105
11 val_11
111 val_111
+113 val_113
114 val_114
116 val_116
118 val_118
+119 val_119
+12 val_12
+120 val_120
125 val_125
126 val_126
+128 val_128
+129 val_129
131 val_131
133 val_133
134 val_134
+136 val_136
+137 val_137
+138 val_138
143 val_143
+145 val_145
+146 val_146
+149 val_149
15 val_15
150 val_150
152 val_152
+153 val_153
155 val_155
+156 val_156
157 val_157
+158 val_158
+160 val_160
+162 val_162
163 val_163
164 val_164
+165 val_165
+166 val_166
167 val_167
168 val_168
169 val_169
17 val_17
170 val_170
+172 val_172
174 val_174
175 val_175
176 val_176
177 val_177
+178 val_178
+179 val_179
18 val_18
180 val_180
+181 val_181
183 val_183
+186 val_186
187 val_187
189 val_189
19 val_19
@@ -4849,7 +4874,9 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
191 val_191
192 val_192
193 val_193
+194 val_194
195 val_195
+196 val_196
197 val_197
199 val_199
2 val_2
@@ -4861,261 +4888,234 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
205 val_205
207 val_207
208 val_208
+209 val_209
213 val_213
214 val_214
216 val_216
217 val_217
+218 val_218
+219 val_219
221 val_221
+222 val_222
+223 val_223
+224 val_224
+226 val_226
+228 val_228
229 val_229
230 val_230
+233 val_233
+235 val_235
237 val_237
238 val_238
239 val_239
24 val_24
241 val_241
+242 val_242
244 val_244
+247 val_247
248 val_248
+249 val_249
252 val_252
+255 val_255
+256 val_256
+257 val_257
258 val_258
26 val_26
+260 val_260
+262 val_262
263 val_263
+265 val_265
+266 val_266
27 val_27
272 val_272
273 val_273
274 val_274
+275 val_275
+277 val_277
278 val_278
+28 val_28
+280 val_280
281 val_281
282 val_282
283 val_283
+284 val_284
285 val_285
286 val_286
287 val_287
288 val_288
+289 val_289
291 val_291
+292 val_292
+296 val_296
298 val_298
30 val_30
302 val_302
305 val_305
306 val_306
307 val_307
+308 val_308
309 val_309
+310 val_310
+311 val_311
315 val_315
316 val_316
+317 val_317
+318 val_318
321 val_321
322 val_322
323 val_323
325 val_325
+327 val_327
33 val_33
+331 val_331
332 val_332
333 val_333
335 val_335
336 val_336
338 val_338
+339 val_339
34 val_34
+341 val_341
+342 val_342
344 val_344
+345 val_345
348 val_348
35 val_35
+351 val_351
353 val_353
+356 val_356
360 val_360
362 val_362
+364 val_364
+365 val_365
366 val_366
367 val_367
+368 val_368
+369 val_369
+37 val_37
373 val_373
+374 val_374
+375 val_375
+377 val_377
+378 val_378
379 val_379
+382 val_382
+384 val_384
386 val_386
+389 val_389
+392 val_392
+393 val_393
394 val_394
+395 val_395
+396 val_396
+397 val_397
399 val_399
4 val_4
+400 val_400
401 val_401
402 val_402
+403 val_403
404 val_404
406 val_406
+407 val_407
409 val_409
41 val_41
411 val_411
413 val_413
+414 val_414
+417 val_417
418 val_418
419 val_419
+42 val_42
421 val_421
424 val_424
427 val_427
429 val_429
+43 val_43
+430 val_430
431 val_431
432 val_432
435 val_435
436 val_436
437 val_437
438 val_438
+439 val_439
+44 val_44
+443 val_443
444 val_444
+446 val_446
+448 val_448
+449 val_449
452 val_452
453 val_453
+454 val_454
455 val_455
457 val_457
+458 val_458
459 val_459
+460 val_460
+462 val_462
463 val_463
466 val_466
+467 val_467
+468 val_468
+469 val_469
47 val_47
+470 val_470
472 val_472
475 val_475
+477 val_477
478 val_478
479 val_479
+480 val_480
+481 val_481
482 val_482
483 val_483
484 val_484
+485 val_485
+487 val_487
+489 val_489
+490 val_490
+491 val_491
492 val_492
+493 val_493
494 val_494
+495 val_495
+496 val_496
+497 val_497
498 val_498
5 val_5
+51 val_51
+53 val_53
54 val_54
57 val_57
+58 val_58
+64 val_64
65 val_65
+66 val_66
+67 val_67
69 val_69
+70 val_70
72 val_72
+74 val_74
76 val_76
+77 val_77
78 val_78
8 val_8
80 val_80
+82 val_82
+83 val_83
+84 val_84
+85 val_85
+86 val_86
+87 val_87
+9 val_9
90 val_90
+92 val_92
+95 val_95
+96 val_96
+97 val_97
98 val_98
-0 val_0
-113 val_113
-119 val_119
-12 val_12
-120 val_120
-128 val_128
-129 val_129
-136 val_136
-137 val_137
-138 val_138
-145 val_145
-146 val_146
-149 val_149
-153 val_153
-156 val_156
-158 val_158
-160 val_160
-162 val_162
-165 val_165
-166 val_166
-172 val_172
-178 val_178
-179 val_179
-181 val_181
-186 val_186
-194 val_194
-196 val_196
-209 val_209
-218 val_218
-219 val_219
-222 val_222
-223 val_223
-224 val_224
-226 val_226
-228 val_228
-233 val_233
-235 val_235
-242 val_242
-247 val_247
-249 val_249
-255 val_255
-256 val_256
-257 val_257
-260 val_260
-262 val_262
-265 val_265
-266 val_266
-275 val_275
-277 val_277
-28 val_28
-280 val_280
-284 val_284
-289 val_289
-292 val_292
-296 val_296
-308 val_308
-310 val_310
-311 val_311
-317 val_317
-318 val_318
-327 val_327
-331 val_331
-339 val_339
-341 val_341
-342 val_342
-345 val_345
-351 val_351
-356 val_356
-364 val_364
-365 val_365
-368 val_368
-369 val_369
-37 val_37
-374 val_374
-375 val_375
-377 val_377
-378 val_378
-382 val_382
-384 val_384
-389 val_389
-392 val_392
-393 val_393
-395 val_395
-396 val_396
-397 val_397
-400 val_400
-403 val_403
-407 val_407
-414 val_414
-417 val_417
-42 val_42
-43 val_43
-430 val_430
-439 val_439
-44 val_44
-443 val_443
-446 val_446
-448 val_448
-449 val_449
-454 val_454
-458 val_458
-460 val_460
-462 val_462
-467 val_467
-468 val_468
-469 val_469
-470 val_470
-477 val_477
-480 val_480
-481 val_481
-485 val_485
-487 val_487
-489 val_489
-490 val_490
-491 val_491
-493 val_493
-495 val_495
-496 val_496
-497 val_497
-51 val_51
-53 val_53
-58 val_58
-64 val_64
-66 val_66
-67 val_67
-70 val_70
-74 val_74
-77 val_77
-82 val_82
-83 val_83
-84 val_84
-85 val_85
-86 val_86
-87 val_87
-9 val_9
-92 val_92
-95 val_95
-96 val_96
-97 val_97
PREHOOK: query: create table src2_n2 as select key, count(1) as count from src
group by key
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
@@ -5674,8 +5674,8 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
0 3
2 1
4 1
-5 3
5 1
+5 3
8 1
9 1
PREHOOK: query: explain extended
@@ -6618,8 +6618,8 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
0 3
2 1
4 1
-5 3
5 1
+5 3
8 1
9 1
PREHOOK: query: create table tmp_srcpart_n0 like srcpart
@@ -7299,523 +7299,162 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
1 291 val_291
1 292 val_292
1 296 val_296
-1 298 val_298
-1 30 val_30
-1 302 val_302
-1 305 val_305
-1 306 val_306
-1 307 val_307
-1 308 val_308
-1 309 val_309
-1 310 val_310
-1 311 val_311
-1 315 val_315
-1 316 val_316
-1 317 val_317
-1 318 val_318
-1 321 val_321
-1 322 val_322
-1 323 val_323
-1 325 val_325
-1 327 val_327
-1 33 val_33
-1 331 val_331
-1 332 val_332
-1 333 val_333
-1 335 val_335
-1 336 val_336
-1 338 val_338
-1 339 val_339
-1 34 val_34
-1 341 val_341
-1 342 val_342
-1 344 val_344
-1 345 val_345
-1 348 val_348
-1 35 val_35
-1 351 val_351
-1 353 val_353
-1 356 val_356
-1 360 val_360
-1 362 val_362
-1 364 val_364
-1 365 val_365
-1 366 val_366
-1 367 val_367
-1 368 val_368
-1 369 val_369
-1 37 val_37
-1 373 val_373
-1 374 val_374
-1 375 val_375
-1 377 val_377
-1 378 val_378
-1 379 val_379
-1 382 val_382
-1 384 val_384
-1 386 val_386
-1 389 val_389
-1 392 val_392
-1 393 val_393
-1 394 val_394
-1 395 val_395
-1 396 val_396
-1 397 val_397
-1 399 val_399
-1 4 val_4
-1 400 val_400
-1 401 val_401
-1 402 val_402
-1 403 val_403
-1 404 val_404
-1 406 val_406
-1 407 val_407
-1 409 val_409
-1 41 val_41
-1 411 val_411
-1 413 val_413
-1 414 val_414
-1 417 val_417
-1 418 val_418
-1 419 val_419
-1 42 val_42
-1 421 val_421
-1 424 val_424
-1 427 val_427
-1 429 val_429
-1 43 val_43
-1 430 val_430
-1 431 val_431
-1 432 val_432
-1 435 val_435
-1 436 val_436
-1 437 val_437
-1 438 val_438
-1 439 val_439
-1 44 val_44
-1 443 val_443
-1 444 val_444
-1 446 val_446
-1 448 val_448
-1 449 val_449
-1 452 val_452
-1 453 val_453
-1 454 val_454
-1 455 val_455
-1 457 val_457
-1 458 val_458
-1 459 val_459
-1 460 val_460
-1 462 val_462
-1 463 val_463
-1 466 val_466
-1 467 val_467
-1 468 val_468
-1 469 val_469
-1 47 val_47
-1 470 val_470
-1 472 val_472
-1 475 val_475
-1 477 val_477
-1 478 val_478
-1 479 val_479
-1 480 val_480
-1 481 val_481
-1 482 val_482
-1 483 val_483
-1 484 val_484
-1 485 val_485
-1 487 val_487
-1 489 val_489
-1 490 val_490
-1 491 val_491
-1 492 val_492
-1 493 val_493
-1 494 val_494
-1 495 val_495
-1 496 val_496
-1 497 val_497
-1 498 val_498
-1 5 val_5
-1 51 val_51
-1 53 val_53
-1 54 val_54
-1 57 val_57
-1 58 val_58
-1 64 val_64
-1 65 val_65
-1 66 val_66
-1 67 val_67
-1 69 val_69
-1 70 val_70
-1 72 val_72
-1 74 val_74
-1 76 val_76
-1 77 val_77
-1 78 val_78
-1 8 val_8
-1 80 val_80
-1 82 val_82
-1 83 val_83
-1 84 val_84
-1 85 val_85
-1 86 val_86
-1 87 val_87
-1 9 val_9
-1 90 val_90
-1 92 val_92
-1 95 val_95
-1 96 val_96
-1 97 val_97
-1 98 val_98
-PREHOOK: query: SELECT
-count(1) as counts,
-key,
-value
-FROM
-(
-
-SELECT
-a.key, a.value
-FROM srcpart a JOIN srcpart b
-ON a.ds='2008-04-08' and a.hr='11' and b.ds='2008-04-08' and b.hr='12'
-AND a.key = b.key
-
-UNION DISTINCT
-
-select key, value
-FROM srcpart LATERAL VIEW explode(array(1,2,3)) myTable AS myCol
-WHERE ds='2008-04-08' and hr='11'
-) a
-group by key, value
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Output: hdfs://### HDFS PATH ###
-POSTHOOK: query: SELECT
-count(1) as counts,
-key,
-value
-FROM
-(
-
-SELECT
-a.key, a.value
-FROM srcpart a JOIN srcpart b
-ON a.ds='2008-04-08' and a.hr='11' and b.ds='2008-04-08' and b.hr='12'
-AND a.key = b.key
-
-UNION DISTINCT
-
-select key, value
-FROM srcpart LATERAL VIEW explode(array(1,2,3)) myTable AS myCol
-WHERE ds='2008-04-08' and hr='11'
-) a
-group by key, value
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Output: hdfs://### HDFS PATH ###
-1 10 val_10
-1 100 val_100
-1 103 val_103
-1 104 val_104
-1 105 val_105
-1 11 val_11
-1 111 val_111
-1 114 val_114
-1 116 val_116
-1 118 val_118
-1 125 val_125
-1 126 val_126
-1 131 val_131
-1 133 val_133
-1 134 val_134
-1 143 val_143
-1 15 val_15
-1 150 val_150
-1 152 val_152
-1 155 val_155
-1 157 val_157
-1 163 val_163
-1 164 val_164
-1 167 val_167
-1 168 val_168
-1 169 val_169
-1 17 val_17
-1 170 val_170
-1 174 val_174
-1 175 val_175
-1 176 val_176
-1 177 val_177
-1 18 val_18
-1 180 val_180
-1 183 val_183
-1 187 val_187
-1 189 val_189
-1 19 val_19
-1 190 val_190
-1 191 val_191
-1 192 val_192
-1 193 val_193
-1 195 val_195
-1 197 val_197
-1 199 val_199
-1 2 val_2
-1 20 val_20
-1 200 val_200
-1 201 val_201
-1 202 val_202
-1 203 val_203
-1 205 val_205
-1 207 val_207
-1 208 val_208
-1 213 val_213
-1 214 val_214
-1 216 val_216
-1 217 val_217
-1 221 val_221
-1 229 val_229
-1 230 val_230
-1 237 val_237
-1 238 val_238
-1 239 val_239
-1 24 val_24
-1 241 val_241
-1 244 val_244
-1 248 val_248
-1 252 val_252
-1 258 val_258
-1 26 val_26
-1 263 val_263
-1 27 val_27
-1 272 val_272
-1 273 val_273
-1 274 val_274
-1 278 val_278
-1 281 val_281
-1 282 val_282
-1 283 val_283
-1 285 val_285
-1 286 val_286
-1 287 val_287
-1 288 val_288
-1 291 val_291
-1 298 val_298
-1 30 val_30
-1 302 val_302
-1 305 val_305
-1 306 val_306
-1 307 val_307
-1 309 val_309
-1 315 val_315
-1 316 val_316
-1 321 val_321
-1 322 val_322
-1 323 val_323
-1 325 val_325
-1 33 val_33
-1 332 val_332
-1 333 val_333
-1 335 val_335
-1 336 val_336
-1 338 val_338
-1 34 val_34
-1 344 val_344
-1 348 val_348
-1 35 val_35
-1 353 val_353
-1 360 val_360
-1 362 val_362
-1 366 val_366
-1 367 val_367
-1 373 val_373
-1 379 val_379
-1 386 val_386
-1 394 val_394
-1 399 val_399
-1 4 val_4
-1 401 val_401
-1 402 val_402
-1 404 val_404
-1 406 val_406
-1 409 val_409
-1 41 val_41
-1 411 val_411
-1 413 val_413
-1 418 val_418
-1 419 val_419
-1 421 val_421
-1 424 val_424
-1 427 val_427
-1 429 val_429
-1 431 val_431
-1 432 val_432
-1 435 val_435
-1 436 val_436
-1 437 val_437
-1 438 val_438
-1 444 val_444
-1 452 val_452
-1 453 val_453
-1 455 val_455
-1 457 val_457
-1 459 val_459
-1 463 val_463
-1 466 val_466
-1 47 val_47
-1 472 val_472
-1 475 val_475
-1 478 val_478
-1 479 val_479
-1 482 val_482
-1 483 val_483
-1 484 val_484
-1 492 val_492
-1 494 val_494
-1 498 val_498
-1 5 val_5
-1 54 val_54
-1 57 val_57
-1 65 val_65
-1 69 val_69
-1 72 val_72
-1 76 val_76
-1 78 val_78
-1 8 val_8
-1 80 val_80
-1 90 val_90
-1 98 val_98
-1 0 val_0
-1 113 val_113
-1 119 val_119
-1 12 val_12
-1 120 val_120
-1 128 val_128
-1 129 val_129
-1 136 val_136
-1 137 val_137
-1 138 val_138
-1 145 val_145
-1 146 val_146
-1 149 val_149
-1 153 val_153
-1 156 val_156
-1 158 val_158
-1 160 val_160
-1 162 val_162
-1 165 val_165
-1 166 val_166
-1 172 val_172
-1 178 val_178
-1 179 val_179
-1 181 val_181
-1 186 val_186
-1 194 val_194
-1 196 val_196
-1 209 val_209
-1 218 val_218
-1 219 val_219
-1 222 val_222
-1 223 val_223
-1 224 val_224
-1 226 val_226
-1 228 val_228
-1 233 val_233
-1 235 val_235
-1 242 val_242
-1 247 val_247
-1 249 val_249
-1 255 val_255
-1 256 val_256
-1 257 val_257
-1 260 val_260
-1 262 val_262
-1 265 val_265
-1 266 val_266
-1 275 val_275
-1 277 val_277
-1 28 val_28
-1 280 val_280
-1 284 val_284
-1 289 val_289
-1 292 val_292
-1 296 val_296
+1 298 val_298
+1 30 val_30
+1 302 val_302
+1 305 val_305
+1 306 val_306
+1 307 val_307
1 308 val_308
+1 309 val_309
1 310 val_310
1 311 val_311
+1 315 val_315
+1 316 val_316
1 317 val_317
1 318 val_318
+1 321 val_321
+1 322 val_322
+1 323 val_323
+1 325 val_325
1 327 val_327
+1 33 val_33
1 331 val_331
+1 332 val_332
+1 333 val_333
+1 335 val_335
+1 336 val_336
+1 338 val_338
1 339 val_339
+1 34 val_34
1 341 val_341
1 342 val_342
+1 344 val_344
1 345 val_345
+1 348 val_348
+1 35 val_35
1 351 val_351
+1 353 val_353
1 356 val_356
+1 360 val_360
+1 362 val_362
1 364 val_364
1 365 val_365
+1 366 val_366
+1 367 val_367
1 368 val_368
1 369 val_369
1 37 val_37
+1 373 val_373
1 374 val_374
1 375 val_375
1 377 val_377
1 378 val_378
+1 379 val_379
1 382 val_382
1 384 val_384
+1 386 val_386
1 389 val_389
1 392 val_392
1 393 val_393
+1 394 val_394
1 395 val_395
1 396 val_396
1 397 val_397
+1 399 val_399
+1 4 val_4
1 400 val_400
+1 401 val_401
+1 402 val_402
1 403 val_403
+1 404 val_404
+1 406 val_406
1 407 val_407
+1 409 val_409
+1 41 val_41
+1 411 val_411
+1 413 val_413
1 414 val_414
1 417 val_417
+1 418 val_418
+1 419 val_419
1 42 val_42
+1 421 val_421
+1 424 val_424
+1 427 val_427
+1 429 val_429
1 43 val_43
1 430 val_430
+1 431 val_431
+1 432 val_432
+1 435 val_435
+1 436 val_436
+1 437 val_437
+1 438 val_438
1 439 val_439
1 44 val_44
1 443 val_443
+1 444 val_444
1 446 val_446
1 448 val_448
1 449 val_449
+1 452 val_452
+1 453 val_453
1 454 val_454
+1 455 val_455
+1 457 val_457
1 458 val_458
+1 459 val_459
1 460 val_460
1 462 val_462
+1 463 val_463
+1 466 val_466
1 467 val_467
1 468 val_468
1 469 val_469
+1 47 val_47
1 470 val_470
+1 472 val_472
+1 475 val_475
1 477 val_477
+1 478 val_478
+1 479 val_479
1 480 val_480
1 481 val_481
+1 482 val_482
+1 483 val_483
+1 484 val_484
1 485 val_485
1 487 val_487
1 489 val_489
1 490 val_490
1 491 val_491
+1 492 val_492
1 493 val_493
+1 494 val_494
1 495 val_495
1 496 val_496
1 497 val_497
+1 498 val_498
+1 5 val_5
1 51 val_51
1 53 val_53
+1 54 val_54
+1 57 val_57
1 58 val_58
1 64 val_64
+1 65 val_65
1 66 val_66
1 67 val_67
+1 69 val_69
1 70 val_70
+1 72 val_72
1 74 val_74
+1 76 val_76
1 77 val_77
+1 78 val_78
+1 8 val_8
+1 80 val_80
1 82 val_82
1 83 val_83
1 84 val_84
@@ -7823,10 +7462,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
1 86 val_86
1 87 val_87
1 9 val_9
+1 90 val_90
1 92 val_92
1 95 val_95
1 96 val_96
1 97 val_97
+1 98 val_98
PREHOOK: query: SELECT
count(1) as counts,
key,
@@ -7877,6 +7518,7 @@ POSTHOOK: Input: default@srcpart
POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
POSTHOOK: Output: hdfs://### HDFS PATH ###
+1 0 val_0
1 10 val_10
1 100 val_100
1 103 val_103
@@ -7884,34 +7526,58 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
1 105 val_105
1 11 val_11
1 111 val_111
+1 113 val_113
1 114 val_114
1 116 val_116
1 118 val_118
+1 119 val_119
+1 12 val_12
+1 120 val_120
1 125 val_125
1 126 val_126
+1 128 val_128
+1 129 val_129
1 131 val_131
1 133 val_133
1 134 val_134
+1 136 val_136
+1 137 val_137
+1 138 val_138
1 143 val_143
+1 145 val_145
+1 146 val_146
+1 149 val_149
1 15 val_15
1 150 val_150
1 152 val_152
+1 153 val_153
1 155 val_155
+1 156 val_156
1 157 val_157
+1 158 val_158
+1 160 val_160
+1 162 val_162
1 163 val_163
1 164 val_164
+1 165 val_165
+1 166 val_166
1 167 val_167
1 168 val_168
1 169 val_169
1 17 val_17
1 170 val_170
+1 172 val_172
1 174 val_174
1 175 val_175
1 176 val_176
1 177 val_177
+1 178 val_178
+1 179 val_179
1 18 val_18
1 180 val_180
+1 181 val_181
1 183 val_183
+1 186 val_186
1 187 val_187
1 189 val_189
1 19 val_19
@@ -7919,7 +7585,9 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
1 191 val_191
1 192 val_192
1 193 val_193
+1 194 val_194
1 195 val_195
+1 196 val_196
1 197 val_197
1 199 val_199
1 2 val_2
@@ -7931,250 +7599,580 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
1 205 val_205
1 207 val_207
1 208 val_208
+1 209 val_209
1 213 val_213
1 214 val_214
1 216 val_216
1 217 val_217
+1 218 val_218
+1 219 val_219
1 221 val_221
+1 222 val_222
+1 223 val_223
+1 224 val_224
+1 226 val_226
+1 228 val_228
1 229 val_229
1 230 val_230
+1 233 val_233
+1 235 val_235
1 237 val_237
1 238 val_238
1 239 val_239
1 24 val_24
1 241 val_241
+1 242 val_242
1 244 val_244
+1 247 val_247
1 248 val_248
+1 249 val_249
1 252 val_252
+1 255 val_255
+1 256 val_256
+1 257 val_257
1 258 val_258
1 26 val_26
+1 260 val_260
+1 262 val_262
1 263 val_263
+1 265 val_265
+1 266 val_266
1 27 val_27
1 272 val_272
1 273 val_273
1 274 val_274
+1 275 val_275
+1 277 val_277
1 278 val_278
+1 28 val_28
+1 280 val_280
1 281 val_281
1 282 val_282
1 283 val_283
+1 284 val_284
1 285 val_285
1 286 val_286
1 287 val_287
1 288 val_288
+1 289 val_289
1 291 val_291
+1 292 val_292
+1 296 val_296
1 298 val_298
1 30 val_30
1 302 val_302
1 305 val_305
1 306 val_306
1 307 val_307
+1 308 val_308
1 309 val_309
+1 310 val_310
+1 311 val_311
1 315 val_315
1 316 val_316
+1 317 val_317
+1 318 val_318
1 321 val_321
1 322 val_322
1 323 val_323
1 325 val_325
+1 327 val_327
1 33 val_33
+1 331 val_331
1 332 val_332
1 333 val_333
1 335 val_335
1 336 val_336
1 338 val_338
+1 339 val_339
1 34 val_34
+1 341 val_341
+1 342 val_342
1 344 val_344
+1 345 val_345
1 348 val_348
1 35 val_35
+1 351 val_351
1 353 val_353
+1 356 val_356
1 360 val_360
1 362 val_362
+1 364 val_364
+1 365 val_365
1 366 val_366
1 367 val_367
+1 368 val_368
+1 369 val_369
+1 37 val_37
1 373 val_373
+1 374 val_374
+1 375 val_375
+1 377 val_377
+1 378 val_378
1 379 val_379
+1 382 val_382
+1 384 val_384
1 386 val_386
+1 389 val_389
+1 392 val_392
+1 393 val_393
1 394 val_394
+1 395 val_395
+1 396 val_396
+1 397 val_397
1 399 val_399
1 4 val_4
+1 400 val_400
1 401 val_401
1 402 val_402
+1 403 val_403
1 404 val_404
1 406 val_406
+1 407 val_407
1 409 val_409
1 41 val_41
1 411 val_411
1 413 val_413
+1 414 val_414
+1 417 val_417
1 418 val_418
1 419 val_419
+1 42 val_42
1 421 val_421
1 424 val_424
1 427 val_427
1 429 val_429
+1 43 val_43
+1 430 val_430
1 431 val_431
1 432 val_432
1 435 val_435
1 436 val_436
1 437 val_437
1 438 val_438
+1 439 val_439
+1 44 val_44
+1 443 val_443
1 444 val_444
+1 446 val_446
+1 448 val_448
+1 449 val_449
1 452 val_452
1 453 val_453
+1 454 val_454
1 455 val_455
1 457 val_457
+1 458 val_458
1 459 val_459
+1 460 val_460
+1 462 val_462
1 463 val_463
1 466 val_466
+1 467 val_467
+1 468 val_468
+1 469 val_469
1 47 val_47
+1 470 val_470
1 472 val_472
1 475 val_475
+1 477 val_477
1 478 val_478
1 479 val_479
+1 480 val_480
+1 481 val_481
1 482 val_482
1 483 val_483
1 484 val_484
+1 485 val_485
+1 487 val_487
+1 489 val_489
+1 490 val_490
+1 491 val_491
1 492 val_492
+1 493 val_493
1 494 val_494
+1 495 val_495
+1 496 val_496
+1 497 val_497
1 498 val_498
1 5 val_5
+1 51 val_51
+1 53 val_53
1 54 val_54
1 57 val_57
+1 58 val_58
+1 64 val_64
1 65 val_65
+1 66 val_66
+1 67 val_67
1 69 val_69
+1 70 val_70
1 72 val_72
+1 74 val_74
1 76 val_76
+1 77 val_77
1 78 val_78
1 8 val_8
1 80 val_80
+1 82 val_82
+1 83 val_83
+1 84 val_84
+1 85 val_85
+1 86 val_86
+1 87 val_87
+1 9 val_9
1 90 val_90
+1 92 val_92
+1 95 val_95
+1 96 val_96
+1 97 val_97
1 98 val_98
+PREHOOK: query: SELECT
+count(1) as counts,
+key,
+value
+FROM
+(
+
+SELECT
+a.key, a.value
+FROM srcpart a JOIN srcpart b
+ON a.ds='2008-04-08' and a.hr='11' and b.ds='2008-04-08' and b.hr='12'
+AND a.key = b.key
+
+UNION DISTINCT
+
+select key, value
+FROM srcpart LATERAL VIEW explode(array(1,2,3)) myTable AS myCol
+WHERE ds='2008-04-08' and hr='11'
+) a
+group by key, value
+PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: hdfs://### HDFS PATH ###
+POSTHOOK: query: SELECT
+count(1) as counts,
+key,
+value
+FROM
+(
+
+SELECT
+a.key, a.value
+FROM srcpart a JOIN srcpart b
+ON a.ds='2008-04-08' and a.hr='11' and b.ds='2008-04-08' and b.hr='12'
+AND a.key = b.key
+
+UNION DISTINCT
+
+select key, value
+FROM srcpart LATERAL VIEW explode(array(1,2,3)) myTable AS myCol
+WHERE ds='2008-04-08' and hr='11'
+) a
+group by key, value
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: hdfs://### HDFS PATH ###
1 0 val_0
+1 10 val_10
+1 100 val_100
+1 103 val_103
+1 104 val_104
+1 105 val_105
+1 11 val_11
+1 111 val_111
1 113 val_113
+1 114 val_114
+1 116 val_116
+1 118 val_118
1 119 val_119
1 12 val_12
1 120 val_120
+1 125 val_125
+1 126 val_126
1 128 val_128
1 129 val_129
+1 131 val_131
+1 133 val_133
+1 134 val_134
1 136 val_136
1 137 val_137
1 138 val_138
+1 143 val_143
1 145 val_145
1 146 val_146
1 149 val_149
+1 15 val_15
+1 150 val_150
+1 152 val_152
1 153 val_153
+1 155 val_155
1 156 val_156
+1 157 val_157
1 158 val_158
1 160 val_160
1 162 val_162
+1 163 val_163
+1 164 val_164
1 165 val_165
1 166 val_166
+1 167 val_167
+1 168 val_168
+1 169 val_169
+1 17 val_17
+1 170 val_170
1 172 val_172
+1 174 val_174
+1 175 val_175
+1 176 val_176
+1 177 val_177
1 178 val_178
1 179 val_179
+1 18 val_18
+1 180 val_180
1 181 val_181
+1 183 val_183
1 186 val_186
+1 187 val_187
+1 189 val_189
+1 19 val_19
+1 190 val_190
+1 191 val_191
+1 192 val_192
+1 193 val_193
1 194 val_194
+1 195 val_195
1 196 val_196
+1 197 val_197
+1 199 val_199
+1 2 val_2
+1 20 val_20
+1 200 val_200
+1 201 val_201
+1 202 val_202
+1 203 val_203
+1 205 val_205
+1 207 val_207
+1 208 val_208
1 209 val_209
+1 213 val_213
+1 214 val_214
+1 216 val_216
+1 217 val_217
1 218 val_218
1 219 val_219
+1 221 val_221
1 222 val_222
1 223 val_223
1 224 val_224
1 226 val_226
1 228 val_228
+1 229 val_229
+1 230 val_230
1 233 val_233
1 235 val_235
+1 237 val_237
+1 238 val_238
+1 239 val_239
+1 24 val_24
+1 241 val_241
1 242 val_242
+1 244 val_244
1 247 val_247
+1 248 val_248
1 249 val_249
+1 252 val_252
1 255 val_255
1 256 val_256
1 257 val_257
+1 258 val_258
+1 26 val_26
1 260 val_260
1 262 val_262
+1 263 val_263
1 265 val_265
1 266 val_266
+1 27 val_27
+1 272 val_272
+1 273 val_273
+1 274 val_274
1 275 val_275
1 277 val_277
+1 278 val_278
1 28 val_28
1 280 val_280
+1 281 val_281
+1 282 val_282
+1 283 val_283
1 284 val_284
+1 285 val_285
+1 286 val_286
+1 287 val_287
+1 288 val_288
1 289 val_289
+1 291 val_291
1 292 val_292
1 296 val_296
+1 298 val_298
+1 30 val_30
+1 302 val_302
+1 305 val_305
+1 306 val_306
+1 307 val_307
1 308 val_308
+1 309 val_309
1 310 val_310
1 311 val_311
+1 315 val_315
+1 316 val_316
1 317 val_317
1 318 val_318
+1 321 val_321
+1 322 val_322
+1 323 val_323
+1 325 val_325
1 327 val_327
+1 33 val_33
1 331 val_331
+1 332 val_332
+1 333 val_333
+1 335 val_335
+1 336 val_336
+1 338 val_338
1 339 val_339
+1 34 val_34
1 341 val_341
1 342 val_342
+1 344 val_344
1 345 val_345
+1 348 val_348
+1 35 val_35
1 351 val_351
+1 353 val_353
1 356 val_356
+1 360 val_360
+1 362 val_362
1 364 val_364
1 365 val_365
+1 366 val_366
+1 367 val_367
1 368 val_368
1 369 val_369
1 37 val_37
+1 373 val_373
1 374 val_374
1 375 val_375
1 377 val_377
1 378 val_378
+1 379 val_379
1 382 val_382
1 384 val_384
+1 386 val_386
1 389 val_389
1 392 val_392
1 393 val_393
+1 394 val_394
1 395 val_395
1 396 val_396
1 397 val_397
+1 399 val_399
+1 4 val_4
1 400 val_400
+1 401 val_401
+1 402 val_402
1 403 val_403
+1 404 val_404
+1 406 val_406
1 407 val_407
+1 409 val_409
+1 41 val_41
+1 411 val_411
+1 413 val_413
1 414 val_414
1 417 val_417
+1 418 val_418
+1 419 val_419
1 42 val_42
+1 421 val_421
+1 424 val_424
+1 427 val_427
+1 429 val_429
1 43 val_43
1 430 val_430
+1 431 val_431
+1 432 val_432
+1 435 val_435
+1 436 val_436
+1 437 val_437
+1 438 val_438
1 439 val_439
1 44 val_44
1 443 val_443
+1 444 val_444
1 446 val_446
1 448 val_448
1 449 val_449
+1 452 val_452
+1 453 val_453
1 454 val_454
+1 455 val_455
+1 457 val_457
1 458 val_458
+1 459 val_459
1 460 val_460
1 462 val_462
+1 463 val_463
+1 466 val_466
1 467 val_467
1 468 val_468
1 469 val_469
+1 47 val_47
1 470 val_470
+1 472 val_472
+1 475 val_475
1 477 val_477
+1 478 val_478
+1 479 val_479
1 480 val_480
1 481 val_481
+1 482 val_482
+1 483 val_483
+1 484 val_484
1 485 val_485
1 487 val_487
1 489 val_489
1 490 val_490
1 491 val_491
+1 492 val_492
1 493 val_493
+1 494 val_494
1 495 val_495
1 496 val_496
1 497 val_497
+1 498 val_498
+1 5 val_5
1 51 val_51
1 53 val_53
+1 54 val_54
+1 57 val_57
1 58 val_58
1 64 val_64
+1 65 val_65
1 66 val_66
1 67 val_67
+1 69 val_69
1 70 val_70
+1 72 val_72
1 74 val_74
+1 76 val_76
1 77 val_77
+1 78 val_78
+1 8 val_8
+1 80 val_80
1 82 val_82
1 83 val_83
1 84 val_84
@@ -8182,10 +8180,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
1 86 val_86
1 87 val_87
1 9 val_9
+1 90 val_90
1 92 val_92
1 95 val_95
1 96 val_96
1 97 val_97
+1 98 val_98
PREHOOK: query: create table jackson_sev_same as select * from src
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
@@ -8684,11 +8684,6 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@union_subq_union_n0
POSTHOOK: Output: hdfs://### HDFS PATH ###
0 val_0
-2 val_2
-4 val_4
-5 val_5
-8 val_8
-9 val_9
10 val_10
11 val_11
12 val_12
@@ -8696,6 +8691,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
17 val_17
18 val_18
19 val_19
+2 val_2
20 val_20
24 val_24
26 val_26
@@ -8703,6 +8699,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
28 val_28
30 val_30
33 val_33
+4 val_4
+5 val_5
+8 val_8
+9 val_9
PREHOOK: query: create table union_subq_union29(key int, value string)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -8965,11 +8965,6 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@union_subq_union29
POSTHOOK: Output: hdfs://### HDFS PATH ###
0 val_0
-2 val_2
-4 val_4
-5 val_5
-8 val_8
-9 val_9
10 val_10
11 val_11
12 val_12
@@ -8977,6 +8972,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
17 val_17
18 val_18
19 val_19
+2 val_2
20 val_20
24 val_24
26 val_26
@@ -8984,6 +8980,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
28 val_28
30 val_30
33 val_33
+4 val_4
+5 val_5
+8 val_8
+9 val_9
PREHOOK: query: explain
SELECT *
FROM (
@@ -9686,11 +9686,6 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@union_subq_union30
POSTHOOK: Output: hdfs://### HDFS PATH ###
0 val_0
-2 val_2
-4 val_4
-5 val_5
-8 val_8
-9 val_9
10 val_10
11 val_11
12 val_12
@@ -9698,6 +9693,7 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
17 val_17
18 val_18
19 val_19
+2 val_2
20 val_20
24 val_24
26 val_26
@@ -9705,6 +9701,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
28 val_28
30 val_30
33 val_33
+4 val_4
+5 val_5
+8 val_8
+9 val_9
PREHOOK: query: drop table t1_n93
PREHOOK: type: DROPTABLE
POSTHOOK: query: drop table t1_n93
@@ -10082,11 +10082,11 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@t4_n11
POSTHOOK: Output: hdfs://### HDFS PATH ###
val_0 1
+val_2 1
+val_4 1
val_5 1
val_8 1
val_9 1
-val_2 1
-val_4 1
PREHOOK: query: create table t5_n4(c1 string, cnt int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -10454,9 +10454,9 @@ POSTHOOK: query: select * from t5_n4
POSTHOOK: type: QUERY
POSTHOOK: Input: default@t5_n4
POSTHOOK: Output: hdfs://### HDFS PATH ###
-4 1
0 3
2 1
+4 1
5 3
8 1
9 1
@@ -10468,9 +10468,9 @@ POSTHOOK: query: select * from t6_n3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@t6_n3
POSTHOOK: Output: hdfs://### HDFS PATH ###
-4 1
0 3
2 1
+4 1
5 3
8 1
9 1
@@ -10833,9 +10833,9 @@ POSTHOOK: query: select * from t7_n4
POSTHOOK: type: QUERY
POSTHOOK: Input: default@t7_n4
POSTHOOK: Output: hdfs://### HDFS PATH ###
-4 1
0 1
2 1
+4 1
5 1
8 1
9 1
@@ -10847,9 +10847,9 @@ POSTHOOK: query: select * from t8_n2
POSTHOOK: type: QUERY
POSTHOOK: Input: default@t8_n2
POSTHOOK: Output: hdfs://### HDFS PATH ###
-4 1
0 1
2 1
+4 1
5 1
8 1
9 1
@@ -10969,9 +10969,9 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@t1_n93
POSTHOOK: Input: default@t2_n58
POSTHOOK: Output: hdfs://### HDFS PATH ###
-4.0
0.0
2.0
+4.0
5.0
8.0
9.0
@@ -11129,9 +11129,9 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@t1_n93
POSTHOOK: Input: default@t2_n58
POSTHOOK: Output: hdfs://### HDFS PATH ###
-4.0
0.0
2.0
+4.0
5.0
8.0
9.0
@@ -11289,9 +11289,9 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@t1_n93
POSTHOOK: Input: default@t2_n58
POSTHOOK: Output: hdfs://### HDFS PATH ###
-4.0
0.0
2.0
+4.0
5.0
8.0
9.0
@@ -11451,8 +11451,8 @@ POSTHOOK: Input: default@t2_n58
POSTHOOK: Output: hdfs://### HDFS PATH ###
0.0 0
2.0 2
-5.0 5
4.0 4
+5.0 5
8.0 8
9.0 9
PREHOOK: query: EXPLAIN
@@ -11612,8 +11612,8 @@ POSTHOOK: Input: default@t2_n58
POSTHOOK: Output: hdfs://### HDFS PATH ###
0.0 0
2.0 2
-5.0 5
4.0 4
+5.0 5
8.0 8
9.0 9
PREHOOK: query: drop table if exists test_src
@@ -12376,16 +12376,16 @@ POSTHOOK: Input: default@src10_2
POSTHOOK: Input: default@src10_3
POSTHOOK: Input: default@src10_4
POSTHOOK: Output: hdfs://### HDFS PATH ###
+165 val_165
238 val_238
+255 val_255
27 val_27
278 val_278
+311 val_311
409 val_409
484 val_484
-98 val_98
-165 val_165
-255 val_255
-311 val_311
86 val_86
+98 val_98
PREHOOK: query: explain
SELECT * FROM (
SELECT sub1.key,sub1.value FROM (SELECT * FROM src10_1) sub1 JOIN (SELECT *
FROM src10_2) sub0 ON (sub0.key = sub1.key)
@@ -12601,13 +12601,13 @@ POSTHOOK: Input: default@src10_2
POSTHOOK: Input: default@src10_3
POSTHOOK: Input: default@src10_4
POSTHOOK: Output: hdfs://### HDFS PATH ###
+165 val_165
238 val_238
+255 val_255
27 val_27
278 val_278
+311 val_311
409 val_409
484 val_484
-98 val_98
-165 val_165
-255 val_255
-311 val_311
86 val_86
+98 val_98
diff --git
a/ql/src/test/results/clientpositive/llap/vectorization_numeric_overflows.q.out
b/ql/src/test/results/clientpositive/llap/vectorization_numeric_overflows.q.out
index 977e6673ab6..acc0073a7a0 100644
---
a/ql/src/test/results/clientpositive/llap/vectorization_numeric_overflows.q.out
+++
b/ql/src/test/results/clientpositive/llap/vectorization_numeric_overflows.q.out
@@ -101,8 +101,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_overflow
#### A masked pattern was here ####
-128 127 -32768 32767 -2147483648 2147483647
-9223372036854775808 9223372036854775807 1.4E-45 3.4028235E38
4.9E-324 1.7976931348623157E308
-64 65 32767 -32768 1073741824 1073741825
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
127 -128 32767 -32768 2147483647 -2147483648
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
+64 65 32767 -32768 1073741824 1073741825
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
PREHOOK: query: explain vectorization expression
select cint1, (cint1-2) from test_overflow where (cint1 - 2) > 0 order by cint1
PREHOOK: type: QUERY
@@ -594,8 +594,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_overflow
#### A masked pattern was here ####
-128 126
-64 62
127 125
+64 62
PREHOOK: query: select ctinyint1, (ctinyint1-2Y) from test_overflow where
(ctinyint1 - 2Y) > 0 order by ctinyint1
PREHOOK: type: QUERY
PREHOOK: Input: default@test_overflow
@@ -605,8 +605,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_overflow
#### A masked pattern was here ####
-128 126
-64 62
127 125
+64 62
PREHOOK: query: explain vectorization expression
select ctinyint2, (ctinyint2 + 2) from test_overflow where (ctinyint2 + 2Y) <
0 order by ctinyint2
PREHOOK: type: QUERY
@@ -1249,8 +1249,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_overflow
#### A masked pattern was here ####
-128 127 -32768 32767 -2147483648 2147483647
-9223372036854775808 9223372036854775807 1.4E-45 3.4028235E38
4.9E-324 1.7976931348623157E308
-64 65 32767 -32768 1073741824 1073741825
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
127 -128 32767 -32768 2147483647 -2147483648
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
+64 65 32767 -32768 1073741824 1073741825
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
PREHOOK: query: explain vectorization expression select * from test_overflow
where pmod(csmallint1, 16385S) > 0 order by ctinyint1
PREHOOK: type: QUERY
PREHOOK: Input: default@test_overflow
@@ -1362,5 +1362,5 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_overflow
#### A masked pattern was here ####
-128 127 -32768 32767 -2147483648 2147483647
-9223372036854775808 9223372036854775807 1.4E-45 3.4028235E38
4.9E-324 1.7976931348623157E308
-64 65 32767 -32768 1073741824 1073741825
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
127 -128 32767 -32768 2147483647 -2147483648
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
+64 65 32767 -32768 1073741824 1073741825
9223372036854775807 -9223372036854775808 3.4028235E38 1.4E-45
1.7976931348623157E308 4.9E-324
