You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2017/05/31 18:47:31 UTC
[30/50] [abbrv] incubator-trafodion git commit: Merge remote branch
'origin/master' into TRAFODION-2001
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/test/runtest
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/sql/scripts/bats/sqconfig.tm
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/sql/scripts/gensq.pl
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/sql/scripts/qmmstart
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/sql/scripts/sqcheck
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/sqcheck
index 0412407,bdb3d94..c5825a8
--- a/core/sqf/sql/scripts/sqcheck
+++ b/core/sqf/sql/scripts/sqcheck
@@@ -248,9 -252,12 +248,9 @@@ let cmp_result=
let sq_up=0
if [[ -z $SQSCRIPTS_DIR ]]; then
- SQSCRIPTS_DIR=$MY_SQROOT/sql/scripts
+ SQSCRIPTS_DIR=$TRAF_HOME/sql/scripts
fi
-SQSCRIPT_FILE="$SQSCRIPTS_DIR/gomon.cold"
-STARTSSMP_FILE="$SQSCRIPTS_DIR/ssmpstart"
-STARTSSCP_FILE="$SQSCRIPTS_DIR/sscpstart"
if [ $check_node '>' -1 ]; then
getNodeStatus
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/sql/scripts/sqgen
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/sqgen
index 2169e60,627194c..fd49ed8
--- a/core/sqf/sql/scripts/sqgen
+++ b/core/sqf/sql/scripts/sqgen
@@@ -26,12 -26,11 +26,12 @@@
function Usage {
script_name=`/bin/basename $0`
echo
- echo $script_name generates various Trafodion files in the $MY_SQROOT/sql/scripts directory.
+ echo $script_name generates various Trafodion files in the $TRAF_HOME/sql/scripts directory.
echo
- echo "Usage: $script_name {-ft | -perf | [sqconfig_filename] | -h}"
+ echo "Usage: $script_name [ -? | -h ] [<sqconfig_filename>]"
+ echo " -? Help"
echo " -h Help"
- echo " <sqconfig_filename> Name of the SQ config file (in $MY_SQROOT/sql/scripts directory)(defaults to 'sqconfig')"
- echo " [sqconfig_filename] Name of the SQ config file (in $TRAF_HOME/sql/scripts directory)(defaults to 'sqconfig')"
++ echo " <sqconfig_filename> Name of the SQ config file (in $TRAF_HOME/sql/scripts directory)(defaults to 'sqconfig')"
echo
exit 1;
}
@@@ -75,11 -74,10 +75,11 @@@ function GetSQcnfg
FT_FLAG=1
PERF_FLAG=0
SQCONFIG_FILE=sqconfig
+SQCONFIG_DB_FILE=sqconfig.db
- if [ -z $MY_SQROOT ]; then
+ if [ -z $TRAF_HOME ]; then
echo
- echo "The MY_SQROOT environment variable does not exist."
+ echo "The TRAF_HOME environment variable does not exist."
echo "Please ensure sqenv.sh has been sourced."
echo
exit 1;
@@@ -191,7 -166,8 +191,7 @@@ if [[ -n "$node_count" ]] && [[ "$node
fi
SQSCRIPT_FILE=./gomon
- SQESPENV_FILE=$MY_SQROOT/sql/scripts/tdm_arkesp.env
-SQCLUSTERCONF_FILE=$MPI_TMPDIR/cluster.conf
+ SQESPENV_FILE=$TRAF_HOME/sql/scripts/tdm_arkesp.env
echo
if [ -f $SQETC_DIR/ms.env ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/sql/scripts/sqnodestatus
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/sql/scripts/sqstart
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/sql/scripts/sqsystem.pm
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/sqsystem.pm
index 384fc35,f44144b..f44144b
mode 100644,100755..100644
--- a/core/sqf/sql/scripts/sqsystem.pm
+++ b/core/sqf/sql/scripts/sqsystem.pm
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/tools/sqtools.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sql/common/Ipc.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sql/qmscommon/QRLogger.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/install/installer/traf_cloudera_mods
----------------------------------------------------------------------