http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/cbo_semijoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_semijoin.q.out 
b/ql/src/test/results/clientpositive/cbo_semijoin.q.out
deleted file mode 100644
index bdd8125..0000000
--- a/ql/src/test/results/clientpositive/cbo_semijoin.q.out
+++ /dev/null
@@ -1,440 +0,0 @@
-PREHOOK: query: -- 12. SemiJoin
-select cbo_t1.c_int           from cbo_t1 left semi join   cbo_t2 on 
cbo_t1.key=cbo_t2.key
-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
-#### A masked pattern was here ####
-POSTHOOK: query: -- 12. SemiJoin
-select cbo_t1.c_int           from cbo_t1 left semi join   cbo_t2 on 
cbo_t1.key=cbo_t2.key
-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
-#### A masked pattern was here ####
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-PREHOOK: query: select cbo_t1.c_int           from cbo_t1 left semi join   
cbo_t2 on cbo_t1.key=cbo_t2.key where (cbo_t1.c_int + 1 == 2) and (cbo_t1.c_int 
> 0 or cbo_t1.c_float >= 0)
-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
-#### A masked pattern was here ####
-POSTHOOK: query: select cbo_t1.c_int           from cbo_t1 left semi join   
cbo_t2 on cbo_t1.key=cbo_t2.key where (cbo_t1.c_int + 1 == 2) and (cbo_t1.c_int 
> 0 or cbo_t1.c_float >= 0)
-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
-#### A masked pattern was here ####
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-PREHOOK: query: select * from (select c, b, a from (select key as a, c_int as 
b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 == 2) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join (select 
cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p left semi join cbo_t3 on cbo_t1.a=key where (b + 1 == 2) and (b > 
0 or c >= 0)) R where  (b + 1 = 2) and (R.b > 0 or c >= 0)
-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@cbo_t3
-#### A masked pattern was here ####
-POSTHOOK: query: select * from (select c, b, a from (select key as a, c_int as 
b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 == 2) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join (select 
cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p left semi join cbo_t3 on cbo_t1.a=key where (b + 1 == 2) and (b > 
0 or c >= 0)) R where  (b + 1 = 2) and (R.b > 0 or c >= 0)
-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@cbo_t3
-#### A masked pattern was here ####
-1.0    1        1
-1.0    1        1
-1.0    1        1 
-1.0    1        1 
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1
-1.0    1       1 
-1.0    1       1 
-PREHOOK: query: select * from (select cbo_t3.c_int, cbo_t1.c, b from (select 
key as a, c_int as b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 
= 2) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join 
(select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t3.c_int  
== 2) and (b > 0 or c_int >= 0)) R where  (R.c_int + 1 = 2) and (R.b > 0 or 
c_int >= 0)
-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@cbo_t3
-#### A masked pattern was here ####
-POSTHOOK: query: select * from (select cbo_t3.c_int, cbo_t1.c, b from (select 
key as a, c_int as b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 
= 2) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join 
(select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t3.c_int  
== 2) and (b > 0 or c_int >= 0)) R where  (R.c_int + 1 = 2) and (R.b > 0 or 
c_int >= 0)
-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@cbo_t3
-#### A masked pattern was here ####
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-1      1.0     1
-PREHOOK: query: select * from (select c_int, b, cbo_t1.c from (select key as 
a, c_int as b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 == 2) 
and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join (select 
cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + 1 == 2) and (b 
> 0 or c_int >= 0)) R where  (c + 1 = 2) and (R.b > 0 or c_int >= 0)
-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@cbo_t3
-#### A masked pattern was here ####
-POSTHOOK: query: select * from (select c_int, b, cbo_t1.c from (select key as 
a, c_int as b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 == 2) 
and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join (select 
cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + 1 == 2) and (b 
> 0 or c_int >= 0)) R where  (c + 1 = 2) and (R.b > 0 or c_int >= 0)
-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@cbo_t3
-#### A masked pattern was here ####
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-PREHOOK: query: select * from (select c_int, b, cbo_t1.c from (select key as 
a, c_int as b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 == 2) 
and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join (select 
cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + 1 == 2) and (b 
> 0 or c_int >= 0)) R where  (c + 1 = 2) and (R.b > 0 or c_int >= 0)
-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@cbo_t3
-#### A masked pattern was here ####
-POSTHOOK: query: select * from (select c_int, b, cbo_t1.c from (select key as 
a, c_int as b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 == 2) 
and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join (select 
cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + 1 == 2) and (b 
> 0 or c_int >= 0)) R where  (c + 1 = 2) and (R.b > 0 or c_int >= 0)
-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@cbo_t3
-#### A masked pattern was here ####
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-1      1       1.0
-PREHOOK: query: select a, c, count(*) from (select key as a, c_int+1 as b, 
sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 
or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having 
cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by a+b desc, c asc) cbo_t1 left semi join (select key as p, c_int+1 as q, 
sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 
or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having 
cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by q+r/10 desc, p) cbo_t2 on cbo_t1.a=p left semi join cbo_t3 on 
cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  having a 
> 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, a
-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@cbo_t3
-#### A masked pattern was here ####
-POSTHOOK: query: select a, c, count(*) from (select key as a, c_int+1 as b, 
sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 
or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having 
cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by a+b desc, c asc) cbo_t1 left semi join (select key as p, c_int+1 as q, 
sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 
or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having 
cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by q+r/10 desc, p) cbo_t2 on cbo_t1.a=p left semi join cbo_t3 on 
cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  having a 
> 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, a
-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@cbo_t3
-#### A masked pattern was here ####
- 1     2       1
- 1     2       1
-1      2       1
-1      12      1
-PREHOOK: query: select a, c, count(*)  from (select key as a, c_int+1 as b, 
sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 
or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having 
cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by a+b desc, c asc limit 5) cbo_t1 left semi join (select key as p, 
c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and 
(cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key 
having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0 order by q+r/10 desc, p limit 5) cbo_t2 on cbo_t1.a=p left semi join 
cbo_t3 on cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  
having a > 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, a
-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@cbo_t3
-#### A masked pattern was here ####
-POSTHOOK: query: select a, c, count(*)  from (select key as a, c_int+1 as b, 
sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 
or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having 
cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by a+b desc, c asc limit 5) cbo_t1 left semi join (select key as p, 
c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and 
(cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key 
having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0 order by q+r/10 desc, p limit 5) cbo_t2 on cbo_t1.a=p left semi join 
cbo_t3 on cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  
having a > 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, a
-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@cbo_t3
-#### A masked pattern was here ####
- 1     2       1
- 1     2       1
-1      2       1
-1      12      1

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/cbo_subq_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_subq_in.q.out 
b/ql/src/test/results/clientpositive/cbo_subq_in.q.out
deleted file mode 100644
index f6bfad2..0000000
--- a/ql/src/test/results/clientpositive/cbo_subq_in.q.out
+++ /dev/null
@@ -1,151 +0,0 @@
-PREHOOK: query: -- 17. SubQueries In
--- non agg, non corr
-select * 
-from src_cbo 
-where src_cbo.key in (select key from src_cbo s1 where s1.key > '9') order by 
key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_cbo
-#### A masked pattern was here ####
-POSTHOOK: query: -- 17. SubQueries In
--- non agg, non corr
-select * 
-from src_cbo 
-where src_cbo.key in (select key from src_cbo s1 where s1.key > '9') order by 
key
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_cbo
-#### A masked pattern was here ####
-90     val_90
-90     val_90
-90     val_90
-92     val_92
-95     val_95
-95     val_95
-96     val_96
-97     val_97
-97     val_97
-98     val_98
-98     val_98
-PREHOOK: query: -- agg, corr
--- add back once rank issue fixed for cbo
-
--- distinct, corr
-select * 
-from src_cbo b 
-where b.key in
-        (select distinct a.key 
-         from src_cbo a 
-         where b.value = a.value and a.key > '9'
-        ) order by b.key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_cbo
-#### A masked pattern was here ####
-POSTHOOK: query: -- agg, corr
--- add back once rank issue fixed for cbo
-
--- distinct, corr
-select * 
-from src_cbo b 
-where b.key in
-        (select distinct a.key 
-         from src_cbo a 
-         where b.value = a.value and a.key > '9'
-        ) order by b.key
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_cbo
-#### A masked pattern was here ####
-90     val_90
-90     val_90
-90     val_90
-92     val_92
-95     val_95
-95     val_95
-96     val_96
-97     val_97
-97     val_97
-98     val_98
-98     val_98
-PREHOOK: query: -- non agg, corr, with join in Parent Query
-select p.p_partkey, li.l_suppkey 
-from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li 
on p.p_partkey = li.l_partkey 
-where li.l_linenumber = 1 and
- li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR' 
and l_linenumber = li.l_linenumber)
- order by p.p_partkey
-PREHOOK: type: QUERY
-PREHOOK: Input: default@lineitem
-#### A masked pattern was here ####
-POSTHOOK: query: -- non agg, corr, with join in Parent Query
-select p.p_partkey, li.l_suppkey 
-from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li 
on p.p_partkey = li.l_partkey 
-where li.l_linenumber = 1 and
- li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR' 
and l_linenumber = li.l_linenumber)
- order by p.p_partkey
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@lineitem
-#### A masked pattern was here ####
-4297   1798
-108570 8571
-PREHOOK: query: -- where and having
--- Plan is:
--- Stage 1: b semijoin sq1:src_cbo (subquery in where)
--- Stage 2: group by Stage 1 o/p
--- Stage 5: group by on sq2:src_cbo (subquery in having)
--- Stage 6: Stage 2 o/p semijoin Stage 5
-select key, value, count(*) 
-from src_cbo b
-where b.key in (select key from src_cbo where src_cbo.key > '8')
-group by key, value
-having count(*) in (select count(*) from src_cbo s1 where s1.key > '9' group 
by s1.key ) order by key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_cbo
-#### A masked pattern was here ####
-POSTHOOK: query: -- where and having
--- Plan is:
--- Stage 1: b semijoin sq1:src_cbo (subquery in where)
--- Stage 2: group by Stage 1 o/p
--- Stage 5: group by on sq2:src_cbo (subquery in having)
--- Stage 6: Stage 2 o/p semijoin Stage 5
-select key, value, count(*) 
-from src_cbo b
-where b.key in (select key from src_cbo where src_cbo.key > '8')
-group by key, value
-having count(*) in (select count(*) from src_cbo s1 where s1.key > '9' group 
by s1.key ) order by key
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_cbo
-#### A masked pattern was here ####
-80     val_80  1
-82     val_82  1
-83     val_83  2
-84     val_84  2
-85     val_85  1
-86     val_86  1
-87     val_87  1
-9      val_9   1
-90     val_90  3
-92     val_92  1
-95     val_95  2
-96     val_96  1
-97     val_97  2
-98     val_98  2
-PREHOOK: query: -- non agg, non corr, windowing
-select p_mfgr, p_name, avg(p_size) 
-from part 
-group by p_mfgr, p_name
-having p_name in 
-  (select first_value(p_name) over(partition by p_mfgr order by p_size) from 
part) order by p_mfgr
-PREHOOK: type: QUERY
-PREHOOK: Input: default@part
-#### A masked pattern was here ####
-POSTHOOK: query: -- non agg, non corr, windowing
-select p_mfgr, p_name, avg(p_size) 
-from part 
-group by p_mfgr, p_name
-having p_name in 
-  (select first_value(p_name) over(partition by p_mfgr order by p_size) from 
part) order by p_mfgr
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@part
-#### A masked pattern was here ####
-Manufacturer#1 almond antique burnished rose metallic  2.0
-Manufacturer#2 almond aquamarine midnight light salmon 2.0
-Manufacturer#3 almond antique misty red olive  1.0
-Manufacturer#4 almond aquamarine yellow dodger mint    7.0
-Manufacturer#5 almond antique sky peru orange  2.0

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/cbo_subq_not_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_subq_not_in.q.out 
b/ql/src/test/results/clientpositive/cbo_subq_not_in.q.out
deleted file mode 100644
index c7274f7..0000000
--- a/ql/src/test/results/clientpositive/cbo_subq_not_in.q.out
+++ /dev/null
@@ -1,365 +0,0 @@
-PREHOOK: query: -- 16. SubQueries Not In
--- non agg, non corr
-select * 
-from src_cbo 
-where src_cbo.key not in  
-  ( select key  from src_cbo s1 
-    where s1.key > '2'
-  ) order by key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_cbo
-#### A masked pattern was here ####
-POSTHOOK: query: -- 16. SubQueries Not In
--- non agg, non corr
-select * 
-from src_cbo 
-where src_cbo.key not in  
-  ( select key  from src_cbo s1 
-    where s1.key > '2'
-  ) order by key
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_cbo
-#### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-10     val_10
-100    val_100
-100    val_100
-103    val_103
-103    val_103
-104    val_104
-104    val_104
-105    val_105
-11     val_11
-111    val_111
-113    val_113
-113    val_113
-114    val_114
-116    val_116
-118    val_118
-118    val_118
-119    val_119
-119    val_119
-119    val_119
-12     val_12
-12     val_12
-120    val_120
-120    val_120
-125    val_125
-125    val_125
-126    val_126
-128    val_128
-128    val_128
-128    val_128
-129    val_129
-129    val_129
-131    val_131
-133    val_133
-134    val_134
-134    val_134
-136    val_136
-137    val_137
-137    val_137
-138    val_138
-138    val_138
-138    val_138
-138    val_138
-143    val_143
-145    val_145
-146    val_146
-146    val_146
-149    val_149
-149    val_149
-15     val_15
-15     val_15
-150    val_150
-152    val_152
-152    val_152
-153    val_153
-155    val_155
-156    val_156
-157    val_157
-158    val_158
-160    val_160
-162    val_162
-163    val_163
-164    val_164
-164    val_164
-165    val_165
-165    val_165
-166    val_166
-167    val_167
-167    val_167
-167    val_167
-168    val_168
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-17     val_17
-170    val_170
-172    val_172
-172    val_172
-174    val_174
-174    val_174
-175    val_175
-175    val_175
-176    val_176
-176    val_176
-177    val_177
-178    val_178
-179    val_179
-179    val_179
-18     val_18
-18     val_18
-180    val_180
-181    val_181
-183    val_183
-186    val_186
-187    val_187
-187    val_187
-187    val_187
-189    val_189
-19     val_19
-190    val_190
-191    val_191
-191    val_191
-192    val_192
-193    val_193
-193    val_193
-193    val_193
-194    val_194
-195    val_195
-195    val_195
-196    val_196
-197    val_197
-197    val_197
-199    val_199
-199    val_199
-199    val_199
-2      val_2
-PREHOOK: query: -- non agg, corr
-select p_mfgr, b.p_name, p_size 
-from part b 
-where b.p_name not in 
-  (select p_name 
-  from (select p_mfgr, p_name, p_size as r from part) a 
-  where r < 10 and b.p_mfgr = a.p_mfgr 
-  ) order by p_mfgr,p_size
-PREHOOK: type: QUERY
-PREHOOK: Input: default@part
-#### A masked pattern was here ####
-POSTHOOK: query: -- non agg, corr
-select p_mfgr, b.p_name, p_size 
-from part b 
-where b.p_name not in 
-  (select p_name 
-  from (select p_mfgr, p_name, p_size as r from part) a 
-  where r < 10 and b.p_mfgr = a.p_mfgr 
-  ) order by p_mfgr,p_size
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@part
-#### A masked pattern was here ####
-Manufacturer#1 almond aquamarine burnished black steel 28
-Manufacturer#1 almond antique chartreuse lavender yellow       34
-Manufacturer#1 almond aquamarine pink moccasin thistle 42
-Manufacturer#2 almond antique violet chocolate turquoise       14
-Manufacturer#2 almond aquamarine sandy cyan gainsboro  18
-Manufacturer#2 almond aquamarine rose maroon antique   25
-Manufacturer#2 almond antique violet turquoise frosted 40
-Manufacturer#3 almond antique forest lavender goldenrod        14
-Manufacturer#3 almond antique chartreuse khaki white   17
-Manufacturer#3 almond antique metallic orange dim      19
-Manufacturer#3 almond antique olive coral navajo       45
-Manufacturer#4 almond antique gainsboro frosted violet 10
-Manufacturer#4 almond azure aquamarine papaya violet   12
-Manufacturer#4 almond aquamarine floral ivory bisque   27
-Manufacturer#4 almond antique violet mint lemon        39
-Manufacturer#5 almond azure blanched chiffon midnight  23
-Manufacturer#5 almond antique blue firebrick mint      31
-Manufacturer#5 almond aquamarine dodger light gainsboro        46
-PREHOOK: query: -- agg, non corr
-select p_name, p_size 
-from 
-part where part.p_size not in 
-  (select avg(p_size) 
-  from (select p_size from part) a 
-  where p_size < 10
-  ) order by p_name
-PREHOOK: type: QUERY
-PREHOOK: Input: default@part
-#### A masked pattern was here ####
-POSTHOOK: query: -- agg, non corr
-select p_name, p_size 
-from 
-part where part.p_size not in 
-  (select avg(p_size) 
-  from (select p_size from part) a 
-  where p_size < 10
-  ) order by p_name
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@part
-#### A masked pattern was here ####
-almond antique blue firebrick mint     31
-almond antique burnished rose metallic 2
-almond antique burnished rose metallic 2
-almond antique chartreuse khaki white  17
-almond antique chartreuse lavender yellow      34
-almond antique forest lavender goldenrod       14
-almond antique gainsboro frosted violet        10
-almond antique medium spring khaki     6
-almond antique metallic orange dim     19
-almond antique misty red olive 1
-almond antique olive coral navajo      45
-almond antique salmon chartreuse burlywood     6
-almond antique sky peru orange 2
-almond antique violet chocolate turquoise      14
-almond antique violet mint lemon       39
-almond antique violet turquoise frosted        40
-almond aquamarine burnished black steel        28
-almond aquamarine dodger light gainsboro       46
-almond aquamarine floral ivory bisque  27
-almond aquamarine midnight light salmon        2
-almond aquamarine pink moccasin thistle        42
-almond aquamarine rose maroon antique  25
-almond aquamarine sandy cyan gainsboro 18
-almond aquamarine yellow dodger mint   7
-almond azure aquamarine papaya violet  12
-almond azure blanched chiffon midnight 23
-PREHOOK: query: -- agg, corr
-select p_mfgr, p_name, p_size 
-from part b where b.p_size not in 
-  (select min(p_size) 
-  from (select p_mfgr, p_size from part) a 
-  where p_size < 10 and b.p_mfgr = a.p_mfgr
-  ) order by  p_name
-PREHOOK: type: QUERY
-PREHOOK: Input: default@part
-#### A masked pattern was here ####
-POSTHOOK: query: -- agg, corr
-select p_mfgr, p_name, p_size 
-from part b where b.p_size not in 
-  (select min(p_size) 
-  from (select p_mfgr, p_size from part) a 
-  where p_size < 10 and b.p_mfgr = a.p_mfgr
-  ) order by  p_name
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@part
-#### A masked pattern was here ####
-Manufacturer#5 almond antique blue firebrick mint      31
-Manufacturer#3 almond antique chartreuse khaki white   17
-Manufacturer#1 almond antique chartreuse lavender yellow       34
-Manufacturer#3 almond antique forest lavender goldenrod        14
-Manufacturer#4 almond antique gainsboro frosted violet 10
-Manufacturer#5 almond antique medium spring khaki      6
-Manufacturer#3 almond antique metallic orange dim      19
-Manufacturer#3 almond antique olive coral navajo       45
-Manufacturer#1 almond antique salmon chartreuse burlywood      6
-Manufacturer#2 almond antique violet chocolate turquoise       14
-Manufacturer#4 almond antique violet mint lemon        39
-Manufacturer#2 almond antique violet turquoise frosted 40
-Manufacturer#1 almond aquamarine burnished black steel 28
-Manufacturer#5 almond aquamarine dodger light gainsboro        46
-Manufacturer#4 almond aquamarine floral ivory bisque   27
-Manufacturer#1 almond aquamarine pink moccasin thistle 42
-Manufacturer#2 almond aquamarine rose maroon antique   25
-Manufacturer#2 almond aquamarine sandy cyan gainsboro  18
-Manufacturer#4 almond azure aquamarine papaya violet   12
-Manufacturer#5 almond azure blanched chiffon midnight  23
-PREHOOK: query: -- non agg, non corr, Group By in Parent Query
-select li.l_partkey, count(*) 
-from lineitem li 
-where li.l_linenumber = 1 and 
-  li.l_orderkey not in (select l_orderkey from lineitem where l_shipmode = 
'AIR') 
-group by li.l_partkey order by li.l_partkey
-PREHOOK: type: QUERY
-PREHOOK: Input: default@lineitem
-#### A masked pattern was here ####
-POSTHOOK: query: -- non agg, non corr, Group By in Parent Query
-select li.l_partkey, count(*) 
-from lineitem li 
-where li.l_linenumber = 1 and 
-  li.l_orderkey not in (select l_orderkey from lineitem where l_shipmode = 
'AIR') 
-group by li.l_partkey order by li.l_partkey
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@lineitem
-#### A masked pattern was here ####
-450    1
-7068   1
-21636  1
-22630  1
-59694  1
-61931  1
-85951  1
-88035  1
-88362  1
-106170 1
-119477 1
-119767 1
-123076 1
-139636 1
-175839 1
-182052 1
-PREHOOK: query: -- add null check test from sq_notin.q once HIVE-7721 resolved.
-
--- non agg, corr, having
-select b.p_mfgr, min(p_retailprice) 
-from part b 
-group by b.p_mfgr
-having b.p_mfgr not in 
-  (select p_mfgr 
-  from (select p_mfgr, min(p_retailprice) l, max(p_retailprice) r, 
avg(p_retailprice) a from part group by p_mfgr) a 
-  where min(p_retailprice) = l and r - l > 600
-  )
-  order by b.p_mfgr
-PREHOOK: type: QUERY
-PREHOOK: Input: default@part
-#### A masked pattern was here ####
-POSTHOOK: query: -- add null check test from sq_notin.q once HIVE-7721 
resolved.
-
--- non agg, corr, having
-select b.p_mfgr, min(p_retailprice) 
-from part b 
-group by b.p_mfgr
-having b.p_mfgr not in 
-  (select p_mfgr 
-  from (select p_mfgr, min(p_retailprice) l, max(p_retailprice) r, 
avg(p_retailprice) a from part group by p_mfgr) a 
-  where min(p_retailprice) = l and r - l > 600
-  )
-  order by b.p_mfgr
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@part
-#### A masked pattern was here ####
-Manufacturer#1 1173.15
-Manufacturer#2 1690.68
-PREHOOK: query: -- agg, non corr, having
-select b.p_mfgr, min(p_retailprice) 
-from part b 
-group by b.p_mfgr
-having b.p_mfgr not in 
-  (select p_mfgr 
-  from part a
-  group by p_mfgr
-  having max(p_retailprice) - min(p_retailprice) > 600
-  )
-  order by b.p_mfgr
-PREHOOK: type: QUERY
-PREHOOK: Input: default@part
-#### A masked pattern was here ####
-POSTHOOK: query: -- agg, non corr, having
-select b.p_mfgr, min(p_retailprice) 
-from part b 
-group by b.p_mfgr
-having b.p_mfgr not in 
-  (select p_mfgr 
-  from part a
-  group by p_mfgr
-  having max(p_retailprice) - min(p_retailprice) > 600
-  )
-  order by b.p_mfgr
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@part
-#### A masked pattern was here ####
-Manufacturer#1 1173.15
-Manufacturer#2 1690.68

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/cbo_udf_udaf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_udf_udaf.q.out 
b/ql/src/test/results/clientpositive/cbo_udf_udaf.q.out
deleted file mode 100644
index 156d02f..0000000
--- a/ql/src/test/results/clientpositive/cbo_udf_udaf.q.out
+++ /dev/null
@@ -1,125 +0,0 @@
-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
-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(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 ####
-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_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_views.q.out 
b/ql/src/test/results/clientpositive/cbo_views.q.out
deleted file mode 100644
index 4a7b935..0000000
--- a/ql/src/test/results/clientpositive/cbo_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