http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/cbo_rp_udf_udaf_stats_opt.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_udf_udaf_stats_opt.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_udf_udaf_stats_opt.q.out
deleted file mode 100644
index 3a589b4..0000000
--- a/ql/src/test/results/clientpositive/cbo_rp_udf_udaf_stats_opt.q.out
+++ /dev/null
@@ -1,124 +0,0 @@
-Warning: Value had a \n character in it.
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- 8. Test UDF/UDAF
-select count(*), count(c_int), sum(c_int), avg(c_int), max(c_int), min(c_int) 
from cbo_t1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- 8. Test UDF/UDAF
-select count(*), count(c_int), sum(c_int), avg(c_int), max(c_int), min(c_int) 
from cbo_t1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-20     18      18      1.0     1       1
-PREHOOK: query: select count(*), count(c_int) as a, sum(c_int), avg(c_int), 
max(c_int), min(c_int), case c_int when 0  then 1 when 1 then 2 else 3 end, 
sum(case c_int when 0  then 1 when 1 then 2 else 3 end) from cbo_t1 group by 
c_int order by a
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select count(*), count(c_int) as a, sum(c_int), avg(c_int), 
max(c_int), min(c_int), case c_int when 0  then 1 when 1 then 2 else 3 end, 
sum(case c_int when 0  then 1 when 1 then 2 else 3 end) from cbo_t1 group by 
c_int order by a
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-18     18      18      1.0     1       1       2       36
-2      0       NULL    NULL    NULL    NULL    3       6
-PREHOOK: query: select * from (select count(*) as a, count(distinct c_int) as 
b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from 
cbo_t1) cbo_t1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select * from (select count(*) as a, count(distinct c_int) as 
b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from 
cbo_t1) cbo_t1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-20     1       18      1.0     1       1
-PREHOOK: query: select * from (select count(*) as a, count(distinct c_int) as 
b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f, case 
c_int when 0  then 1 when 1 then 2 else 3 end as g, sum(case c_int when 0  then 
1 when 1 then 2 else 3 end) as h from cbo_t1 group by c_int) cbo_t1 order by a
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select * from (select count(*) as a, count(distinct c_int) as 
b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f, case 
c_int when 0  then 1 when 1 then 2 else 3 end as g, sum(case c_int when 0  then 
1 when 1 then 2 else 3 end) as h from cbo_t1 group by c_int) cbo_t1 order by a
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-18     1       18      1.0     1       1       2       36
-2      0       NULL    NULL    NULL    NULL    3       6
-PREHOOK: query: select f,a,e,b from (select count(*) as a, count(c_int) as b, 
sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) 
cbo_t1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-#### A masked pattern was here ####
-POSTHOOK: query: select f,a,e,b from (select count(*) as a, count(c_int) as b, 
sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) 
cbo_t1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-#### A masked pattern was here ####
-1      20      1       18
-PREHOOK: query: select f,a,e,b from (select count(*) as a, count(distinct 
c_int) as b, sum(distinct c_int) as c, avg(distinct c_int) as d, max(distinct 
c_int) as e, min(distinct c_int) as f from cbo_t1) cbo_t1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select f,a,e,b from (select count(*) as a, count(distinct 
c_int) as b, sum(distinct c_int) as c, avg(distinct c_int) as d, max(distinct 
c_int) as e, min(distinct c_int) as f from cbo_t1) cbo_t1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-1      20      1       1
-PREHOOK: query: select key,count(c_int) as a, avg(c_float) from cbo_t1 group 
by key order by a
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select key,count(c_int) as a, avg(c_float) from cbo_t1 group 
by key order by a
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
- 1     2       1.0
- 1     2       1.0
-1      12      1.0
-1      2       1.0
-NULL   0       NULL
-PREHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 
group by c_float order by a
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 
group by c_float order by a
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-0      NULL
-1      1.0
-PREHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 
group by c_int order by a
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 
group by c_int order by a
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-0      NULL
-1      1.0
-PREHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 
group by c_float, c_int order by a
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 
group by c_float, c_int order by a
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-0      NULL
-1      1.0

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/cbo_rp_unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_unionDistinct_2.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_unionDistinct_2.q.out
deleted file mode 100644
index 304d74f..0000000
--- a/ql/src/test/results/clientpositive/cbo_rp_unionDistinct_2.q.out
+++ /dev/null
@@ -1,551 +0,0 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE u1 as select key, value from src order by key limit 5
-PREHOOK: type: CREATETABLE_AS_SELECT
-PREHOOK: Input: default@src
-PREHOOK: Output: database:default
-PREHOOK: Output: default@u1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE u1 as select key, value from src order by key limit 5
-POSTHOOK: type: CREATETABLE_AS_SELECT
-POSTHOOK: Input: default@src
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@u1
-POSTHOOK: Lineage: u1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: u1.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
-PREHOOK: query: CREATE TABLE u2 as select key, value from src order by key 
limit 3
-PREHOOK: type: CREATETABLE_AS_SELECT
-PREHOOK: Input: default@src
-PREHOOK: Output: database:default
-PREHOOK: Output: default@u2
-POSTHOOK: query: CREATE TABLE u2 as select key, value from src order by key 
limit 3
-POSTHOOK: type: CREATETABLE_AS_SELECT
-POSTHOOK: Input: default@src
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@u2
-POSTHOOK: Lineage: u2.key SIMPLE [(src)src.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: u2.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
-PREHOOK: query: CREATE TABLE u3 as select key, value from src order by key 
desc limit 5
-PREHOOK: type: CREATETABLE_AS_SELECT
-PREHOOK: Input: default@src
-PREHOOK: Output: database:default
-PREHOOK: Output: default@u3
-POSTHOOK: query: CREATE TABLE u3 as select key, value from src order by key 
desc limit 5
-POSTHOOK: type: CREATETABLE_AS_SELECT
-POSTHOOK: Input: default@src
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@u3
-POSTHOOK: Lineage: u3.key SIMPLE [(src)src.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: u3.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
-PREHOOK: query: select * from u1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from u1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-#### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-10     val_10
-100    val_100
-PREHOOK: query: select * from u2
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u2
-#### A masked pattern was here ####
-POSTHOOK: query: select * from u2
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u2
-#### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-PREHOOK: query: select * from u3
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select * from u3
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-96     val_96
-97     val_97
-97     val_97
-98     val_98
-98     val_98
-PREHOOK: query: select key, value from 
-(
-select key, value from u1
-union all
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select key, value from 
-(
-select key, value from u1
-union all
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-0      val_0
-0      val_0
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-97     val_97
-98     val_98
-98     val_98
-PREHOOK: query: select key, value from 
-(
-select key, value from u1
-union 
-select key, value from u2
-union all
-select key, value from u3
-) tab
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select key, value from 
-(
-select key, value from u1
-union 
-select key, value from u2
-union all
-select key, value from u3
-) tab
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-97     val_97
-98     val_98
-98     val_98
-PREHOOK: query: select key, value from 
-(
-select key, value from u1
-union distinct
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select key, value from 
-(
-select key, value from u1
-union distinct
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-97     val_97
-98     val_98
-98     val_98
-PREHOOK: query: select key, value from 
-(
-select key, value from u1
-union all
-select key, value from u2
-union
-select key, value from u3
-) tab
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select key, value from 
-(
-select key, value from u1
-union all
-select key, value from u2
-union
-select key, value from u3
-) tab
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-98     val_98
-PREHOOK: query: select key, value from 
-(
-select key, value from u1
-union 
-select key, value from u2
-union
-select key as key, value from u3
-) tab
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select key, value from 
-(
-select key, value from u1
-union 
-select key, value from u2
-union
-select key as key, value from u3
-) tab
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-98     val_98
-PREHOOK: query: select distinct * from 
-(
-select key, value from u1
-union all 
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select distinct * from 
-(
-select key, value from u1
-union all 
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-98     val_98
-PREHOOK: query: select distinct * from 
-(
-select distinct * from u1
-union  
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select distinct * from 
-(
-select distinct * from u1
-union  
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-98     val_98
-PREHOOK: query: drop view if exists v
-PREHOOK: type: DROPVIEW
-POSTHOOK: query: drop view if exists v
-POSTHOOK: type: DROPVIEW
-PREHOOK: query: create view v as select distinct * from 
-(
-select distinct * from u1
-union  
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-PREHOOK: Output: database:default
-PREHOOK: Output: default@v
-POSTHOOK: query: create view v as select distinct * from 
-(
-select distinct * from u1
-union  
-select key, value from u2
-union all
-select key as key, value from u3
-) tab
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@v
-PREHOOK: query: describe extended v
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@v
-POSTHOOK: query: describe extended v
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@v
-key                    string                                      
-value                  string                                      
-                
-#### A masked pattern was here ####
-(               
-select distinct * from u1               
-union                   
-select key, value from u2               
-union all               
-select key as key, value from u3                
-) tab, viewExpandedText:select distinct `tab`.`key`, `tab`.`value` from        
         
-(               
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`            
-union                   
-select `u2`.`key`, `u2`.`value` from `default`.`u2`             
-union all               
-select `u3`.`key` as `key`, `u3`.`value` from `default`.`u3`            
-) `tab`, tableType:VIRTUAL_VIEW)                
-PREHOOK: query: select * from v
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-PREHOOK: Input: default@v
-#### A masked pattern was here ####
-POSTHOOK: query: select * from v
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-POSTHOOK: Input: default@v
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-98     val_98
-PREHOOK: query: drop view if exists v
-PREHOOK: type: DROPVIEW
-PREHOOK: Input: default@v
-PREHOOK: Output: default@v
-POSTHOOK: query: drop view if exists v
-POSTHOOK: type: DROPVIEW
-POSTHOOK: Input: default@v
-POSTHOOK: Output: default@v
-PREHOOK: query: create view v as select tab.* from 
-(
-select distinct * from u1
-union  
-select distinct * from u2
-) tab
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Output: database:default
-PREHOOK: Output: default@v
-POSTHOOK: query: create view v as select tab.* from 
-(
-select distinct * from u1
-union  
-select distinct * from u2
-) tab
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@v
-PREHOOK: query: describe extended v
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@v
-POSTHOOK: query: describe extended v
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@v
-key                    string                                      
-value                  string                                      
-                
-#### A masked pattern was here ####
-(               
-select distinct * from u1               
-union                   
-select distinct * from u2               
-) tab, viewExpandedText:select `tab`.`key`, `tab`.`value` from                 
 
-(               
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`            
-union                   
-select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`            
-) `tab`, tableType:VIRTUAL_VIEW)                
-PREHOOK: query: select * from v
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@v
-#### A masked pattern was here ####
-POSTHOOK: query: select * from v
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@v
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-PREHOOK: query: drop view if exists v
-PREHOOK: type: DROPVIEW
-PREHOOK: Input: default@v
-PREHOOK: Output: default@v
-POSTHOOK: query: drop view if exists v
-POSTHOOK: type: DROPVIEW
-POSTHOOK: Input: default@v
-POSTHOOK: Output: default@v
-PREHOOK: query: create view v as select * from 
-(
-select distinct u1.* from u1
-union all 
-select distinct * from u2
-) tab
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Output: database:default
-PREHOOK: Output: default@v
-POSTHOOK: query: create view v as select * from 
-(
-select distinct u1.* from u1
-union all 
-select distinct * from u2
-) tab
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@v
-PREHOOK: query: describe extended v
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@v
-POSTHOOK: query: describe extended v
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@v
-key                    string                                      
-value                  string                                      
-                
-#### A masked pattern was here ####
-(               
-select distinct u1.* from u1            
-union all               
-select distinct * from u2               
-) tab, viewExpandedText:select `tab`.`key`, `tab`.`value` from                 
 
-(               
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`            
-union all               
-select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`            
-) `tab`, tableType:VIRTUAL_VIEW)                
-PREHOOK: query: select * from v
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@v
-#### A masked pattern was here ####
-POSTHOOK: query: select * from v
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@v
-#### A masked pattern was here ####
-0      val_0
-0      val_0
-10     val_10
-100    val_100
-PREHOOK: query: select distinct * from 
-(
-select key, value from u1
-union all 
-select key, value from u2
-union 
-select key as key, value from u3
-) tab
-PREHOOK: type: QUERY
-PREHOOK: Input: default@u1
-PREHOOK: Input: default@u2
-PREHOOK: Input: default@u3
-#### A masked pattern was here ####
-POSTHOOK: query: select distinct * from 
-(
-select key, value from u1
-union all 
-select key, value from u2
-union 
-select key as key, value from u3
-) tab
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@u1
-POSTHOOK: Input: default@u2
-POSTHOOK: Input: default@u3
-#### A masked pattern was here ####
-0      val_0
-10     val_10
-100    val_100
-96     val_96
-97     val_97
-98     val_98

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/cbo_rp_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_views.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_views.q.out
deleted file mode 100644
index 4a7b935..0000000
--- a/ql/src/test/results/clientpositive/cbo_rp_views.q.out
+++ /dev/null
@@ -1,237 +0,0 @@
-PREHOOK: query: -- 10. Test views
-create view v1 as select c_int, value, c_boolean, dt from cbo_t1
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Output: database:default
-PREHOOK: Output: default@v1
-POSTHOOK: query: -- 10. Test views
-create view v1 as select c_int, value, c_boolean, dt from cbo_t1
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@v1
-PREHOOK: query: create view v2 as select c_int, value from cbo_t2
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@cbo_t2
-PREHOOK: Output: database:default
-PREHOOK: Output: default@v2
-POSTHOOK: query: create view v2 as select c_int, value from cbo_t2
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@cbo_t2
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@v2
-PREHOOK: query: select value from v1 where c_boolean=false
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@v1
-#### A masked pattern was here ####
-POSTHOOK: query: select value from v1 where c_boolean=false
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
-1
-1
-PREHOOK: query: select max(c_int) from v1 group by (c_boolean)
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@v1
-#### A masked pattern was here ####
-POSTHOOK: query: select max(c_int) from v1 group by (c_boolean)
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
-NULL
-1
-1
-PREHOOK: query: select count(v1.c_int)  from v1 join cbo_t2 on v1.c_int = 
cbo_t2.c_int
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@cbo_t2
-PREHOOK: Input: default@cbo_t2@dt=2014
-PREHOOK: Input: default@v1
-#### A masked pattern was here ####
-POSTHOOK: query: select count(v1.c_int)  from v1 join cbo_t2 on v1.c_int = 
cbo_t2.c_int
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@cbo_t2
-POSTHOOK: Input: default@cbo_t2@dt=2014
-POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
-234
-PREHOOK: query: select count(v1.c_int)  from v1 join v2 on v1.c_int = v2.c_int
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@cbo_t2
-PREHOOK: Input: default@cbo_t2@dt=2014
-PREHOOK: Input: default@v1
-PREHOOK: Input: default@v2
-#### A masked pattern was here ####
-POSTHOOK: query: select count(v1.c_int)  from v1 join v2 on v1.c_int = v2.c_int
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@cbo_t2
-POSTHOOK: Input: default@cbo_t2@dt=2014
-POSTHOOK: Input: default@v1
-POSTHOOK: Input: default@v2
-#### A masked pattern was here ####
-234
-PREHOOK: query: select count(*) from v1 a join v1 b on a.value = b.value
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@v1
-#### A masked pattern was here ####
-POSTHOOK: query: select count(*) from v1 a join v1 b on a.value = b.value
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
-156
-PREHOOK: query: create view v3 as select v1.value val from v1 join cbo_t1 on 
v1.c_boolean = cbo_t1.c_boolean
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@v1
-PREHOOK: Output: database:default
-PREHOOK: Output: default@v3
-POSTHOOK: query: create view v3 as select v1.value val from v1 join cbo_t1 on 
v1.c_boolean = cbo_t1.c_boolean
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@v1
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@v3
-PREHOOK: query: select count(val) from v3 where val != '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@v1
-PREHOOK: Input: default@v3
-#### A masked pattern was here ####
-POSTHOOK: query: select count(val) from v3 where val != '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@v1
-POSTHOOK: Input: default@v3
-#### A masked pattern was here ####
-96
-PREHOOK: query: with q1 as ( select key from cbo_t1 where key = '1')
-select count(*) from q1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: with q1 as ( select key from cbo_t1 where key = '1')
-select count(*) from q1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-12
-PREHOOK: query: with q1 as ( select value from v1 where c_boolean = false)
-select count(value) from q1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@v1
-#### A masked pattern was here ####
-POSTHOOK: query: with q1 as ( select value from v1 where c_boolean = false)
-select count(value) from q1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
-2
-PREHOOK: query: create view v4 as
-with q1 as ( select key,c_int from cbo_t1  where key = '1')
-select * from q1
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Output: database:default
-PREHOOK: Output: default@v4
-POSTHOOK: query: create view v4 as
-with q1 as ( select key,c_int from cbo_t1  where key = '1')
-select * from q1
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@v4
-PREHOOK: query: with q1 as ( select c_int from q2 where c_boolean = false),
-q2 as ( select c_int,c_boolean from v1  where value = '1')
-select sum(c_int) from (select c_int from q1) a
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@v1
-#### A masked pattern was here ####
-POSTHOOK: query: with q1 as ( select c_int from q2 where c_boolean = false),
-q2 as ( select c_int,c_boolean from v1  where value = '1')
-select sum(c_int) from (select c_int from q1) a
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
-2
-PREHOOK: query: with q1 as ( select cbo_t1.c_int c_int from q2 join cbo_t1 
where q2.c_int = cbo_t1.c_int  and cbo_t1.dt='2014'),
-q2 as ( select c_int,c_boolean from v1  where value = '1' or dt = '14')
-select count(*) from q1 join q2 join v4 on q1.c_int = q2.c_int and v4.c_int = 
q2.c_int
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-PREHOOK: Input: default@v1
-PREHOOK: Input: default@v4
-#### A masked pattern was here ####
-POSTHOOK: query: with q1 as ( select cbo_t1.c_int c_int from q2 join cbo_t1 
where q2.c_int = cbo_t1.c_int  and cbo_t1.dt='2014'),
-q2 as ( select c_int,c_boolean from v1  where value = '1' or dt = '14')
-select count(*) from q1 join q2 join v4 on q1.c_int = q2.c_int and v4.c_int = 
q2.c_int
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-POSTHOOK: Input: default@v1
-POSTHOOK: Input: default@v4
-#### A masked pattern was here ####
-31104
-PREHOOK: query: drop view v1
-PREHOOK: type: DROPVIEW
-PREHOOK: Input: default@v1
-PREHOOK: Output: default@v1
-POSTHOOK: query: drop view v1
-POSTHOOK: type: DROPVIEW
-POSTHOOK: Input: default@v1
-POSTHOOK: Output: default@v1
-PREHOOK: query: drop view v2
-PREHOOK: type: DROPVIEW
-PREHOOK: Input: default@v2
-PREHOOK: Output: default@v2
-POSTHOOK: query: drop view v2
-POSTHOOK: type: DROPVIEW
-POSTHOOK: Input: default@v2
-POSTHOOK: Output: default@v2
-PREHOOK: query: drop view v3
-PREHOOK: type: DROPVIEW
-PREHOOK: Input: default@v3
-PREHOOK: Output: default@v3
-POSTHOOK: query: drop view v3
-POSTHOOK: type: DROPVIEW
-POSTHOOK: Input: default@v3
-POSTHOOK: Output: default@v3
-PREHOOK: query: drop view v4
-PREHOOK: type: DROPVIEW
-PREHOOK: Input: default@v4
-PREHOOK: Output: default@v4
-POSTHOOK: query: drop view v4
-POSTHOOK: type: DROPVIEW
-POSTHOOK: Input: default@v4
-POSTHOOK: Output: default@v4

Reply via email to