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/03/08 17:33:08 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-1860]sqgen failed to
execute on CentOS7
Repository: incubator-trafodion
Updated Branches:
refs/heads/master df0f84725 -> 2d44fac64
[TRAFODION-1860]sqgen failed to execute on CentOS7
remove dependency of ctime.pl
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4ad51c73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4ad51c73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4ad51c73
Branch: refs/heads/master
Commit: 4ad51c730a98d2fff01a84ad86516a33cdbf55f6
Parents: d5ab1ea
Author: Eason <hf...@gmail.com>
Authored: Thu Mar 3 11:55:58 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Thu Mar 3 11:55:58 2016 +0800
----------------------------------------------------------------------
core/sqf/sql/scripts/gensq.pl | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ad51c73/core/sqf/sql/scripts/gensq.pl
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/gensq.pl b/core/sqf/sql/scripts/gensq.pl
index e826c99..22a687b 100755
--- a/core/sqf/sql/scripts/gensq.pl
+++ b/core/sqf/sql/scripts/gensq.pl
@@ -21,7 +21,6 @@
#
# @@@ END COPYRIGHT @@@
#
-require "ctime.pl";
use sqnodes;
use POSIX;
use DBI;
@@ -145,6 +144,10 @@ my $DBH = 0;
# instance type
my $instanceType = "";
+sub getTime {
+ return strftime("%a %b %d %H:%M:%S %Y\n", localtime(time));
+}
+
sub printScript {
($dWhich, @rest) = @_;
@@ -199,7 +202,7 @@ sub printRMSCheckScript{
}
sub printTime {
- printScript(1, "# Trafodion Startup script generated @ ",&ctime(time),"\n");
+ printScript(1, "# Trafodion Startup script generated @ ",getTime(),"\n");
}
sub validate_config_script {
@@ -660,30 +663,30 @@ sub generateRMS {
#generate rmsstart and rmsstop scripts
printRMSScript(0, "#!/bin/sh\n");
- printRMSScript(0, "# SQ config/utility file generated @ ",&ctime(time),"\n");
+ printRMSScript(0, "# SQ config/utility file generated @ ",getTime(),"\n");
printRMSScript(0, "\n# Start the RMS processes\n");
printRMSScript(0, "sscpstart\n");
printRMSScript(0, "ssmpstart\n");
printRMSStopScript(0, "#!/bin/sh\n");
- printRMSStopScript(0, "# SQ config/utility file generated @ ",&ctime(time),"\n");
+ printRMSStopScript(0, "# SQ config/utility file generated @ ",getTime(),"\n");
printRMSStopScript(0, "\n# Stop the RMS processes\n");
printRMSStopScript(0, "ssmpstop\n");
printRMSStopScript(0, "sscpstop\n");
#generate ssmpstart, ssmpstop, sscpstart, sscpstop scripts
printRMSScript(1, "#!/bin/sh\n");
- printRMSScript(1, "# SQ config/utility file generated @ ",&ctime(time),"\n");
+ printRMSScript(1, "# SQ config/utility file generated @ ",getTime(),"\n");
printRMSScript(2, "\n# Start the SSMP processes\n");
printRMSScript(3, "\n# Start the SSCP processes\n");
printRMSStopScript(1, "#!/bin/sh\n");
- printRMSStopScript(1, "# SQ config/utility file generated @ ",&ctime(time),"\n");
+ printRMSStopScript(1, "# SQ config/utility file generated @ ",getTime(),"\n");
printRMSStopScript(1, "sqshell -a << eof\n");
printRMSStopScript(2, "\n!Stop the SSMP processes\n");
printRMSStopScript(3, "\n!Stop the SSCP processes\n");
- printRMSCheckScript(1, "-- SQ config/utility file generated @ ",&ctime(time),"\n");
+ printRMSCheckScript(1, "-- SQ config/utility file generated @ ",getTime(),"\n");
printRMSCheckScript(1, "prepare rms_check from select current_timestamp, \n");
printRMSCheckScript(1, "cast('Node' as varchar(5)), \n");
printRMSCheckScript(1, "cast(tokenstr('nodeId:', variable_info) as varchar(3)) node, \n");
@@ -1028,7 +1031,7 @@ sub printInitLinesAuxFiles {
my $file_ptr = @_[0];
print $file_ptr "#!/bin/sh\n";
- print $file_ptr "# SQ config/utility file generated @ ", &ctime(time), "\n";
+ print $file_ptr "# SQ config/utility file generated @ ", getTime(), "\n";
}
sub openFiles {
[2/3] incubator-trafodion git commit: [TRAFODION 1875]
Posted by db...@apache.org.
[TRAFODION 1875]
'sqnodeipcrm' script failed to parse node name during sqstart when 'dot' in trafodion folder name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0413d770
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0413d770
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0413d770
Branch: refs/heads/master
Commit: 0413d7706132b357e52ae9fb743093639b94893f
Parents: 4ad51c7
Author: Eason <hf...@gmail.com>
Authored: Mon Mar 7 17:06:32 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Mon Mar 7 17:06:32 2016 +0800
----------------------------------------------------------------------
core/sqf/sql/scripts/sqnodeipcrm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0413d770/core/sqf/sql/scripts/sqnodeipcrm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqnodeipcrm b/core/sqf/sql/scripts/sqnodeipcrm
index 1f5ec13..00e9153 100755
--- a/core/sqf/sql/scripts/sqnodeipcrm
+++ b/core/sqf/sql/scripts/sqnodeipcrm
@@ -25,7 +25,7 @@ function rm_shm {
lv_port_file=$1
echo "Using Portfile $lv_port_file"
declare -i lv_virtual_node
- let lv_virtual_node=`echo $lv_port_file | cut -d '.' -f 3`
+ let lv_virtual_node=`echo $lv_port_file | awk -F/ '{print $NF}' | cut -d '.' -f 3`
lv_port_no=`cat $lv_port_file | cut -d ':' -f 2`
#echo "lv_virtual_node=$lv_virtual_node"
#echo "lv_port_no=$lv_port_no"
[3/3] incubator-trafodion git commit: Merge [TRAFODION-1860]
[TRAFODION-1875] PR 358 Remove ctime.pl dependency
Posted by db...@apache.org.
Merge [TRAFODION-1860] [TRAFODION-1875] PR 358 Remove ctime.pl dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2d44fac6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2d44fac6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2d44fac6
Branch: refs/heads/master
Commit: 2d44fac64ab140542c315d2412e1c359db92e2a9
Parents: df0f847 0413d77
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Mar 8 16:32:21 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Mar 8 16:32:21 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/gensq.pl | 19 +++++++++++--------
core/sqf/sql/scripts/sqnodeipcrm | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------