HIVE-14913 : addendum patch
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6cca9911 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6cca9911 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6cca9911 Branch: refs/heads/hive-14535 Commit: 6cca9911bde22dbe9dfacbfa188dd7a56062f202 Parents: f2efa6a Author: Ashutosh Chauhan <[email protected]> Authored: Fri Oct 21 06:51:44 2016 -0700 Committer: Ashutosh Chauhan <[email protected]> Committed: Fri Oct 21 06:51:44 2016 -0700 ---------------------------------------------------------------------- .../test/queries/clientpositive/orc_ppd_basic.q | 6 + .../clientpositive/current_date_timestamp.q.out | 376 -- .../llap/current_date_timestamp.q.out | 4780 ++++++++++++++++++ .../clientpositive/llap/orc_ppd_basic.q.out | 467 +- 4 files changed, 4884 insertions(+), 745 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/6cca9911/ql/src/test/queries/clientpositive/orc_ppd_basic.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/orc_ppd_basic.q b/ql/src/test/queries/clientpositive/orc_ppd_basic.q index c3ba24a..41134a0 100644 --- a/ql/src/test/queries/clientpositive/orc_ppd_basic.q +++ b/ql/src/test/queries/clientpositive/orc_ppd_basic.q @@ -191,6 +191,12 @@ set hive.optimize.index.filter=true; select count(*) from orc_ppd where f=74.72; +RESET; +set hive.compute.query.using.stats=false; +set hive.mapred.mode=nonstrict; +SET hive.fetch.task.conversion=none; +SET hive.optimize.index.filter=true; +SET hive.cbo.enable=false; create temporary table tmp_orcppd stored as orc as select ctinyint, csmallint, cint , cbigint, cfloat, cdouble, http://git-wip-us.apache.org/repos/asf/hive/blob/6cca9911/ql/src/test/results/clientpositive/current_date_timestamp.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/current_date_timestamp.q.out b/ql/src/test/results/clientpositive/current_date_timestamp.q.out deleted file mode 100644 index 93e5104..0000000 --- a/ql/src/test/results/clientpositive/current_date_timestamp.q.out +++ /dev/null @@ -1,376 +0,0 @@ -PREHOOK: query: select current_timestamp = current_timestamp(), current_date = current_date() from src limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@src -#### A masked pattern was here #### -POSTHOOK: query: select current_timestamp = current_timestamp(), current_date = current_date() from src limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@src -#### A masked pattern was here #### -true true -true true -true true -true true -true true -PREHOOK: query: --ensure that timestamp is same for all the rows while using current_timestamp() query should return single row -select count(*) from (select current_timestamp() from alltypesorc union select current_timestamp() from src limit 5 ) subq -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -PREHOOK: Input: default@src -#### A masked pattern was here #### -POSTHOOK: query: --ensure that timestamp is same for all the rows while using current_timestamp() query should return single row -select count(*) from (select current_timestamp() from alltypesorc union select current_timestamp() from src limit 5 ) subq -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -POSTHOOK: Input: default@src -#### A masked pattern was here #### -1 -PREHOOK: query: select count(*) from (select current_timestamp() from alltypesorc - union - select current_timestamp() from src - limit 5 ) subqr -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -PREHOOK: Input: default@src -#### A masked pattern was here #### -POSTHOOK: query: select count(*) from (select current_timestamp() from alltypesorc - union - select current_timestamp() from src - limit 5 ) subqr -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -POSTHOOK: Input: default@src -#### A masked pattern was here #### -1 -PREHOOK: query: --current_timestamp() should appear as expression -explain extended select current_timestamp() from alltypesorc -PREHOOK: type: QUERY -POSTHOOK: query: --current_timestamp() should appear as expression -explain extended select current_timestamp() from alltypesorc -POSTHOOK: type: QUERY -STAGE DEPENDENCIES: - Stage-0 is a root stage - -STAGE PLANS: - Stage: Stage-0 - Fetch Operator - limit: -1 - Processor Tree: - TableScan - alias: alltypesorc - Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: COMPLETE - GatherStats: false - Select Operator - expressions: 2012-01-01 01:02:03.0 (type: timestamp) - outputColumnNames: _col0 - Statistics: Num rows: 12288 Data size: 491520 Basic stats: COMPLETE Column stats: COMPLETE - ListSink - -PREHOOK: query: --current_timestamp() + insert -create temporary table tmp_runtimeconstant( - ts1 timestamp, - ts2 timestamp, - dt date, - s string, - v varchar(50), - c char(50) - ) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: query: --current_timestamp() + insert -create temporary table tmp_runtimeconstant( - ts1 timestamp, - ts2 timestamp, - dt date, - s string, - v varchar(50), - c char(50) - ) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@tmp_runtimeconstant -PREHOOK: query: insert into table tmp_runtimeconstant - select current_timestamp(), - cast(current_timestamp() as timestamp), - cast(current_timestamp() as date), - cast(current_timestamp() as string), - cast(current_timestamp() as varchar(50)), - cast(current_timestamp() as char(50)) - from alltypesorc limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -PREHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: query: insert into table tmp_runtimeconstant - select current_timestamp(), - cast(current_timestamp() as timestamp), - cast(current_timestamp() as date), - cast(current_timestamp() as string), - cast(current_timestamp() as varchar(50)), - cast(current_timestamp() as char(50)) - from alltypesorc limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -POSTHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: Lineage: tmp_runtimeconstant.c SIMPLE [] -POSTHOOK: Lineage: tmp_runtimeconstant.dt SIMPLE [] -POSTHOOK: Lineage: tmp_runtimeconstant.s SIMPLE [] -POSTHOOK: Lineage: tmp_runtimeconstant.ts1 SIMPLE [] -POSTHOOK: Lineage: tmp_runtimeconstant.ts2 SIMPLE [] -POSTHOOK: Lineage: tmp_runtimeconstant.v SIMPLE [] -PREHOOK: query: select ts1 = ts2, - to_date(ts2) = dt, - s = v, - v = c -from tmp_runtimeconstant -PREHOOK: type: QUERY -PREHOOK: Input: default@tmp_runtimeconstant -#### A masked pattern was here #### -POSTHOOK: query: select ts1 = ts2, - to_date(ts2) = dt, - s = v, - v = c -from tmp_runtimeconstant -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tmp_runtimeconstant -#### A masked pattern was here #### -true true true true -true true true true -true true true true -true true true true -true true true true -PREHOOK: query: --current_date() + insert -drop table if exists tmp_runtimeconstant -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@tmp_runtimeconstant -PREHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: query: --current_date() + insert -drop table if exists tmp_runtimeconstant -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@tmp_runtimeconstant -POSTHOOK: Output: default@tmp_runtimeconstant -PREHOOK: query: create temporary table tmp_runtimeconstant(d date, t timestamp) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: query: create temporary table tmp_runtimeconstant(d date, t timestamp) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@tmp_runtimeconstant -PREHOOK: query: insert into table tmp_runtimeconstant - select current_date(), current_timestamp() from alltypesorc limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -PREHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: query: insert into table tmp_runtimeconstant - select current_date(), current_timestamp() from alltypesorc limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -POSTHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: Lineage: tmp_runtimeconstant.d SIMPLE [] -POSTHOOK: Lineage: tmp_runtimeconstant.t SIMPLE [] -PREHOOK: query: select to_date(t)=d from tmp_runtimeconstant -PREHOOK: type: QUERY -PREHOOK: Input: default@tmp_runtimeconstant -#### A masked pattern was here #### -POSTHOOK: query: select to_date(t)=d from tmp_runtimeconstant -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tmp_runtimeconstant -#### A masked pattern was here #### -true -true -true -true -true -PREHOOK: query: --current_timestamp() + current_date() + where -drop table if exists tmp_runtimeconstant -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@tmp_runtimeconstant -PREHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: query: --current_timestamp() + current_date() + where -drop table if exists tmp_runtimeconstant -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@tmp_runtimeconstant -POSTHOOK: Output: default@tmp_runtimeconstant -PREHOOK: query: create temporary table tmp_runtimeconstant(t timestamp, d date) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: query: create temporary table tmp_runtimeconstant(t timestamp, d date) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@tmp_runtimeconstant -PREHOOK: query: insert into table tmp_runtimeconstant - select current_timestamp(), current_date() from alltypesorc limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -PREHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: query: insert into table tmp_runtimeconstant - select current_timestamp(), current_date() from alltypesorc limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -POSTHOOK: Output: default@tmp_runtimeconstant -POSTHOOK: Lineage: tmp_runtimeconstant.d SIMPLE [] -POSTHOOK: Lineage: tmp_runtimeconstant.t SIMPLE [] -PREHOOK: query: select count(*) from tmp_runtimeconstant - where current_timestamp() >= t - and current_date <> d -PREHOOK: type: QUERY -PREHOOK: Input: default@tmp_runtimeconstant -#### A masked pattern was here #### -POSTHOOK: query: select count(*) from tmp_runtimeconstant - where current_timestamp() >= t - and current_date <> d -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tmp_runtimeconstant -#### A masked pattern was here #### -0 -PREHOOK: query: --current_timestamp() as argument for unix_timestamp(), hour(), minute(), second() -select unix_timestamp(current_timestamp()), - hour(current_timestamp()), - minute(current_timestamp()), - second(current_timestamp()) - from alltypesorc limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -POSTHOOK: query: --current_timestamp() as argument for unix_timestamp(), hour(), minute(), second() -select unix_timestamp(current_timestamp()), - hour(current_timestamp()), - minute(current_timestamp()), - second(current_timestamp()) - from alltypesorc limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -1325408523 1 2 3 -1325408523 1 2 3 -1325408523 1 2 3 -1325408523 1 2 3 -1325408523 1 2 3 -PREHOOK: query: --current_timestamp() as argument for various date udfs -select to_date(current_timestamp()), - year(current_timestamp()), - month(current_timestamp()), - day(current_timestamp()), - weekofyear(current_timestamp()), - datediff(current_timestamp(),current_timestamp), - to_date(date_add(current_timestamp(), 31)), - to_date(date_sub(current_timestamp(), 31)), - last_day(current_timestamp()), - next_day(current_timestamp(),'FRIDAY') - from alltypesorc limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -POSTHOOK: query: --current_timestamp() as argument for various date udfs -select to_date(current_timestamp()), - year(current_timestamp()), - month(current_timestamp()), - day(current_timestamp()), - weekofyear(current_timestamp()), - datediff(current_timestamp(),current_timestamp), - to_date(date_add(current_timestamp(), 31)), - to_date(date_sub(current_timestamp(), 31)), - last_day(current_timestamp()), - next_day(current_timestamp(),'FRIDAY') - from alltypesorc limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -PREHOOK: query: --current_date() as argument for various date udfs -select to_date(current_date()), - year(current_date()), - month(current_date()), - day(current_date()), - weekofyear(current_date()), - datediff(current_date(),current_date), - to_date(date_add(current_date(), 31)), - to_date(date_sub(current_date(), 31)), - last_day(current_date()), - next_day(current_date(),'FRIDAY') - from alltypesorc limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -POSTHOOK: query: --current_date() as argument for various date udfs -select to_date(current_date()), - year(current_date()), - month(current_date()), - day(current_date()), - weekofyear(current_date()), - datediff(current_date(),current_date), - to_date(date_add(current_date(), 31)), - to_date(date_sub(current_date(), 31)), - last_day(current_date()), - next_day(current_date(),'FRIDAY') - from alltypesorc limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -2012-01-01 2012 1 1 52 0 2012-02-01 2011-12-01 2012-01-31 2012-01-06 -PREHOOK: query: select current_timestamp() - current_timestamp(), - current_timestamp() - current_date(), - current_date() - current_timestamp(), - current_date() - current_date() - from alltypesorc limit 1 -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -POSTHOOK: query: select current_timestamp() - current_timestamp(), - current_timestamp() - current_date(), - current_date() - current_timestamp(), - current_date() - current_date() - from alltypesorc limit 1 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -0 00:00:00.000000000 0 01:02:03.000000000 -0 01:02:03.000000000 0 00:00:00.000000000 -PREHOOK: query: select ctimestamp1 - current_date(), - ctimestamp1- ctimestamp2, - current_date() - current_date(), - current_date() - ctimestamp2 -from alltypesorc -where ctimestamp1 is not null - and ctimestamp2 is not null - limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@alltypesorc -#### A masked pattern was here #### -POSTHOOK: query: select ctimestamp1 - current_date(), - ctimestamp1- ctimestamp2, - current_date() - current_date(), - current_date() - ctimestamp2 -from alltypesorc -where ctimestamp1 is not null - and ctimestamp2 is not null - limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@alltypesorc -#### A masked pattern was here #### --15340 08:00:12.326000000 -0 00:00:21.201000000 0 00:00:00.000000000 15340 07:59:51.125000000 --15340 08:00:03.213000000 -0 00:00:04.759000000 0 00:00:00.000000000 15340 07:59:58.454000000 --15340 08:00:14.813000000 -0 00:00:21.774000000 0 00:00:00.000000000 15340 07:59:53.039000000 --15340 08:00:08.566000000 -0 00:00:21.918000000 0 00:00:00.000000000 15340 07:59:46.648000000 --15340 07:59:44.993000000 -0 00:00:00.141000000 0 00:00:00.000000000 15340 07:59:44.852000000 -PREHOOK: query: select current_date, current_timestamp from src limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: default@src -#### A masked pattern was here #### -POSTHOOK: query: select current_date, current_timestamp from src limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@src -#### A masked pattern was here #### -2012-01-01 2012-01-01 01:02:03 -2012-01-01 2012-01-01 01:02:03 -2012-01-01 2012-01-01 01:02:03 -2012-01-01 2012-01-01 01:02:03 -2012-01-01 2012-01-01 01:02:03
