You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/07/29 21:34:19 UTC
[1/2] incubator-trafodion git commit: fix regression test hive 005
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 <ov...@sina.com>
Authored: Fri Jul 29 09:45:39 2016 +0000
Committer: Liu Ming <ov...@sina.com>
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
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1605] PR 629
Fix ulimit -l unlimited bug + hive TEST005
Posted by db...@apache.org.
Merge [TRAFODION-1605] PR 629 Fix ulimit -l unlimited bug + hive TEST005
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ae0ccee4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ae0ccee4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ae0ccee4
Branch: refs/heads/master
Commit: ae0ccee40c99a67b49e643c2836c299d92d5cfc0
Parents: 5cc5945 ab2139a
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Jul 29 21:33:21 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Jul 29 21:33:21 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/sqstart | 4 ++++
core/sql/regress/hive/EXPECTED005 | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------