trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [1/2] incubator-trafodion git commit: rework of TRAFODION-2001
Date Mon, 05 Jun 2017 20:11:59 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 78a8390d9 -> 52cca83f2


rework of TRAFODION-2001


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0530f22b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0530f22b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0530f22b

Branch: refs/heads/master
Commit: 0530f22bc3aca8c011d96ce2c9c5eb61e0688082
Parents: e96e2b8
Author: Eason <hfutmkby@gmail.com>
Authored: Thu Jun 1 11:00:56 2017 +0800
Committer: Eason <hfutmkby@gmail.com>
Committed: Thu Jun 1 11:05:49 2017 +0800

----------------------------------------------------------------------
 core/sqf/sql/scripts/gensq.pl              | 23 +++++++++++++----------
 core/sqf/sysinstall/home/trafodion/.bashrc |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0530f22b/core/sqf/sql/scripts/gensq.pl
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/gensq.pl b/core/sqf/sql/scripts/gensq.pl
index 1def252..1804edf 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 sqpersist;
 use POSIX;
@@ -134,8 +133,12 @@ sub printTMScript {
     print TM @rest;
 }
 
+sub getTime {
+    return strftime("%a %b %d %H:%M:%S %Y\n", localtime(time));
+}
+
 sub printTime {
-    printScript(1, "# Trafodion Startup script generated @ ",&ctime(time),"\n");
+    printScript(1, "# Trafodion Startup script generated @ ",getTime(),"\n");
 }
 
 sub printInitialLines {
@@ -319,7 +322,7 @@ sub genComponentTmWait {
 sub genIDTMSrv {
     if ($SQ_IDTMSRV > 0) {
         printIDTMScript(1, "#!/bin/sh\n");
-        printIDTMScript(1, "# Trafodion config/utility file generated @ ",&ctime(time),"\n");
+        printIDTMScript(1, "# Trafodion config/utility file generated @ ",getTime(),"\n");
         
         printIDTMScript(1, "sqshell -c persist exec TMID\n");
         printIDTMScript(1, "exit $?\n");
@@ -331,7 +334,7 @@ sub genIDTMSrv {
 sub genDTM {
 
     printTMScript(1, "#!/bin/sh\n");
-    printTMScript(1, "# Trafodion config/utility file generated @ ",&ctime(time),"\n");
+    printTMScript(1, "# Trafodion config/utility file generated @ ",getTime(),"\n");
  
     printTMScript(1, "sqshell -a <<eof\n");
     printTMScript(1, "\n! Start DTM\n");
@@ -379,13 +382,13 @@ sub generateRMS {
     
     #generate rmsstart and rmsstop scripts
     printRMSScript(0, "#!/bin/sh\n");
-    printRMSScript(0, "# Trafodion config/utility file generated @ ",&ctime(time),"\n");
+    printRMSScript(0, "# Trafodion 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, "# Trafodion config/utility file generated @ ",&ctime(time),"\n");
+    printRMSStopScript(0, "# Trafodion config/utility file generated @ ",getTime(),"\n");
     printRMSStopScript(0, "\n# Stop the RMS processes\n");
     printRMSStopScript(0, "ssmpstop\n");
     printRMSStopScript(0, "sscpstop\n");
@@ -393,7 +396,7 @@ sub generateRMS {
 
     #generate ssmpstart, ssmpstop, sscpstart, sscpstop scripts
     printRMSScript(1, "#!/bin/sh\n");
-    printRMSScript(1, "# Trafodion config/utility file generated @ ",&ctime(time),"\n");
+    printRMSScript(1, "# Trafodion config/utility file generated @ ",getTime(),"\n");
     printRMSScript(2, "\n# Start the SSMP processes\n");
     printRMSScript(2, "sqshell -c persist exec SSMP\n");
     printRMSScript(2, "exit \$?\n");
@@ -402,7 +405,7 @@ sub generateRMS {
     printRMSScript(3, "exit \$?\n");
 
     printRMSStopScript(1, "#!/bin/sh\n");
-    printRMSStopScript(1, "# Trafodion config/utility file generated @ ",&ctime(time),"\n");
+    printRMSStopScript(1, "# Trafodion config/utility file generated @ ",getTime(),"\n");
     printRMSStopScript(2, "\n# Stop the SSMP processes\n");
     printRMSStopScript(2, "sqshell -c persist kill SSMP\n");
     printRMSStopScript(2, "exit \$?\n");
@@ -411,7 +414,7 @@ sub generateRMS {
     printRMSStopScript(3, "exit \$?\n");
    
 
-    printRMSCheckScript(1, "-- Trafodion config/utility file generated @ ",&ctime(time),"\n");
+    printRMSCheckScript(1, "-- Trafodion 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");
@@ -633,7 +636,7 @@ sub printInitLinesAuxFiles {
     my $file_ptr  = @_[0];
 
     print $file_ptr "#!/bin/sh\n";
-    print $file_ptr "# Trafodion config/utility file generated @ ", &ctime(time), "\n";
+    print $file_ptr "# Trafodion config/utility file generated @ ", getTime(), "\n";
 }
 
 sub openFiles {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0530f22b/core/sqf/sysinstall/home/trafodion/.bashrc
----------------------------------------------------------------------
diff --git a/core/sqf/sysinstall/home/trafodion/.bashrc b/core/sqf/sysinstall/home/trafodion/.bashrc
index 1ce031d..076eb29 100755
--- a/core/sqf/sysinstall/home/trafodion/.bashrc
+++ b/core/sqf/sysinstall/home/trafodion/.bashrc
@@ -50,7 +50,7 @@ if [ -f $TRAF_HOME/sqenv.sh ]; then
         source ./sqenv.sh
         popd >/dev/null
         export MANPATH=$MANPATH:$MPI_ROOT/share/man
-        #setup_my_nodes
+        setup_my_nodes
 fi
 
 #-------------------------------------------


Mime
View raw message