diff --git a/ql/src/test/queries/clientpositive/cbo_windowing.q b/ql/src/test/queries/clientpositive/cbo_windowing.q index 4ccc891..c5bb683 100644 --- a/ql/src/test/queries/clientpositive/cbo_windowing.q +++ b/ql/src/test/queries/clientpositive/cbo_windowing.q @@ -8,8 +8,8 @@ set hive.auto.convert.join=false; -- SORT_QUERY_RESULTS select count(c_int) over() from cbo_t1; -select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1; -select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1; +select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn; +select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn) cbo_t1; select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1; select 1+sum(c_int) over() from cbo_t1; select sum(c_int)+sum(sum(c_int)) over() from cbo_t1; diff --git a/ql/src/test/results/clientpositive/cbo_windowing.q.out b/ql/src/test/results/clientpositive/cbo_windowing.q.out index 57201b5..bec3f1a 100644 --- a/ql/src/test/results/clientpositive/cbo_windowing.q.out +++ b/ql/src/test/results/clientpositive/cbo_windowing.q.out @@ -34,17 +34,17 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18 18 -PREHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 +PREHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 +POSTHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -18 18.0 1 1 1 1 1 0.0 1 NULL +18 18.0 1 1 1 1 1 0.0 NULL NULL 18 18.0 1 1 10 1 1 0.0 1 1.0 18 18.0 1 1 11 1 1 0.0 1 1.0 18 18.0 1 1 12 1 1 0.0 1 1.0 @@ -55,26 +55,26 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18.0 1 1 17 1 1 0.0 1 1.0 18 18.0 1 1 18 1 1 0.0 1 1.0 18 18.0 1 1 19 1 1 0.0 1 1.0 -18 18.0 1 1 2 1 1 0.0 1 NULL +18 18.0 1 1 2 1 1 0.0 NULL NULL 18 18.0 1 1 20 1 1 0.0 1 1.0 -18 18.0 1 1 3 1 1 0.0 1 NULL -18 18.0 1 1 4 1 1 0.0 1 NULL +18 18.0 1 1 3 1 1 0.0 1 1.0 +18 18.0 1 1 4 1 1 0.0 1 1.0 18 18.0 1 1 5 1 1 0.0 1 1.0 18 18.0 1 1 6 1 1 0.0 1 1.0 18 18.0 1 1 7 1 1 0.0 1 1.0 18 18.0 1 1 8 1 1 0.0 1 1.0 18 18.0 1 1 9 1 1 0.0 1 1.0 -PREHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 +PREHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn) 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(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 +POSTHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -18 18.0 1 1 1 1 1 0.0 1 NULL +18 18.0 1 1 1 1 1 0.0 NULL NULL 18 18.0 1 1 10 1 1 0.0 1 1.0 18 18.0 1 1 11 1 1 0.0 1 1.0 18 18.0 1 1 12 1 1 0.0 1 1.0 @@ -85,10 +85,10 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18.0 1 1 17 1 1 0.0 1 1.0 18 18.0 1 1 18 1 1 0.0 1 1.0 18 18.0 1 1 19 1 1 0.0 1 1.0 -18 18.0 1 1 2 1 1 0.0 1 NULL +18 18.0 1 1 2 1 1 0.0 NULL NULL 18 18.0 1 1 20 1 1 0.0 1 1.0 -18 18.0 1 1 3 1 1 0.0 1 NULL -18 18.0 1 1 4 1 1 0.0 1 NULL +18 18.0 1 1 3 1 1 0.0 1 1.0 +18 18.0 1 1 4 1 1 0.0 1 1.0 18 18.0 1 1 5 1 1 0.0 1 1.0 18 18.0 1 1 6 1 1 0.0 1 1.0 18 18.0 1 1 7 1 1 0.0 1 1.0 diff --git a/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out b/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out index 57201b5..bec3f1a 100644 --- a/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out +++ b/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out @@ -34,17 +34,17 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18 18 -PREHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 +PREHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 +POSTHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -18 18.0 1 1 1 1 1 0.0 1 NULL +18 18.0 1 1 1 1 1 0.0 NULL NULL 18 18.0 1 1 10 1 1 0.0 1 1.0 18 18.0 1 1 11 1 1 0.0 1 1.0 18 18.0 1 1 12 1 1 0.0 1 1.0 @@ -55,26 +55,26 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18.0 1 1 17 1 1 0.0 1 1.0 18 18.0 1 1 18 1 1 0.0 1 1.0 18 18.0 1 1 19 1 1 0.0 1 1.0 -18 18.0 1 1 2 1 1 0.0 1 NULL +18 18.0 1 1 2 1 1 0.0 NULL NULL 18 18.0 1 1 20 1 1 0.0 1 1.0 -18 18.0 1 1 3 1 1 0.0 1 NULL -18 18.0 1 1 4 1 1 0.0 1 NULL +18 18.0 1 1 3 1 1 0.0 1 1.0 +18 18.0 1 1 4 1 1 0.0 1 1.0 18 18.0 1 1 5 1 1 0.0 1 1.0 18 18.0 1 1 6 1 1 0.0 1 1.0 18 18.0 1 1 7 1 1 0.0 1 1.0 18 18.0 1 1 8 1 1 0.0 1 1.0 18 18.0 1 1 9 1 1 0.0 1 1.0 -PREHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 +PREHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn) 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(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 +POSTHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over() as rn, rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(partition by c_boolean order by c_float), lag(c_float, 2, c_float) over(partition by c_boolean order by c_float) from cbo_t1 order by rn) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -18 18.0 1 1 1 1 1 0.0 1 NULL +18 18.0 1 1 1 1 1 0.0 NULL NULL 18 18.0 1 1 10 1 1 0.0 1 1.0 18 18.0 1 1 11 1 1 0.0 1 1.0 18 18.0 1 1 12 1 1 0.0 1 1.0 @@ -85,10 +85,10 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18.0 1 1 17 1 1 0.0 1 1.0 18 18.0 1 1 18 1 1 0.0 1 1.0 18 18.0 1 1 19 1 1 0.0 1 1.0 -18 18.0 1 1 2 1 1 0.0 1 NULL +18 18.0 1 1 2 1 1 0.0 NULL NULL 18 18.0 1 1 20 1 1 0.0 1 1.0 -18 18.0 1 1 3 1 1 0.0 1 NULL -18 18.0 1 1 4 1 1 0.0 1 NULL +18 18.0 1 1 3 1 1 0.0 1 1.0 +18 18.0 1 1 4 1 1 0.0 1 1.0 18 18.0 1 1 5 1 1 0.0 1 1.0 18 18.0 1 1 6 1 1 0.0 1 1.0 18 18.0 1 1 7 1 1 0.0 1 1.0