http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_map_values_arg_num.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_map_values_arg_num.q.out 
b/ql/src/test/results/clientnegative/udf_map_values_arg_num.q.out
index f5deee4..6320a2e 100644
--- a/ql/src/test/results/clientnegative/udf_map_values_arg_num.q.out
+++ b/ql/src/test/results/clientnegative/udf_map_values_arg_num.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 1:7 Arguments length mismatch 
'"2"': The function MAP_VALUES only accepts 1 argument.
+FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch 
'"2"': The function MAP_VALUES only accepts 1 argument.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_map_values_arg_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_map_values_arg_type.q.out 
b/ql/src/test/results/clientnegative/udf_map_values_arg_type.q.out
index affb070..0af2e65 100644
--- a/ql/src/test/results/clientnegative/udf_map_values_arg_type.q.out
+++ b/ql/src/test/results/clientnegative/udf_map_values_arg_type.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 1:18 Argument type mismatch '4': 
"map" is expected at function MAP_VALUES, but "array<int>" is found
+FAILED: SemanticException [Error 10016]: Line 2:18 Argument type mismatch '4': 
"map" is expected at function MAP_VALUES, but "array<int>" is found

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_printf_wrong1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_printf_wrong1.q.out 
b/ql/src/test/results/clientnegative/udf_printf_wrong1.q.out
index 41359d0..298b8a9 100644
--- a/ql/src/test/results/clientnegative/udf_printf_wrong1.q.out
+++ b/ql/src/test/results/clientnegative/udf_printf_wrong1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch 
'printf': The function PRINTF(String format, Obj... args) needs at least one 
arguments.
+FAILED: SemanticException [Error 10015]: Line 3:7 Arguments length mismatch 
'printf': The function PRINTF(String format, Obj... args) needs at least one 
arguments.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_printf_wrong2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_printf_wrong2.q.out 
b/ql/src/test/results/clientnegative/udf_printf_wrong2.q.out
index 6a7c8e6..09e7b84 100644
--- a/ql/src/test/results/clientnegative/udf_printf_wrong2.q.out
+++ b/ql/src/test/results/clientnegative/udf_printf_wrong2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:14 Argument type mismatch 
'100': Argument 1 of function PRINTF must be "string", but "int" was found.
+FAILED: SemanticException [Error 10016]: Line 3:14 Argument type mismatch 
'100': Argument 1 of function PRINTF must be "string", but "int" was found.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_printf_wrong3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_printf_wrong3.q.out 
b/ql/src/test/results/clientnegative/udf_printf_wrong3.q.out
index c020fda..95063b9 100644
--- a/ql/src/test/results/clientnegative/udf_printf_wrong3.q.out
+++ b/ql/src/test/results/clientnegative/udf_printf_wrong3.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:32 Argument type mismatch 
'"argument"': Argument 2 of function PRINTF must be "PRIMITIVE", but 
"array<string>" was found.
+FAILED: SemanticException [Error 10016]: Line 3:32 Argument type mismatch 
'"argument"': Argument 2 of function PRINTF must be "PRIMITIVE", but 
"array<string>" was found.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_printf_wrong4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_printf_wrong4.q.out 
b/ql/src/test/results/clientnegative/udf_printf_wrong4.q.out
index c020fda..95063b9 100644
--- a/ql/src/test/results/clientnegative/udf_printf_wrong4.q.out
+++ b/ql/src/test/results/clientnegative/udf_printf_wrong4.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:32 Argument type mismatch 
'"argument"': Argument 2 of function PRINTF must be "PRIMITIVE", but 
"array<string>" was found.
+FAILED: SemanticException [Error 10016]: Line 3:32 Argument type mismatch 
'"argument"': Argument 2 of function PRINTF must be "PRIMITIVE", but 
"array<string>" was found.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_size_wrong_args_len.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_size_wrong_args_len.q.out 
b/ql/src/test/results/clientnegative/udf_size_wrong_args_len.q.out
index 45b41fa..805776e 100644
--- a/ql/src/test/results/clientnegative/udf_size_wrong_args_len.q.out
+++ b/ql/src/test/results/clientnegative/udf_size_wrong_args_len.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch 
'lintstring': The function SIZE only accepts 1 argument.
+FAILED: SemanticException [Error 10015]: Line 3:7 Arguments length mismatch 
'lintstring': The function SIZE only accepts 1 argument.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_size_wrong_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_size_wrong_type.q.out 
b/ql/src/test/results/clientnegative/udf_size_wrong_type.q.out
index 4100701..a38ee31 100644
--- a/ql/src/test/results/clientnegative/udf_size_wrong_type.q.out
+++ b/ql/src/test/results/clientnegative/udf_size_wrong_type.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 1:12 Argument type mismatch 
''wrong type: string'': "map" or "list" is expected at function SIZE, but 
"string" is found
+FAILED: SemanticException [Error 10016]: Line 2:12 Argument type mismatch 
''wrong type: string'': "map" or "list" is expected at function SIZE, but 
"string" is found

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_sort_array_by_wrong1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_sort_array_by_wrong1.q.out 
b/ql/src/test/results/clientnegative/udf_sort_array_by_wrong1.q.out
index c7794d3..5dd2eae 100644
--- a/ql/src/test/results/clientnegative/udf_sort_array_by_wrong1.q.out
+++ b/ql/src/test/results/clientnegative/udf_sort_array_by_wrong1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:21 Argument type mismatch '4': 
Element[s] of first argument array in function SORT_ARRAY_BY must be struct, 
but array<int> was found.
+FAILED: SemanticException [Error 10016]: Line 3:21 Argument type mismatch '4': 
Element[s] of first argument array in function SORT_ARRAY_BY must be struct, 
but array<int> was found.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_sort_array_by_wrong2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_sort_array_by_wrong2.q.out 
b/ql/src/test/results/clientnegative/udf_sort_array_by_wrong2.q.out
index 220ade5..4ae738e 100644
--- a/ql/src/test/results/clientnegative/udf_sort_array_by_wrong2.q.out
+++ b/ql/src/test/results/clientnegative/udf_sort_array_by_wrong2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch 
'70000': SORT_ARRAY_BY requires minimum 2 arguments, got 1
+FAILED: SemanticException [Error 10015]: Line 3:7 Arguments length mismatch 
'70000': SORT_ARRAY_BY requires minimum 2 arguments, got 1

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_sort_array_wrong1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_sort_array_wrong1.q.out 
b/ql/src/test/results/clientnegative/udf_sort_array_wrong1.q.out
index 6d4b2ab..883da96 100644
--- a/ql/src/test/results/clientnegative/udf_sort_array_wrong1.q.out
+++ b/ql/src/test/results/clientnegative/udf_sort_array_wrong1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10015]: Line 2:7 Arguments length mismatch 
'3': sortarray requires 1 argument(s), got 2
+FAILED: SemanticException [Error 10015]: Line 3:7 Arguments length mismatch 
'3': sortarray requires 1 argument(s), got 2

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_sort_array_wrong2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_sort_array_wrong2.q.out 
b/ql/src/test/results/clientnegative/udf_sort_array_wrong2.q.out
index 2123e2e..39ebb0e 100644
--- a/ql/src/test/results/clientnegative/udf_sort_array_wrong2.q.out
+++ b/ql/src/test/results/clientnegative/udf_sort_array_wrong2.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:18 Argument type mismatch 
'"Invalid"': Argument 1 of function SORT_ARRAY must be array, and element type 
should be either primitive, list, struct, or map, but string was found.
+FAILED: SemanticException [Error 10016]: Line 3:18 Argument type mismatch 
'"Invalid"': Argument 1 of function SORT_ARRAY must be array, and element type 
should be either primitive, list, struct, or map, but string was found.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_sort_array_wrong3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_sort_array_wrong3.q.out 
b/ql/src/test/results/clientnegative/udf_sort_array_wrong3.q.out
index 6745f4f..b78c645 100644
--- a/ql/src/test/results/clientnegative/udf_sort_array_wrong3.q.out
+++ b/ql/src/test/results/clientnegative/udf_sort_array_wrong3.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 2:18 Argument type mismatch 
'"a"': Argument 1 of function SORT_ARRAY must be array, and element type should 
be either primitive, list, struct, or map, but array<uniontype<string>> was 
found.
+FAILED: SemanticException [Error 10016]: Line 3:18 Argument type mismatch 
'"a"': Argument 1 of function SORT_ARRAY must be array, and element type should 
be either primitive, list, struct, or map, but array<uniontype<string>> was 
found.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udf_when_type_wrong.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udf_when_type_wrong.q.out 
b/ql/src/test/results/clientnegative/udf_when_type_wrong.q.out
index 7c7582d..bc2851f 100644
--- a/ql/src/test/results/clientnegative/udf_when_type_wrong.q.out
+++ b/ql/src/test/results/clientnegative/udf_when_type_wrong.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10016]: Line 3:13 Argument type mismatch 
''1'': "boolean" is expected after WHEN, but "string" is found
+FAILED: SemanticException [Error 10016]: Line 4:13 Argument type mismatch 
''1'': "boolean" is expected after WHEN, but "string" is found

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/udtf_not_supported1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/udtf_not_supported1.q.out 
b/ql/src/test/results/clientnegative/udtf_not_supported1.q.out
index 0dcb730..c5ab549 100644
--- a/ql/src/test/results/clientnegative/udtf_not_supported1.q.out
+++ b/ql/src/test/results/clientnegative/udtf_not_supported1.q.out
@@ -1 +1 @@
-FAILED: SemanticException 1:39 Only a single expression in the SELECT clause 
is supported with UDTF's. Error encountered near token 'key'
+FAILED: SemanticException 2:39 Only a single expression in the SELECT clause 
is supported with UDTF's. Error encountered near token 'key'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/unionClusterBy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/unionClusterBy.q.out 
b/ql/src/test/results/clientnegative/unionClusterBy.q.out
index 7f01413..1f0dddc 100644
--- a/ql/src/test/results/clientnegative/unionClusterBy.q.out
+++ b/ql/src/test/results/clientnegative/unionClusterBy.q.out
@@ -1 +1 @@
-FAILED: ParseException line 5:0 missing EOF at 'union' near 'key'
+FAILED: ParseException line 6:0 missing EOF at 'union' near 'key'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/unionDistributeBy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/unionDistributeBy.q.out 
b/ql/src/test/results/clientnegative/unionDistributeBy.q.out
index 7f01413..1f0dddc 100644
--- a/ql/src/test/results/clientnegative/unionDistributeBy.q.out
+++ b/ql/src/test/results/clientnegative/unionDistributeBy.q.out
@@ -1 +1 @@
-FAILED: ParseException line 5:0 missing EOF at 'union' near 'key'
+FAILED: ParseException line 6:0 missing EOF at 'union' near 'key'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/unionLimit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/unionLimit.q.out 
b/ql/src/test/results/clientnegative/unionLimit.q.out
index e8463b5..61d91ab 100644
--- a/ql/src/test/results/clientnegative/unionLimit.q.out
+++ b/ql/src/test/results/clientnegative/unionLimit.q.out
@@ -1 +1 @@
-FAILED: ParseException line 5:0 missing EOF at 'union' near '1'
+FAILED: ParseException line 6:0 missing EOF at 'union' near '1'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/unionOrderBy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/unionOrderBy.q.out 
b/ql/src/test/results/clientnegative/unionOrderBy.q.out
index 7f01413..1f0dddc 100644
--- a/ql/src/test/results/clientnegative/unionOrderBy.q.out
+++ b/ql/src/test/results/clientnegative/unionOrderBy.q.out
@@ -1 +1 @@
-FAILED: ParseException line 5:0 missing EOF at 'union' near 'key'
+FAILED: ParseException line 6:0 missing EOF at 'union' near 'key'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/unionSortBy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/unionSortBy.q.out 
b/ql/src/test/results/clientnegative/unionSortBy.q.out
index 7f01413..1f0dddc 100644
--- a/ql/src/test/results/clientnegative/unionSortBy.q.out
+++ b/ql/src/test/results/clientnegative/unionSortBy.q.out
@@ -1 +1 @@
-FAILED: ParseException line 5:0 missing EOF at 'union' near 'key'
+FAILED: ParseException line 6:0 missing EOF at 'union' near 'key'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/uniquejoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/uniquejoin.q.out 
b/ql/src/test/results/clientnegative/uniquejoin.q.out
index 5778770..f44b309 100644
--- a/ql/src/test/results/clientnegative/uniquejoin.q.out
+++ b/ql/src/test/results/clientnegative/uniquejoin.q.out
@@ -1 +1 @@
-FAILED: ParseException line 1:16 cannot recognize input near '(' 'SELECT' 
'src' in table name
+FAILED: ParseException line 2:16 cannot recognize input near '(' 'SELECT' 
'src' in table name

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientnegative/uniquejoin3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/uniquejoin3.q.out 
b/ql/src/test/results/clientnegative/uniquejoin3.q.out
index e10a47b..319b0b3 100644
--- a/ql/src/test/results/clientnegative/uniquejoin3.q.out
+++ b/ql/src/test/results/clientnegative/uniquejoin3.q.out
@@ -1 +1 @@
-FAILED: ParseException line 1:54 required (...)+ loop did not match anything 
at input 'JOIN' in statement
+FAILED: ParseException line 2:54 required (...)+ loop did not match anything 
at input 'JOIN' in statement

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/add_part_exist.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/add_part_exist.q.out 
b/ql/src/test/results/clientpositive/add_part_exist.q.out
index 7851664..e918ae2 100644
--- a/ql/src/test/results/clientpositive/add_part_exist.q.out
+++ b/ql/src/test/results/clientpositive/add_part_exist.q.out
@@ -78,28 +78,6 @@ POSTHOOK: query: DROP TABLE add_part_test
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@add_part_test
 POSTHOOK: Output: default@add_part_test
-PREHOOK: query: SHOW TABLES
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE add_part_test_db
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:add_part_test_db

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/alter1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter1.q.out 
b/ql/src/test/results/clientpositive/alter1.q.out
index 6c43860..1fef592 100644
--- a/ql/src/test/results/clientpositive/alter1.q.out
+++ b/ql/src/test/results/clientpositive/alter1.q.out
@@ -185,28 +185,12 @@ POSTHOOK: query: DROP TABLE alter1
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@alter1
 POSTHOOK: Output: default@alter1
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "alter*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "alter*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE alter1_db
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:alter1_db

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/alter2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter2.q.out 
b/ql/src/test/results/clientpositive/alter2.q.out
index 4b94a05..b9d1b61 100644
--- a/ql/src/test/results/clientpositive/alter2.q.out
+++ b/ql/src/test/results/clientpositive/alter2.q.out
@@ -198,28 +198,12 @@ POSTHOOK: query: DROP TABLE alter2
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@alter2
 POSTHOOK: Output: default@alter2
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "alter*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "alter*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE alter2_db
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:alter2_db
@@ -232,10 +216,10 @@ PREHOOK: Input: database:alter2_db
 POSTHOOK: query: USE alter2_db
 POSTHOOK: type: SWITCHDATABASE
 POSTHOOK: Input: database:alter2_db
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "alter*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:alter2_db
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "alter*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:alter2_db
 PREHOOK: query: CREATE TABLE alter2(a int, b int) PARTITIONED BY (insertdate 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/alter3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter3.q.out 
b/ql/src/test/results/clientpositive/alter3.q.out
index 8395a79..7ceeb3a 100644
--- a/ql/src/test/results/clientpositive/alter3.q.out
+++ b/ql/src/test/results/clientpositive/alter3.q.out
@@ -174,28 +174,12 @@ POSTHOOK: query: DROP TABLE alter3_like_renamed
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@alter3_like_renamed
 POSTHOOK: Output: default@alter3_like_renamed
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "alter3_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "alter3_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE alter3_db
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:alter3_db

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/alter4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter4.q.out 
b/ql/src/test/results/clientpositive/alter4.q.out
index 292b26d..74e2dfb 100644
--- a/ql/src/test/results/clientpositive/alter4.q.out
+++ b/ql/src/test/results/clientpositive/alter4.q.out
@@ -42,28 +42,12 @@ POSTHOOK: query: DROP TABLE set_bucketing_test
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@set_bucketing_test
 POSTHOOK: Output: default@set_bucketing_test
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "set_bucketing_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "set_bucketing_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE alter4_db
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:alter4_db

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/alter5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter5.q.out 
b/ql/src/test/results/clientpositive/alter5.q.out
index a0bafc7..5874f9f 100644
--- a/ql/src/test/results/clientpositive/alter5.q.out
+++ b/ql/src/test/results/clientpositive/alter5.q.out
@@ -100,28 +100,12 @@ POSTHOOK: query: DROP TABLE alter5
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@alter5
 POSTHOOK: Output: default@alter5
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "alter*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "alter*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE alter5_db
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:alter5_db

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/alter_rename_partition.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_rename_partition.q.out 
b/ql/src/test/results/clientpositive/alter_rename_partition.q.out
index df39ecc..fc7d750 100644
--- a/ql/src/test/results/clientpositive/alter_rename_partition.q.out
+++ b/ql/src/test/results/clientpositive/alter_rename_partition.q.out
@@ -6,28 +6,6 @@ PREHOOK: query: DROP TABLE alter_rename_partition
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE alter_rename_partition
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: SHOW TABLES
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: create table alter_rename_partition_src ( col1 string ) stored 
as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -134,28 +112,6 @@ POSTHOOK: query: DROP TABLE alter_rename_partition
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@alter_rename_partition
 POSTHOOK: Output: default@alter_rename_partition
-PREHOOK: query: SHOW TABLES
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE alter_rename_partition_db
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:alter_rename_partition_db

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/authorization_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/authorization_9.q.out 
b/ql/src/test/results/clientpositive/authorization_9.q.out
index 17ca6ef..ac3baf9 100644
--- a/ql/src/test/results/clientpositive/authorization_9.q.out
+++ b/ql/src/test/results/clientpositive/authorization_9.q.out
@@ -1,134 +1,82 @@
+PREHOOK: query: create database authorization_9
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:authorization_9
+POSTHOOK: query: create database authorization_9
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:authorization_9
+PREHOOK: query: use authorization_9
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:authorization_9
+POSTHOOK: query: use authorization_9
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:authorization_9
 PREHOOK: query: create table dummy (key string, value string)
 PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
+PREHOOK: Output: database:authorization_9
 POSTHOOK: query: create table dummy (key string, value string)
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@dummy
+POSTHOOK: Output: authorization_9@dummy
+POSTHOOK: Output: database:authorization_9
 PREHOOK: query: grant select to user hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: query: grant select to user hive_test_user
 POSTHOOK: type: GRANT_PRIVILEGE
-PREHOOK: query: grant select on database default to user hive_test_user
+PREHOOK: query: grant select on database authorization_9 to user hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
-POSTHOOK: query: grant select on database default to user hive_test_user
+POSTHOOK: query: grant select on database authorization_9 to user 
hive_test_user
 POSTHOOK: type: GRANT_PRIVILEGE
 PREHOOK: query: grant select on table dummy to user hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
 POSTHOOK: query: grant select on table dummy to user hive_test_user
 POSTHOOK: type: GRANT_PRIVILEGE
-POSTHOOK: Output: default@dummy
+POSTHOOK: Output: authorization_9@dummy
 PREHOOK: query: grant select (key, value) on table dummy to user hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
 POSTHOOK: query: grant select (key, value) on table dummy to user 
hive_test_user
 POSTHOOK: type: GRANT_PRIVILEGE
-POSTHOOK: Output: default@dummy
-PREHOOK: query: show grant user hive_test_user on database default
+POSTHOOK: Output: authorization_9@dummy
+PREHOOK: query: show grant user hive_test_user on database authorization_9
 PREHOOK: type: SHOW_GRANT
-POSTHOOK: query: show grant user hive_test_user on database default
+POSTHOOK: query: show grant user hive_test_user on database authorization_9
 POSTHOOK: type: SHOW_GRANT
-default                                hive_test_user  USER    SELECT  false   
-1      hive_test_user
+authorization_9                                hive_test_user  USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on table dummy
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table dummy
 POSTHOOK: type: SHOW_GRANT
-default        dummy                   hive_test_user  USER    SELECT  false   
-1      hive_test_user
+authorization_9        dummy                   hive_test_user  USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on all
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on all
 POSTHOOK: type: SHOW_GRANT
                                hive_test_user  USER    SELECT  false   -1      
hive_test_user
-default                                hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        dummy                   hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        lineitem                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        part                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_json                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
DELETE  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
INSERT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
SELECT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
UPDATE  true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcpart                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        dummy           [key]   hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        dummy           [value] hive_test_user  USER    SELECT  false   
-1      hive_test_user
+authorization_9                                hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy                   hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [key]   hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [value] hive_test_user  USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: grant select to user hive_test_user2
 PREHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: query: grant select to user hive_test_user2
 POSTHOOK: type: GRANT_PRIVILEGE
-PREHOOK: query: grant select on database default to user hive_test_user2
+PREHOOK: query: grant select on database authorization_9 to user 
hive_test_user2
 PREHOOK: type: GRANT_PRIVILEGE
-POSTHOOK: query: grant select on database default to user hive_test_user2
+POSTHOOK: query: grant select on database authorization_9 to user 
hive_test_user2
 POSTHOOK: type: GRANT_PRIVILEGE
 PREHOOK: query: grant select on table dummy to user hive_test_user2
 PREHOOK: type: GRANT_PRIVILEGE
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
 POSTHOOK: query: grant select on table dummy to user hive_test_user2
 POSTHOOK: type: GRANT_PRIVILEGE
-POSTHOOK: Output: default@dummy
+POSTHOOK: Output: authorization_9@dummy
 PREHOOK: query: grant select (key, value) on table dummy to user 
hive_test_user2
 PREHOOK: type: GRANT_PRIVILEGE
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
 POSTHOOK: query: grant select (key, value) on table dummy to user 
hive_test_user2
 POSTHOOK: type: GRANT_PRIVILEGE
-POSTHOOK: Output: default@dummy
+POSTHOOK: Output: authorization_9@dummy
 PREHOOK: query: show grant on all
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant on all
@@ -136,197 +84,69 @@ POSTHOOK: type: SHOW_GRANT
                                admin   ROLE    ALL     true    -1      admin
                                hive_test_user  USER    SELECT  false   -1      
hive_test_user
                                hive_test_user2 USER    SELECT  false   -1      
hive_test_user
-default                                hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default                                hive_test_user2 USER    SELECT  false   
-1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        dummy                   hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        dummy                   hive_test_user2 USER    SELECT  false   
-1      hive_test_user
-default        lineitem                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        part                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_json                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
DELETE  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
INSERT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
SELECT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
UPDATE  true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcpart                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        dummy           [key]   hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        dummy           [key]   hive_test_user2 USER    SELECT  false   
-1      hive_test_user
-default        dummy           [value] hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        dummy           [value] hive_test_user2 USER    SELECT  false   
-1      hive_test_user
+authorization_9                                hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9                                hive_test_user2 USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy                   hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy                   hive_test_user2 USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [key]   hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [key]   hive_test_user2 USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [value] hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [value] hive_test_user2 USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on all
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on all
 POSTHOOK: type: SHOW_GRANT
                                hive_test_user  USER    SELECT  false   -1      
hive_test_user
-default                                hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        dummy                   hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        lineitem                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        part                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_json                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
DELETE  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
INSERT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
SELECT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
UPDATE  true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcpart                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        dummy           [key]   hive_test_user  USER    SELECT  false   
-1      hive_test_user
-default        dummy           [value] hive_test_user  USER    SELECT  false   
-1      hive_test_user
+authorization_9                                hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy                   hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [key]   hive_test_user  USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [value] hive_test_user  USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user2 on all
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user2 on all
 POSTHOOK: type: SHOW_GRANT
                                hive_test_user2 USER    SELECT  false   -1      
hive_test_user
-default                                hive_test_user2 USER    SELECT  false   
-1      hive_test_user
-default        dummy                   hive_test_user2 USER    SELECT  false   
-1      hive_test_user
-default        dummy           [key]   hive_test_user2 USER    SELECT  false   
-1      hive_test_user
-default        dummy           [value] hive_test_user2 USER    SELECT  false   
-1      hive_test_user
+authorization_9                                hive_test_user2 USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy                   hive_test_user2 USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [key]   hive_test_user2 USER    SELECT  
false   -1      hive_test_user
+authorization_9        dummy           [value] hive_test_user2 USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: revoke select from user hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
 POSTHOOK: query: revoke select from user hive_test_user
 POSTHOOK: type: REVOKE_PRIVILEGE
-PREHOOK: query: revoke select on database default from user hive_test_user
+PREHOOK: query: revoke select on database authorization_9 from user 
hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
-POSTHOOK: query: revoke select on database default from user hive_test_user
+POSTHOOK: query: revoke select on database authorization_9 from user 
hive_test_user
 POSTHOOK: type: REVOKE_PRIVILEGE
 PREHOOK: query: revoke select on table dummy from user hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
 POSTHOOK: query: revoke select on table dummy from user hive_test_user
 POSTHOOK: type: REVOKE_PRIVILEGE
-POSTHOOK: Output: default@dummy
+POSTHOOK: Output: authorization_9@dummy
 PREHOOK: query: revoke select (key, value) on table dummy from user 
hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
 POSTHOOK: query: revoke select (key, value) on table dummy from user 
hive_test_user
 POSTHOOK: type: REVOKE_PRIVILEGE
-POSTHOOK: Output: default@dummy
+POSTHOOK: Output: authorization_9@dummy
 PREHOOK: query: revoke select from user hive_test_user2
 PREHOOK: type: REVOKE_PRIVILEGE
 POSTHOOK: query: revoke select from user hive_test_user2
 POSTHOOK: type: REVOKE_PRIVILEGE
-PREHOOK: query: revoke select on database default from user hive_test_user2
+PREHOOK: query: revoke select on database authorization_9 from user 
hive_test_user2
 PREHOOK: type: REVOKE_PRIVILEGE
-POSTHOOK: query: revoke select on database default from user hive_test_user2
+POSTHOOK: query: revoke select on database authorization_9 from user 
hive_test_user2
 POSTHOOK: type: REVOKE_PRIVILEGE
 PREHOOK: query: revoke select on table dummy from user hive_test_user2
 PREHOOK: type: REVOKE_PRIVILEGE
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
 POSTHOOK: query: revoke select on table dummy from user hive_test_user2
 POSTHOOK: type: REVOKE_PRIVILEGE
-POSTHOOK: Output: default@dummy
+POSTHOOK: Output: authorization_9@dummy
 PREHOOK: query: revoke select (key, value) on table dummy from user 
hive_test_user2
 PREHOOK: type: REVOKE_PRIVILEGE
-PREHOOK: Output: default@dummy
+PREHOOK: Output: authorization_9@dummy
 POSTHOOK: query: revoke select (key, value) on table dummy from user 
hive_test_user2
 POSTHOOK: type: REVOKE_PRIVILEGE
-POSTHOOK: Output: default@dummy
+POSTHOOK: Output: authorization_9@dummy

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/authorization_show_grant.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/authorization_show_grant.q.out 
b/ql/src/test/results/clientpositive/authorization_show_grant.q.out
index b4dab78..37c6555 100644
--- a/ql/src/test/results/clientpositive/authorization_show_grant.q.out
+++ b/ql/src/test/results/clientpositive/authorization_show_grant.q.out
@@ -103,70 +103,6 @@ PREHOOK: query: show grant
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant
 POSTHOOK: type: SHOW_GRANT
-default        alltypesorc                     hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesorc                     hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        lineitem                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        part                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src                     hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_json                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
DELETE  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
INSERT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
SELECT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
UPDATE  true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcpart                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
 default        t1                      rolea   ROLE    SELECT  false   -1      
user1
 default        t1                      user1   USER    DELETE  true    -1      
hive_admin_user
 default        t1                      user1   USER    INSERT  true    -1      
hive_admin_user

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/cte_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_5.q.out 
b/ql/src/test/results/clientpositive/cte_5.q.out
index e99f1e7..83d47c5 100644
--- a/ql/src/test/results/clientpositive/cte_5.q.out
+++ b/ql/src/test/results/clientpositive/cte_5.q.out
@@ -41,28 +41,6 @@ POSTHOOK: query: show tables in mydb
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:mydb
 q1
-PREHOOK: query: show tables
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: show tables
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 Warning: Shuffle Join JOIN[8][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain
 with q1 as (select * from src where key= '5')

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/cte_mat_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_mat_4.q.out 
b/ql/src/test/results/clientpositive/cte_mat_4.q.out
index d2659a5..8900e27 100644
--- a/ql/src/test/results/clientpositive/cte_mat_4.q.out
+++ b/ql/src/test/results/clientpositive/cte_mat_4.q.out
@@ -16,29 +16,13 @@ POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@q1
 POSTHOOK: Lineage: q1.a SCRIPT []
 POSTHOOK: Lineage: q1.b SCRIPT []
-PREHOOK: query: show tables
+PREHOOK: query: show tables like "q1"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: show tables
+POSTHOOK: query: show tables like "q1"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
 q1
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
@@ -215,29 +199,13 @@ POSTHOOK: Output: default@q1
 5
 5
 5
-PREHOOK: query: show tables
+PREHOOK: query: show tables like "q1"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: show tables
+POSTHOOK: query: show tables like "q1"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
 q1
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: select * from q1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@q1
@@ -255,28 +223,12 @@ POSTHOOK: query: drop table q1
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@q1
 POSTHOOK: Output: default@q1
-PREHOOK: query: show tables
+PREHOOK: query: show tables like "q1"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: show tables
+POSTHOOK: query: show tables like "q1"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
@@ -453,25 +405,9 @@ POSTHOOK: Output: default@q1
 5
 5
 5
-PREHOOK: query: show tables
+PREHOOK: query: show tables like "q1"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: show tables
+POSTHOOK: query: show tables like "q1"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/cte_mat_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_mat_5.q.out 
b/ql/src/test/results/clientpositive/cte_mat_5.q.out
index 09bd98a..09e8762 100644
--- a/ql/src/test/results/clientpositive/cte_mat_5.q.out
+++ b/ql/src/test/results/clientpositive/cte_mat_5.q.out
@@ -41,28 +41,6 @@ POSTHOOK: query: show tables in mydb
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:mydb
 q1
-PREHOOK: query: show tables
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: show tables
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.colnum

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/describe_table_json.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_table_json.q.out 
b/ql/src/test/results/clientpositive/describe_table_json.q.out
index 3fc950f..3577529 100644
--- a/ql/src/test/results/clientpositive/describe_table_json.q.out
+++ b/ql/src/test/results/clientpositive/describe_table_json.q.out
@@ -6,23 +6,16 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS jsontable (key 
INT, value STRING) CO
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@jsontable
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE 'jsontab*'
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-{"tables":["alltypesorc","alltypesparquet","cbo_t1","cbo_t2","cbo_t3","jsontable","lineitem","part","src","src1","src_cbo","src_json","src_sequencefile","src_thrift","srcbucket","srcbucket2","srcpart"]}
-PREHOOK: query: SHOW TABLES LIKE 'json*'
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES LIKE 'json*'
+POSTHOOK: query: SHOW TABLES LIKE 'jsontab*'
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
 {"tables":["jsontable"]}
-PREHOOK: query: SHOW TABLE EXTENDED LIKE 'json*'
+PREHOOK: query: SHOW TABLE EXTENDED LIKE 'jsontab*'
 PREHOOK: type: SHOW_TABLESTATUS
-POSTHOOK: query: SHOW TABLE EXTENDED LIKE 'json*'
+POSTHOOK: query: SHOW TABLE EXTENDED LIKE 'jsontab*'
 POSTHOOK: type: SHOW_TABLESTATUS
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE jsontable SET TBLPROPERTIES ('id' = 'jsontable')

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
----------------------------------------------------------------------
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 129abc8..c802e1a 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
@@ -18,14 +18,13 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@encrypted_table
 Encryption key created: 'key_128'
 Encryption zone created: 
'/build/ql/test/data/warehouse/default/encrypted_table' using key: 'key_128'
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "encrypted_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "encrypted_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
 encrypted_table
-src
 PREHOOK: query: ALTER TABLE encrypted_table SET 
TBLPROPERTIES("auto.purge"="true")
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@encrypted_table
@@ -140,13 +139,12 @@ POSTHOOK: query: DROP TABLE encrypted_ext_table
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@encrypted_ext_table
 POSTHOOK: Output: default@encrypted_ext_table
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "encrypted_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "encrypted_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-src
 PREHOOK: query: DROP TABLE IF EXISTS encrypted_table PURGE
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table PURGE

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
----------------------------------------------------------------------
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 996c33a..2de856a 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
@@ -38,15 +38,14 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@encrypted_ext_table
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "encrypted_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "encrypted_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
 encrypted_ext_table
 encrypted_table
-src
 PREHOOK: query: DROP TABLE default.encrypted_ext_table
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@encrypted_ext_table
@@ -55,14 +54,13 @@ POSTHOOK: query: DROP TABLE default.encrypted_ext_table
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@encrypted_ext_table
 POSTHOOK: Output: default@encrypted_ext_table
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "encrypted_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "encrypted_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
 encrypted_table
-src
 PREHOOK: query: DROP TABLE default.encrypted_table
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@encrypted_table
@@ -71,13 +69,12 @@ POSTHOOK: query: DROP TABLE default.encrypted_table
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@encrypted_table
 POSTHOOK: Output: default@encrypted_table
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "encrypted_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "encrypted_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-src
 PREHOOK: query: DROP TABLE IF EXISTS encrypted_table1
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table1
@@ -145,22 +142,20 @@ POSTHOOK: query: DROP TABLE default.encrypted_table1
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@encrypted_table1
 POSTHOOK: Output: default@encrypted_table1
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "encrypted_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "encrypted_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-src
 FAILED: SemanticException [Error 10001]: Table not found encrypted_table1
 PREHOOK: query: DROP TABLE default.encrypted_table1
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE default.encrypted_table1
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "encrypted_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "encrypted_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-src

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
----------------------------------------------------------------------
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 5af6d5d..0f652b5 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
@@ -38,14 +38,13 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@encrypted_table
 POSTHOOK: Lineage: encrypted_table.key EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: encrypted_table.value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "encrypted_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "encrypted_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
 encrypted_table
-src
 PREHOOK: query: ANALYZE TABLE encrypted_table COMPUTE STATISTICS FOR COLUMNS
 PREHOOK: type: QUERY
 PREHOOK: Input: default@encrypted_table

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/input2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input2.q.out 
b/ql/src/test/results/clientpositive/input2.q.out
index 9693131..a2702ee 100644
--- a/ql/src/test/results/clientpositive/input2.q.out
+++ b/ql/src/test/results/clientpositive/input2.q.out
@@ -39,28 +39,12 @@ POSTHOOK: Input: default@test2b
 a                      array<int>                                  
 b                      double                                      
 c                      map<double,int>                             
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "TEST2*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "TEST2*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 test2a
 test2b
 PREHOOK: query: DROP TABLE TEST2a
@@ -71,28 +55,12 @@ POSTHOOK: query: DROP TABLE TEST2a
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@test2a
 POSTHOOK: Output: default@test2a
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "TEST2*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "TEST2*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 test2b
 PREHOOK: query: DROP TABLE TEST2b
 PREHOOK: type: DROPTABLE
@@ -103,10 +71,10 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@test2b
 POSTHOOK: Output: default@test2b
 PREHOOK: query: EXPLAIN
-SHOW TABLES
+SHOW TABLES LIKE "TEST2*"
 PREHOOK: type: SHOWTABLES
 POSTHOOK: query: EXPLAIN
-SHOW TABLES
+SHOW TABLES LIKE "TEST2*"
 POSTHOOK: type: SHOWTABLES
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
@@ -117,6 +85,7 @@ STAGE PLANS:
       Show Table Operator:
         Show Tables
           database name: default
+          pattern: TEST2*
 
   Stage: Stage-1
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/input3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input3.q.out 
b/ql/src/test/results/clientpositive/input3.q.out
index db30111..b57717b 100644
--- a/ql/src/test/results/clientpositive/input3.q.out
+++ b/ql/src/test/results/clientpositive/input3.q.out
@@ -31,28 +31,12 @@ POSTHOOK: Input: default@test3b
 a                      array<int>                                  
 b                      double                                      
 c                      map<double,int>                             
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "TEST3*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "TEST3*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 test3a
 test3b
 PREHOOK: query: EXPLAIN
@@ -126,28 +110,12 @@ a                         array<int>
 b                      double                                      
 c                      map<double,int>                             
 x                      double                                      
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "TEST3*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "TEST3*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 test3a
 test3c
 PREHOOK: query: EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/llap/cte_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_5.q.out 
b/ql/src/test/results/clientpositive/llap/cte_5.q.out
index 76ba829..a85fbee 100644
--- a/ql/src/test/results/clientpositive/llap/cte_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_5.q.out
@@ -41,28 +41,6 @@ POSTHOOK: query: show tables in mydb
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:mydb
 q1
-PREHOOK: query: show tables
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: show tables
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 Warning: Shuffle Join MERGEJOIN[13][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain
 with q1 as (select * from src where key= '5')

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out 
b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
index f3947ca..087d978 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
@@ -16,29 +16,13 @@ POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@q1
 POSTHOOK: Lineage: q1.a SCRIPT []
 POSTHOOK: Lineage: q1.b SCRIPT []
-PREHOOK: query: show tables
+PREHOOK: query: show tables like "q1"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: show tables
+POSTHOOK: query: show tables like "q1"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
 q1
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
@@ -127,29 +111,13 @@ POSTHOOK: Output: default@q1
 5
 5
 5
-PREHOOK: query: show tables
+PREHOOK: query: show tables like "q1"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: show tables
+POSTHOOK: query: show tables like "q1"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
 q1
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: select * from q1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@q1
@@ -167,28 +135,12 @@ POSTHOOK: query: drop table q1
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@q1
 POSTHOOK: Output: default@q1
-PREHOOK: query: show tables
+PREHOOK: query: show tables like "q1"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: show tables
+POSTHOOK: query: show tables like "q1"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
@@ -277,25 +229,9 @@ POSTHOOK: Output: default@q1
 5
 5
 5
-PREHOOK: query: show tables
+PREHOOK: query: show tables like "q1"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: show tables
+POSTHOOK: query: show tables like "q1"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out 
b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
index ccf73ac..7f0503b 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
@@ -41,28 +41,6 @@ POSTHOOK: query: show tables in mydb
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:mydb
 q1
-PREHOOK: query: show tables
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: show tables
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.colnum

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out 
b/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
index c580274..3be32fb 100644
--- a/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
+++ b/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
@@ -59,34 +59,19 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dbs
 PREHOOK: query: select tables.name as tn, dbs.NAME as dn, tables.type as t
-from tables join dbs on (tables.db_id = dbs.DB_ID) order by tn, dn, t
+from tables join dbs on (tables.db_id = dbs.DB_ID) WHERE tables.name IN 
("src", "dbs", "tables") order by tn, dn, t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dbs
 PREHOOK: Input: default@tables
 #### A masked pattern was here ####
 POSTHOOK: query: select tables.name as tn, dbs.NAME as dn, tables.type as t
-from tables join dbs on (tables.db_id = dbs.DB_ID) order by tn, dn, t
+from tables join dbs on (tables.db_id = dbs.DB_ID) WHERE tables.name IN 
("src", "dbs", "tables") order by tn, dn, t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dbs
 POSTHOOK: Input: default@tables
 #### A masked pattern was here ####
-alltypesorc    default MANAGED_TABLE
-alltypesparquet        default MANAGED_TABLE
-cbo_t1 default MANAGED_TABLE
-cbo_t2 default MANAGED_TABLE
-cbo_t3 default MANAGED_TABLE
 dbs    default EXTERNAL_TABLE
-lineitem       default MANAGED_TABLE
-part   default MANAGED_TABLE
 src    default MANAGED_TABLE
-src1   default MANAGED_TABLE
-src_cbo        default MANAGED_TABLE
-src_json       default MANAGED_TABLE
-src_sequencefile       default MANAGED_TABLE
-src_thrift     default MANAGED_TABLE
-srcbucket      default MANAGED_TABLE
-srcbucket2     default MANAGED_TABLE
-srcpart        default MANAGED_TABLE
 tables default EXTERNAL_TABLE
 Warning: Shuffle Join MERGEJOIN[17][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain
@@ -206,7 +191,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[17][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
+Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: select
   t1.name as a, t2.key as b
 from
@@ -214,6 +199,7 @@ from
   join
   (select distinct key from src) t2
   on (t2.key-1) = t1.db_id
+  where t1.name IN ("src", "dbs", "tables")
 order by a,b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -226,53 +212,15 @@ from
   join
   (select distinct key from src) t2
   on (t2.key-1) = t1.db_id
+  where t1.name IN ("src", "dbs", "tables")
 order by a,b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@tables
 #### A masked pattern was here ####
-alltypesorc    2
-alltypesparquet        2
-cbo_t1 2
-cbo_t2 2
-cbo_t3 2
 dbs    2
-lineitem       2
-part   2
 src    2
-src1   2
-src_cbo        2
-src_json       2
-src_sequencefile       2
-src_thrift     2
-srcbucket      2
-srcbucket2     2
-srcpart        2
 tables 2
-PREHOOK: query: show tables
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: show tables
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-dbs
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
-tables
 PREHOOK: query: describe tables
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@tables

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/llap/temp_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/temp_table.q.out 
b/ql/src/test/results/clientpositive/llap/temp_table.q.out
index b04c643..de0fef2 100644
--- a/ql/src/test/results/clientpositive/llap/temp_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/temp_table.q.out
@@ -395,32 +395,6 @@ POSTHOOK: Input: default@bay
 103    val_103
 104    val_104
 104    val_104
-PREHOOK: query: SHOW TABLES
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-bar
-bay
-baz
-cbo_t1
-cbo_t2
-cbo_t3
-foo
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE two
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:two

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/rename_column.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rename_column.q.out 
b/ql/src/test/results/clientpositive/rename_column.q.out
index 6418ce2..43abc7f 100644
--- a/ql/src/test/results/clientpositive/rename_column.q.out
+++ b/ql/src/test/results/clientpositive/rename_column.q.out
@@ -142,28 +142,12 @@ POSTHOOK: query: DROP TABLE kv_rename_test
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@kv_rename_test
 POSTHOOK: Output: default@kv_rename_test
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "kv_rename_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "kv_rename_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE kv_rename_test_db
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:kv_rename_test_db
@@ -320,9 +304,9 @@ POSTHOOK: query: DROP TABLE kv_rename_test
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: kv_rename_test_db@kv_rename_test
 POSTHOOK: Output: kv_rename_test_db@kv_rename_test
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "kv_rename_*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:kv_rename_test_db
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "kv_rename_*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:kv_rename_test_db

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/show_tables.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_tables.q.out 
b/ql/src/test/results/clientpositive/show_tables.q.out
index c498ab3..5cdecb5 100644
--- a/ql/src/test/results/clientpositive/show_tables.q.out
+++ b/ql/src/test/results/clientpositive/show_tables.q.out
@@ -127,30 +127,6 @@ POSTHOOK: Input: database:test_db
 bar
 baz
 foo
-PREHOOK: query: SHOW TABLES FROM default
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES FROM default
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-shtb_test1
-shtb_test2
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: SHOW TABLES IN test_db
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:test_db
@@ -160,30 +136,6 @@ POSTHOOK: Input: database:test_db
 bar
 baz
 foo
-PREHOOK: query: SHOW TABLES IN default
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES IN default
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-shtb_test1
-shtb_test2
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: SHOW TABLES IN test_db "test*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:test_db

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/spark/temp_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/temp_table.q.out 
b/ql/src/test/results/clientpositive/spark/temp_table.q.out
index 71fa11d..ff08546 100644
--- a/ql/src/test/results/clientpositive/spark/temp_table.q.out
+++ b/ql/src/test/results/clientpositive/spark/temp_table.q.out
@@ -369,32 +369,6 @@ POSTHOOK: Input: default@bay
 103    val_103
 104    val_104
 104    val_104
-PREHOOK: query: SHOW TABLES
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-bar
-bay
-baz
-cbo_t1
-cbo_t2
-cbo_t3
-foo
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 PREHOOK: query: CREATE DATABASE two
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:two

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/clientpositive/temp_table_truncate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/temp_table_truncate.q.out 
b/ql/src/test/results/clientpositive/temp_table_truncate.q.out
index 23084cc..eb491a4 100644
--- a/ql/src/test/results/clientpositive/temp_table_truncate.q.out
+++ b/ql/src/test/results/clientpositive/temp_table_truncate.q.out
@@ -44,28 +44,12 @@ key                         string
 value                  string                                      
 ds                     string                                      
 hr                     string                                      
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES LIKE "tmp_src*"
 PREHOOK: type: SHOWTABLES
 PREHOOK: Input: database:default
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES LIKE "tmp_src*"
 POSTHOOK: type: SHOWTABLES
 POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart
 tmp_src
 tmp_srcpart
 PREHOOK: query: SELECT count(*) FROM tmp_src

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/results/compiler/errors/duplicate_alias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/compiler/errors/duplicate_alias.q.out 
b/ql/src/test/results/compiler/errors/duplicate_alias.q.out
index c0ed623..ea9de4b 100644
--- a/ql/src/test/results/compiler/errors/duplicate_alias.q.out
+++ b/ql/src/test/results/compiler/errors/duplicate_alias.q.out
@@ -1,2 +1,2 @@
 Semantic Exception: 
-Line 1:20 Ambiguous table alias 'a'
\ No newline at end of file
+Line 2:20 Ambiguous table alias 'a'
\ No newline at end of file

Reply via email to