fix an issue, add regress tests
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f59119c8 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f59119c8 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f59119c8 Branch: refs/heads/master Commit: f59119c8195e8c04646124c2312c2ac180662c28 Parents: dc9f5b5 Author: Liu Ming <ovis_p...@sina.com> Authored: Fri Feb 16 19:28:21 2018 +0000 Committer: Liu Ming <ovis_p...@sina.com> Committed: Fri Feb 16 19:28:21 2018 +0000 ---------------------------------------------------------------------- core/sql/exp/exp_function.cpp | 2 +- core/sql/regress/executor/EXPECTED002.SB | 1050 +++++++++++++++++++++++++ core/sql/regress/executor/FILTER002 | 2 + core/sql/regress/executor/TEST002 | 27 + 4 files changed, 1080 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/f59119c8/core/sql/exp/exp_function.cpp ---------------------------------------------------------------------- diff --git a/core/sql/exp/exp_function.cpp b/core/sql/exp/exp_function.cpp index 8f03bab..e80401f 100644 --- a/core/sql/exp/exp_function.cpp +++ b/core/sql/exp/exp_function.cpp @@ -2589,7 +2589,7 @@ ex_expr::exp_return_type ex_function_unixtime::eval(char *op_data[], { char *opData = op_data[1]; //if there is input value - if(opData[0] != 0 && getNumOperands() == 2) + if( getNumOperands() == 2) { struct tm* ptr; char* r = strptime(opData, "%Y-%m-%d %H:%M:%S", ptr); http://git-wip-us.apache.org/repos/asf/trafodion/blob/f59119c8/core/sql/regress/executor/EXPECTED002.SB ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/EXPECTED002.SB b/core/sql/regress/executor/EXPECTED002.SB index d4742cb..6260f06 100644 --- a/core/sql/regress/executor/EXPECTED002.SB +++ b/core/sql/regress/executor/EXPECTED002.SB @@ -6852,6 +6852,1056 @@ C1 >>drop table regexp_test; --- SQL operation complete. +>> +>>--create table have 1K rows +>>create table T002T1K (uniq int not null, ++> c1K int, c100 int, ++> c10 int, c1 int, c0 int ) ++> STORE BY (uniq) ++> ATTRIBUTES ALIGNED FORMAT ++> SALT USING 8 PARTITIONS ++> ; + +--- SQL operation complete. +>> +>>upsert using load into T002T1K select ++>0 + (1000 * x10) + (100 * x1) + (10 * x1) + (1 * x01), ++>0 + (100 * x10) + (10 * x1) + (1 * x01), ++>0 + (10 * x1) + (1 * x01), ++>0 + (1 * x01), ++>0, ++>X01 ++>from (values(0)) t ++>transpose 0,1,2,3,4,5,6,7,8,9 as x10 ++>transpose 0,1,2,3,4,5,6,7,8,9 as x1 ++>transpose 0,1,2,3,4,5,6,7,8,9 as X01; + +--- 1000 row(s) inserted. +>> +>>select sleep(5) from dual; + +(EXPR) +----------- + + 1 + +--- 1 row(s) selected. +>>select 'unixtimestamp',unix_timestamp() from dual; + +(EXPR) (EXPR) +---------- + +unixtimestamp 1518772709 + +--- 1 row(s) selected. +>>select 'uuidrow', uuid(), unix_timestamp() from T002T1K; + +(EXPR) (EXPR) (EXPR) +---------- + +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid +uuid + +--- 1000 row(s) selected. +>> >>------------------------------------------------------------------------ >>-- added for JIRA TRAFODION-2843 >> http://git-wip-us.apache.org/repos/asf/trafodion/blob/f59119c8/core/sql/regress/executor/FILTER002 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/FILTER002 b/core/sql/regress/executor/FILTER002 index a7075c6..d872937 100755 --- a/core/sql/regress/executor/FILTER002 +++ b/core/sql/regress/executor/FILTER002 @@ -31,4 +31,6 @@ if [ "$fil" = "" ]; then fi sed " s/\.[ ]*\*\*\*/\. \*\*\*/g +s/^uuidrow.*$/uuid/ +s/^unixtimestamp.*$/unixtimestamp/ " $fil http://git-wip-us.apache.org/repos/asf/trafodion/blob/f59119c8/core/sql/regress/executor/TEST002 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/TEST002 b/core/sql/regress/executor/TEST002 index 22cec00..f16c381 100755 --- a/core/sql/regress/executor/TEST002 +++ b/core/sql/regress/executor/TEST002 @@ -1188,6 +1188,32 @@ select * from regexp_test where c1 regexp '^(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2 select * from regexp_test where c1 regexp '(ä¸ææµè¯)'; select * from regexp_test where c1 regexp '[^\'; drop table regexp_test; + +--create table have 1K rows +create table T002T1K (uniq int not null, + c1K int, c100 int, + c10 int, c1 int, c0 int ) + STORE BY (uniq) + ATTRIBUTES ALIGNED FORMAT + SALT USING 8 PARTITIONS + ; + +upsert using load into T002T1K select +0 + (1000 * x10) + (100 * x1) + (10 * x1) + (1 * x01), +0 + (100 * x10) + (10 * x1) + (1 * x01), +0 + (10 * x1) + (1 * x01), +0 + (1 * x01), +0, +X01 +from (values(0)) t +transpose 0,1,2,3,4,5,6,7,8,9 as x10 +transpose 0,1,2,3,4,5,6,7,8,9 as x1 +transpose 0,1,2,3,4,5,6,7,8,9 as X01; + +select sleep(5) from dual; +select 'unixtimestamp',unix_timestamp() from dual; +select 'uuidrow', uuid(), unix_timestamp() from T002T1K; + ------------------------------------------------------------------------ -- added for JIRA TRAFODION-2843 @@ -1274,6 +1300,7 @@ drop table t002t8; drop table t002t9; drop table t002t10; drop table t002tab2; +drop table t002t1k; -- * drop table t002ZZ; -- * drop table t002ZZI; -- * drop table t002FU;