http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/cbo_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_gby.q.out
b/ql/src/test/results/clientpositive/cbo_gby.q.out
deleted file mode 100644
index 04597a7..0000000
--- a/ql/src/test/results/clientpositive/cbo_gby.q.out
+++ /dev/null
@@ -1,124 +0,0 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- 6. Test Select + TS + Join + Fil + GB + GB Having
-select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float,
cbo_t1.c_int, key
-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
-
--- 6. Test Select + TS + Join + Fil + GB + GB Having
-select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float,
cbo_t1.c_int, key
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
- 1 4 2
- 1 4 2
-1 4 12
-1 4 2
-NULL NULL NULL
-PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as
x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by
y, x
-PREHOOK: type: QUERY
-PREHOOK: Input: default@cbo_t1
-PREHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-POSTHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2)
as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group
by y, x
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@cbo_t1
-POSTHOOK: Input: default@cbo_t1@dt=2014
-#### A masked pattern was here ####
-5.0 12 1
-5.0 2 3
-NULL NULL 1
-PREHOOK: query: select cbo_t3.c_int, 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
order by a) cbo_t1 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 order by q/10 desc, r asc) cbo_t2 on
cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or
c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c
-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 cbo_t3.c_int, 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
order by a) cbo_t1 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 order by q/10 desc, r asc) cbo_t2 on
cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or
c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c
-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 12 6
-1 2 6
-PREHOOK: query: select cbo_t3.c_int, 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 b % c asc, b desc) cbo_t1 left outer 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) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b +
cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having
cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by
cbo_t3.c_int % c asc, cbo_t3.c_int desc
-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 cbo_t3.c_int, 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 b % c asc, b desc) cbo_t1 left outer 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) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b +
cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having
cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by
cbo_t3.c_int % c asc, cbo_t3.c_int desc
-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 12 6
-1 2 6
-PREHOOK: query: select cbo_t3.c_int, 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 b+c, a desc) cbo_t1 right outer 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)
cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b +
cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c
-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 cbo_t3.c_int, 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 b+c, a desc) cbo_t1 right outer 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)
cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b +
cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c
-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 12 6
-1 2 6
-PREHOOK: query: select cbo_t3.c_int, 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 c+a desc) cbo_t1 full outer 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 p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on
cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by
cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int +
c) >= 0 order by cbo_t3.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@cbo_t3
-#### A masked pattern was here ####
-POSTHOOK: query: select cbo_t3.c_int, 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 c+a desc) cbo_t1 full outer 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 p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on
cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by
cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int +
c) >= 0 order by cbo_t3.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@cbo_t3
-#### A masked pattern was here ####
-1 12 6
-1 2 6
-PREHOOK: query: select cbo_t3.c_int, 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) cbo_t1 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) cbo_t2 on cbo_t1.a=p join cbo_t3 on
cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by
cbo_t3.c_int, c
-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 cbo_t3.c_int, 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) cbo_t1 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) cbo_t2 on cbo_t1.a=p join cbo_t3 on
cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by
cbo_t3.c_int, c
-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 12 6
-1 2 6