You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/15 08:51:26 UTC
[04/10] incubator-trafodion git commit: convert all MY_SQROOT to
TRAF_HOME
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
index 5ec8509..59615a9 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
@@ -112,8 +112,8 @@ public class HBaseTxClient {
void setupLog4j() {
//System.out.println("In setupLog4J");
- System.setProperty("trafodion.root", System.getenv("MY_SQROOT"));
- String confFile = System.getenv("MY_SQROOT")
+ System.setProperty("trafodion.root", System.getenv("TRAF_HOME"));
+ String confFile = System.getenv("TRAF_HOME")
+ "/conf/log4j.dtm.config";
PropertyConfigurator.configure(confFile);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/macros.gmk b/core/sqf/src/seatrans/tm/macros.gmk
index fdfc8f8..feacd93 100644
--- a/core/sqf/src/seatrans/tm/macros.gmk
+++ b/core/sqf/src/seatrans/tm/macros.gmk
@@ -19,7 +19,7 @@
#
# @@@ END COPYRIGHT @@@
-TMINC=$(MY_SQROOT)/src/tm
+TMINC=$(TRAF_HOME)/src/tm
INC_JAVA=$(JAVA_HOME)/include
INC_JAVALINUX=$(JAVA_HOME)/include/linux
TMOS_TRACE=0
@@ -86,7 +86,7 @@ ifeq ($(SQ_USE_INTC),0)
HPCWARN = -Wno-unused-parameter
HPCXXWARN = -Wno-unused-parameter -Wno-non-virtual-dtor
endif
-INCLUDES = -I$(INCEXPDIR) -I$(INCMONDIR) -I$(TMINC) -I$(MY_SQROOT)/export/include -I$(MY_SPROOT)/export/include -I$(MY_SPROOT)/source/publications -I$(PROTOBUFS_INC) -I$(INC_JAVA) -I$(INC_JAVALINUX) -I$(MY_SQROOT)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES = -I$(INCEXPDIR) -I$(INCMONDIR) -I$(TMINC) -I$(TRAF_HOME)/export/include -I$(MY_SPROOT)/export/include -I$(MY_SPROOT)/source/publications -I$(PROTOBUFS_INC) -I$(INC_JAVA) -I$(INC_JAVALINUX) -I$(TRAF_HOME)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
LIBSSB = -L$(JAVA_HOME)/jre/lib/i386/client -L$(JAVA_HOME)/jre/lib/amd64/server -L$(LIBEXPDIR) -ltmjni -ljvm
@@ -123,7 +123,7 @@ LIBSBTS = $(LIBEXPDIR)/libsbts.$(LIBSUF)
LIBSBTSX = -L$(LIBEXPDIR) -lsbts
# DTM TM objects
-TMOBJLOC = $(MY_SQROOT)/src/tm/$(OUTDIR)
+TMOBJLOC = $(TRAF_HOME)/src/tm/$(OUTDIR)
# common rules
.c.o:
$(CC) $(CDEPFLAGS) $(CFLAGS) $(INCLUDES) -c $<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/tm/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/Makefile b/core/sqf/src/tm/Makefile
index 266af25..4151b24 100644
--- a/core/sqf/src/tm/Makefile
+++ b/core/sqf/src/tm/Makefile
@@ -26,7 +26,7 @@ include ../../macros.gmk
include ../macros.gmk
include macros.gmk
-HBASE_TRX_LOC = $(MY_SQROOT)/src/seatrans/hbase-trx
+HBASE_TRX_LOC = $(TRAF_HOME)/src/seatrans/hbase-trx
DEBUG =
DEFINES = -DDEBUG -DxUSE_FILE_AUDIT
@@ -173,10 +173,10 @@ $(LIBEXPDIR)/libshbasetmlib.so: $(LIBSXATMOBJS) cp_trx_jar
$(LIBEXPDIR)/libxarm.so: $(LIBXARMOBJS)
$(CXX) $(LNK_FLGS) -shared -o $@ $(LIBXARMOBJS) -L$(LIBEXPDIR) -llog4cxx -DXARM_BUILD_
-$(OUTDIR)/CommonLogger.o: $(MY_SQROOT)/commonLogger/CommonLogger.cpp
+$(OUTDIR)/CommonLogger.o: $(TRAF_HOME)/commonLogger/CommonLogger.cpp
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
-$(OUTDIR)/javaobjectinterfacetm.o: $(MY_SQROOT)/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.cpp
+$(OUTDIR)/javaobjectinterfacetm.o: $(TRAF_HOME)/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.cpp
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
hbasetmlib:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/tm/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/macros.gmk b/core/sqf/src/tm/macros.gmk
index 95c735d..7f4f5c1 100644
--- a/core/sqf/src/tm/macros.gmk
+++ b/core/sqf/src/tm/macros.gmk
@@ -43,13 +43,13 @@ LIBSTMB = -L$(LIBEXPDIR) -lutil -lsbms
LIBSTMX = $(LIBSTMB) $(LIBS) $(DEBUG)
LIBSTM = $(LIBSTMB) -lsxatmlib -lshbasetmlib $(LIBS) $(DEBUG)
-HBASETMLIB = $(MY_SQROOT)/src/seatrans/tm/hbasetmlib2
+HBASETMLIB = $(TRAF_HOME)/src/seatrans/tm/hbasetmlib2
#xarm
LIBXARM = -lxarm
#log4cxx
-LIBCLOGGER = $(MY_SQROOT)/commonLogger
+LIBCLOGGER = $(TRAF_HOME)/commonLogger
# seabed
SBROOT = ..
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/tm/tools/run_dtmci
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tools/run_dtmci b/core/sqf/src/tm/tools/run_dtmci
index 5c0947d..81570a7 100755
--- a/core/sqf/src/tm/tools/run_dtmci
+++ b/core/sqf/src/tm/tools/run_dtmci
@@ -29,9 +29,9 @@ execNode = 0
def isDev():
mySQROOT = ''
try:
- mySQROOT = os.environ['MY_SQROOT']
+ mySQROOT = os.environ['TRAF_HOME']
except:
- print "ERROR: $MY_SQROOT variable not set. Please setup SeaQuest environment."
+ print "ERROR: $TRAF_HOME variable not set. Please setup SeaQuest environment."
exit(1)
sqconfig = "%s/sql/scripts/sqconfig" % mySQROOT
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/tools/sqdiag_core_compare
----------------------------------------------------------------------
diff --git a/core/sqf/tools/sqdiag_core_compare b/core/sqf/tools/sqdiag_core_compare
index 42a3dd8..7ab281e 100755
--- a/core/sqf/tools/sqdiag_core_compare
+++ b/core/sqf/tools/sqdiag_core_compare
@@ -30,7 +30,7 @@ function storage_core_bt {
lv_cmd_file=sq_$1_core_bt.cmds
echo "echo 'Checking the $2 directories for any cores'" > $lv_cmd_file
- grep mkdir $MY_SQROOT/sql/scripts/sq_$1.create | sed -e "s/mkdir \-p /sqdiag_core_mask /" -e "s@' &\$@ $3' &@" | sed -r 's/\/\\\$/\/\\\\\\\$/g' >> $lv_cmd_file
+ grep mkdir $TRAF_HOME/sql/scripts/sq_$1.create | sed -e "s/mkdir \-p /sqdiag_core_mask /" -e "s@' &\$@ $3' &@" | sed -r 's/\/\\\$/\/\\\\\\\$/g' >> $lv_cmd_file
echo "wait" >> $lv_cmd_file
chmod +x $lv_cmd_file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/tools/sqdiag_core_mask
----------------------------------------------------------------------
diff --git a/core/sqf/tools/sqdiag_core_mask b/core/sqf/tools/sqdiag_core_mask
index cbea3fd..297d1b4 100755
--- a/core/sqf/tools/sqdiag_core_mask
+++ b/core/sqf/tools/sqdiag_core_mask
@@ -56,7 +56,7 @@ fi
# get traces from all core files
#
CORENAME_LIST=`find -L $SEARCH_DIR -name "core.*" 2>/dev/null`
-#DIAG_TMP_DIR=$MY_SQROOT/sqdiag_tmp
+#DIAG_TMP_DIR=$TRAF_HOME/sqdiag_tmp
DIAG_TMP_DIR=$SEARCH_DIR/sqdiag_tmp
mkdir $DIAG_TMP_DIR 2>/dev/null
echo "set output-radix 0x10" > $DIAG_TMP_DIR/gdb_bt_command
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/tools/sqtools.sh
----------------------------------------------------------------------
diff --git a/core/sqf/tools/sqtools.sh b/core/sqf/tools/sqtools.sh
index d369959..a75e02f 100644
--- a/core/sqf/tools/sqtools.sh
+++ b/core/sqf/tools/sqtools.sh
@@ -41,7 +41,7 @@ function cmaph {
l_nl=$1
fi
setup_sqpdsh
- eval '$SQPDSHA "head --quiet --lines $l_nl $MY_SQROOT/tmp/monitor.map.[0-9]*.*" 2>/dev/null | sort -k1'
+ eval '$SQPDSHA "head --quiet --lines $l_nl $TRAF_HOME/tmp/monitor.map.[0-9]*.*" 2>/dev/null | sort -k1'
}
# tail of the monitor.map.[0-9]*.* files in the cluster
@@ -51,19 +51,19 @@ function cmapt {
l_nl=$1
fi
setup_sqpdsh
- eval '$SQPDSHA "tail --quiet --lines $l_nl $MY_SQROOT/tmp/monitor.map.[0-9]*.*" 2>/dev/null | sort -k1'
+ eval '$SQPDSHA "tail --quiet --lines $l_nl $TRAF_HOME/tmp/monitor.map.[0-9]*.*" 2>/dev/null | sort -k1'
}
#grep the monitor map file(s) on a node for the given string
function ngrepmm {
l_lookup=$*
- grep -h "$l_lookup" $MY_SQROOT/tmp/monitor.map.[0-9]*.*
+ grep -h "$l_lookup" $TRAF_HOME/tmp/monitor.map.[0-9]*.*
}
#grep the monitor map file(s) on a node for the given string and then filters anything other than tdm_arkesp
function ngrepmms {
l_lookup=$*
- grep -h "$l_lookup" $MY_SQROOT/tmp/monitor.map.[0-9]*.* | grep tdm_arkesp
+ grep -h "$l_lookup" $TRAF_HOME/tmp/monitor.map.[0-9]*.* | grep tdm_arkesp
}
# lookup the monitor.map.[0-9]*.* files in the cluster
@@ -148,36 +148,36 @@ function cmappc {
l_nl=$1
fi
setup_sqpdsh
- eval '$SQPDSHA "grep -h $l_nl $MY_SQROOT/tmp/monitor.map.[0-9]*.* | grep BEGIN | wc -l" 2>/dev/null | sort -nk2'
+ eval '$SQPDSHA "grep -h $l_nl $TRAF_HOME/tmp/monitor.map.[0-9]*.* | grep BEGIN | wc -l" 2>/dev/null | sort -nk2'
}
#### Begin MD5 related functions
function sqmd5b {
setup_sqpdsh
- eval '$SQPDSHA "cd $MY_SQROOT/export/bin${SQ_MBTYPE}; md5sum $1 2>/dev/null" 2>/dev/null | cut -f2 -d: | sort -u'
+ eval '$SQPDSHA "cd $TRAF_HOME/export/bin${SQ_MBTYPE}; md5sum $1 2>/dev/null" 2>/dev/null | cut -f2 -d: | sort -u'
}
function sqmd5ba {
setup_sqpdsh
- eval '$SQPDSHA "cd $MY_SQROOT/export/bin${SQ_MBTYPE}; md5sum $1 2>/dev/null" 2>/dev/null | sort'
+ eval '$SQPDSHA "cd $TRAF_HOME/export/bin${SQ_MBTYPE}; md5sum $1 2>/dev/null" 2>/dev/null | sort'
}
function sqmd5l {
setup_sqpdsh
- eval '$SQPDSHA "cd $MY_SQROOT/export/lib${SQ_MBTYPE}; md5sum $1 2>/dev/null" 2>/dev/null | cut -f2 -d: | sort -u'
+ eval '$SQPDSHA "cd $TRAF_HOME/export/lib${SQ_MBTYPE}; md5sum $1 2>/dev/null" 2>/dev/null | cut -f2 -d: | sort -u'
}
function sqmd5la {
setup_sqpdsh
- eval '$SQPDSHA "cd $MY_SQROOT/export/lib${SQ_MBTYPE}; md5sum $1 2>/dev/null" 2>/dev/null | sort -u'
+ eval '$SQPDSHA "cd $TRAF_HOME/export/lib${SQ_MBTYPE}; md5sum $1 2>/dev/null" 2>/dev/null | sort -u'
}
#### End MD5 related functions
function cmapc {
setup_sqpdsh
- eval '$SQPDSHA "grep $1 $MY_SQROOT/tmp/monitor.map* | grep $2 | wc -l" '
+ eval '$SQPDSHA "grep $1 $TRAF_HOME/tmp/monitor.map* | grep $2 | wc -l" '
}
function pdsh_counter {
@@ -321,7 +321,7 @@ function run_util {
# check the startup log and sort the interesting even chronologically
function sqchksl {
setup_sqpdsh
- eval '$SQPDSHA "cd $MY_SQROOT/sql/scripts; grep Executing startup.log 2>/dev/null" 2>/dev/null | sort -k4 -k5'
+ eval '$SQPDSHA "cd $TRAF_HOME/sql/scripts; grep Executing startup.log 2>/dev/null" 2>/dev/null | sort -k4 -k5'
}
function sqchkopt {
@@ -365,7 +365,7 @@ function sqsecheck {
}
function sqchkmpi {
- pdsh $MY_NODES "cd $MY_SQROOT/logs; egrep -i '(mpi bug|ibv_create)' *.log" 2>/dev/null
+ pdsh $MY_NODES "cd $TRAF_HOME/logs; egrep -i '(mpi bug|ibv_create)' *.log" 2>/dev/null
}
#### Log Collection functions
@@ -424,27 +424,27 @@ function sqsavelogs {
sqcollectmonmemlog 2>/dev/null
- cp -p $MY_SQROOT/logs/master_exec*.log ${lv_copy_to_dir}
- cp -p $MY_SQROOT/logs/mon.*.log ${lv_copy_to_dir}
- cp -p $MY_SQROOT/logs/monmem.*.log ${lv_copy_to_dir}
- cp -p $MY_SQROOT/logs/pstart*.log ${lv_copy_to_dir}
- cp -p $MY_SQROOT/logs/smstats.*.log ${lv_copy_to_dir}
- cp -p $MY_SQROOT/logs/sqmo*.log ${lv_copy_to_dir}
- cp -p $MY_SQROOT/logs/trafodion.dtm.log* ${lv_copy_to_dir}
- cp -p $MY_SQROOT/logs/tm*.log ${lv_copy_to_dir}
- cp -p $MY_SQROOT/logs/wdt.*.log ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/master_exec*.log ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/mon.*.log ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/monmem.*.log ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/pstart*.log ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/smstats.*.log ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/sqmo*.log ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/trafodion.dtm.log* ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/tm*.log ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/logs/wdt.*.log ${lv_copy_to_dir}
- cp -p $MY_SQROOT/tmp/monitor.map.[0-9]*.* ${lv_copy_to_dir}
- cp -p $MY_SQROOT/tmp/monitor.trace* ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/tmp/monitor.map.[0-9]*.* ${lv_copy_to_dir}
+ cp -p $TRAF_HOME/tmp/monitor.trace* ${lv_copy_to_dir}
lv_stdout_dir_name=${lv_copy_to_dir}/stdout_${lv_node}
mkdir -p ${lv_stdout_dir_name}
- cp -p $MY_SQROOT/sql/scripts/startup.log ${lv_copy_to_dir}/startup.${lv_node}.log
- cp -p $MY_SQROOT/sql/scripts/stdout_* ${lv_stdout_dir_name}
- cp -p $MY_SQROOT/sql/scripts/hs_err_pid*.log ${lv_stdout_dir_name}
+ cp -p $TRAF_HOME/sql/scripts/startup.log ${lv_copy_to_dir}/startup.${lv_node}.log
+ cp -p $TRAF_HOME/sql/scripts/stdout_* ${lv_stdout_dir_name}
+ cp -p $TRAF_HOME/sql/scripts/hs_err_pid*.log ${lv_stdout_dir_name}
lv_config_dir_name=${lv_copy_to_dir}/sqconfig_db
- cp -p $MY_SQROOT/sql/scripts/sqconfig.db ${lv_config_dir_name}/${lv_node}_sqconfig.db
+ cp -p $TRAF_HOME/sql/scripts/sqconfig.db ${lv_config_dir_name}/${lv_node}_sqconfig.db
sqsave_linux_info ${lv_linux_collection_dir}/linux
@@ -461,10 +461,10 @@ function sqsavelogs_compress {
lv_node=`uname -n`
- cd $MY_SQROOT
+ cd $TRAF_HOME
mkdir -p ${lv_node_collection_dir_name}/logs/sqconfig_db
- sqsavelogs ${MY_SQROOT}/${lv_node_collection_dir_name} ${lv_move_to_dir}
+ sqsavelogs ${TRAF_HOME}/${lv_node_collection_dir_name} ${lv_move_to_dir}
lv_tar_file_name=${lv_node}_${lv_node_collection_dir_name}.tgz
cd ${lv_node_collection_dir_name}
@@ -603,14 +603,14 @@ function sqcollectlogs {
sqvers -u > sqvers_u.out 2>/dev/null
sqid > sqid.out 2>/dev/null
- cp -p $MY_SQROOT/sqenv.sh .
- cp -p $MY_SQROOT/sqenvcom.sh .
- cp -p $MY_SQROOT/etc/ms.env .
- cp -p $MY_SQROOT/sql/scripts/gomon.cold .
- cp -p $MY_SQROOT/sql/scripts/gomon.warm .
- cp -p $MY_SQROOT/sql/scripts/sqconfig .
- cp -p $MY_SQROOT/sql/scripts/mon.env . 2>/dev/null
- cp -p $MY_SQROOT/sql/scripts/shell.env . 2>/dev/null
+ cp -p $TRAF_HOME/sqenv.sh .
+ cp -p $TRAF_HOME/sqenvcom.sh .
+ cp -p $TRAF_HOME/etc/ms.env .
+ cp -p $TRAF_HOME/sql/scripts/gomon.cold .
+ cp -p $TRAF_HOME/sql/scripts/gomon.warm .
+ cp -p $TRAF_HOME/sql/scripts/sqconfig .
+ cp -p $TRAF_HOME/sql/scripts/mon.env . 2>/dev/null
+ cp -p $TRAF_HOME/sql/scripts/shell.env . 2>/dev/null
cd ..
# end configuration info
@@ -686,7 +686,7 @@ function sqcollectmonmemlog {
if [ $monpid_x ]; then
monpid=`printf "%d" 0x$monpid_x`
nodename=`uname -n`
- monmemlog $monpid nowait > $MY_SQROOT/logs/monmem.${nodename}.${monpid}.log
+ monmemlog $monpid nowait > $TRAF_HOME/logs/monmem.${nodename}.${monpid}.log
fi
}
@@ -967,7 +967,7 @@ export -f run_util
function sq_gdb {
export MY_CURRENT_DIR=$PWD
- bash -c "cd $MY_SQROOT; . $MY_SQROOT/sqenv.sh; cd $MY_CURRENT_DIR ; sq_gdb_main $* ; "
+ bash -c "cd $TRAF_HOME; . $TRAF_HOME/sqenv.sh; cd $MY_CURRENT_DIR ; sq_gdb_main $* ; "
lv_retcode=$?
unset MY_CURRENT_DIR
return $lv_retcode
@@ -989,19 +989,19 @@ function tmpspace {
# functions to cd to a particular directory
function cds {
- cd $MY_SQROOT/sql/scripts
+ cd $TRAF_HOME/sql/scripts
}
function cdw {
- cd $MY_SQROOT
+ cd $TRAF_HOME
}
function cdl {
- cd $MY_SQROOT/logs
+ cd $TRAF_HOME/logs
}
function cdb {
- cd $MY_SQROOT/export/bin${SQ_MBTYPE}
+ cd $TRAF_HOME/export/bin${SQ_MBTYPE}
}
function cdi {
- cd $MY_SQROOT/export/lib${SQ_MBTYPE}
+ cd $TRAF_HOME/export/lib${SQ_MBTYPE}
}
function cdt {
cd $MPI_TMPDIR
@@ -1010,7 +1010,7 @@ function cdc {
cd /local/cores/$UID
}
function cdj {
- cd $MY_SQROOT/../sql/src/main/java/org/trafodion/sql
+ cd $TRAF_HOME/../sql/src/main/java/org/trafodion/sql
}
# ls variants
function lst {
@@ -1024,12 +1024,12 @@ ls -al $*
function run_sb_regr {
pushd .
- mkdir -p $MY_SQROOT/rundir
- cd $MY_SQROOT/sql
- ln -sf $MY_SQROOT/../sql/regress regress
- ln -sf $MY_SQROOT/../sql/sqludr sqludr
+ mkdir -p $TRAF_HOME/rundir
+ cd $TRAF_HOME/sql
+ ln -sf $TRAF_HOME/../sql/regress regress
+ ln -sf $TRAF_HOME/../sql/sqludr sqludr
- cd $MY_SQROOT/sql/regress/tools
+ cd $TRAF_HOME/sql/regress/tools
. ./setuplnxenv
cd $scriptsdir
@@ -1043,17 +1043,17 @@ function run_sb_regr {
function run_sb_test {
pushd .
- mkdir -p $MY_SQROOT/rundir
- cd $MY_SQROOT/sql
- ln -sf $MY_SQROOT/../sql/regress regress
- ln -sf $MY_SQROOT/../sql/sqludr sqludr
+ mkdir -p $TRAF_HOME/rundir
+ cd $TRAF_HOME/sql
+ ln -sf $TRAF_HOME/../sql/regress regress
+ ln -sf $TRAF_HOME/../sql/sqludr sqludr
- cd $MY_SQROOT/sql/regress/tools
+ cd $TRAF_HOME/sql/regress/tools
. ./setuplnxenv
if [ -d $scriptsdir/$1 ]; then
cd $scriptsdir/$1
- mkdir -p $MY_SQROOT/rundir/$1
+ mkdir -p $TRAF_HOME/rundir/$1
shift
../tools/runregr -sb $*
else
@@ -1065,14 +1065,14 @@ function run_sb_test {
function check_sb_regr {
pushd . > /dev/null
- cd $MY_SQROOT/rundir
+ cd $TRAF_HOME/rundir
find . -name runregr-sb.log | xargs grep FAIL
popd > /dev/null
}
function status_sb_regr {
pushd . > /dev/null
- cd $MY_SQROOT/rundir
+ cd $TRAF_HOME/rundir
find . -name runregr-sb.log | xargs tail -n 1
popd > /dev/null
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/SqlCompilerDebugger/cln.sh
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/cln.sh b/core/sql/SqlCompilerDebugger/cln.sh
index 3876b70..d6ecc5e 100644
--- a/core/sql/SqlCompilerDebugger/cln.sh
+++ b/core/sql/SqlCompilerDebugger/cln.sh
@@ -18,9 +18,9 @@
# under the License.
#
# @@@ END COPYRIGHT @@@
-#rm -f $MY_SQROOT/export/lib64d/libSqlCompilerDebugger.so
-#rm -f $MY_SQROOT/export/lib64d/libQtCore.so
-#rm -f $MY_SQROOT/export/lib64d/libQtGui.so
+#rm -f $TRAF_HOME/export/lib64d/libSqlCompilerDebugger.so
+#rm -f $TRAF_HOME/export/lib64d/libQtCore.so
+#rm -f $TRAF_HOME/export/lib64d/libQtGui.so
make clean
rm -f Makefile
rm -f libSqlCompilerDebugger.so*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/arkcmp/CmpErrLog.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpErrLog.cpp b/core/sql/arkcmp/CmpErrLog.cpp
index 6e911e3..8cf82ac 100644
--- a/core/sql/arkcmp/CmpErrLog.cpp
+++ b/core/sql/arkcmp/CmpErrLog.cpp
@@ -130,13 +130,13 @@ void CmpErrLog::openLogFile()
return;
- // On Linux determine the log location based off of MY_SQROOT environment
+ // On Linux determine the log location based off of TRAF_HOME environment
// variable.
char logFilePath[MAX_LOGFILE_NAME_LEN+1];
- char *sqroot = getenv("MY_SQROOT");
+ char *sqroot = getenv("TRAF_HOME");
// Use a generated path for the logfile if 3 conditions are met:
- // 1. MY_SQROOT is set in the environment.
+ // 1. TRAF_HOME is set in the environment.
// 2. The first character of the logfile starts with a character or digit.
// 3. The complete path can fit into the size of the "logFilePath" buffer.
if ((sqroot != NULL) &&
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/bin/ex_esp_main.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/ex_esp_main.cpp b/core/sql/bin/ex_esp_main.cpp
index b4ac9a2..49d0500 100644
--- a/core/sql/bin/ex_esp_main.cpp
+++ b/core/sql/bin/ex_esp_main.cpp
@@ -575,7 +575,7 @@ void EspGuaControlConnection::actOnSystemMessage(
// LCOV_EXCL_START
/*
Coverage notes: to test this code in a dev regression requires
- changing $MY_SQROOT/etc/ms.env, so I made a manual test on
+ changing $TRAF_HOME/etc/ms.env, so I made a manual test on
May 11, 2012 to verify this code.
*/
char myName[20];
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index ac8d454..6f08447 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -8570,7 +8570,7 @@ Lng32 SQLCLI_GetSystemVolume_Internal(
// Very first time the SMD Location is uninitialized in CliGlobals. In this
// case the location is acquired from
// the environment variable SQLMX_SMD_LOCATION defined in the
- // $MY_SQROOT/etc/ms.env configuration file
+ // $TRAF_HOME/etc/ms.env configuration file
// (The SQLMX_SMD_LOCATION value should contain a valid volume name only;
// for example: SQLMX_SMD_LOCATION='$DATA2' - The default volume name
// $SYSTEM is used when SQLMX_SMD_LOCATION is not defined or when the
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/cli/SessionDefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/SessionDefaults.cpp b/core/sql/cli/SessionDefaults.cpp
index c9dbd34..8922244 100644
--- a/core/sql/cli/SessionDefaults.cpp
+++ b/core/sql/cli/SessionDefaults.cpp
@@ -684,7 +684,7 @@ Lng32 SessionDefaults::readFromDefaultsTable(CliGlobals * cliGlobals)
{
// Read system defaults from configuration file
// keep this name in sync with file sqlcomp/nadefaults.cpp
- NAString confFile(getenv("MY_SQROOT"));
+ NAString confFile(getenv("TRAF_HOME"));
confFile += "/etc/SQSystemDefaults.conf";
FILE *f = fopen(confFile, "r");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/common/ComRtUtils.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComRtUtils.cpp b/core/sql/common/ComRtUtils.cpp
index 086cf04..387c609 100644
--- a/core/sql/common/ComRtUtils.cpp
+++ b/core/sql/common/ComRtUtils.cpp
@@ -271,7 +271,7 @@ Lng32 ComRtGetModuleFileName(
memset(sysModuleDirNameBuf, 0, bufSize);
memset(userModuleDirNameBuf, 0, bufSize);
- mySQROOT = getenv("MY_SQROOT");
+ mySQROOT = getenv("TRAF_HOME");
if (mySQROOT != NULL && strlen(mySQROOT) <= bufSize-100) {
strcpy(sysModuleDirNameBuf, mySQROOT);
strcpy(userModuleDirNameBuf, mySQROOT);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/common/Ipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/Ipc.cpp b/core/sql/common/Ipc.cpp
index dbd7ece..a5e6e71 100644
--- a/core/sql/common/Ipc.cpp
+++ b/core/sql/common/Ipc.cpp
@@ -641,7 +641,7 @@ void IpcServer::logEspRelease(const char * filename, int lineNum,
// LCOV_EXCL_START
/*
Coverage notes: to test this code in a dev regression requires
- changing $MY_SQROOT/etc/ms.env. However, it was tested in
+ changing $TRAF_HOME/etc/ms.env. However, it was tested in
stress test on May 10, 2012.
*/
char logMsg[500];
@@ -1665,7 +1665,7 @@ WaitReturnStatus IpcSetOfConnections::waitOnSet(IpcTimeout timeout,
/*
Coverage notes: to test this code in a dev
regression requires changing
- $MY_SQROOT/etc/ms.env. However, it was
+ $TRAF_HOME/etc/ms.env. However, it was
tested in stress test on
May 10, 2012.
*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/executor/ExSMTrace.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSMTrace.cpp b/core/sql/executor/ExSMTrace.cpp
index bda93f9..d5d5761 100644
--- a/core/sql/executor/ExSMTrace.cpp
+++ b/core/sql/executor/ExSMTrace.cpp
@@ -138,8 +138,8 @@ void ExSM_SetTraceEnabled(bool b, ExSMGlobals *smGlobals)
int node = EXSM_NODE_NUMBER;
int tid = EXSM_TID;
- const char *sqRoot = getenv("MY_SQROOT");
- exsm_assert(sqRoot, "getenv(MY_SQROOT) returned NULL");
+ const char *sqRoot = getenv("TRAF_HOME");
+ exsm_assert(sqRoot, "getenv(TRAF_HOME) returned NULL");
char *filename = new char[PATH_MAX + 1];
exsm_assert(filename, "Could not allocate SM trace file name");
@@ -149,7 +149,7 @@ void ExSM_SetTraceEnabled(bool b, ExSMGlobals *smGlobals)
// * The generated name will be <prefix>.<other-info>
// where <other-info> includes the node ID and process ID
// * If <prefix> starts with "/", it is an absolute path
- // * Otherwise the file is placed under $MY_SQROOT/tmp
+ // * Otherwise the file is placed under $TRAF_HOME/tmp
if (!strncmp(smGlobals->getTraceFilePrefix(), "stdout", 6))
{
EXSM_OUTFILE = stdout;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/executor/HdfsLogger.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/HdfsLogger.h b/core/sql/executor/HdfsLogger.h
index 8ef95a6..760289f 100644
--- a/core/sql/executor/HdfsLogger.h
+++ b/core/sql/executor/HdfsLogger.h
@@ -44,7 +44,7 @@ public:
/**
* Initializes log4cxx by using the configuration file.
* If the path given is relative (does not start with a
- * slash), it is appended to the $MY_SQROOT environment variable.
+ * slash), it is appended to the $TRAF_HOME environment variable.
* If the configuration file is not found, perform hard-coded
* default configuration.
* @param configFileName name of the log4cxx configuration file.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/executor/JavaObjectInterface.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/JavaObjectInterface.cpp b/core/sql/executor/JavaObjectInterface.cpp
index 7f406d8..4e7f70f 100644
--- a/core/sql/executor/JavaObjectInterface.cpp
+++ b/core/sql/executor/JavaObjectInterface.cpp
@@ -193,7 +193,7 @@ int JavaObjectInterface::createJVM()
jvm_options[numJVMOptions].optionString = (char *)oomOption;
numJVMOptions++;
- char *mySqRoot = getenv("MY_SQROOT");
+ char *mySqRoot = getenv("TRAF_HOME");
int len;
char *oomDumpDir = NULL;
if (mySqRoot != NULL)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 32d6ff8..85fa98b 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -3374,7 +3374,7 @@ void ExLobGlobals::traceMessage(const char *logMessage, ExLobCursor *cursor,
//Enable envvar TRACE_LOB_ACTIONS to enable tracing.
//The output file will be in the masterexec.<pid> logs in the
-//$MY_SQROOT/logs directory on each node
+//$TRAF_HOME/logs directory on each node
void lobDebugInfo(const char *logMessage,Int32 errorcode,
Int32 line, NABoolean lobTrace)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/export/NAAbort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NAAbort.cpp b/core/sql/export/NAAbort.cpp
index 477f603..9e539c5 100644
--- a/core/sql/export/NAAbort.cpp
+++ b/core/sql/export/NAAbort.cpp
@@ -237,7 +237,7 @@ void assert_botch_abend( const char *f, Int32 l, const char * m, const char *c)
SQLMXLoggingArea::logSQLMXAssertionFailureEvent(f, l, m, c, tidPtr); // Any executor thread can log a failure
// Log the message to stderr. On Linux stderr is mapped to a file
- // under $MY_SQROOT/logs and our output will be prefixed with a
+ // under $TRAF_HOME/logs and our output will be prefixed with a
// timestamp and process ID.
cerr << "Executor assertion failure in file " << f
<< " on line " << l << '\n';
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/langman/LmLangManagerJava.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmLangManagerJava.cpp b/core/sql/langman/LmLangManagerJava.cpp
index 9348ef6..38713a9 100644
--- a/core/sql/langman/LmLangManagerJava.cpp
+++ b/core/sql/langman/LmLangManagerJava.cpp
@@ -3685,7 +3685,7 @@ void LmLanguageManagerJava::setJavaClassPath()
const char *ntTrafJar = "/export/lib/trafodion-UDR-0.7.0.jar";
const char *ntJdbcT4Jar = "/export/lib/jdbcT2.jar";
- char *root = getenv("MY_SQROOT");
+ char *root = getenv("TRAF_HOME");
LM_ASSERT(root != NULL);
resultlength = strlen(root) + 1;
LM_ASSERT(resultlength < LMJ_NT_FILE_PATH_LEN);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/lib_mgmt/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/Makefile b/core/sql/lib_mgmt/Makefile
index d10bccd..72a44ac 100644
--- a/core/sql/lib_mgmt/Makefile
+++ b/core/sql/lib_mgmt/Makefile
@@ -19,8 +19,8 @@
#
# @@@ END COPYRIGHT @@@
-INSTALL_LIBDIR := ${MY_SQROOT}/export/lib
-INSTALL_SCRIPTSDIR := ${MY_SQROOT}/sql/scripts
+INSTALL_LIBDIR := ${TRAF_HOME}/export/lib
+INSTALL_SCRIPTSDIR := ${TRAF_HOME}/sql/scripts
CP :=/bin/cp -f
all:
@$(MAVEN) package -DskipTests
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/lib_mgmt/README.rst
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/README.rst b/core/sql/lib_mgmt/README.rst
index d462730..2eacac5 100644
--- a/core/sql/lib_mgmt/README.rst
+++ b/core/sql/lib_mgmt/README.rst
@@ -26,7 +26,7 @@ Trafodion lib_mgmt README
How to build and initialize default SPJs
Build
-cd $MY_SQROOT/../sql/lib_mgmt
+cd $TRAF_HOME/../sql/lib_mgmt
make clean && make all
Initialization
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/lib_mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/pom.xml b/core/sql/lib_mgmt/pom.xml
index aafb2e1..d01ae09 100644
--- a/core/sql/lib_mgmt/pom.xml
+++ b/core/sql/lib_mgmt/pom.xml
@@ -54,7 +54,7 @@
value="${basedir}/src/main/java/org/trafodion/libmgmt" />
<property name="manifest.file" value="${basedir}/src/main/resources/MANIFEST.MF" />
<property name="vproc.str" value="Traf_libmgmt_Build_" />
-<property file="${env.MY_SQROOT}/export/include/SCMBuildMan.mf"/>
+<property file="${env.TRAF_HOME}/export/include/SCMBuildMan.mf"/>
<exec executable="git" outputproperty="rev_head">
<arg value="rev-parse" />
<arg value="--short" />
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java b/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java
index ed96097..ba5d886 100644
--- a/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java
+++ b/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java
@@ -550,7 +550,7 @@ public class FileMgmt {
private static String getCodeFilePath(Connection conn) throws SQLException {
String user = getCurrentUser(conn);
- String root = System.getenv("MY_SQROOT");
+ String root = System.getenv("TRAF_HOME");
if (root == null || "".equals(root.trim())) {
LOG.error("Cant get your traf installation path!");
throw new SQLException("Cant get your traf installation path!");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/lib_mgmt/src/main/resources/init_libmgmt.sh
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/src/main/resources/init_libmgmt.sh b/core/sql/lib_mgmt/src/main/resources/init_libmgmt.sh
index 9e31ec1..55e315c 100644
--- a/core/sql/lib_mgmt/src/main/resources/init_libmgmt.sh
+++ b/core/sql/lib_mgmt/src/main/resources/init_libmgmt.sh
@@ -20,7 +20,7 @@
#
# @@@ END COPYRIGHT @@@
-SERVER_JAR=${MY_SQROOT}/export/lib/lib_mgmt.jar
+SERVER_JAR=${TRAF_HOME}/export/lib/lib_mgmt.jar
CI=sqlci
CATALOG_NAME=TRAFODION
LIB_SCHEMA="DB__LIBMGR"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/nskgmake/Makerules.linux
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/Makerules.linux b/core/sql/nskgmake/Makerules.linux
index d0b0e63..039dd80 100755
--- a/core/sql/nskgmake/Makerules.linux
+++ b/core/sql/nskgmake/Makerules.linux
@@ -37,12 +37,12 @@ ifdef MAKECMDGOALS
ifeq (,$(filter $(FLAVOR),release debug doc))
$(error Cannot determine the flavor - debug or release)
else
- ifndef MY_SQROOT
- $(error MY_SQROOT must be defined for a Linux build)
+ ifndef TRAF_HOME
+ $(error TRAF_HOME must be defined for a Linux build)
endif
# Pick up the top-level project definitions
- include $(MY_SQROOT)/sql/macros.gmk
+ include $(TRAF_HOME)/sql/macros.gmk
endif
endif
endif
@@ -80,13 +80,13 @@ OBJSUFFIX := o
#######################################################################
# Define several directories used by various parts of the Linux build
#######################################################################
-LIBROOT = $(MY_SQROOT)/export/lib$(SQ_MBTYPE)
-TRAF_BIN = $(MY_SQROOT)/export/bin$(SQ_MBTYPE)
+LIBROOT = $(TRAF_HOME)/export/lib$(SQ_MBTYPE)
+TRAF_BIN = $(TRAF_HOME)/export/bin$(SQ_MBTYPE)
XMPIROOT = $(LIBROOT)
ifeq ($(SQ_BUILD_TYPE),release)
- STUBLIBROOT = $(MY_SQROOT)/sql/stublibs/lib/linux/$(SQ_MTYPE)bit/release
+ STUBLIBROOT = $(TRAF_HOME)/sql/stublibs/lib/linux/$(SQ_MTYPE)bit/release
else
- STUBLIBROOT = $(MY_SQROOT)/sql/stublibs/lib/linux/$(SQ_MTYPE)bit/debug
+ STUBLIBROOT = $(TRAF_HOME)/sql/stublibs/lib/linux/$(SQ_MTYPE)bit/debug
endif
PGO_DIR := $(shell /bin/pwd)/pgo_profile_data
ifeq ($(SQ_BUILD_TYPE),release)
@@ -192,18 +192,18 @@ ifdef USE_HADOOP_1
endif
SYS_INCLUDES :=
- SYS_INCLUDES += -I$(MY_SQROOT)/inc \
- -I$(MY_SQROOT)/export/include \
+ SYS_INCLUDES += -I$(TRAF_HOME)/inc \
+ -I$(TRAF_HOME)/export/include \
-I$(PROTOBUFS_INC) \
$(THRIFT_INC) $(LOG4CXX_INC) $(LIBCURL_INC) \
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-OTHER_INCLUDES := -include "$(MY_SQROOT)/inc/seaquest/sqtypes.h" \
+OTHER_INCLUDES := -include "$(TRAF_HOME)/inc/seaquest/sqtypes.h" \
-I$(LLVM_INC_ROOT) \
-I$(LLVM_INC_ROOT2) \
-I$(UDIS86_INC_ROOT) \
- -I$(MY_SQROOT)/../dbsecurity/auth/inc \
- -I$(MY_SQROOT)/commonLogger
+ -I$(TRAF_HOME)/../dbsecurity/auth/inc \
+ -I$(TRAF_HOME)/commonLogger
LOC_LIBS := \
-L$(RESULTDIR) \
@@ -425,7 +425,7 @@ copytoolslibs:
# if these are not found, then...
-cp -Pf $(HADOOP_BLD_LIB)/$(LIBHDFS_SO)* $(LIBROOT)
-cp -Pf $(HADOOP_BLD_LIB)/$(LIBHADOOP_SO)* $(LIBROOT)
- -cp -Pf $(HADOOP_BLD_INC)/hdfs.h $(MY_SQROOT)/export/include
+ -cp -Pf $(HADOOP_BLD_INC)/hdfs.h $(TRAF_HOME)/export/include
# download Hadoop-common distro
get_libhdfs_files --verbose
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/nskgmake/Makerules.mk
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk
index 86401e7..d61cb77 100755
--- a/core/sql/nskgmake/Makerules.mk
+++ b/core/sql/nskgmake/Makerules.mk
@@ -275,20 +275,20 @@ endif
mavenbuild:
# create a jar manifest file with the correct version information
mkdir -p ../src/main/resources
- $(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf
+ $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf
# run maven
set -o pipefail && cd ..; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- cp -pf ../target/trafodion-sql-cdh*.jar $(MY_SQROOT)/export/lib
+ cp -pf ../target/trafodion-sql-cdh*.jar $(TRAF_HOME)/export/lib
# Java files get built through Maven
mavenbuild_apache:
set -o pipefail && cd ..; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- cp -pf ../target/trafodion-sql-apache*.jar $(MY_SQROOT)/export/lib
+ cp -pf ../target/trafodion-sql-apache*.jar $(TRAF_HOME)/export/lib
# Java files get built through Maven
mavenbuild_hdp:
set -o pipefail && cd ..; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- cp -pf ../target/trafodion-sql-hdp*.jar $(MY_SQROOT)/export/lib
+ cp -pf ../target/trafodion-sql-hdp*.jar $(TRAF_HOME)/export/lib
# This is where the top-level is declared to build everything.
buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild mavenbuild_hdp mavenbuild_apache
@@ -305,4 +305,4 @@ clean:
@echo "Removing coverage files"
@-find $(TOPDIR) -maxdepth 1 -name '*.gcov' -print | xargs rm -f
@cd ..; $(MAVEN) clean
- @rm -rf $(MY_SQROOT)/export/lib/trafodion-sql-*.jar
+ @rm -rf $(TRAF_HOME)/export/lib/trafodion-sql-*.jar
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/nskgmake/cli/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/cli/Makefile b/core/sql/nskgmake/cli/Makefile
index e2bd063..20f4ade 100755
--- a/core/sql/nskgmake/cli/Makefile
+++ b/core/sql/nskgmake/cli/Makefile
@@ -38,7 +38,7 @@ CPPSRC := \
CPPSRC += mpisetup.cpp vers_libcli.cpp
SRCPATH := cli bin common
CPPSRC += CliExtern.cpp
-C_INC_OVERRIDE := -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/export/include/seabed
+C_INC_OVERRIDE := -I$(TRAF_HOME)/export/include -I$(TRAF_HOME)/export/include/seabed
USER_INCLUDES += $(WMS_INC) \
$(THRIFT_INC)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/nskgmake/clitest/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/clitest/Makefile b/core/sql/nskgmake/clitest/Makefile
index d129541..b9a783c 100755
--- a/core/sql/nskgmake/clitest/Makefile
+++ b/core/sql/nskgmake/clitest/Makefile
@@ -27,7 +27,7 @@ CPPSRC := \
CPPSRC += mpisetup.cpp
SRCPATH := clitest bin
-C_INC_OVERRIDE := -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/export/include/seabed
+C_INC_OVERRIDE := -I$(TRAF_HOME)/export/include -I$(TRAF_HOME)/export/include/seabed
ifeq ($(FLAVOR), debug)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/nskgmake/tdm_sqlexp/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/tdm_sqlexp/Makefile b/core/sql/nskgmake/tdm_sqlexp/Makefile
index 880d06d..6b973af 100755
--- a/core/sql/nskgmake/tdm_sqlexp/Makefile
+++ b/core/sql/nskgmake/tdm_sqlexp/Makefile
@@ -82,18 +82,18 @@ DEFS := -D_IEEE_FLOAT -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H -D__STDC_CONSTANT_MA
#
LLVM_OBJ_DIR := $(LLVM)/$(SQ_BUILD_TYPE)/lib
#
-$(MY_SQROOT)/export/lib64d/libudis86.so : $(UDIS86)/lib/libudis86.so
- mkdir -p $(MY_SQROOT)/export/lib64d
- cp -Pf $(UDIS86)/lib/libudis86.so* $(MY_SQROOT)/export/lib64d/
+$(TRAF_HOME)/export/lib64d/libudis86.so : $(UDIS86)/lib/libudis86.so
+ mkdir -p $(TRAF_HOME)/export/lib64d
+ cp -Pf $(UDIS86)/lib/libudis86.so* $(TRAF_HOME)/export/lib64d/
#NOTE: The following line says the lib64 version is dependent on the lib64d version.
# That's a bit of a lie, but it forces the lib64d version to be created and we need it.
-$(MY_SQROOT)/export/lib64/libudis86.so : $(UDIS86)/lib/libudis86.so $(MY_SQROOT)/export/lib64d/libudis86.so
- mkdir -p $(MY_SQROOT)/export/lib64
- cp -Pf $(UDIS86)/lib/libudis86.so* $(MY_SQROOT)/export/lib64/
+$(TRAF_HOME)/export/lib64/libudis86.so : $(UDIS86)/lib/libudis86.so $(TRAF_HOME)/export/lib64d/libudis86.so
+ mkdir -p $(TRAF_HOME)/export/lib64
+ cp -Pf $(UDIS86)/lib/libudis86.so* $(TRAF_HOME)/export/lib64/
#
-EXTERN_OBJS += $(MY_SQROOT)/export/lib64/libudis86.so \
+EXTERN_OBJS += $(TRAF_HOME)/export/lib64/libudis86.so \
$(LLVM_OBJ_DIR)/libLLVMX86AsmParser.a \
$(LLVM_OBJ_DIR)/libLLVMX86Disassembler.a \
$(LLVM_OBJ_DIR)/libLLVMX86CodeGen.a \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindRelExpr.cpp b/core/sql/optimizer/BindRelExpr.cpp
index da1ab29..9a09152 100644
--- a/core/sql/optimizer/BindRelExpr.cpp
+++ b/core/sql/optimizer/BindRelExpr.cpp
@@ -17274,7 +17274,7 @@ RelExpr * FastExtract::bindNode(BindWA *bindWA)
}
else
{
- char * sqroot = getenv("MY_SQROOT");
+ char * sqroot = getenv("TRAF_HOME");
if (sqroot && (! CmpCommon::context()->getSqlmxRegress()) &&
(strncmp(sqroot, getTargetName().data(),strlen(sqroot)) == 0))
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/optimizer/RelRoutine.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelRoutine.cpp b/core/sql/optimizer/RelRoutine.cpp
index 990b790..1fdec10 100644
--- a/core/sql/optimizer/RelRoutine.cpp
+++ b/core/sql/optimizer/RelRoutine.cpp
@@ -1094,8 +1094,8 @@ NARoutine * PredefinedTableMappingFunction::getRoutineMetadata(
NAString libraryPath;
// the libraries for predefined UDRs are in the regular
- // library directory $MY_SQROOT/export/lib${SQ_MBTYPE}
- libraryPath += getenv("MY_SQROOT");
+ // library directory $TRAF_HOME/export/lib${SQ_MBTYPE}
+ libraryPath += getenv("TRAF_HOME");
libraryPath += "/export/lib";
switch (getOperatorType())
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/pom.xml.apache
----------------------------------------------------------------------
diff --git a/core/sql/pom.xml.apache b/core/sql/pom.xml.apache
index c52db31..938bbbb 100644
--- a/core/sql/pom.xml.apache
+++ b/core/sql/pom.xml.apache
@@ -82,7 +82,7 @@
<artifactId>${hbase-trx.id}</artifactId>
<version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
+ <systemPath>${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/pom.xml.hdp
----------------------------------------------------------------------
diff --git a/core/sql/pom.xml.hdp b/core/sql/pom.xml.hdp
index 9964a82..5b1216f 100644
--- a/core/sql/pom.xml.hdp
+++ b/core/sql/pom.xml.hdp
@@ -72,7 +72,7 @@
<artifactId>${hbase-trx.id}</artifactId>
<version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
+ <systemPath>${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/qms/QmmQmm.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmmQmm.cpp b/core/sql/qms/QmmQmm.cpp
index d480468..6cc2760 100644
--- a/core/sql/qms/QmmQmm.cpp
+++ b/core/sql/qms/QmmQmm.cpp
@@ -900,7 +900,7 @@ void QmpStub::spawnProcess(IpcEnvironment& ipcEnv, short cpu) //, ComDiagsArea *
SET_ARGV(largv, largc, "-oss");
//SET_ARGV(largv, largc, NULL);
- strcpy(prog, getenv("MY_SQROOT"));
+ strcpy(prog, getenv("TRAF_HOME"));
strcat(prog, "/export/bin32/");
strcat(prog, progFile);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/qmscommon/QRLogger.h
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRLogger.h b/core/sql/qmscommon/QRLogger.h
index dd7c6b7..f663849 100644
--- a/core/sql/qmscommon/QRLogger.h
+++ b/core/sql/qmscommon/QRLogger.h
@@ -176,7 +176,7 @@ public:
/**
* Initializes log4cxx by using the configuration file.
* If the path given is relative (does not start with a
- * slash), it is appended to the $MY_SQROOT environment variable.
+ * slash), it is appended to the $TRAF_HOME environment variable.
* If the configuration file is not found, perform hard-coded
* default configuration.
* @param configFileName name of the log4cxx configuration file.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/newregr/mvqr/installMvqrSQ
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvqr/installMvqrSQ b/core/sql/regress/newregr/mvqr/installMvqrSQ
index 3d04ba8..16e2ef5 100644
--- a/core/sql/regress/newregr/mvqr/installMvqrSQ
+++ b/core/sql/regress/newregr/mvqr/installMvqrSQ
@@ -39,7 +39,7 @@ version=1.0
# -- tdm_arkqmm location
typeset qmmloc
-qmmloc="$MY_SQROOT/export/bin32"
+qmmloc="$TRAF_HOME/export/bin32"
#--QMM process name
qmmName="ZQM0003"
@@ -219,7 +219,7 @@ function crTab
{
echo " "
echo "creating REWRITE_PUBLISH table. Please wait...."
- $MY_SQROOT/export/bin32/sqlci <<aeof >>$NULL
+ $TRAF_HOME/export/bin32/sqlci <<aeof >>$NULL
log $crTabLog clear;
--
create schema MANAGEABILITY.MV_REWRITE;
@@ -250,7 +250,7 @@ aeof
# table need to be assigned to super.services
# if [ $isSuperSuper = $TRUE ] ; then
#
-# $MY_SQROOT/export/bin32/sqlci <<aeof >>$NULL
+# $TRAF_HOME/export/bin32/sqlci <<aeof >>$NULL
# log $crTabLog;
# begin work;
# GRANT ALL PRIVILEGES ON TABLE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/newregr/mvqr/uninstallMvqrSQ
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvqr/uninstallMvqrSQ b/core/sql/regress/newregr/mvqr/uninstallMvqrSQ
index 36f23a7..233a310 100644
--- a/core/sql/regress/newregr/mvqr/uninstallMvqrSQ
+++ b/core/sql/regress/newregr/mvqr/uninstallMvqrSQ
@@ -196,7 +196,7 @@ function dropTable
function drTab
{
echo "dropping REWRITE_PUBLISH table. Please wait...."
- $MY_SQROOT/export/bin32/sqlci <<aeof >>$NULL
+ $TRAF_HOME/export/bin32/sqlci <<aeof >>$NULL
log $drTabLog clear;
--
drop schema MANAGEABILITY.MV_REWRITE cascade;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/dll-compile.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/dll-compile.ksh b/core/sql/regress/tools/dll-compile.ksh
index cf6a522..72a10eb 100755
--- a/core/sql/regress/tools/dll-compile.ksh
+++ b/core/sql/regress/tools/dll-compile.ksh
@@ -65,13 +65,13 @@ TARGET=
CC=`which $CC`
fi
CC_OPTS="-g "
- CC_OPTS="$CC_OPTS -I$MY_SQROOT/sql/sqludr"
- CC_OPTS="$CC_OPTS -I$MY_SQROOT/export/include/sql -I$MY_SQROOT/export/include/nsk -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
+ CC_OPTS="$CC_OPTS -I$TRAF_HOME/sql/sqludr"
+ CC_OPTS="$CC_OPTS -I$TRAF_HOME/export/include/sql -I$TRAF_HOME/export/include/nsk -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
CC_OPTS="$CC_OPTS -w -O0 -Wno-unknown-pragmas -fPIC -fshort-wchar -c -o $BASE.o $1"
TARGET=$BASE.dll
LD=$CC
LD_OPTS=" -w -O0 -Wno-unknown-pragmas -fshort-wchar"
- LD_OPTS="$LD_OPTS -shared -rdynamic -o $TARGET -lc -lhdfs -ljvm -L$MY_SQROOT/export/lib${SQ_MBTYPE} -ltdm_sqlcli -L${JAVA_HOME}/jre/lib/amd64/server $2 $BASE.o"
+ LD_OPTS="$LD_OPTS -shared -rdynamic -o $TARGET -lc -lhdfs -ljvm -L$TRAF_HOME/export/lib${SQ_MBTYPE} -ltdm_sqlcli -L${JAVA_HOME}/jre/lib/amd64/server $2 $BASE.o"
LONGLINE=\
------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/java-compile.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/java-compile.ksh b/core/sql/regress/tools/java-compile.ksh
index e451f90..1d95d15 100755
--- a/core/sql/regress/tools/java-compile.ksh
+++ b/core/sql/regress/tools/java-compile.ksh
@@ -82,7 +82,7 @@ if [ "$REGRRUNDIR" = "" ]; then
REGRRUNDIR=$(pwd)
fi
-export CLASSPATH=$CLASSPATH:$MY_SQROOT/export/lib/spjsql.jar
+export CLASSPATH=$CLASSPATH:$TRAF_HOME/export/lib/spjsql.jar
# Consider using -nowarn to turn off warnings
echo -- Executing: \$javac -d \$REGRRUNDIR $BaseNameList
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/regrhadoop.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/regrhadoop.ksh b/core/sql/regress/tools/regrhadoop.ksh
index e4c3c87..ba79c21 100755
--- a/core/sql/regress/tools/regrhadoop.ksh
+++ b/core/sql/regress/tools/regrhadoop.ksh
@@ -25,7 +25,7 @@
# run the swhadoop convenience script if it exists, otherwise run the hadoop command
# swhadoop is used when Hadoop is installed with install_local_hadoop
# hadoop is used otherwise, e.g. on Jenkins
-if [ -x $MY_SQROOT/sql/scripts/swhadoop ]; then
+if [ -x $TRAF_HOME/sql/scripts/swhadoop ]; then
swhadoop $*
else
hadoop $*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/regrhbase.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/regrhbase.ksh b/core/sql/regress/tools/regrhbase.ksh
index 054c540..7465a6e 100755
--- a/core/sql/regress/tools/regrhbase.ksh
+++ b/core/sql/regress/tools/regrhbase.ksh
@@ -25,7 +25,7 @@
# run the swhbase convenience script if it exists, otherwise run the hbase shell command
# swhbase is used when Hadoop is installed with install_local_hadoop
# hbase shell is used otherwise, e.g. on Jenkins
-if [ -x $MY_SQROOT/sql/scripts/swhbase ]; then
+if [ -x $TRAF_HOME/sql/scripts/swhbase ]; then
swhbase $*
else
hbase shell $*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/regrhive.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/regrhive.ksh b/core/sql/regress/tools/regrhive.ksh
index 1f65171..64448f1 100755
--- a/core/sql/regress/tools/regrhive.ksh
+++ b/core/sql/regress/tools/regrhive.ksh
@@ -25,7 +25,7 @@
# run the swhive convenience script if it exists, otherwise run the hive command
# swhive is used when Hadoop is installed with install_local_hadoop
# hive is used otherwise, e.g. on Jenkins
-if [ -x $MY_SQROOT/sql/scripts/swhive ]; then
+if [ -x $TRAF_HOME/sql/scripts/swhive ]; then
swhive $*
else
hive -hiveconf hive.cli.print.header=true $*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/runallsb
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runallsb b/core/sql/regress/tools/runallsb
index 1cc82bc..6411547 100755
--- a/core/sql/regress/tools/runallsb
+++ b/core/sql/regress/tools/runallsb
@@ -78,8 +78,8 @@ while [ $OK -ne 0 ]; do # loop to allow options to appear in any order
done
-test ! -d $MY_SQROOT/sql/regress && ln -s $MY_SQROOT/../sql/regress $MY_SQROOT/sql/regress
-test ! -d $MY_SQROOT/sql/sqludr && ln -s $MY_SQROOT/../sql/sqludr $MY_SQROOT/sql/sqludr
+test ! -d $TRAF_HOME/sql/regress && ln -s $TRAF_HOME/../sql/regress $TRAF_HOME/sql/regress
+test ! -d $TRAF_HOME/sql/sqludr && ln -s $TRAF_HOME/../sql/sqludr $TRAF_HOME/sql/sqludr
pushd tools
. ./setuplnxenv
@@ -106,7 +106,7 @@ fi
#
# Check if resource is a cluster
-SQCONFIG=$MY_SQROOT/sql/scripts/sqconfig
+SQCONFIG=$TRAF_HOME/sql/scripts/sqconfig
CONN_NODE=$(grep -v '^#' $SQCONFIG | grep -m 1 connection | sed -e "s@node-name=\(n[0-9]*\);.*@\1@" | cut -d ';' -f2)
# if CONN_NODE is empty then resource is a workstation otherwise resource is a cluster
@@ -114,7 +114,7 @@ if [ -z $CONN_NODE ]
then
sqcheck
else
- ssh $CONN_NODE $MY_SQROOT/sql/scripts/sqcheck
+ ssh $CONN_NODE $TRAF_HOME/sql/scripts/sqcheck
fi
if [[ $? -ne 0 ]]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/runregr_compGeneral.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_compGeneral.ksh b/core/sql/regress/tools/runregr_compGeneral.ksh
index e8f0cbf..d890365 100755
--- a/core/sql/regress/tools/runregr_compGeneral.ksh
+++ b/core/sql/regress/tools/runregr_compGeneral.ksh
@@ -371,7 +371,7 @@ fi
cd $REGRRUNDIR 2>$NULL
if [ `uname` = "Linux" ]; then
- wDir=$MY_SQROOT/../sql
+ wDir=$TRAF_HOME/../sql
else
wDir=../..
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/runregr_executor.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_executor.ksh b/core/sql/regress/tools/runregr_executor.ksh
index 6e763a0..33a4948 100755
--- a/core/sql/regress/tools/runregr_executor.ksh
+++ b/core/sql/regress/tools/runregr_executor.ksh
@@ -28,7 +28,7 @@ if [ `uname` = "Linux" ]; then
fi
if [ $LINUX -ne 0 ]; then
- export CLASSPATH=$MY_SQROOT/export/lib/hpt4jdbc.jar:$CLASSPATH:.
+ export CLASSPATH=$TRAF_HOME/export/lib/hpt4jdbc.jar:$CLASSPATH:.
fi
USE_NDCS=0
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/runregr_hive.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_hive.ksh b/core/sql/regress/tools/runregr_hive.ksh
index 72e601c..4757b81 100755
--- a/core/sql/regress/tools/runregr_hive.ksh
+++ b/core/sql/regress/tools/runregr_hive.ksh
@@ -287,7 +287,7 @@ if [ $diffOnly -eq 0 ]; then
which swstartall >$NULL 2>&1
missing_sqstart=$?
echo
- if [[ ( $missing_sqstart -ne 0 ) || ( ! -d $MY_SQROOT/sql/local_hadoop ) ]]; then
+ if [[ ( $missing_sqstart -ne 0 ) || ( ! -d $TRAF_HOME/sql/local_hadoop ) ]]; then
echo "Local hadoop instance is not installed, invoking install script : install_local_hadoop -y"
echo
install_local_hadoop -y
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/runregr_seabase.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_seabase.ksh b/core/sql/regress/tools/runregr_seabase.ksh
index 9b060c9..1147813 100755
--- a/core/sql/regress/tools/runregr_seabase.ksh
+++ b/core/sql/regress/tools/runregr_seabase.ksh
@@ -294,7 +294,7 @@ if [ $diffOnly -eq 0 ]; then
which swstartall >$NULL 2>&1
missing_sqstart=$?
echo
- if [[ ( $missing_sqstart -ne 0 ) || ( ! -d $MY_SQROOT/sql/local_hadoop ) ]]; then
+ if [[ ( $missing_sqstart -ne 0 ) || ( ! -d $TRAF_HOME/sql/local_hadoop ) ]]; then
echo "Local hadoop instance is not installed, invoking install script : install_local_hadoop -y"
echo
install_local_hadoop -y
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/runregr_udr.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_udr.ksh b/core/sql/regress/tools/runregr_udr.ksh
index 1e68799..26a5ed4 100755
--- a/core/sql/regress/tools/runregr_udr.ksh
+++ b/core/sql/regress/tools/runregr_udr.ksh
@@ -795,9 +795,9 @@ echo "schema=$TEST_SCHEMA" >schema.prop
echo "$(date '+%m/%d/%Y %R')" >> $rgrlog
export JDBC_T4_URL="jdbc:t4jdbc://localhost:23400/:"
-if [ -r $MY_SQROOT/sql/scripts/sw_env.sh ]; then
+if [ -r $TRAF_HOME/sql/scripts/sw_env.sh ]; then
# use a custom port for the JDBC Type 4 driver
- . $MY_SQROOT/sql/scripts/sw_env.sh
+ . $TRAF_HOME/sql/scripts/sw_env.sh
export JDBC_T4_URL="jdbc:t4jdbc://localhost:${MY_DCS_MASTER_PORT}/:"
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/setupenv
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/setupenv b/core/sql/regress/tools/setupenv
index 154182f..b406871 100755
--- a/core/sql/regress/tools/setupenv
+++ b/core/sql/regress/tools/setupenv
@@ -52,8 +52,8 @@ if [ $SQLMX_REGRESS -ne 0 ]; then
export SQL_MXCI_CASE_INSENSITIVE_LOG='U' # force Uppercase LOG ..
export SQL_MXCI_CASE_INSENSITIVE_OBEY='U' # ..and OBEY file names
- test "$scriptsdir" = "" && export scriptsdir=$MY_SQROOT/../sql/regress
- test "$rundir" = "" && export rundir=$MY_SQROOT/../sql/regress/rundir
+ test "$scriptsdir" = "" && export scriptsdir=$TRAF_HOME/../sql/regress
+ test "$rundir" = "" && export rundir=$TRAF_HOME/../sql/regress/rundir
dbgvars=`env | grep -i -e _DEBUG -e SQLMX_REGRESS_JAVA`
if [ "$dbgvars" != "" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/tools/setuplnxenv
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/setuplnxenv b/core/sql/regress/tools/setuplnxenv
index 843a089..e92dc74 100755
--- a/core/sql/regress/tools/setuplnxenv
+++ b/core/sql/regress/tools/setuplnxenv
@@ -73,8 +73,8 @@ if [ "$SQ_STARTUP" == "" ]; then
fi
fi # sourcing sqend.sh
-if [ -z "$MY_SQROOT" ]; then
- echo " ERROR: MY_SQROOT is not set. "
+if [ -z "$TRAF_HOME" ]; then
+ echo " ERROR: TRAF_HOME is not set. "
return 1
fi
@@ -82,25 +82,25 @@ fi
# Finally, add the regression variables and make sure the directories
# actually exist
#
-echo " MY_SQROOT is set to: $MY_SQROOT"
-export MY_SQROOT=$MY_SQROOT
-export SQLMX_MODULE_DIR=${MY_SQROOT}/sql/sqlmx/USERMODULES
-export SQLMX_SYSMODULE_DIR=${MY_SQROOT}/sql/sqlmx/SYSTEMMODULES
+echo " TRAF_HOME is set to: $TRAF_HOME"
+export TRAF_HOME=$TRAF_HOME
+export SQLMX_MODULE_DIR=${TRAF_HOME}/sql/sqlmx/USERMODULES
+export SQLMX_SYSMODULE_DIR=${TRAF_HOME}/sql/sqlmx/SYSTEMMODULES
if [ -z "$mxcidir" ]; then
- export mxcidir=${MY_SQROOT}/export/bin${SQ_MBTYPE}
+ export mxcidir=${TRAF_HOME}/export/bin${SQ_MBTYPE}
fi
if [ -z "$mxcmpdir" ]; then
- export mxcmpdir=${MY_SQROOT}/export/bin${SQ_MBTYPE}
+ export mxcmpdir=${TRAF_HOME}/export/bin${SQ_MBTYPE}
fi
if [ -z "$rundir" ]; then
- export rundir=${MY_SQROOT}/rundir
+ export rundir=${TRAF_HOME}/rundir
fi
if [ -z "$scriptsdir" ]; then
- export scriptsdir=${MY_SQROOT}/sql/regress
+ export scriptsdir=${TRAF_HOME}/sql/regress
fi
if [ -z "$mxlibdir" ]; then
- export mxlibdir=${MY_SQROOT}/export/lib
+ export mxlibdir=${TRAF_HOME}/export/lib
fi
for i in $mxcmpdir $mxcidir $rundir $scriptsdir $mxlibdir
@@ -111,7 +111,7 @@ do
fi
done
-if [ -d $MY_SQROOT/sql/local_hadoop ]; then
+if [ -d $TRAF_HOME/sql/local_hadoop ]; then
. $(dirname $(which swhadoop))/sw_env.sh
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/udr/EXPECTED002
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/EXPECTED002 b/core/sql/regress/udr/EXPECTED002
index 2e7677b..c4f2554 100644
--- a/core/sql/regress/udr/EXPECTED002
+++ b/core/sql/regress/udr/EXPECTED002
@@ -6548,7 +6548,7 @@ the 611
>>
>>-- copy a file with known content to the log directory and see whether
>>-- we get the correct results
->>sh cp $$scriptsdir$$/udr/TEST002.sample_events $$MY_SQROOT$$/logs/master_exec_regr_999_99999.log;
+>>sh cp $$scriptsdir$$/udr/TEST002.sample_events $$TRAF_HOME$$/logs/master_exec_regr_999_99999.log;
>>
>>select count(*) as num_events,
+> max(log_file_line) as num_lines,
@@ -6585,7 +6585,7 @@ LOG_TS SEVERITY COMPONENT
--- 8 row(s) selected.
>>-- lines 20, 30 and 31 have parse errors and are also displayed
>>
->>sh rm $$MY_SQROOT$$/logs/master_exec_regr_999_99999.log;
+>>sh rm $$TRAF_HOME$$/logs/master_exec_regr_999_99999.log;
>>
>>-- some negative test cases
>>prepare s from select * from udf(event_log_reader(10));
@@ -6741,9 +6741,9 @@ P SLICE_TIME VAL1_FCI VAL1_LCI VAL2_FCI
--- 39 row(s) selected.
>>
>>-- JDBC queries through a TMUDF. Note that this requires the Trafodion T4
->>-- driver jar to exist in $MY_SQROOT/udr/external_libs.
->>sh mkdir -p $$MY_SQROOT$$/udr/external_libs;
->>sh cp $$MY_SQROOT$$/export/lib/jdbcT2.jar $$MY_SQROOT$$/udr/external_libs;
+>>-- driver jar to exist in $TRAF_HOME/udr/external_libs.
+>>sh mkdir -p $$TRAF_HOME$$/udr/external_libs;
+>>sh cp $$TRAF_HOME$$/export/lib/jdbcT2.jar $$TRAF_HOME$$/udr/external_libs;
>>
>>-- with default ports, $$QUOTE$$$$JDBC_T4_URL$$$$QUOTE$$ should be
>>-- 'jdbc:t4jdbc://localhost:23400/:'
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/udr/TEST002
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/TEST002 b/core/sql/regress/udr/TEST002
index fd60dda..d792ddd 100644
--- a/core/sql/regress/udr/TEST002
+++ b/core/sql/regress/udr/TEST002
@@ -169,7 +169,7 @@ where x.log_file_line <100;
-- copy a file with known content to the log directory and see whether
-- we get the correct results
-sh cp $$scriptsdir$$/udr/TEST002.sample_events $$MY_SQROOT$$/logs/master_exec_regr_999_99999.log;
+sh cp $$scriptsdir$$/udr/TEST002.sample_events $$TRAF_HOME$$/logs/master_exec_regr_999_99999.log;
select count(*) as num_events,
max(log_file_line) as num_lines,
@@ -185,7 +185,7 @@ where log_file_name = 'master_exec_regr_999_99999.log'
order by log_file_line;
-- lines 20, 30 and 31 have parse errors and are also displayed
-sh rm $$MY_SQROOT$$/logs/master_exec_regr_999_99999.log;
+sh rm $$TRAF_HOME$$/logs/master_exec_regr_999_99999.log;
-- some negative test cases
prepare s from select * from udf(event_log_reader(10));
@@ -231,9 +231,9 @@ from udf(timeseries(table(select * from t002_Timeseries
'VAL2', 'LLi'));
-- JDBC queries through a TMUDF. Note that this requires the Trafodion T4
--- driver jar to exist in $MY_SQROOT/udr/external_libs.
-sh mkdir -p $$MY_SQROOT$$/udr/external_libs;
-sh cp $$MY_SQROOT$$/export/lib/jdbcT2.jar $$MY_SQROOT$$/udr/external_libs;
+-- driver jar to exist in $TRAF_HOME/udr/external_libs.
+sh mkdir -p $$TRAF_HOME$$/udr/external_libs;
+sh cp $$TRAF_HOME$$/export/lib/jdbcT2.jar $$TRAF_HOME$$/udr/external_libs;
-- with default ports, $$QUOTE$$$$JDBC_T4_URL$$$$QUOTE$$ should be
-- 'jdbc:t4jdbc://localhost:23400/:'
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/udr/TEST107
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/TEST107 b/core/sql/regress/udr/TEST107
index a6d5069..a4f921c 100644
--- a/core/sql/regress/udr/TEST107
+++ b/core/sql/regress/udr/TEST107
@@ -126,8 +126,8 @@ sh cp ../../sqludr/*.java .;
sh cp ../../sqludr/Install*Metadata .;
#ifNT
#ifLINUX
-sh cp -f $MY_SQROOT/sql/sqludr/*.java $REGRTSTDIR;
-sh cp -f $MY_SQROOT/sql/sqludr/Install*Metadata $REGRTSTDIR;
+sh cp -f $TRAF_HOME/sql/sqludr/*.java $REGRTSTDIR;
+sh cp -f $TRAF_HOME/sql/sqludr/Install*Metadata $REGRTSTDIR;
#ifLINUX
?section compile_libs
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/udr/TEST163
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/TEST163 b/core/sql/regress/udr/TEST163
index e3dfcf1..273ba69 100644
--- a/core/sql/regress/udr/TEST163
+++ b/core/sql/regress/udr/TEST163
@@ -99,8 +99,8 @@ sh cp ../../sqludr/*.java .;
sh cp ../../sqludr/Install*Metadata .;
#ifNT
#ifLINUX
-sh cp -f $MY_SQROOT/sql/sqludr/*.java $REGRTSTDIR;
-sh cp -f $MY_SQROOT/sql/sqludr/Install*Metadata $REGRTSTDIR;
+sh cp -f $TRAF_HOME/sql/sqludr/*.java $REGRTSTDIR;
+sh cp -f $TRAF_HOME/sql/sqludr/Install*Metadata $REGRTSTDIR;
#ifLINUX
?section compile_libs
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/udr/Utils.java
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/Utils.java b/core/sql/regress/udr/Utils.java
index d73f6bc..c48846a 100644
--- a/core/sql/regress/udr/Utils.java
+++ b/core/sql/regress/udr/Utils.java
@@ -53,7 +53,7 @@ public class Utils
log = Boolean.getBoolean("debugOn");
if (log) {
- sqRoot = System.getenv("MY_SQROOT");
+ sqRoot = System.getenv("TRAF_HOME");
logLocation = sqRoot + "/logs/";
}
}
@@ -258,7 +258,7 @@ public class Utils
PrintStream origOut_ = System.out;
PrintStream origErr_ = System.err;
- String sqRoot = System.getenv("MY_SQROOT");
+ String sqRoot = System.getenv("TRAF_HOME");
String stdoutFile = sqRoot + "/sql/scripts/" + filename;
PrintStream stdout = null;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/regress/udr/tvudf.c
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/tvudf.c b/core/sql/regress/udr/tvudf.c
index 40d6cf1..3ca43ae 100755
--- a/core/sql/regress/udr/tvudf.c
+++ b/core/sql/regress/udr/tvudf.c
@@ -20,7 +20,7 @@
// @@@ END COPYRIGHT @@@
/*
- gcc -g -m32 -I$MY_SQROOT/../sql/sqludr -I$MY_SQROOT/../sql/cli \
+ gcc -g -m32 -I$TRAF_HOME/../sql/sqludr -I$TRAF_HOME/../sql/cli \
-shared -o tvudf.so tvudf.c
*/
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index af4d287..0e02b8c 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -7087,7 +7087,7 @@ void CmpSeabaseDDL::initSeabaseMD(NABoolean ddlXns, NABoolean minimal)
// Note that this is not an existing jar file, the class
// loader will attempt to load the class from the CLASSPATH if
// it can't find this jar
- NAString installJar(getenv("MY_SQROOT"));
+ NAString installJar(getenv("TRAF_HOME"));
installJar += "/export/lib/trafodion-sql-currversion.jar";
breadCrumb = 1;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
index d6996a6..d444832 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
@@ -91,7 +91,7 @@
// * *
// * <isSystemObject> bool In *
// * if true, indicates the filename should be prepended with the value of *
-// * MY_SQROOT before validating existence. *
+// * TRAF_HOME before validating existence. *
// * *
// *****************************************************************************
static int validateLibraryFileExists(
@@ -104,7 +104,7 @@ static int validateLibraryFileExists(
if (isSystemObject) {
completeLibraryFilename.insert(0,'/');
- completeLibraryFilename.insert(0,getenv("MY_SQROOT"));
+ completeLibraryFilename.insert(0,getenv("TRAF_HOME"));
}
else
if (CmpCommon::getDefault(CAT_LIBRARY_PATH_RELATIVE) == DF_ON)
@@ -1599,7 +1599,7 @@ short CmpSeabaseDDL::createSeabaseLibmgr(ExeCliInterface * cliInterface)
return -1;
}
- NAString jarLocation(getenv("MY_SQROOT"));
+ NAString jarLocation(getenv("TRAF_HOME"));
jarLocation += "/export/lib/lib_mgmt.jar";
char queryBuf[strlen(getSystemCatalog()) + strlen(SEABASE_LIBMGR_SCHEMA) +
strlen(SEABASE_LIBMGR_LIBRARY) + strlen(DB__LIBMGRROLE) +
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 149f097..bb299d3 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -4035,7 +4035,7 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
// On SQ, the way to get an envvar from inside a un-attached process
// is to use the msg_getenv_str() call and set the env inside
// the SQ_PROP_ property file. In this case the property
- // file is $MY_SQROOT/etc/SQ_PROP_tdm_arkcmp which contains the line
+ // file is $TRAF_HOME/etc/SQ_PROP_tdm_arkcmp which contains the line
// "SQLMX_REGRESS=1". This file was generated by tools/setuplnxenv.
// resetNeoDefaults = (msg_getenv_str("SQLMX_REGRESS") != NULL);
resetNeoDefaults = (getenv("SQLMX_REGRESS") != NULL);
@@ -4769,7 +4769,7 @@ void NADefaults::readFromSQLTables(Provenance overwriteIfNotYet, Int32 errOrWarn
{
// Read system defaults from configuration file.
// keep this name in sync with file cli/SessionDefaults.cpp
- NAString confFile(getenv("MY_SQROOT"));
+ NAString confFile(getenv("TRAF_HOME"));
confFile += "/etc/SQSystemDefaults.conf";
readFromFlatFile(confFile, overwriteIfNotYet, errOrWarn);
tablesRead_.insert(confFile);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/sqlmsg/GetErrorMessage.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/GetErrorMessage.cpp b/core/sql/sqlmsg/GetErrorMessage.cpp
index 7d85c38..895b8f2 100644
--- a/core/sql/sqlmsg/GetErrorMessage.cpp
+++ b/core/sql/sqlmsg/GetErrorMessage.cpp
@@ -248,7 +248,7 @@ NABoolean openMessageCatalog(nl_catd* msgCatalog)
char defaultMessageFile[MAX_MESSAGE_PATH_LEN];
defaultMessageFile[0] = '\0';
- char *mySQROOT = getenv("MY_SQROOT");
+ char *mySQROOT = getenv("TRAF_HOME");
const char *msgCatPath2 = "/export/bin";
const char *mbType = getenv("SQ_MBTYPE");
const char *msgCatPath4 = "/mxcierrors.cat";
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/sqludr/SqlUdrPredefLogReader.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqludr/SqlUdrPredefLogReader.cpp b/core/sql/sqludr/SqlUdrPredefLogReader.cpp
index ab70018..8b908d9 100644
--- a/core/sql/sqludr/SqlUdrPredefLogReader.cpp
+++ b/core/sql/sqludr/SqlUdrPredefLogReader.cpp
@@ -455,7 +455,7 @@ void ReadCppEventsUDFInterface::describeDesiredDegreeOfParallelism(
{
// check for configurations with virtual nodes. Run the UDF serially
// in those cases, since all the virtual nodes share the same node.
- int usesNoVirtualNodes = system("grep '^[ \t]*_virtualnodes ' $MY_SQROOT/sql/scripts/sqconfig >/dev/null");
+ int usesNoVirtualNodes = system("grep '^[ \t]*_virtualnodes ' $TRAF_HOME/sql/scripts/sqconfig >/dev/null");
if (usesNoVirtualNodes != 0 || useParallelExecForVirtualNodes_)
// this TMUDF needs to run once on each node, since every
@@ -545,7 +545,7 @@ void ReadCppEventsUDFInterface::processData(UDRInvocationInfo &info,
switch (logLocationIndex)
{
case 0: // sqroot, for all logs other than dcs
- logrootdir = getenv("MY_SQROOT");
+ logrootdir = getenv("TRAF_HOME");
if (strlen(logrootdir) > 1000)
throw UDRException(38001, "SQROOT is longer than 1000 characters");
break ;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/sqludr/doxygen_tmudr.1.6.config
----------------------------------------------------------------------
diff --git a/core/sql/sqludr/doxygen_tmudr.1.6.config b/core/sql/sqludr/doxygen_tmudr.1.6.config
index 8ebc083..c5e14e1 100644
--- a/core/sql/sqludr/doxygen_tmudr.1.6.config
+++ b/core/sql/sqludr/doxygen_tmudr.1.6.config
@@ -31,7 +31,7 @@ PROJECT_NAME = tmudr
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-# NOTE: Also change this in file $MY_SQROOT/sql/scripts/build_apidocs.sh
+# NOTE: Also change this in file $TRAF_HOME/sql/scripts/build_apidocs.sh
# This is the main version number of the TMUDF interface, it does not
# need to change with every Trafodion release, only when the API changes
# in a significant way.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
index 3e14c76..20336b2 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
@@ -151,8 +151,8 @@ public class HBaseClient {
//use the default HBaseClient config.
String confFile = System.getProperty("hbaseclient.log4j.properties");
if(confFile == null) {
- System.setProperty("trafodion.hdfs.log", System.getenv("MY_SQROOT") + "/logs/trafodion.hdfs.log");
- confFile = System.getenv("MY_SQROOT") + "/conf/log4j.hdfs.config";
+ System.setProperty("trafodion.hdfs.log", System.getenv("TRAF_HOME") + "/logs/trafodion.hdfs.log");
+ confFile = System.getenv("TRAF_HOME") + "/conf/log4j.hdfs.config";
}
PropertyConfigurator.configure(confFile);
config = TrafConfiguration.create();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HiveClient.java b/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
index b6471a6..dd26eca 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
@@ -77,7 +77,7 @@ public class HiveClient {
}
void setupLog4j() {
- String confFile = System.getenv("MY_SQROOT")
+ String confFile = System.getenv("TRAF_HOME")
+ "/conf/log4j.hdfs.config";
PropertyConfigurator.configure(confFile);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java b/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java
index 0d7e44a..52599c3 100644
--- a/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java
+++ b/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java
@@ -33,7 +33,7 @@ public class TrafConfiguration extends HBaseConfiguration {
public static Configuration addTrafResources(Configuration conf) {
Configuration lv_conf = new Configuration();
- String trafSiteXml = new String(System.getenv("MY_SQROOT") + "/etc/trafodion-site.xml");
+ String trafSiteXml = new String(System.getenv("TRAF_HOME") + "/etc/trafodion-site.xml");
Path fileRes = new Path(trafSiteXml);
lv_conf.addResource(fileRes);
Iterator<Map.Entry<String,String>> iter = lv_conf.iterator();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/src/main/java/org/trafodion/sql/udr/UDR.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDR.java b/core/sql/src/main/java/org/trafodion/sql/udr/UDR.java
index 8179455..2546089 100644
--- a/core/sql/src/main/java/org/trafodion/sql/udr/UDR.java
+++ b/core/sql/src/main/java/org/trafodion/sql/udr/UDR.java
@@ -361,7 +361,7 @@ public abstract class UDR
// native methods used by these calls
// use this command to regenerate the C headers:
- // javah -d $MY_SQROOT/../sql/langman org.trafodion.sql.udr.UDR
+ // javah -d $TRAF_HOME/../sql/langman org.trafodion.sql.udr.UDR
private native void SpInfoGetNextRowJava(byte[] rowData,
int tableIndex,
QueueStateInfo queueState);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java b/core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java
index 31fb72a..04faccb 100644
--- a/core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java
+++ b/core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java
@@ -98,12 +98,12 @@ class JDBCUDR extends UDR
{
try {
Path driverJarPath = Paths.get(driverJar_);
- Path sandBoxPath = Paths.get(System.getenv("MY_SQROOT"), "udr", "external_libs");
+ Path sandBoxPath = Paths.get(System.getenv("TRAF_HOME"), "udr", "external_libs");
URLClassLoader jdbcJarLoader = null;
URL jarClassPath[] = new URL[1];
// for security reasons, we sandbox the allowed driver jars
- // into $MY_SQROOT/export/lib/udr/external_libs
+ // into $TRAF_HOME/export/lib/udr/external_libs
driverJarPath = driverJarPath.normalize();
if (driverJarPath.isAbsolute())
{
@@ -111,7 +111,7 @@ class JDBCUDR extends UDR
throw new UDRException(
38010,
"The jar name of the JDBC driver must be a name relative to %s, got %s",
- System.getenv("MY_SQROOT")+"/udr/external_libs",
+ System.getenv("TRAF_HOME")+"/udr/external_libs",
driverJar_);
}
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java b/core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java
index 21a058b..f639db7 100644
--- a/core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java
+++ b/core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java
@@ -279,7 +279,7 @@ public class ChgAutoList {
// Now remove AUTO_CQDS_SET file from the cluster.
String shellCmd;
- String sqroot = System.getenv("MY_SQROOT");
+ String sqroot = System.getenv("TRAF_HOME");
shellCmd = "rm " + sqroot + "/export/lib/mx_ustat/autodir/USTAT_CQDS_SET";
Process p = Runtime.getRuntime().exec(shellCmd);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java b/core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java
index 12f1f4c..1f59159 100644
--- a/core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java
+++ b/core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java
@@ -61,7 +61,7 @@ public class UstatUtil extends Thread
String cmd_path;
if ( os.indexOf("linux") >=0 ) {
- cmd_path = "sh " + System.getenv("MY_SQROOT") + "/export/lib";
+ cmd_path = "sh " + System.getenv("TRAF_HOME") + "/export/lib";
} else { // assume NSK
cmd_path = "/usr/tandem";
}
@@ -88,7 +88,7 @@ public class UstatUtil extends Thread
String cmd_path;
if ( os.indexOf("linux") >=0 ) {
- cmd_path = "sh " + System.getenv("MY_SQROOT") + "/export/lib";
+ cmd_path = "sh " + System.getenv("TRAF_HOME") + "/export/lib";
} else { // assume NSK
cmd_path = "/usr/tandem";
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/udrserv/UdrCfgParser.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrCfgParser.cpp b/core/sql/udrserv/UdrCfgParser.cpp
index 7ecc2c8..c1c9753 100644
--- a/core/sql/udrserv/UdrCfgParser.cpp
+++ b/core/sql/udrserv/UdrCfgParser.cpp
@@ -51,7 +51,7 @@ NABoolean UdrCfgParser::cfgFileIsOpen(NAString &errorText)
}
else
{
- NAString s(getenv("MY_SQROOT"));
+ NAString s(getenv("TRAF_HOME"));
s += "/conf/trafodion.udr.config";
cfgFileName = strdup(s.data());
UDR_DEBUG1("UdrCfgParser(): default cfgFileName is %s", cfgFileName);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/udrserv/spinfoCallback.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/spinfoCallback.cpp b/core/sql/udrserv/spinfoCallback.cpp
index f053209..c733255 100644
--- a/core/sql/udrserv/spinfoCallback.cpp
+++ b/core/sql/udrserv/spinfoCallback.cpp
@@ -43,7 +43,7 @@
#include "udrutil.h"
#include "LmRoutineCppObj.h"
// include the file generated by this command and checked into git:
-// javah -d $MY_SQROOT/../sql/langman org.trafodion.sql.udr.UDR
+// javah -d $TRAF_HOME/../sql/langman org.trafodion.sql.udr.UDR
#include "org_trafodion_sql_udr_UDR.h"
extern UdrGlobals *UDR_GLOBALS;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/udrserv/udrload.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrload.cpp b/core/sql/udrserv/udrload.cpp
index c4fde5e..9e74f74 100644
--- a/core/sql/udrserv/udrload.cpp
+++ b/core/sql/udrserv/udrload.cpp
@@ -55,7 +55,7 @@
#include "udrdecs.h"
#include "spinfoCallback.h"
// include the file generated by this command and checked into git:
-// javah -d $MY_SQROOT/../sql/langman org.trafodion.sql.udr.UDR
+// javah -d $TRAF_HOME/../sql/langman org.trafodion.sql.udr.UDR
#include "org_trafodion_sql_udr_UDR.h"
class UdrServerReplyStream;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/udrserv/udrserv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrserv.cpp b/core/sql/udrserv/udrserv.cpp
index 4310cd8..f1b18c0 100644
--- a/core/sql/udrserv/udrserv.cpp
+++ b/core/sql/udrserv/udrserv.cpp
@@ -186,7 +186,7 @@ static NAString initErrText("");
found in an optional configuration file into an LmJavaOptions instance.
File must be in location indicated by envvar TRAFUDRCFG, or if not found,
- use default of $MY_SQROOT/conf/trafodion.udr.config
+ use default of $TRAF_HOME/conf/trafodion.udr.config
*************************************************************************/
void readCfgFileSection ( const char *section, LmJavaOptions &javaOptions )
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/ustat/FillAutoTbl.sh
----------------------------------------------------------------------
diff --git a/core/sql/ustat/FillAutoTbl.sh b/core/sql/ustat/FillAutoTbl.sh
index d76c972..4990a16 100644
--- a/core/sql/ustat/FillAutoTbl.sh
+++ b/core/sql/ustat/FillAutoTbl.sh
@@ -40,8 +40,8 @@ if [ `uname` != "Linux" ]; then
sys=$1 # The system name
else
export SQLMX_TERMINAL_CHARSET=UTF8
- MXCI=$MY_SQROOT/export/bin32/sqlci
- autoloc=$MY_SQROOT/export/lib/mx_ustat
+ MXCI=$TRAF_HOME/export/bin32/sqlci
+ autoloc=$TRAF_HOME/export/lib/mx_ustat
alias print=echo
sys=NSK
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/ustat/RunLogUstats.sh
----------------------------------------------------------------------
diff --git a/core/sql/ustat/RunLogUstats.sh b/core/sql/ustat/RunLogUstats.sh
index 4393ba3..494b22d 100644
--- a/core/sql/ustat/RunLogUstats.sh
+++ b/core/sql/ustat/RunLogUstats.sh
@@ -57,7 +57,7 @@ if [ `uname` != "Linux" ]; then
else
export SQLMX_TERMINAL_CHARSET=UTF8
MXCI=sqlci
- autoloc=$MY_SQROOT/export/lib/mx_ustat
+ autoloc=$TRAF_HOME/export/lib/mx_ustat
alias print=echo
sys=NSK
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/ustat/StopAutoStats.sh
----------------------------------------------------------------------
diff --git a/core/sql/ustat/StopAutoStats.sh b/core/sql/ustat/StopAutoStats.sh
index 56515f7..6e9e61e 100644
--- a/core/sql/ustat/StopAutoStats.sh
+++ b/core/sql/ustat/StopAutoStats.sh
@@ -47,7 +47,7 @@ if [ `uname` != "Linux" ]; then
autoloc_prefix=/E/${MstrSeg}
else
- autoloc=$MY_SQROOT/export/lib/mx_ustat
+ autoloc=$TRAF_HOME/export/lib/mx_ustat
alias print=echo
autoloc_prefix=""
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/ustat/USAS.sh
----------------------------------------------------------------------
diff --git a/core/sql/ustat/USAS.sh b/core/sql/ustat/USAS.sh
index a42daa4..9784a41 100644
--- a/core/sql/ustat/USAS.sh
+++ b/core/sql/ustat/USAS.sh
@@ -422,8 +422,8 @@ alias getRow="sed '1,6 d' | sed '2,6 d' | sed '1,\$s/ //g'"
alias print=echo
export SQLMX_TERMINAL_CHARSET=UTF8
- MXCI="$MY_SQROOT/export/bin32/sqlci"
- autoloc="$MY_SQROOT/export/lib/mx_ustat"
+ MXCI="$TRAF_HOME/export/bin32/sqlci"
+ autoloc="$TRAF_HOME/export/lib/mx_ustat"
this_node=$(uname -n)
@@ -458,11 +458,11 @@ AutoTempTable="NEO.PUBLIC_ACCESS_SCHEMA.USTAT_AUTO_TMP_TABLES"
# First find the total number of SQL storage nodes.
# this line greps for the node-id text line in sqconfig file, looking for
# storage nodes. The logical node names are stored in $nodes.
- nodes=$(grep "^node-id=" $MY_SQROOT/sql/scripts/sqconfig | grep storage | cut -d ';' -f 2 | cut -d '=' -f 2)
+ nodes=$(grep "^node-id=" $TRAF_HOME/sql/scripts/sqconfig | grep storage | cut -d ';' -f 2 | cut -d '=' -f 2)
# grep the number of cores per SQ node
- cores=$(grep "^node-id=" $MY_SQROOT/sql/scripts/sqconfig | grep storage | cut -d ';' -f 3 | cut -d '=' -f 2 | cut -d '-' -f 2)
+ cores=$(grep "^node-id=" $TRAF_HOME/sql/scripts/sqconfig | grep storage | cut -d ';' -f 3 | cut -d '=' -f 2 | cut -d '-' -f 2)
#
# Uncomment and modify the following two variables to unit test special cases.
@@ -472,16 +472,16 @@ AutoTempTable="NEO.PUBLIC_ACCESS_SCHEMA.USTAT_AUTO_TMP_TABLES"
#cores="7 7"
#nodes="n3 n4"
- headnodes=$(grep "^node-id=" $MY_SQROOT/sql/scripts/sqconfig | grep connection | cut -d ';' -f 2 | cut -d '=' -f 2)
+ headnodes=$(grep "^node-id=" $TRAF_HOME/sql/scripts/sqconfig | grep connection | cut -d ';' -f 2 | cut -d '=' -f 2)
# If no storage text line exists as in workstation environment, grep for
# _virtualnodes.
if [ "$nodes" = "" ]; then
- nodes=$(grep "^_virtualnodes" $MY_SQROOT/sql/scripts/sqconfig)
+ nodes=$(grep "^_virtualnodes" $TRAF_HOME/sql/scripts/sqconfig)
# We can not find node text line. Bail out.
if [ "$nodes" = "" ]; then
- log "Ill-formatted sqconfig file at $MY_SQROOT/sql/scripts."
+ log "Ill-formatted sqconfig file at $TRAF_HOME/sql/scripts."
log "Exit the USAS.sh script."
# In the future, we can hook up this exit with SQ version of EMS log.
@@ -525,7 +525,7 @@ fi
# PreAuto Step #3. Create progress directory if not already running.
# This will keep another USAS program from running at the same time.
- doPreAutoStep3="$MY_SQROOT/tmp/doPreAutoStep3"
+ doPreAutoStep3="$TRAF_HOME/tmp/doPreAutoStep3"
echo "rm -fr $PREV" > $doPreAutoStep3
echo "mv $AUTODIR $PREV" >> $doPreAutoStep3