Repository: incubator-trafodion Updated Branches: refs/heads/master 5cc5945bf -> ae0ccee40
fix regression test hive 005 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ab2139a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ab2139a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ab2139a9 Branch: refs/heads/master Commit: ab2139a9924f5a8bc6e2254186f417b5cb9e22c3 Parents: 5cc5945 Author: Liu Ming <[email protected]> Authored: Fri Jul 29 09:45:39 2016 +0000 Committer: Liu Ming <[email protected]> Committed: Fri Jul 29 09:45:39 2016 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/sqstart | 4 ++++ core/sql/regress/hive/EXPECTED005 | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ab2139a9/core/sqf/sql/scripts/sqstart ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/sqstart b/core/sqf/sql/scripts/sqstart index dbe3fcf..05117ac 100755 --- a/core/sqf/sql/scripts/sqstart +++ b/core/sqf/sql/scripts/sqstart @@ -260,20 +260,24 @@ function checkUlimit { #check ulimit -l maxLockMem=`ulimit -l` if [[ $maxLockMem -lt 65536 ]] ; then + if [[ "$maxLockMem" -ne "unlimited" ]]; then echoLog "" echoLog "ERROR: issue detected during startup. Please make sure your ulimit -l is set up correctly." echoLog "ERROR: max locked memory is smaller than 64M" echoLog "" return + fi fi #check ulimit -l if [[ $maxLockMem -lt 327680 ]] ; then + if [[ "$maxLockMem" -ne "unlimited" ]]; then echoLog "" echoLog "WARNING: issue detected during startup, please make sure your ulimit -l is set up correctly." echoLog "WARNING: max locked memory is smaller than 320M " echoLog "" return + fi fi } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ab2139a9/core/sql/regress/hive/EXPECTED005 ---------------------------------------------------------------------- diff --git a/core/sql/regress/hive/EXPECTED005 b/core/sql/regress/hive/EXPECTED005 index 273184d..ae8bd7b 100644 --- a/core/sql/regress/hive/EXPECTED005 +++ b/core/sql/regress/hive/EXPECTED005 @@ -435,7 +435,7 @@ ID CHAPTER ENGLISH TRANSLATOR >>select * from tbl_type; TINT SM I BIG STR F D T DT VC D10 D18 D181 D30 ----- ------ ----------- -------------------- ------------------------- --------------- ------------------------- -------------------------- ---------- ---------------------------------------- ----------- ---------- +---- ------ ----------- -------------------- ------------------------- --------------- ------------------------- -------------------------- ---------- ---------------------------------------- ----------- ---------- ----------- ------------------------------- 101 202 203 204 two hundred 2.0000000E+002 2.00000000000000000E+002 2022-02-02 22:22:22.222222 2022-02-02 varchar 1234567890 123456.11 12345 11111111111111111111111111111 @@ -446,7 +446,7 @@ TINT SM I BIG STR F >>select * from tbl_type_temp; TINT SM I BIG STR F D T DT VC D10 D18 D181 D30 ----- ------ ----------- -------------------- ------------------------- --------------- ------------------------- -------------------------- ---------- ---------------------------------------- ----------- ---------- +---- ------ ----------- -------------------- ------------------------- --------------- ------------------------- -------------------------- ---------- ---------------------------------------- ----------- ---------- ----------- ------------------------------- 101 202 203 204 two hundred 2.0000000E+002 2.00000000000000000E+002 2022-02-02 22:22:22.222222 2022-02-02 varchar 1234567890 123456.11 12345 11111111111111111111111111111
