You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2018/04/14 06:41:47 UTC
[03/19] hive git commit: HIVE-18862: qfiles: prepare .q files for
using datasets (Laszlo Bodor via Zoltan Haindrich)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/windowing_udaf2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/windowing_udaf2.q b/ql/src/test/queries/clientpositive/windowing_udaf2.q
index b813657..e2a6e6d 100644
--- a/ql/src/test/queries/clientpositive/windowing_udaf2.q
+++ b/ql/src/test/queries/clientpositive/windowing_udaf2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- user-added aggregates should be usable as windowing functions
create temporary function mysum as 'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum';
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/ambiguous_join_col.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/ambiguous_join_col.q b/ql/src/test/queries/negative/ambiguous_join_col.q
index e70aae4..ff4ba0f 100644
--- a/ql/src/test/queries/negative/ambiguous_join_col.q
+++ b/ql/src/test/queries/negative/ambiguous_join_col.q
@@ -1,2 +1,4 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM src src1 JOIN src src2 ON src1.key = src2.key
INSERT OVERWRITE TABLE dest1 SELECT key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/duplicate_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/duplicate_alias.q b/ql/src/test/queries/negative/duplicate_alias.q
index 5fd2246..c3df285 100644
--- a/ql/src/test/queries/negative/duplicate_alias.q
+++ b/ql/src/test/queries/negative/duplicate_alias.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src a JOIN src a ON (a.key = a.key)
INSERT OVERWRITE TABLE dest1 SELECT a.key, a.value
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/garbage.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/garbage.q b/ql/src/test/queries/negative/garbage.q
index 6c8c751..93bb546 100644
--- a/ql/src/test/queries/negative/garbage.q
+++ b/ql/src/test/queries/negative/garbage.q
@@ -1 +1,2 @@
+--! qt:dataset:src
this is totally garbage SELECT src.key WHERE a lot of garbage
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/insert_wrong_number_columns.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/insert_wrong_number_columns.q b/ql/src/test/queries/negative/insert_wrong_number_columns.q
index aadfbde..a5919e7 100644
--- a/ql/src/test/queries/negative/insert_wrong_number_columns.q
+++ b/ql/src/test/queries/negative/insert_wrong_number_columns.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value, 1 WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/invalid_dot.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/invalid_dot.q b/ql/src/test/queries/negative/invalid_dot.q
index 36b9bd2..e13535a 100644
--- a/ql/src/test/queries/negative/invalid_dot.q
+++ b/ql/src/test/queries/negative/invalid_dot.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT src.value.member WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/invalid_function_param2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/invalid_function_param2.q b/ql/src/test/queries/negative/invalid_function_param2.q
index 3543449..8212f9f 100644
--- a/ql/src/test/queries/negative/invalid_function_param2.q
+++ b/ql/src/test/queries/negative/invalid_function_param2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT substr('1234', 'abc'), src.value WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/invalid_index.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/invalid_index.q b/ql/src/test/queries/negative/invalid_index.q
index 146bc5d..dc36804 100644
--- a/ql/src/test/queries/negative/invalid_index.q
+++ b/ql/src/test/queries/negative/invalid_index.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT src.key[0], src.value
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/invalid_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/invalid_select.q b/ql/src/test/queries/negative/invalid_select.q
index fd12985..8bb0982 100644
--- a/ql/src/test/queries/negative/invalid_select.q
+++ b/ql/src/test/queries/negative/invalid_select.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
SELECT
trim(trim(a))
trim(b)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/missing_overwrite.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/missing_overwrite.q b/ql/src/test/queries/negative/missing_overwrite.q
index 1bfeee3..578b5c6 100644
--- a/ql/src/test/queries/negative/missing_overwrite.q
+++ b/ql/src/test/queries/negative/missing_overwrite.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT TABLE dest1 SELECT '1234', src.value WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/nonkey_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/nonkey_groupby.q b/ql/src/test/queries/negative/nonkey_groupby.q
index ad0f441..d156a26 100644
--- a/ql/src/test/queries/negative/nonkey_groupby.q
+++ b/ql/src/test/queries/negative/nonkey_groupby.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.key < 100 group by src.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/quoted_string.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/quoted_string.q b/ql/src/test/queries/negative/quoted_string.q
index 0252a9e..106b8e3 100644
--- a/ql/src/test/queries/negative/quoted_string.q
+++ b/ql/src/test/queries/negative/quoted_string.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234", src.value WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_column1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_column1.q b/ql/src/test/queries/negative/unknown_column1.q
index 429cead..a55b75a 100644
--- a/ql/src/test/queries/negative/unknown_column1.q
+++ b/ql/src/test/queries/negative/unknown_column1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.dummycol WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_column2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_column2.q b/ql/src/test/queries/negative/unknown_column2.q
index 3767dc4..1af47af 100644
--- a/ql/src/test/queries/negative/unknown_column2.q
+++ b/ql/src/test/queries/negative/unknown_column2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.dummykey < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_column3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_column3.q b/ql/src/test/queries/negative/unknown_column3.q
index 2fc5f49..ce71717 100644
--- a/ql/src/test/queries/negative/unknown_column3.q
+++ b/ql/src/test/queries/negative/unknown_column3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.key < 100 group by src.dummycol
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_column4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_column4.q b/ql/src/test/queries/negative/unknown_column4.q
index 8ad8dd1..2bc7979 100644
--- a/ql/src/test/queries/negative/unknown_column4.q
+++ b/ql/src/test/queries/negative/unknown_column4.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.key < 100 group by dummysrc.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_column5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_column5.q b/ql/src/test/queries/negative/unknown_column5.q
index 766b0e5..bcc82dd 100644
--- a/ql/src/test/queries/negative/unknown_column5.q
+++ b/ql/src/test/queries/negative/unknown_column5.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE dummysrc.key < 100 group by src.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_column6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_column6.q b/ql/src/test/queries/negative/unknown_column6.q
index bb76c28..26a20d8 100644
--- a/ql/src/test/queries/negative/unknown_column6.q
+++ b/ql/src/test/queries/negative/unknown_column6.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', dummysrc.value WHERE src.key < 100 group by src.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_function1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_function1.q b/ql/src/test/queries/negative/unknown_function1.q
index d8ff632..9867cab 100644
--- a/ql/src/test/queries/negative/unknown_function1.q
+++ b/ql/src/test/queries/negative/unknown_function1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', dummyfn(src.value, 10) WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_function2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_function2.q b/ql/src/test/queries/negative/unknown_function2.q
index f7d2559..ffffa1e 100644
--- a/ql/src/test/queries/negative/unknown_function2.q
+++ b/ql/src/test/queries/negative/unknown_function2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE anotherdummyfn('abc', src.key) + 10 < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_function3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_function3.q b/ql/src/test/queries/negative/unknown_function3.q
index 87d4edc..b252077 100644
--- a/ql/src/test/queries/negative/unknown_function3.q
+++ b/ql/src/test/queries/negative/unknown_function3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE anotherdummyfn('abc', src.key) + 10 < 100 group by src.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_function4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_function4.q b/ql/src/test/queries/negative/unknown_function4.q
index cfe70e4..0e13f90 100644
--- a/ql/src/test/queries/negative/unknown_function4.q
+++ b/ql/src/test/queries/negative/unknown_function4.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT '1234', dummyfn(src.key) WHERE src.key < 100 group by src.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_table1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_table1.q b/ql/src/test/queries/negative/unknown_table1.q
index 585ef6d..f1aa4ae 100644
--- a/ql/src/test/queries/negative/unknown_table1.q
+++ b/ql/src/test/queries/negative/unknown_table1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM dummySrc
INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/unknown_table2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/unknown_table2.q b/ql/src/test/queries/negative/unknown_table2.q
index 2c69c16..49ad972 100644
--- a/ql/src/test/queries/negative/unknown_table2.q
+++ b/ql/src/test/queries/negative/unknown_table2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dummyDest SELECT '1234', src.value WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/wrong_distinct1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/wrong_distinct1.q b/ql/src/test/queries/negative/wrong_distinct1.q
index d92c3bb..1e966ad 100755
--- a/ql/src/test/queries/negative/wrong_distinct1.q
+++ b/ql/src/test/queries/negative/wrong_distinct1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT DISTINCT src.key, substr(src.value,4,1) GROUP BY src.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/negative/wrong_distinct2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/negative/wrong_distinct2.q b/ql/src/test/queries/negative/wrong_distinct2.q
index 53fb550..1c05e21 100755
--- a/ql/src/test/queries/negative/wrong_distinct2.q
+++ b/ql/src/test/queries/negative/wrong_distinct2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT src.key, DISTINCT substr(src.value,4,1) GROUP BY src.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/case_sensitivity.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/case_sensitivity.q b/ql/src/test/queries/positive/case_sensitivity.q
index d7f7371..83b86c7 100644
--- a/ql/src/test/queries/positive/case_sensitivity.q
+++ b/ql/src/test/queries/positive/case_sensitivity.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src_thrift
FROM SRC_THRIFT
INSERT OVERWRITE TABLE dest1 SELECT src_Thrift.LINT[1], src_thrift.lintstring[0].MYSTRING where src_thrift.liNT[0] > 0
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/cast1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/cast1.q b/ql/src/test/queries/positive/cast1.q
index 6269c6a..bf7dab3 100644
--- a/ql/src/test/queries/positive/cast1.q
+++ b/ql/src/test/queries/positive/cast1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
SELECT 3 + 2, 3.0 + 2, 3 + 2.0, 3.0 + 2.0, 3 + CAST(2.0 AS INT), CAST(1 AS BOOLEAN), CAST(TRUE AS INT) WHERE src.key = 86
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/groupby1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/groupby1.q b/ql/src/test/queries/positive/groupby1.q
index 96b29b0..e2f6a6b 100755
--- a/ql/src/test/queries/positive/groupby1.q
+++ b/ql/src/test/queries/positive/groupby1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/groupby2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/groupby2.q b/ql/src/test/queries/positive/groupby2.q
index d741eb6..f1b68d4 100755
--- a/ql/src/test/queries/positive/groupby2.q
+++ b/ql/src/test/queries/positive/groupby2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/groupby3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/groupby3.q b/ql/src/test/queries/positive/groupby3.q
index 03b1248..ce9a829 100755
--- a/ql/src/test/queries/positive/groupby3.q
+++ b/ql/src/test/queries/positive/groupby3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
SELECT sum(substr(src.value,5)), avg(substr(src.value,5)), avg(DISTINCT substr(src.value,5)), max(substr(src.value,5)), min(substr(src.value,5))
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/groupby4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/groupby4.q b/ql/src/test/queries/positive/groupby4.q
index 85271a9..384e158 100755
--- a/ql/src/test/queries/positive/groupby4.q
+++ b/ql/src/test/queries/positive/groupby4.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/groupby5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/groupby5.q b/ql/src/test/queries/positive/groupby5.q
index ebd65b3..b837f06 100755
--- a/ql/src/test/queries/positive/groupby5.q
+++ b/ql/src/test/queries/positive/groupby5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
SELECT src.key, sum(substr(src.value,5))
FROM src
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/groupby6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/groupby6.q b/ql/src/test/queries/positive/groupby6.q
index 80654f2..817c749 100755
--- a/ql/src/test/queries/positive/groupby6.q
+++ b/ql/src/test/queries/positive/groupby6.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
SELECT DISTINCT substr(src.value,5,1)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input1.q b/ql/src/test/queries/positive/input1.q
index fdd290d..329df89 100644
--- a/ql/src/test/queries/positive/input1.q
+++ b/ql/src/test/queries/positive/input1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input2.q b/ql/src/test/queries/positive/input2.q
index 4e1612e..8777d17 100644
--- a/ql/src/test/queries/positive/input2.q
+++ b/ql/src/test/queries/positive/input2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT src.* WHERE src.key < 100
INSERT OVERWRITE TABLE dest2 SELECT src.key, src.value WHERE src.key >= 100 and src.key < 200
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input20.q b/ql/src/test/queries/positive/input20.q
index f30cf27..09dd9fc 100644
--- a/ql/src/test/queries/positive/input20.q
+++ b/ql/src/test/queries/positive/input20.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
FROM (
FROM src
MAP src.key % 2, src.key % 5
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input3.q b/ql/src/test/queries/positive/input3.q
index fc53e94..c0a41f5 100644
--- a/ql/src/test/queries/positive/input3.q
+++ b/ql/src/test/queries/positive/input3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest1 SELECT src.* WHERE src.key < 100
INSERT OVERWRITE TABLE dest2 SELECT src.key, src.value WHERE src.key >= 100 and src.key < 200
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input4.q b/ql/src/test/queries/positive/input4.q
index 03e6de4..b1b448e 100644
--- a/ql/src/test/queries/positive/input4.q
+++ b/ql/src/test/queries/positive/input4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
FROM (
FROM src
SELECT TRANSFORM(src.key, src.value)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input5.q b/ql/src/test/queries/positive/input5.q
index a46abc7..e1d0fed 100644
--- a/ql/src/test/queries/positive/input5.q
+++ b/ql/src/test/queries/positive/input5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
FROM (
FROM src_thrift
SELECT TRANSFORM(src_thrift.lint, src_thrift.lintstring)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input6.q b/ql/src/test/queries/positive/input6.q
index d6f25a9..0a8e028 100644
--- a/ql/src/test/queries/positive/input6.q
+++ b/ql/src/test/queries/positive/input6.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src1
FROM src1
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src1.value WHERE src1.key is null
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input7.q b/ql/src/test/queries/positive/input7.q
index 33a8295..2474280 100644
--- a/ql/src/test/queries/positive/input7.q
+++ b/ql/src/test/queries/positive/input7.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src1
FROM src1
INSERT OVERWRITE TABLE dest1 SELECT NULL, src1.key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input8.q b/ql/src/test/queries/positive/input8.q
index 0843b9b..021c508 100644
--- a/ql/src/test/queries/positive/input8.q
+++ b/ql/src/test/queries/positive/input8.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src1
FROM src1
SELECT 4 + NULL, src1.key - NULL, NULL + NULL
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input9.q b/ql/src/test/queries/positive/input9.q
index 2892f0b..0d0ebd3 100644
--- a/ql/src/test/queries/positive/input9.q
+++ b/ql/src/test/queries/positive/input9.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src1
FROM src1
INSERT OVERWRITE TABLE dest1 SELECT NULL, src1.key where NULL = NULL
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input_part1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input_part1.q b/ql/src/test/queries/positive/input_part1.q
index d45d1cd..5390ab8 100644
--- a/ql/src/test/queries/positive/input_part1.q
+++ b/ql/src/test/queries/positive/input_part1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:srcpart
FROM srcpart
SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input_testsequencefile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input_testsequencefile.q b/ql/src/test/queries/positive/input_testsequencefile.q
index cf9a092..2daa53a 100755
--- a/ql/src/test/queries/positive/input_testsequencefile.q
+++ b/ql/src/test/queries/positive/input_testsequencefile.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
FROM src
INSERT OVERWRITE TABLE dest4_sequencefile SELECT src.key, src.value
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input_testxpath.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input_testxpath.q b/ql/src/test/queries/positive/input_testxpath.q
index 7699bff..70c8e07 100755
--- a/ql/src/test/queries/positive/input_testxpath.q
+++ b/ql/src/test/queries/positive/input_testxpath.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src_thrift
FROM src_thrift
SELECT src_thrift.lint[1], src_thrift.lintstring[0].mystring, src_thrift.mstringstring['key_2']
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/input_testxpath2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/input_testxpath2.q b/ql/src/test/queries/positive/input_testxpath2.q
index 08abaf4..4aa4b58 100644
--- a/ql/src/test/queries/positive/input_testxpath2.q
+++ b/ql/src/test/queries/positive/input_testxpath2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src_thrift
FROM src_thrift
SELECT size(src_thrift.lint), size(src_thrift.lintstring), size(src_thrift.mstringstring) where src_thrift.lint IS NOT NULL AND NOT (src_thrift.mstringstring IS NULL)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/insert_column_mixcase.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/insert_column_mixcase.q b/ql/src/test/queries/positive/insert_column_mixcase.q
index 12671d2..b2b90f2 100644
--- a/ql/src/test/queries/positive/insert_column_mixcase.q
+++ b/ql/src/test/queries/positive/insert_column_mixcase.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
DROP TABLE IF EXISTS insert_camel_case;
CREATE TABLE insert_camel_case (key int, value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/join1.q b/ql/src/test/queries/positive/join1.q
index 739c39d..aea13b7 100644
--- a/ql/src/test/queries/positive/join1.q
+++ b/ql/src/test/queries/positive/join1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM src src1 JOIN src src2 ON (src1.key = src2.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/join2.q b/ql/src/test/queries/positive/join2.q
index a02d87f..763f472 100644
--- a/ql/src/test/queries/positive/join2.q
+++ b/ql/src/test/queries/positive/join2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key + src2.key = src3.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/join3.q b/ql/src/test/queries/positive/join3.q
index b57c956..8e68655 100644
--- a/ql/src/test/queries/positive/join3.q
+++ b/ql/src/test/queries/positive/join3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key = src3.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/join4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/join4.q b/ql/src/test/queries/positive/join4.q
index 2e5967f..d377616 100644
--- a/ql/src/test/queries/positive/join4.q
+++ b/ql/src/test/queries/positive/join4.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM (
FROM
(
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/join5.q b/ql/src/test/queries/positive/join5.q
index 63a38f5..be322e8 100644
--- a/ql/src/test/queries/positive/join5.q
+++ b/ql/src/test/queries/positive/join5.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM (
FROM
(
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/join6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/join6.q b/ql/src/test/queries/positive/join6.q
index 110451c..594d59b 100644
--- a/ql/src/test/queries/positive/join6.q
+++ b/ql/src/test/queries/positive/join6.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM (
FROM
(
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/join7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/join7.q b/ql/src/test/queries/positive/join7.q
index 65797b4..aa973e0 100644
--- a/ql/src/test/queries/positive/join7.q
+++ b/ql/src/test/queries/positive/join7.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM (
FROM
(
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/join8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/join8.q b/ql/src/test/queries/positive/join8.q
index d215b07..b29e607 100644
--- a/ql/src/test/queries/positive/join8.q
+++ b/ql/src/test/queries/positive/join8.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
FROM (
FROM
(
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/sample1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/sample1.q b/ql/src/test/queries/positive/sample1.q
index 3a168b9..326557d 100644
--- a/ql/src/test/queries/positive/sample1.q
+++ b/ql/src/test/queries/positive/sample1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
-- no input pruning, no sample filter
SELECT s.*
FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON rand()) s
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/sample2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/sample2.q b/ql/src/test/queries/positive/sample2.q
index b505b89..718b934 100644
--- a/ql/src/test/queries/positive/sample2.q
+++ b/ql/src/test/queries/positive/sample2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
-- input pruning, no sample filter
-- default table sample columns
INSERT OVERWRITE TABLE dest1 SELECT s.*
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/sample3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/sample3.q b/ql/src/test/queries/positive/sample3.q
index 42d5a2b..7e1bbae 100644
--- a/ql/src/test/queries/positive/sample3.q
+++ b/ql/src/test/queries/positive/sample3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
-- sample columns not same as bucket columns
-- no input pruning, sample filter
INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/sample4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/sample4.q b/ql/src/test/queries/positive/sample4.q
index 7b5ab03..a65c99a 100644
--- a/ql/src/test/queries/positive/sample4.q
+++ b/ql/src/test/queries/positive/sample4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
-- bucket column is the same as table sample
-- No need for sample filter
INSERT OVERWRITE TABLE dest1 SELECT s.*
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/sample5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/sample5.q b/ql/src/test/queries/positive/sample5.q
index b9b48fd..57ee101 100644
--- a/ql/src/test/queries/positive/sample5.q
+++ b/ql/src/test/queries/positive/sample5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
-- no input pruning, sample filter
INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/sample6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/sample6.q b/ql/src/test/queries/positive/sample6.q
index 0ee026f..1efa99c 100644
--- a/ql/src/test/queries/positive/sample6.q
+++ b/ql/src/test/queries/positive/sample6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
-- both input pruning and sample filter
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 4 on key) s
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/sample7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/sample7.q b/ql/src/test/queries/positive/sample7.q
index f17ce10..9809710 100644
--- a/ql/src/test/queries/positive/sample7.q
+++ b/ql/src/test/queries/positive/sample7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
-- both input pruning and sample filter
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 4 on key) s
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/subq.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/subq.q b/ql/src/test/queries/positive/subq.q
index 6392dbc..4402e7d 100644
--- a/ql/src/test/queries/positive/subq.q
+++ b/ql/src/test/queries/positive/subq.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
FROM (
FROM src select src.* WHERE src.key < 100
) unioninput
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/udf1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/udf1.q b/ql/src/test/queries/positive/udf1.q
index 2ecf46e..edca676 100644
--- a/ql/src/test/queries/positive/udf1.q
+++ b/ql/src/test/queries/positive/udf1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
FROM src SELECT 'a' LIKE '%a%', 'b' LIKE '%a%', 'ab' LIKE '%a%', 'ab' LIKE '%a_',
'%_' LIKE '\%\_', 'ab' LIKE '\%\_', 'ab' LIKE '_a%', 'ab' LIKE 'a',
'' RLIKE '.*', 'a' RLIKE '[ab]', '' RLIKE '[ab]', 'hadoop' RLIKE '[a-z]*', 'hadoop' RLIKE 'o*',
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/udf6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/udf6.q b/ql/src/test/queries/positive/udf6.q
index fc7f99c..a9b325f 100644
--- a/ql/src/test/queries/positive/udf6.q
+++ b/ql/src/test/queries/positive/udf6.q
@@ -1 +1,2 @@
+--! qt:dataset:src
FROM src SELECT CONCAT('a', 'b'), IF(TRUE, 1 ,2) + key
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/udf_case.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/udf_case.q b/ql/src/test/queries/positive/udf_case.q
index 0c86da2..55cb4be 100644
--- a/ql/src/test/queries/positive/udf_case.q
+++ b/ql/src/test/queries/positive/udf_case.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
SELECT CASE 1
WHEN 1 THEN 2
WHEN 3 THEN 4
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/udf_when.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/udf_when.q b/ql/src/test/queries/positive/udf_when.q
index 99ed099..91af416 100644
--- a/ql/src/test/queries/positive/udf_when.q
+++ b/ql/src/test/queries/positive/udf_when.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
SELECT CASE
WHEN 1=1 THEN 2
WHEN 3=5 THEN 4
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/positive/union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/positive/union.q b/ql/src/test/queries/positive/union.q
index 6a6b988..60b20ef 100644
--- a/ql/src/test/queries/positive/union.q
+++ b/ql/src/test/queries/positive/union.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
FROM (
FROM src select src.key, src.value WHERE src.key < 100
UNION ALL
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/clusterbyorderby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/clusterbyorderby.q.out b/ql/src/test/results/clientnegative/clusterbyorderby.q.out
index 5545809..fa069a6 100644
--- a/ql/src/test/results/clientnegative/clusterbyorderby.q.out
+++ b/ql/src/test/results/clientnegative/clusterbyorderby.q.out
@@ -1 +1 @@
-FAILED: ParseException line 5:0 missing EOF at 'ORDER' near 'tkey'
+FAILED: ParseException line 6:0 missing EOF at 'ORDER' near 'tkey'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/clustern3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/clustern3.q.out b/ql/src/test/results/clientnegative/clustern3.q.out
index dd1c9e7..be92d8e 100644
--- a/ql/src/test/results/clientnegative/clustern3.q.out
+++ b/ql/src/test/results/clientnegative/clustern3.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10002]: Line 2:52 Invalid column reference 'key'
+FAILED: SemanticException [Error 10002]: Line 3:52 Invalid column reference 'key'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/clustern4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/clustern4.q.out b/ql/src/test/results/clientnegative/clustern4.q.out
index 5c1c71f..76a9c8d 100644
--- a/ql/src/test/results/clientnegative/clustern4.q.out
+++ b/ql/src/test/results/clientnegative/clustern4.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 2:50 Invalid table alias or column reference 'key': (possible column names are: k1, x.value)
+FAILED: SemanticException [Error 10004]: Line 3:50 Invalid table alias or column reference 'key': (possible column names are: k1, x.value)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/column_rename3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/column_rename3.q.out b/ql/src/test/results/clientnegative/column_rename3.q.out
index 6d521f5..de9e122 100644
--- a/ql/src/test/results/clientnegative/column_rename3.q.out
+++ b/ql/src/test/results/clientnegative/column_rename3.q.out
@@ -1 +1 @@
-FAILED: ParseException line 1:30 cannot recognize input near '<EOF>' '<EOF>' '<EOF>' in column type
+FAILED: ParseException line 2:30 cannot recognize input near '<EOF>' '<EOF>' '<EOF>' in column type
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/groupby_key.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/groupby_key.q.out b/ql/src/test/results/clientnegative/groupby_key.q.out
index f5f0958..d3101e8 100644
--- a/ql/src/test/results/clientnegative/groupby_key.q.out
+++ b/ql/src/test/results/clientnegative/groupby_key.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10025]: Line 1:7 Expression not in GROUP BY key 'value'
+FAILED: SemanticException [Error 10025]: Line 2:7 Expression not in GROUP BY key 'value'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/input1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/input1.q.out b/ql/src/test/results/clientnegative/input1.q.out
index 1c1be74..8566a82 100644
--- a/ql/src/test/results/clientnegative/input1.q.out
+++ b/ql/src/test/results/clientnegative/input1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10009]: Line 1:7 Invalid table alias 'a'
+FAILED: SemanticException [Error 10009]: Line 2:7 Invalid table alias 'a'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/input2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/input2.q.out b/ql/src/test/results/clientnegative/input2.q.out
index f7cdf6e..5dba8a3 100644
--- a/ql/src/test/results/clientnegative/input2.q.out
+++ b/ql/src/test/results/clientnegative/input2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 1:7 Invalid table alias or column reference 'a': (possible column names are: key, value)
+FAILED: SemanticException [Error 10004]: Line 2:7 Invalid table alias or column reference 'a': (possible column names are: key, value)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/invalid_distinct2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/invalid_distinct2.q.out b/ql/src/test/results/clientnegative/invalid_distinct2.q.out
index c1c95a9..c08b1c3 100644
--- a/ql/src/test/results/clientnegative/invalid_distinct2.q.out
+++ b/ql/src/test/results/clientnegative/invalid_distinct2.q.out
@@ -1 +1 @@
-FAILED: SemanticException 1:15 Distinct keyword is not support in current context. Error encountered near token 'value'
+FAILED: SemanticException 2:15 Distinct keyword is not support in current context. Error encountered near token 'value'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/join_alt_syntax_comma_on.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/join_alt_syntax_comma_on.q.out b/ql/src/test/results/clientnegative/join_alt_syntax_comma_on.q.out
index 364b6df..f9a6327 100644
--- a/ql/src/test/results/clientnegative/join_alt_syntax_comma_on.q.out
+++ b/ql/src/test/results/clientnegative/join_alt_syntax_comma_on.q.out
@@ -1 +1 @@
-FAILED: ParseException line 3:25 Failed to recognize predicate '<EOF>'. Failed rule: 'joinSource' in join source
+FAILED: ParseException line 4:25 Failed to recognize predicate '<EOF>'. Failed rule: 'joinSource' in join source
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/lateral_view_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/lateral_view_join.q.out b/ql/src/test/results/clientnegative/lateral_view_join.q.out
index b96f18f..3e4332e 100644
--- a/ql/src/test/results/clientnegative/lateral_view_join.q.out
+++ b/ql/src/test/results/clientnegative/lateral_view_join.q.out
@@ -1 +1 @@
-FAILED: ParseException line 1:59 cannot recognize input near 'AS' 'myTable' 'JOIN' in table alias
+FAILED: ParseException line 2:59 cannot recognize input near 'AS' 'myTable' 'JOIN' in table alias
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/nonkey_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/nonkey_groupby.q.out b/ql/src/test/results/clientnegative/nonkey_groupby.q.out
index bbe928c..eda09dc 100644
--- a/ql/src/test/results/clientnegative/nonkey_groupby.q.out
+++ b/ql/src/test/results/clientnegative/nonkey_groupby.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10025]: Line 1:15 Expression not in GROUP BY key 'key'
+FAILED: SemanticException [Error 10025]: Line 2:15 Expression not in GROUP BY key 'key'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out b/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out
index 8aa512b..a10cee9 100644
--- a/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out
+++ b/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10025]: Line 2:7 Expression not in GROUP BY key 'p_mfgr'
+FAILED: SemanticException [Error 10025]: Line 3:7 Expression not in GROUP BY key 'p_mfgr'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out b/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out
index e8e8580..ed24fe5 100644
--- a/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out
+++ b/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out
@@ -1 +1 @@
-FAILED: ParseException line 3:3 cannot recognize input near 'sum' '(' 'p_retailprice' in expression specification
+FAILED: ParseException line 4:3 cannot recognize input near 'sum' '(' 'p_retailprice' in expression specification
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out b/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out
index 81e6b39..f7c0256 100644
--- a/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out
+++ b/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out
@@ -1 +1 @@
-FAILED: SemanticException 8:7 Duplicate definition of window w2 is not allowed. Error encountered near token 'w2'
+FAILED: SemanticException 9:7 Duplicate definition of window w2 is not allowed. Error encountered near token 'w2'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out b/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out
index e8e8580..ed24fe5 100644
--- a/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out
+++ b/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out
@@ -1 +1 @@
-FAILED: ParseException line 3:3 cannot recognize input near 'sum' '(' 'p_retailprice' in expression specification
+FAILED: ParseException line 4:3 cannot recognize input near 'sum' '(' 'p_retailprice' in expression specification
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out b/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out
index 42f60e7..d7425e5 100644
--- a/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out
+++ b/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 5:6 Invalid table alias or column reference 'r': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
+FAILED: SemanticException [Error 10004]: Line 6:6 Invalid table alias or column reference 'r': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out b/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out
index c9c1c6d..4d2cac0 100644
--- a/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out
+++ b/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out
@@ -1 +1 @@
-FAILED: ParseException line 2:7 cannot recognize input near 'sum' '(' 'p_retailprice' in expression specification
+FAILED: ParseException line 3:7 cannot recognize input near 'sum' '(' 'p_retailprice' in expression specification
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out b/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out
index c9c1c6d..4d2cac0 100644
--- a/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out
+++ b/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out
@@ -1 +1 @@
-FAILED: ParseException line 2:7 cannot recognize input near 'sum' '(' 'p_retailprice' in expression specification
+FAILED: ParseException line 3:7 cannot recognize input near 'sum' '(' 'p_retailprice' in expression specification
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/selectDistinctStarNeg_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/selectDistinctStarNeg_2.q.out b/ql/src/test/results/clientnegative/selectDistinctStarNeg_2.q.out
index b332293..bafa21f 100644
--- a/ql/src/test/results/clientnegative/selectDistinctStarNeg_2.q.out
+++ b/ql/src/test/results/clientnegative/selectDistinctStarNeg_2.q.out
@@ -1 +1 @@
-FAILED: SemanticException 3:36 SELECT DISTINCT and GROUP BY can not be in the same query. Error encountered near token 'key'
+FAILED: SemanticException 4:36 SELECT DISTINCT and GROUP BY can not be in the same query. Error encountered near token 'key'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out b/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out
index 2f4bbde..a6dbb6f 100644
--- a/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out
+++ b/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out
@@ -1 +1 @@
-FAILED: SemanticException 3:7 Distinct keyword is not support in current context. Error encountered near token 'key'
+FAILED: SemanticException 4:7 Distinct keyword is not support in current context. Error encountered near token 'key'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/select_star_suffix.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/select_star_suffix.q.out b/ql/src/test/results/clientnegative/select_star_suffix.q.out
index b873100..e750e07 100644
--- a/ql/src/test/results/clientnegative/select_star_suffix.q.out
+++ b/ql/src/test/results/clientnegative/select_star_suffix.q.out
@@ -1 +1 @@
-FAILED: ParseException line 3:8 missing EOF at 'abcdef' near '*'
+FAILED: ParseException line 4:8 missing EOF at 'abcdef' near '*'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/semijoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/semijoin1.q.out b/ql/src/test/results/clientnegative/semijoin1.q.out
index b7a3215..8a7e020 100644
--- a/ql/src/test/results/clientnegative/semijoin1.q.out
+++ b/ql/src/test/results/clientnegative/semijoin1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 2:7 Invalid table alias or column reference 'b': (possible column names are: key, value)
+FAILED: SemanticException [Error 10004]: Line 3:7 Invalid table alias or column reference 'b': (possible column names are: key, value)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/semijoin2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/semijoin2.q.out b/ql/src/test/results/clientnegative/semijoin2.q.out
index 731a39f..002d68b 100644
--- a/ql/src/test/results/clientnegative/semijoin2.q.out
+++ b/ql/src/test/results/clientnegative/semijoin2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 2:70 Invalid table alias or column reference 'b': (possible column names are: key, value)
+FAILED: SemanticException [Error 10004]: Line 3:70 Invalid table alias or column reference 'b': (possible column names are: key, value)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/semijoin3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/semijoin3.q.out b/ql/src/test/results/clientnegative/semijoin3.q.out
index 0e096f6..6233cdb 100644
--- a/ql/src/test/results/clientnegative/semijoin3.q.out
+++ b/ql/src/test/results/clientnegative/semijoin3.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 2:67 Invalid table alias or column reference 'b': (possible column names are: key, value)
+FAILED: SemanticException [Error 10004]: Line 3:67 Invalid table alias or column reference 'b': (possible column names are: key, value)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/semijoin4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/semijoin4.q.out b/ql/src/test/results/clientnegative/semijoin4.q.out
index 75d9c8e..b1ef45e 100644
--- a/ql/src/test/results/clientnegative/semijoin4.q.out
+++ b/ql/src/test/results/clientnegative/semijoin4.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 2:112 Invalid table alias or column reference 'b': (possible column names are: key, value)
+FAILED: SemanticException [Error 10004]: Line 3:112 Invalid table alias or column reference 'b': (possible column names are: key, value)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subq_insert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subq_insert.q.out b/ql/src/test/results/clientnegative/subq_insert.q.out
index 620409b..b69f42b 100644
--- a/ql/src/test/results/clientnegative/subq_insert.q.out
+++ b/ql/src/test/results/clientnegative/subq_insert.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10024]: Line 2:38 Cannot insert in a subquery. Inserting to table 'src1'
+FAILED: SemanticException [Error 10024]: Line 3:38 Cannot insert in a subquery. Inserting to table 'src1'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_corr_from.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_corr_from.q.out b/ql/src/test/results/clientnegative/subquery_corr_from.q.out
index 663a8bb..3af1a8a 100644
--- a/ql/src/test/results/clientnegative/subquery_corr_from.q.out
+++ b/ql/src/test/results/clientnegative/subquery_corr_from.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 3:113 Invalid table alias or column reference 'po': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
+FAILED: SemanticException [Error 10004]: Line 4:113 Invalid table alias or column reference 'po': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_corr_grandparent.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_corr_grandparent.q.out b/ql/src/test/results/clientnegative/subquery_corr_grandparent.q.out
index 4bc7c64..6f06fc7 100644
--- a/ql/src/test/results/clientnegative/subquery_corr_grandparent.q.out
+++ b/ql/src/test/results/clientnegative/subquery_corr_grandparent.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 4:95 Invalid table alias or column reference 'x': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
+FAILED: SemanticException [Error 10004]: Line 5:95 Invalid table alias or column reference 'x': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_corr_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_corr_select.q.out b/ql/src/test/results/clientnegative/subquery_corr_select.q.out
index 1f3dbb7..d95b939 100644
--- a/ql/src/test/results/clientnegative/subquery_corr_select.q.out
+++ b/ql/src/test/results/clientnegative/subquery_corr_select.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 2:54 Invalid table alias or column reference 'po': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
+FAILED: SemanticException [Error 10004]: Line 3:54 Invalid table alias or column reference 'po': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out b/ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out
index b650309..0d846be 100644
--- a/ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out
+++ b/ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10250]: org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: Line 7:7 Invalid SubQuery expression ''val_9'': A predicate on EXISTS/NOT EXISTS SubQuery with implicit Aggregation(no Group By clause) cannot be rewritten.
+FAILED: SemanticException [Error 10250]: org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: Line 8:7 Invalid SubQuery expression ''val_9'': A predicate on EXISTS/NOT EXISTS SubQuery with implicit Aggregation(no Group By clause) cannot be rewritten.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_in_on.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_in_on.q.out b/ql/src/test/results/clientnegative/subquery_in_on.q.out
index 551f0ec..ee27eb9 100644
--- a/ql/src/test/results/clientnegative/subquery_in_on.q.out
+++ b/ql/src/test/results/clientnegative/subquery_in_on.q.out
@@ -1 +1 @@
-FAILED: SemanticException org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: 2:77 Unsupported SubQuery Expression Currently SubQuery expressions are only allowed as Where and Having Clause predicates. Error encountered near token 'p2'
+FAILED: SemanticException org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: 3:77 Unsupported SubQuery Expression Currently SubQuery expressions are only allowed as Where and Having Clause predicates. Error encountered near token 'p2'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out b/ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out
index b650309..0d846be 100644
--- a/ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out
+++ b/ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10250]: org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: Line 7:7 Invalid SubQuery expression ''val_9'': A predicate on EXISTS/NOT EXISTS SubQuery with implicit Aggregation(no Group By clause) cannot be rewritten.
+FAILED: SemanticException [Error 10250]: org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: Line 8:7 Invalid SubQuery expression ''val_9'': A predicate on EXISTS/NOT EXISTS SubQuery with implicit Aggregation(no Group By clause) cannot be rewritten.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_subquery_chain.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_subquery_chain.q.out b/ql/src/test/results/clientnegative/subquery_subquery_chain.q.out
index ca9d03a..23ae287 100644
--- a/ql/src/test/results/clientnegative/subquery_subquery_chain.q.out
+++ b/ql/src/test/results/clientnegative/subquery_subquery_chain.q.out
@@ -1 +1 @@
-FAILED: ParseException line 5:39 cannot recognize input near 'in' '(' 'select' in expression specification
+FAILED: ParseException line 6:39 cannot recognize input near 'in' '(' 'select' in expression specification
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_subquery_chain_exists.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_subquery_chain_exists.q.out b/ql/src/test/results/clientnegative/subquery_subquery_chain_exists.q.out
index 9b5212b..9b957e6 100644
--- a/ql/src/test/results/clientnegative/subquery_subquery_chain_exists.q.out
+++ b/ql/src/test/results/clientnegative/subquery_subquery_chain_exists.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10249]: org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: Line 4:7 Unsupported SubQuery Expression 'key': IN/NOT IN subqueries are not allowed in LHS
+FAILED: SemanticException [Error 10249]: org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: Line 5:7 Unsupported SubQuery Expression 'key': IN/NOT IN subqueries are not allowed in LHS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out b/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
index daac4bb..f42e064 100644
--- a/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
+++ b/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10249]: org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: Line 6:8 Unsupported SubQuery Expression 'p_brand': Correlated Sub Queries cannot contain Windowing clauses.
+FAILED: SemanticException [Error 10249]: org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubquerySemanticException: Line 7:8 Unsupported SubQuery Expression 'p_brand': Correlated Sub Queries cannot contain Windowing clauses.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udaf_invalid_place.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udaf_invalid_place.q.out b/ql/src/test/results/clientnegative/udaf_invalid_place.q.out
index 6727889..50880e5 100644
--- a/ql/src/test/results/clientnegative/udaf_invalid_place.q.out
+++ b/ql/src/test/results/clientnegative/udaf_invalid_place.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10128]: Line 1:21 Not yet supported place for UDAF 'sum'
+FAILED: SemanticException [Error 10128]: Line 2:21 Not yet supported place for UDAF 'sum'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_array_contains_wrong1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_array_contains_wrong1.q.out b/ql/src/test/results/clientnegative/udf_array_contains_wrong1.q.out
index 00cb3ed..ac37300 100644
--- a/ql/src/test/results/clientnegative/udf_array_contains_wrong1.q.out
+++ b/ql/src/test/results/clientnegative/udf_array_contains_wrong1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:22 Argument type mismatch '1': "array" expected at function ARRAY_CONTAINS, but "int" is found
+FAILED: SemanticException [Error 10016]: Line 3:22 Argument type mismatch '1': "array" expected at function ARRAY_CONTAINS, but "int" is found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_array_contains_wrong2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_array_contains_wrong2.q.out b/ql/src/test/results/clientnegative/udf_array_contains_wrong2.q.out
index 507d322..dafdd0e 100644
--- a/ql/src/test/results/clientnegative/udf_array_contains_wrong2.q.out
+++ b/ql/src/test/results/clientnegative/udf_array_contains_wrong2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:38 Argument type mismatch ''2'': "int" expected at function ARRAY_CONTAINS, but "string" is found
+FAILED: SemanticException [Error 10016]: Line 3:38 Argument type mismatch ''2'': "int" expected at function ARRAY_CONTAINS, but "string" is found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_coalesce.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_coalesce.q.out b/ql/src/test/results/clientnegative/udf_coalesce.q.out
index 249a83d..1adf140 100644
--- a/ql/src/test/results/clientnegative/udf_coalesce.q.out
+++ b/ql/src/test/results/clientnegative/udf_coalesce.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 1:33 Argument type mismatch ''2.0'': The expressions after COALESCE should all have the same type: "array<string>" is expected but "string" is found
+FAILED: SemanticException [Error 10016]: Line 2:33 Argument type mismatch ''2.0'': The expressions after COALESCE should all have the same type: "array<string>" is expected but "string" is found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_concat_ws_wrong1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_concat_ws_wrong1.q.out b/ql/src/test/results/clientnegative/udf_concat_ws_wrong1.q.out
index ea31b90..fa6515c 100644
--- a/ql/src/test/results/clientnegative/udf_concat_ws_wrong1.q.out
+++ b/ql/src/test/results/clientnegative/udf_concat_ws_wrong1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch ''-'': The function CONCAT_WS(separator,[string | array(string)]+) needs at least two arguments.
+FAILED: SemanticException [Error 10015]: Line 3:7 Arguments length mismatch ''-'': The function CONCAT_WS(separator,[string | array(string)]+) needs at least two arguments.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_concat_ws_wrong2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_concat_ws_wrong2.q.out b/ql/src/test/results/clientnegative/udf_concat_ws_wrong2.q.out
index 24edb6a..394fca7 100644
--- a/ql/src/test/results/clientnegative/udf_concat_ws_wrong2.q.out
+++ b/ql/src/test/results/clientnegative/udf_concat_ws_wrong2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:23 Argument type mismatch '50': Argument 2 of function CONCAT_WS must be "string or array<string>", but "array<int>" was found.
+FAILED: SemanticException [Error 10016]: Line 3:23 Argument type mismatch '50': Argument 2 of function CONCAT_WS must be "string or array<string>", but "array<int>" was found.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_concat_ws_wrong3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_concat_ws_wrong3.q.out b/ql/src/test/results/clientnegative/udf_concat_ws_wrong3.q.out
index 3c94167..50e6454 100644
--- a/ql/src/test/results/clientnegative/udf_concat_ws_wrong3.q.out
+++ b/ql/src/test/results/clientnegative/udf_concat_ws_wrong3.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:17 Argument type mismatch '1234': Argument 1 of function CONCAT_WS must be "string or array<string>", but "int" was found.
+FAILED: SemanticException [Error 10016]: Line 3:17 Argument type mismatch '1234': Argument 1 of function CONCAT_WS must be "string or array<string>", but "int" was found.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_elt_wrong_args_len.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_elt_wrong_args_len.q.out b/ql/src/test/results/clientnegative/udf_elt_wrong_args_len.q.out
index 53bb579..70b5b50 100644
--- a/ql/src/test/results/clientnegative/udf_elt_wrong_args_len.q.out
+++ b/ql/src/test/results/clientnegative/udf_elt_wrong_args_len.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 1:7 Arguments length mismatch '3': The function ELT(N,str1,str2,str3,...) needs at least two arguments.
+FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch '3': The function ELT(N,str1,str2,str3,...) needs at least two arguments.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_elt_wrong_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_elt_wrong_type.q.out b/ql/src/test/results/clientnegative/udf_elt_wrong_type.q.out
index 33d7a53..c5164da 100644
--- a/ql/src/test/results/clientnegative/udf_elt_wrong_type.q.out
+++ b/ql/src/test/results/clientnegative/udf_elt_wrong_type.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:14 Argument type mismatch 'lintstring': The 2nd argument of function ELT is expected to a primitive type, but list is found
+FAILED: SemanticException [Error 10016]: Line 3:14 Argument type mismatch 'lintstring': The 2nd argument of function ELT is expected to a primitive type, but list is found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_field_wrong_args_len.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_field_wrong_args_len.q.out b/ql/src/test/results/clientnegative/udf_field_wrong_args_len.q.out
index 5276b44..81eef73 100644
--- a/ql/src/test/results/clientnegative/udf_field_wrong_args_len.q.out
+++ b/ql/src/test/results/clientnegative/udf_field_wrong_args_len.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10014]: Line 1:7 Wrong arguments '3': The function FIELD(str, str1, str2, ...) needs at least two arguments.
+FAILED: SemanticException [Error 10014]: Line 2:7 Wrong arguments '3': The function FIELD(str, str1, str2, ...) needs at least two arguments.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_field_wrong_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_field_wrong_type.q.out b/ql/src/test/results/clientnegative/udf_field_wrong_type.q.out
index fa6533f..f485743 100644
--- a/ql/src/test/results/clientnegative/udf_field_wrong_type.q.out
+++ b/ql/src/test/results/clientnegative/udf_field_wrong_type.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:16 Argument type mismatch 'lintstring': The 2nd argument of function FIELD is expected to a primitive type, but list is found
+FAILED: SemanticException [Error 10016]: Line 3:16 Argument type mismatch 'lintstring': The 2nd argument of function FIELD is expected to a primitive type, but list is found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_format_number_wrong1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_format_number_wrong1.q.out b/ql/src/test/results/clientnegative/udf_format_number_wrong1.q.out
index 925c3c0..ff68c7f 100644
--- a/ql/src/test/results/clientnegative/udf_format_number_wrong1.q.out
+++ b/ql/src/test/results/clientnegative/udf_format_number_wrong1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch '12332.123456': The function FORMAT_NUMBER(X, D or F) needs two arguments.
+FAILED: SemanticException [Error 10015]: Line 3:7 Arguments length mismatch '12332.123456': The function FORMAT_NUMBER(X, D or F) needs two arguments.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_format_number_wrong2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_format_number_wrong2.q.out b/ql/src/test/results/clientnegative/udf_format_number_wrong2.q.out
index d98854c..be49d43 100644
--- a/ql/src/test/results/clientnegative/udf_format_number_wrong2.q.out
+++ b/ql/src/test/results/clientnegative/udf_format_number_wrong2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch '3': The function FORMAT_NUMBER(X, D or F) needs two arguments.
+FAILED: SemanticException [Error 10015]: Line 3:7 Arguments length mismatch '3': The function FORMAT_NUMBER(X, D or F) needs two arguments.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_format_number_wrong3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_format_number_wrong3.q.out b/ql/src/test/results/clientnegative/udf_format_number_wrong3.q.out
index 25486e1..d0f031c 100644
--- a/ql/src/test/results/clientnegative/udf_format_number_wrong3.q.out
+++ b/ql/src/test/results/clientnegative/udf_format_number_wrong3.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10014]: Line 2:7 Wrong arguments '4': org.apache.hadoop.hive.ql.metadata.HiveException: Argument 2 of function FORMAT_NUMBER must be >= 0, but "-4" was found
+FAILED: SemanticException [Error 10014]: Line 3:7 Wrong arguments '4': org.apache.hadoop.hive.ql.metadata.HiveException: Argument 2 of function FORMAT_NUMBER must be >= 0, but "-4" was found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_format_number_wrong4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_format_number_wrong4.q.out b/ql/src/test/results/clientnegative/udf_format_number_wrong4.q.out
index 1536041..182686d 100644
--- a/ql/src/test/results/clientnegative/udf_format_number_wrong4.q.out
+++ b/ql/src/test/results/clientnegative/udf_format_number_wrong4.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:35 Argument type mismatch '4.01': Argument 2 of function FORMAT_NUMBER must be "tinyint" or "smallint" or "int" or "bigint" or "string", but "decimal(3,2)" was found.
+FAILED: SemanticException [Error 10016]: Line 3:35 Argument type mismatch '4.01': Argument 2 of function FORMAT_NUMBER must be "tinyint" or "smallint" or "int" or "bigint" or "string", but "decimal(3,2)" was found.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_format_number_wrong5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_format_number_wrong5.q.out b/ql/src/test/results/clientnegative/udf_format_number_wrong5.q.out
index 5db7248..080dc15 100644
--- a/ql/src/test/results/clientnegative/udf_format_number_wrong5.q.out
+++ b/ql/src/test/results/clientnegative/udf_format_number_wrong5.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:21 Argument type mismatch '321.23': Argument 1 of function FORMAT_NUMBER must be "tinyint" or "smallint" or "int" or "bigint" or "double" or "float" or "decimal", but "array<decimal(11,6)>" was found.
+FAILED: SemanticException [Error 10016]: Line 3:21 Argument type mismatch '321.23': Argument 1 of function FORMAT_NUMBER must be "tinyint" or "smallint" or "int" or "bigint" or "double" or "float" or "decimal", but "array<decimal(11,6)>" was found.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_format_number_wrong7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_format_number_wrong7.q.out b/ql/src/test/results/clientnegative/udf_format_number_wrong7.q.out
index 58704ac..edc06a2 100644
--- a/ql/src/test/results/clientnegative/udf_format_number_wrong7.q.out
+++ b/ql/src/test/results/clientnegative/udf_format_number_wrong7.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:21 Argument type mismatch '4': Argument 1 of function FORMAT_NUMBER must be "tinyint" or "smallint" or "int" or "bigint" or "double" or "float" or "decimal", but "string" was found.
+FAILED: SemanticException [Error 10016]: Line 3:21 Argument type mismatch '4': Argument 1 of function FORMAT_NUMBER must be "tinyint" or "smallint" or "int" or "bigint" or "double" or "float" or "decimal", but "string" was found.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_greatest_error_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_greatest_error_1.q.out b/ql/src/test/results/clientnegative/udf_greatest_error_1.q.out
index 66a4476..ce0faa8 100644
--- a/ql/src/test/results/clientnegative/udf_greatest_error_1.q.out
+++ b/ql/src/test/results/clientnegative/udf_greatest_error_1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10014]: Line 1:7 Wrong arguments ''2.0'': greatest only takes primitive types, got array<string>
+FAILED: SemanticException [Error 10014]: Line 2:7 Wrong arguments ''2.0'': greatest only takes primitive types, got array<string>
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_greatest_error_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_greatest_error_2.q.out b/ql/src/test/results/clientnegative/udf_greatest_error_2.q.out
index 58b4c44..2418eca 100644
--- a/ql/src/test/results/clientnegative/udf_greatest_error_2.q.out
+++ b/ql/src/test/results/clientnegative/udf_greatest_error_2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 1:7 Arguments length mismatch '1': greatest requires at least 2 arguments, got 1
+FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch '1': greatest requires at least 2 arguments, got 1
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_if_not_bool.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_if_not_bool.q.out b/ql/src/test/results/clientnegative/udf_if_not_bool.q.out
index 6e3fafe..1a0d6ae 100644
--- a/ql/src/test/results/clientnegative/udf_if_not_bool.q.out
+++ b/ql/src/test/results/clientnegative/udf_if_not_bool.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 1:10 Argument type mismatch ''STRING'': The first argument of function IF should be "boolean", but "string" is found
+FAILED: SemanticException [Error 10016]: Line 2:10 Argument type mismatch ''STRING'': The first argument of function IF should be "boolean", but "string" is found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_if_wrong_args_len.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_if_wrong_args_len.q.out b/ql/src/test/results/clientnegative/udf_if_wrong_args_len.q.out
index dfc6ff3..463940b 100644
--- a/ql/src/test/results/clientnegative/udf_if_wrong_args_len.q.out
+++ b/ql/src/test/results/clientnegative/udf_if_wrong_args_len.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 1:7 Arguments length mismatch '1': The function IF(expr1,expr2,expr3) accepts exactly 3 arguments.
+FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch '1': The function IF(expr1,expr2,expr3) accepts exactly 3 arguments.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_instr_wrong_args_len.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_instr_wrong_args_len.q.out b/ql/src/test/results/clientnegative/udf_instr_wrong_args_len.q.out
index 114746f..25df5a5 100644
--- a/ql/src/test/results/clientnegative/udf_instr_wrong_args_len.q.out
+++ b/ql/src/test/results/clientnegative/udf_instr_wrong_args_len.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 1:7 Arguments length mismatch ''abcd'': The function INSTR accepts exactly 2 arguments.
+FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch ''abcd'': The function INSTR accepts exactly 2 arguments.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_instr_wrong_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_instr_wrong_type.q.out b/ql/src/test/results/clientnegative/udf_instr_wrong_type.q.out
index 2b2f29f..9aa895b 100644
--- a/ql/src/test/results/clientnegative/udf_instr_wrong_type.q.out
+++ b/ql/src/test/results/clientnegative/udf_instr_wrong_type.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:21 Argument type mismatch 'lintstring': The 2nd argument of function INSTR is expected to a primitive type, but list is found
+FAILED: SemanticException [Error 10016]: Line 3:21 Argument type mismatch 'lintstring': The 2nd argument of function INSTR is expected to a primitive type, but list is found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_likeall_wrong1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_likeall_wrong1.q.out b/ql/src/test/results/clientnegative/udf_likeall_wrong1.q.out
index bf48229..a5af901 100644
--- a/ql/src/test/results/clientnegative/udf_likeall_wrong1.q.out
+++ b/ql/src/test/results/clientnegative/udf_likeall_wrong1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 1:7 Argument type mismatch '120': likeall only takes STRING_GROUP, VOID_GROUP types as 1st argument, got INT
+FAILED: SemanticException [Error 10016]: Line 2:7 Argument type mismatch '120': likeall only takes STRING_GROUP, VOID_GROUP types as 1st argument, got INT
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_likeany_wrong1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_likeany_wrong1.q.out b/ql/src/test/results/clientnegative/udf_likeany_wrong1.q.out
index 3b7f41d..82fa5e1 100644
--- a/ql/src/test/results/clientnegative/udf_likeany_wrong1.q.out
+++ b/ql/src/test/results/clientnegative/udf_likeany_wrong1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 1:7 Argument type mismatch '120': likeany only takes STRING_GROUP, VOID_GROUP types as 1st argument, got INT
+FAILED: SemanticException [Error 10016]: Line 2:7 Argument type mismatch '120': likeany only takes STRING_GROUP, VOID_GROUP types as 1st argument, got INT
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_locate_wrong_args_len.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_locate_wrong_args_len.q.out b/ql/src/test/results/clientnegative/udf_locate_wrong_args_len.q.out
index b3e353b..3561380 100644
--- a/ql/src/test/results/clientnegative/udf_locate_wrong_args_len.q.out
+++ b/ql/src/test/results/clientnegative/udf_locate_wrong_args_len.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 1:7 Arguments length mismatch '2': The function LOCATE accepts exactly 2 or 3 arguments.
+FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch '2': The function LOCATE accepts exactly 2 or 3 arguments.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_locate_wrong_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_locate_wrong_type.q.out b/ql/src/test/results/clientnegative/udf_locate_wrong_type.q.out
index eb724a5..db41e2e 100644
--- a/ql/src/test/results/clientnegative/udf_locate_wrong_type.q.out
+++ b/ql/src/test/results/clientnegative/udf_locate_wrong_type.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:22 Argument type mismatch 'lintstring': The 2nd argument of function LOCATE is expected to a primitive type, but list is found
+FAILED: SemanticException [Error 10016]: Line 3:22 Argument type mismatch 'lintstring': The 2nd argument of function LOCATE is expected to a primitive type, but list is found
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_map_keys_arg_num.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_map_keys_arg_num.q.out b/ql/src/test/results/clientnegative/udf_map_keys_arg_num.q.out
index 44fcc58..f551346 100644
--- a/ql/src/test/results/clientnegative/udf_map_keys_arg_num.q.out
+++ b/ql/src/test/results/clientnegative/udf_map_keys_arg_num.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 1:7 Arguments length mismatch '"2"': The function MAP_KEYS only accepts one argument.
+FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch '"2"': The function MAP_KEYS only accepts one argument.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_map_keys_arg_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_map_keys_arg_type.q.out b/ql/src/test/results/clientnegative/udf_map_keys_arg_type.q.out
index 5a190ce..568aaf1 100644
--- a/ql/src/test/results/clientnegative/udf_map_keys_arg_type.q.out
+++ b/ql/src/test/results/clientnegative/udf_map_keys_arg_type.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 1:16 Argument type mismatch '3': "map" is expected at function MAP_KEYS, but "array<int>" is found
+FAILED: SemanticException [Error 10016]: Line 2:16 Argument type mismatch '3': "map" is expected at function MAP_KEYS, but "array<int>" is found