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:23 UTC
[01/10] incubator-trafodion git commit: [TRAFODION-2388] there should
be only one ENV for Trafodion's root directory instead of many.
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 97ee8a768 -> b11143027
[TRAFODION-2388] there should be only one ENV for Trafodion's root directory instead of many.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fbb465ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fbb465ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fbb465ae
Branch: refs/heads/master
Commit: fbb465ae1a12c1457f19e6a80f39dc4c9fc3b129
Parents: 1430279
Author: Eason <hf...@gmail.com>
Authored: Tue Dec 6 23:48:05 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Tue Dec 6 23:48:05 2016 +0800
----------------------------------------------------------------------
core/conn/jdbc_type2/Makefile | 4 +--
core/conn/odbc/src/odbc/macros.gmk | 2 +-
core/conn/odbc/src/odbc/nsksrvr/Makefile | 2 +-
core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 2 +-
core/sqf/sqenvcom.sh | 2 +-
core/sqf/sql/scripts/gensq.pl | 4 +--
core/sqf/sql/scripts/install_apache_hadoop | 2 +-
core/sqf/sql/scripts/sqsystem.pm | 4 +--
core/sqf/sql/scripts/trafnodestatus | 2 +-
core/sqf/src/tm/macros.gmk | 2 +-
.../src/asciidoc/_chapters/introduction.adoc | 4 +--
.../src/asciidoc/_chapters/prepare.adoc | 2 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 6 ++--
install/installer/addNode_step1 | 8 +++---
install/installer/addNode_step2 | 28 +++++++++---------
install/installer/bashrc_default | 3 +-
install/installer/dcs_installer | 8 +++---
install/installer/rest_installer | 4 +--
install/installer/traf_add_ldap | 14 ++++-----
install/installer/traf_config | 30 ++++++++++----------
install/installer/traf_config_check | 4 +--
install/installer/traf_config_setup | 12 ++++----
install/installer/traf_secure | 20 ++++++-------
install/installer/traf_sqgen | 10 +++----
install/installer/traf_start | 18 ++++++------
install/installer/trafodion_config_default | 2 +-
install/installer/trafodion_install | 6 ++--
install/installer/trafodion_uninstaller | 8 +++---
install/python-installer/bashrc.template | 5 ++--
install/python-installer/dcs_setup.py | 14 ++++-----
install/python-installer/traf_ldap.py | 6 ++--
install/python-installer/traf_setup.py | 4 +--
install/python-installer/traf_sqconfig.py | 6 ++--
install/python-installer/traf_user.py | 4 +--
34 files changed, 125 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/conn/jdbc_type2/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/Makefile b/core/conn/jdbc_type2/Makefile
index f71fb45..ab13539 100644
--- a/core/conn/jdbc_type2/Makefile
+++ b/core/conn/jdbc_type2/Makefile
@@ -59,9 +59,9 @@ T2_OBJS = $(OUTDIR)/CommonDiags.o \
$(OUTDIR)/type2version.o
OBJS = $(COMMON_OBJS) $(T2_OBJS)
-MXODIR = $(SQ_HOME)/../conn/odbc/src/odbc
+MXODIR = $(MY_SQROOT)/../conn/odbc/src/odbc
-INCLUDES = -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Inative -I$(MXODIR)/Krypton/generated_incs -I$(MXODIR)/dependencies/include -I$(MXODIR)/dependencies/linux -I$(SQ_HOME)/export/include/sql -I$(SQ_HOME)/inc/tmf_tipapi -I$(SQ_HOME)/inc -I$(SQ_HOME)/export/include -I$(SQ_HOME)/inc/rosetta -I$(SQ_HOME)/../sql/cli -I$(SQ_HOME)/../sql/common -I$(SQ_HOME)/../dbsecurity/cert/inc -I$(SQ_HOME)/../dbsecurity/auth/inc -I$(SQ_HOME)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES = -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Inative -I$(MXODIR)/Krypton/generated_incs -I$(MXODIR)/dependencies/include -I$(MXODIR)/dependencies/linux -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/inc/rosetta -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/../sql/common -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(MY_SQROOT)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
COMMON_DEFINES = -DTRAFODION_JDBCT2_VER_MAJOR=$(TRAFODION_VER_MAJOR) -DTRAFODION_JDBCT2_VER_MINOR=$(TRAFODION_VER_MINOR) -D_LP64 -DNA_LINUX -DSIZEOF_LONG_INT=4 -DSQ_GUARDIAN_CALL -DDISABLE_NOWAIT -D_FASTPATH -DTODO -D_SQ64 -w
DEFINES = $(COMMON_DEFINES)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/conn/odbc/src/odbc/macros.gmk
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/macros.gmk b/core/conn/odbc/src/odbc/macros.gmk
index 9d77d9c..8497a89 100644
--- a/core/conn/odbc/src/odbc/macros.gmk
+++ b/core/conn/odbc/src/odbc/macros.gmk
@@ -155,6 +155,6 @@ $(OUTDIR)/%.o: ../../../Common/%.cpp
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
# Common logger
-$(OUTDIR)/%.o: $(SQ_HOME)/commonLogger/%.cpp
+$(OUTDIR)/%.o: $(MY_SQROOT)/commonLogger/%.cpp
@if [ -d "$(OUTDIR)" ]; then x=1; else mkdir -p "$(OUTDIR)"; fi
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/conn/odbc/src/odbc/nsksrvr/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Makefile b/core/conn/odbc/src/odbc/nsksrvr/Makefile
index 36404e6..c7894e1 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvr/Makefile
@@ -103,7 +103,7 @@ ODBC_OBJS = $(OUTDIR)/odbcas_drvr.o \
OBJS = $(COMMON_OBJS) $(COMPRESS_OBJS) $(DBT_OBJS) $(ODBC_OBJS) $(WMS_OBJS)
-INCLUDES = -I. -I../Common -I../Common/linux -I../EventMsgs -I../SrvrMsg -I../nsksrvrcore -I./Interface -I./Interface/linux -I../dependencies/include -I../dependencies/linux -I../dependencies/liblzf -I../Krypton/generated_incs -I$(SQ_HOME)/export/include/sql -I$(SQ_HOME)/inc/tmf_tipapi -I$(SQ_HOME)/inc -I$(SQ_HOME)/export/include -I$(SQ_HOME)/inc/rosetta -I ../OssCfgCl/src -I../CmdCfgDll -I$(SQ_HOME)/../sql/cli -I$(SQ_HOME)/../dbsecurity/cert/inc -I$(SQ_HOME)/../dbsecurity/auth/inc -I$(ZOOKEEPER_DIR)/include -I$(SQ_HOME)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES = -I. -I../Common -I../Common/linux -I../EventMsgs -I../SrvrMsg -I../nsksrvrcore -I./Interface -I./Interface/linux -I../dependencies/include -I../dependencies/linux -I../dependencies/liblzf -I../Krypton/generated_incs -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/inc/rosetta -I ../OssCfgCl/src -I../CmdCfgDll -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(ZOOKEEPER_DIR)/include -I$(MY_SQROOT)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
COMMON_DEFINES = -DNA_LINUX -DSIZEOF_LONG_INT=4 -DSQ_GUARDIAN_CALL -DUSE_NEW_PHANDLE -DTIMER_FIXED -w -DNSK_ODBC_SRVR -D__TIME_LOGGER -DTHREADED
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
index d1e3741..25a4843 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
@@ -64,7 +64,7 @@ OBJS = $(OUTDIR)/CommonDiags.o \
$(OUTDIR)/srvrothers.o \
$(OUTDIR)/libmxocore_version.o
-INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux -I../Krypton/generated_incs -I$(SQ_HOME)/export/include/sql -I$(SQ_HOME)/inc/tmf_tipapi -I$(SQ_HOME)/inc -I$(SQ_HOME)/export/include -I$(SQ_HOME)/sql/nq_w/common -I../OssCfgCl/src -I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(SQ_HOME)/../sql/cli -I$(SQ_HOME)/commonLogger -I$(SQ_HOME)/../dbsecurity/cert/inc -I$(SQ_HOME)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(SQ_HOME)/../mpi/src/include/intern
+INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux -I../Krypton/generated_incs -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/sql/nq_w/common -I../OssCfgCl/src -I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/commonLogger -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(MY_SQROOT)/../mpi/src/include/intern
DEFINES = -DNA_LINUX -DSIZEOF_LONG_INT=4 -DUSE_NEW_PHANDLE -DSQ_GUARDIAN_CALL -D_M_DG -DINC_QPID_EVENT -w
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 058f7f8..d5acf92 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -138,7 +138,7 @@ else
export RH_MAJ_VERS=6
fi
export MY_SQROOT=$PWD
-export SQ_HOME=$PWD
+export MY_SQROOT=$PWD
# set common version to be consistent between shared lib and maven dependencies
export HBASE_DEP_VER_CDH=1.2.0-cdh5.7.1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sql/scripts/gensq.pl
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/gensq.pl b/core/sqf/sql/scripts/gensq.pl
index 58ccd06..099022b 100755
--- a/core/sqf/sql/scripts/gensq.pl
+++ b/core/sqf/sql/scripts/gensq.pl
@@ -122,7 +122,7 @@ my $gFloatingNodeId = -1;
my $gFloatingFailoverNodeId = -1;
-my $SQ_ROOT = $ENV{'MY_SQROOT'};
+my $MY_SQROOT = $ENV{'MY_SQROOT'};
my $HOME = $ENV{'HOME'};
my $MPI_TMPDIR = $ENV{'MPI_TMPDIR'};
my $SQ_SEAMONSTER = $ENV{'SQ_SEAMONSTER'};
@@ -391,7 +391,7 @@ sub printInitialLines {
printScript(0, "\nset MY_NODES=\$MY_NODES\n");
addDbClusterData( "SQ_MBTYPE", $ENV{'SQ_MBTYPE'});
- addDbClusterData( "MY_SQROOT", "$SQ_ROOT"); # comes out null
+ addDbClusterData( "MY_SQROOT", "$MY_SQROOT"); # comes out null
$gbInitialLinesPrinted = 1;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sql/scripts/install_apache_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_apache_hadoop b/core/sqf/sql/scripts/install_apache_hadoop
index 9fdc5ff..3871b0e 100755
--- a/core/sqf/sql/scripts/install_apache_hadoop
+++ b/core/sqf/sql/scripts/install_apache_hadoop
@@ -955,7 +955,7 @@ else
echo "Updating files $H_CORE_FILE, $H_HDFS_FILE and $H_MAPRED_FILE ..."
cat <<EOF >$H_ENV_FILE
export HADOOP_COMMON_LIB_NATIVE_DIR=${MY_SW_ROOT}/hadoop/lib/native
-export HADOOP_OPTS="-Djava.library.path=$MY_SQ_ROOT/hadoop/lib"
+export HADOOP_OPTS="-Djava.library.path=$MY_SQROOT/hadoop/lib"
EOF
mv -f $H_CORE_FILE $H_CORE_FILE.orig
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sql/scripts/sqsystem.pm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqsystem.pm b/core/sqf/sql/scripts/sqsystem.pm
index 384fc35..b380b79 100755
--- a/core/sqf/sql/scripts/sqsystem.pm
+++ b/core/sqf/sql/scripts/sqsystem.pm
@@ -40,10 +40,10 @@ sub isProd
sub isSingleNode
{
- my $SQ_ROOT = $ENV{'MY_SQROOT'};
+ my $MY_SQROOT = $ENV{'MY_SQROOT'};
# Get the number of nodes in the instance
- my $TempList = `grep 'node-name=.[^A-Za-z].[0-9]*' $SQ_ROOT/sql/scripts/sqconfig | grep -v "\#" | cut -d"=" -f3 | cut -d";" -f1 | sort -u`;
+ my $TempList = `grep 'node-name=.[^A-Za-z].[0-9]*' $MY_SQROOT/sql/scripts/sqconfig | grep -v "\#" | cut -d"=" -f3 | cut -d";" -f1 | sort -u`;
if (!$TempList)
{# Single-node development system
return 1; # true
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/sql/scripts/trafnodestatus
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/trafnodestatus b/core/sqf/sql/scripts/trafnodestatus
index f417471..f7e5956 100755
--- a/core/sqf/sql/scripts/trafnodestatus
+++ b/core/sqf/sql/scripts/trafnodestatus
@@ -89,7 +89,7 @@ if [[ ! -z ${SQ_VIRTUAL_NODES} ]]; then
traf_exit 1
fi
-grep_out_mon=`$SQ_ROOT/sql/scripts/cstat | grep "monitor COLD" `
+grep_out_mon=`$MY_SQROOT/sql/scripts/cstat | grep "monitor COLD" `
lv_ret=$?
if [[ $lv_ret == 0 ]]; then
grep_out=`cstat | grep "monitor COLD" | grep -v mpirun | sort | cut -d: -f1`
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/core/sqf/src/tm/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/macros.gmk b/core/sqf/src/tm/macros.gmk
index aff0226..95c735d 100644
--- a/core/sqf/src/tm/macros.gmk
+++ b/core/sqf/src/tm/macros.gmk
@@ -49,7 +49,7 @@ HBASETMLIB = $(MY_SQROOT)/src/seatrans/tm/hbasetmlib2
LIBXARM = -lxarm
#log4cxx
-LIBCLOGGER = $(SQ_HOME)/commonLogger
+LIBCLOGGER = $(MY_SQROOT)/commonLogger
# seabed
SBROOT = ..
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
index af2db61..08246c6 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
@@ -317,7 +317,7 @@ in the <<prepare,Prepare>> chapter, you record the following information.
| RENEW_LIFETIME | Kerberos ticket renewal lifetime for {project-name} principal | 7days
| REST_BUILD | Tar file containing the REST component. |
| SECURE_HADOOP | Indicates whether Hadoop has Kerberos enabled | Based on whether Kerberos is enabled for your Hadoop installation
-| SQ_ROOT | Target directory for the {project-name} software. | /home/trafodion/apache-trafodion-1.3.0-incubating-bin
+| MY_SQROOT | Target directory for the {project-name} software. | /home/trafodion/apache-trafodion-1.3.0-incubating-bin
| START | Whether to start {project-name} after install/upgrade. | Y
| SUSE_LINUX | Whether your installing {project-name} on SUSE Linux. | false
| TRAF_PACKAGE | The location of the {project-name} installation package tar file or core installation tar file. | /home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz
@@ -456,7 +456,7 @@ export HBASE="hbase"
# First time install : /home/trafodion/traf
# On Upgrade: /home/trafodion/traf_<date>
# By doing this the previous version will remain and allow for an easier rollback.
-export SQ_ROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+export MY_SQROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
# Start Trafodion after install completes
export START="Y"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
index 93b23b3..bf8fb3c 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
@@ -177,7 +177,7 @@ distribution manager's REST API.
| RENEW_LIFETIME^2^ | Number times Kerberos ticket is for the Trafodion principal | 7days | Can be specified when Kerberos is enabled.
| REST_BUILD | Tar file containing the REST component. | None | Not needed if using a {project-name} package installation tar file.
| SECURE_HADOOP^2^ | Indicates whether Hadoop has enabled Kerberos | Y only if Kerberos enabled | Based on whether Kerberos is enabled for your Hadoop installation
-| SQ_ROOT | Target directory for the {project-name} software. | $HOME_DIR/trafodion | {project-name} is installed in this directory on all nodes in `$NODE_LIST`.
+| MY_SQROOT | Target directory for the {project-name} software. | $HOME_DIR/trafodion | {project-name} is installed in this directory on all nodes in `$NODE_LIST`.
| START | Whether to start {project-name} after install/upgrade. | N | Does not apply to Recipe-Based Provisioning.
| SUSE_LINUX | Whether your installing {project-name} on SUSE Linux. | false | Auto-detected by the {project-name} Installer.
| TRAF_KEYTAB^2^ | Name to use when specifying {project-name} keytab | based on distribution | Required if Kerberos is enabled.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
index 7eea1a7..0f1dd31 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
@@ -298,7 +298,7 @@ At a minimum, you need to change the following settings:
* `LOCAL_WORKDIR`
* `TRAF_PACKAGE`
-* `SQ_ROOT`
+* `MY_SQROOT`
*Example*
@@ -309,7 +309,7 @@ $ # Pre edit content
export LOCAL_WORKDIR="/home/centos/trafodion-installer/installer"
export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz"
-export SQ_ROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+export MY_SQROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
$ # Use your favorite editor to modify my_config_2.0
$ emacs my_config_2.0
@@ -317,7 +317,7 @@ $ # Post edit changes
export LOCAL_WORKDIR="/home/centos/trafodion-installer-2.0/installer"
export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-2.0.0-incubating-bin.tar.gz"
-export SQ_ROOT="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
+export MY_SQROOT="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
```
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/addNode_step1
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step1 b/install/installer/addNode_step1
index ce3ee52..99f4ad9 100755
--- a/install/installer/addNode_step1
+++ b/install/installer/addNode_step1
@@ -267,10 +267,10 @@ do
echo
echo "********************************************************************"
- sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $SQ_ROOT/tmp/cluster.conf
- sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $SQ_ROOT/sql/scripts/sqconfig
- sudo rm -rf $SQ_ROOT/tmp/se*
- sudo rm -rf $SQ_ROOT/sql/scripts/se*
+ sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $MY_SQROOT/tmp/cluster.conf
+ sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $MY_SQROOT/sql/scripts/sqconfig
+ sudo rm -rf $MY_SQROOT/tmp/se*
+ sudo rm -rf $MY_SQROOT/sql/scripts/se*
sudo chmod 777 $TRAF_CONFIG
sed -i '/TRAF_EXCLUDE_LIST\=/d' $TRAF_CONFIG
echo "export TRAF_EXCLUDE_LIST=\"$TRAF_EXCLUDE_LIST\"" >> $TRAF_CONFIG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/addNode_step2
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step2 b/install/installer/addNode_step2
index 26ad9f1..20c20ee 100755
--- a/install/installer/addNode_step2
+++ b/install/installer/addNode_step2
@@ -181,11 +181,11 @@ echo "***IMPORTANT*** Ignore copy errors to new node."
echo
sleep 5
-sudo cp $SQ_ROOT/tmp/cluster.conf $PWD
+sudo cp $MY_SQROOT/tmp/cluster.conf $PWD
sudo chown $(whoami).$(whoami) $PWD/cluster.conf
$TRAF_PDCP $PWD/cluster.conf $HOME
-$TRAF_PDSH sudo cp $HOME/cluster.conf $SQ_ROOT/tmp/cluster.conf 2>&1 > /dev/null
-$TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/tmp/cluster.conf 2>&1 > /dev/null
+$TRAF_PDSH sudo cp $HOME/cluster.conf $MY_SQROOT/tmp/cluster.conf 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/tmp/cluster.conf 2>&1 > /dev/null
$TRAF_PDSH sudo rm $HOME/cluster.conf
}
@@ -199,11 +199,11 @@ echo "***IMPORTANT*** Ignore copy errors to new node."
echo
sleep 5
-sudo cp -r $SQ_ROOT/sql/scripts/sqconfig $PWD
+sudo cp -r $MY_SQROOT/sql/scripts/sqconfig $PWD
sudo chown $(whoami).$(whoami) $PWD/sqconfig
$TRAF_PDCP $PWD/sqconfig $HOME
-$TRAF_PDSH sudo cp $HOME/sqconfig $SQ_ROOT/sql/scripts/sqconfig 2>&1 > /dev/null
-$TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/sql/scripts/sqconfig 2>&1 > /dev/null
+$TRAF_PDSH sudo cp $HOME/sqconfig $MY_SQROOT/sql/scripts/sqconfig 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/sql/scripts/sqconfig 2>&1 > /dev/null
$TRAF_PDSH sudo rm $HOME/sqconfig
@@ -223,9 +223,9 @@ function editDCSServers {
echo "***INFO: Create DCS servers file"
source $TRAF_CONFIG
-DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs\*)
+DCS_DIR=$(sudo ls $MY_SQROOT | grep dcs\*)
-sudo cp $SQ_ROOT/$DCS_DIR/conf/servers $PWD
+sudo cp $MY_SQROOT/$DCS_DIR/conf/servers $PWD
sudo chown $(whoami).$(whoami) $PWD/servers
let per_node=$DCS_SERVERS_PARM/$node_count
@@ -253,8 +253,8 @@ done
$TRAF_PDCP $PWD/servers $HOME/tempServers
-$TRAF_PDSH sudo cp $HOME/tempServers $SQ_ROOT/$DCS_DIR/conf/servers
-$TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/$DCS_DIR/conf/servers
+$TRAF_PDSH sudo cp $HOME/tempServers $MY_SQROOT/$DCS_DIR/conf/servers
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/$DCS_DIR/conf/servers
@@ -265,7 +265,7 @@ function editDCSBackUp {
echo "***INFO: Create DCS Backup Master file"
source $TRAF_CONFIG
-DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs\*)
+DCS_DIR=$(sudo ls $MY_SQROOT | grep dcs\*)
if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
for node_name in $BACKUP_DCS_NODES
@@ -274,8 +274,8 @@ if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
done
$TRAF_PDCP $PWD/tempbackup $HOME
- $TRAF_PDSH sudo cp $HOME/tempbackup $SQ_ROOT/$DCS_DIR/conf/backup-master
- $TRAF_PDSH sudo chown $TRAF_USER.trafodion $SQ_ROOT/$DCS_DIR/conf/backup-master
+ $TRAF_PDSH sudo cp $HOME/tempbackup $MY_SQROOT/$DCS_DIR/conf/backup-master
+ $TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/$DCS_DIR/conf/backup-master
fi
}
@@ -294,7 +294,7 @@ $TRAF_NEW_PDSH sudo mkdir -p $HOME_DIR/$TRAF_USER/.ssh
$TRAF_NEW_PDSH mkdir -p $HOME/tmpTraf
sudo cp -r $HOME_DIR/$TRAF_USER/.bashrc $HOME/tmpTraf/.bashrc
sudo cp -r $HOME_DIR/$TRAF_USER/.ssh $HOME/tmpTraf
-sudo cp -r $SQ_ROOT $HOME/tmpTraf
+sudo cp -r $MY_SQROOT $HOME/tmpTraf
echo "***IMPORTANT: Keep waiting..."
sudo chown -R $(whoami).$(whoami) $HOME/tmpTraf
$TRAF_NEW_PDCP -r $HOME/tmpTraf $HOME
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/bashrc_default
----------------------------------------------------------------------
diff --git a/install/installer/bashrc_default b/install/installer/bashrc_default
index 81eb9df..766296b 100755
--- a/install/installer/bashrc_default
+++ b/install/installer/bashrc_default
@@ -44,8 +44,7 @@ fi
#-------------------------------------------
# full path of your Trafodion installation
#-------------------------------------------
-export SQ_HOME=XXXXXX
-export MY_SQROOT=$SQ_HOME
+export MY_SQROOT=XXXXXX
#-------------------------------------------
# other env vars needed by Trafodion
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index 7033014..d6a3f40 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -131,8 +131,8 @@ mkdir -p $DCS_INSTALL_PATH
cd $DCS_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- DCS_DIR=$(ls $SQ_ROOT | grep dcs)
- DCS_DIR=$SQ_ROOT/$DCS_DIR
+ DCS_DIR=$(ls $MY_SQROOT | grep dcs)
+ DCS_DIR=$MY_SQROOT/$DCS_DIR
echo "***INFO: DCS Install Directory: $DCS_DIR"
else
# untar DCS build into install directory
@@ -215,13 +215,13 @@ if [[ "$ENABLE_HA" == "true" ]]; then
######Configure trafci wrapper script to use Floating IP address
newHName="HNAME=$FLOATING_IP:23400"
- sed -i -e "s/HNAME=localhost:23400/$newHName/g" $SQ_ROOT/trafci/bin/trafci
+ sed -i -e "s/HNAME=localhost:23400/$newHName/g" $MY_SQROOT/trafci/bin/trafci
else
######Configure trafci wrapper script
newHName="HNAME=$DCS_PRIMARY_MASTER_NODE:23400"
- sed -i -e "s/HNAME=localhost:23400/$newHName/g" $SQ_ROOT/trafci/bin/trafci
+ sed -i -e "s/HNAME=localhost:23400/$newHName/g" $MY_SQROOT/trafci/bin/trafci
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index 511d54c..1ce5208 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -94,8 +94,8 @@ mkdir -p $REST_INSTALL_PATH
cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- REST_DIR=$(ls $SQ_ROOT | grep rest)
- REST_DIR=$SQ_ROOT/$REST_DIR
+ REST_DIR=$(ls $MY_SQROOT | grep rest)
+ REST_DIR=$MY_SQROOT/$REST_DIR
echo "***INFO: Rest Install Directory: $REST_DIR"
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_add_ldap
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_ldap b/install/installer/traf_add_ldap
index 652326f..d0c8226 100755
--- a/install/installer/traf_add_ldap
+++ b/install/installer/traf_add_ldap
@@ -48,14 +48,14 @@ echo "***INFO: Copy $LDAP_AUTH_FILE to all nodes"
if [[ "$all_node_count" -eq "1" ]]; then
sudo cp -r $LOCAL_WORKDIR/$LDAP_AUTH_FILE $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
sudo chown $TRAF_USER.$TRAF_GROUP $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
- sudo su $TRAF_USER --command "cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $SQ_ROOT/sql/scripts/.traf_authentication_config" 2>&1
- sudo su $TRAF_USER --command "chmod 750 $SQ_ROOT/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $MY_SQROOT/sql/scripts/.traf_authentication_config" 2>&1
+ sudo su $TRAF_USER --command "chmod 750 $MY_SQROOT/sql/scripts/.traf_authentication_config"
else
$TRAF_PDCP $LOCAL_WORKDIR/$LDAP_AUTH_FILE $HOME
$TRAF_PDSH sudo cp $HOME/$LDAP_AUTH_FILE $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
$TRAF_PDSH sudo chown $TRAF_USER:$TRAF_GROUP $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
- sudo su $TRAF_USER --command "$TRAF_PDSH cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $SQ_ROOT/sql/scripts/.traf_authentication_config"
- sudo su $TRAF_USER --command "$TRAF_PDSH chmod 750 $SQ_ROOT/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "$TRAF_PDSH cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $MY_SQROOT/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "$TRAF_PDSH chmod 750 $MY_SQROOT/sql/scripts/.traf_authentication_config"
fi
# Check traf_authentication_config for errors
@@ -81,7 +81,7 @@ fi
# change and copy sqenvcom.sh
echo "***INFO: Modifying sqenvcom.sh to turn on authentication"
-sudo cp -r $SQ_ROOT/sqenvcom.sh $LOCAL_WORKDIR/sqenvcom.sh
+sudo cp -r $MY_SQROOT/sqenvcom.sh $LOCAL_WORKDIR/sqenvcom.sh
sudo chown $(whoami).$(whoami) $LOCAL_WORKDIR/sqenvcom.sh
sed -i -e "s@TRAFODION_ENABLE_AUTHENTICATION=NO@TRAFODION_ENABLE_AUTHENTICATION=YES@g" $LOCAL_WORKDIR/sqenvcom.sh
sudo cp $LOCAL_WORKDIR/sqenvcom.sh $HOME_DIR/$TRAF_USER/sqenvcom.sh
@@ -89,9 +89,9 @@ sudo chown $TRAF_USER.$TRAF_GROUP $HOME_DIR/$TRAF_USER/sqenvcom.sh
sudo chmod 664 $HOME_DIR/$TRAF_USER/sqenvcom.sh
echo "***INFO: copying sqenvcom.sh to all nodes"
if [[ "$all_node_count" -ne "1" ]]; then
- sudo su $TRAF_USER --command "$TRAF_PDCP $HOME_DIR/$TRAF_USER/sqenvcom.sh $SQ_ROOT/sqenvcom.sh"
+ sudo su $TRAF_USER --command "$TRAF_PDCP $HOME_DIR/$TRAF_USER/sqenvcom.sh $MY_SQROOT/sqenvcom.sh"
else
- sudo cp $HOME_DIR/$TRAF_USER/sqenvcom.sh $SQ_ROOT/sqenvcom.sh
+ sudo cp $HOME_DIR/$TRAF_USER/sqenvcom.sh $MY_SQROOT/sqenvcom.sh
fi
rm $LOCAL_WORKDIR/sqenvcom.sh
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_config
----------------------------------------------------------------------
diff --git a/install/installer/traf_config b/install/installer/traf_config
index b5b2b85..74e68e8 100755
--- a/install/installer/traf_config
+++ b/install/installer/traf_config
@@ -67,8 +67,8 @@ fi
#============================================
# Create install directory
-mkdir -p $SQ_ROOT
-echo $SQ_ROOT
+mkdir -p $MY_SQROOT
+echo $MY_SQROOT
if [[ "$UPGRADE_TRAF" == "true" ]]; then
echo
@@ -83,17 +83,17 @@ fi
if [[ -f $HOME/sqenvcom.sh ]]; then
echo "****INFO: Copying over sqenvcom.sh"
- cp -rf $HOME/sqenvcom.sh $SQ_ROOT
+ cp -rf $HOME/sqenvcom.sh $MY_SQROOT
fi
-cd $SQ_ROOT
+cd $MY_SQROOT
# untar Trafodion build into install directory
if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
- echo "***INFO: untarring file $TRAF_BUILD to $SQ_ROOT" | tee -a $INSTALL_LOG
+ echo "***INFO: untarring file $TRAF_BUILD to $MY_SQROOT" | tee -a $INSTALL_LOG
tar -xzf $TRAF_BUILD 2>&1 | tee -a $INSTALL_LOG
else
- echo "***INFO: untarring file $TRAF_BUILD to $SQ_ROOT" | tee -a $INSTALL_LOG
+ echo "***INFO: untarring file $TRAF_BUILD to $MY_SQROOT" | tee -a $INSTALL_LOG
tar -xzf $UNTAR_DIR/$traf_filename 2>&1 | tee -a $INSTALL_LOG
fi
if [ "$?" != "0" ]; then
@@ -120,7 +120,7 @@ else
fi
else
# For single node, we use the sqconfig in the build
- SQCONFIG_MASTER=$SQ_ROOT/sql/scripts/sqconfig
+ SQCONFIG_MASTER=$MY_SQROOT/sql/scripts/sqconfig
if [[ ! -f "$SQCONFIG_MASTER" ]]; then
echo "***ERROR: SQ config file cannot be found ($SQCONFIG_MASTER)." | tee -a $INSTALL_LOG
exit -1
@@ -133,8 +133,8 @@ echo "***INFO: modifying .bashrc to set Trafodion environment variables" | tee -
cd $HOME
cp .bashrc bashrc_temp
# NOTE: have to use '@' as delimiter because the usual slash '/' doesn't work
-# because $SQ_ROOT's value has slashes in it
-sed -e "s@export SQ_HOME=.*@export SQ_HOME=$SQ_ROOT@" <bashrc_temp >$HOME/.bashrc
+# because $MY_SQROOT's value has slashes in it
+sed -e "s@export MY_SQROOT=.*@export MY_SQROOT=$MY_SQROOT@" <bashrc_temp >$HOME/.bashrc
cp .bashrc bashrc_temp
sed -e "s@export TOOLSDIR=.*@export TOOLSDIR=$TRAF_TOOLSDIR@" <bashrc_temp >$HOME/.bashrc
@@ -153,20 +153,20 @@ fi
#==========================================
if [ "$node_count" -ne "1" ]; then
- echo "***INFO: copying sqconfig file ($SQCONFIG_MASTER) to $SQ_ROOT/sql/scripts/sqconfig" | tee -a $INSTALL_LOG
- cp $SQCONFIG_MASTER $SQ_ROOT/sql/scripts/sqconfig
+ echo "***INFO: copying sqconfig file ($SQCONFIG_MASTER) to $MY_SQROOT/sql/scripts/sqconfig" | tee -a $INSTALL_LOG
+ cp $SQCONFIG_MASTER $MY_SQROOT/sql/scripts/sqconfig
fi
-cd $SQ_ROOT
+cd $MY_SQROOT
#=================================================
if [ "$all_node_count" -ne "1" ]; then
- echo "***INFO: Creating $SQ_ROOT directory on all nodes" | tee -a $INSTALL_LOG
- $PDSH $ALL_NODES -x $HOSTNAME $PDSH_SSH_CMD mkdir -p $SQ_ROOT
+ echo "***INFO: Creating $MY_SQROOT directory on all nodes" | tee -a $INSTALL_LOG
+ $PDSH $ALL_NODES -x $HOSTNAME $PDSH_SSH_CMD mkdir -p $MY_SQROOT
if [[ -f $HOME/sqenvcom.sh ]]; then
echo "****INFO: Copying over sqenvcom.sh"
- $PDCP $ALL_NODES $HOME/sqenvcom.sh $SQ_ROOT
+ $PDCP $ALL_NODES $HOME/sqenvcom.sh $MY_SQROOT
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index f404f94..a270c45 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -856,10 +856,10 @@ fi
function checkSQROOT {
-if [[ -z $SQ_ROOT ]]; then
+if [[ -z $MY_SQROOT ]]; then
errorFound=1
echo "SQ ROOT" >> $ERROR_LOG
- echo "***ERROR: SQ_ROOT variable not set in config file" >> $ERROR_LOG
+ echo "***ERROR: MY_SQROOT variable not set in config file" >> $ERROR_LOG
fi
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index dd40644..d938b9d 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -58,7 +58,7 @@ HBASE_USER="hbase"
HBASE_GROUP="hbase"
ZOO_USER="zookeeper"
-SQ_ROOT=""
+MY_SQROOT=""
INIT_TRAFODION="N"
START="N"
SQCONFIG=""
@@ -101,7 +101,7 @@ Inputs Requested:
*HDFS username (default is [$HDFS_USER])
*HBase username (default is [$HBASE_USER])
*HBase group (default is [$HBASE_GROUP])
-*Full pathname to the install directory location (default [$SQ_ROOT])
+*Full pathname to the install directory location (default [$MY_SQROOT])
*Full pathname to the DNS build tar file (default [$DCS_BUILD])
*Start Trafodion after install (default is [No])
*Total number of DCS servers to start
@@ -677,15 +677,15 @@ fi
#Install location
traf_filename=$(basename "$TRAF_PACKAGE")
-SQ_ROOT="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
+MY_SQROOT="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
-echo -n "Enter directory to install trafodion to, default is [$SQ_ROOT]: "
+echo -n "Enter directory to install trafodion to, default is [$MY_SQROOT]: "
read answer
if [ -z $answer ]; then
- echo "export SQ_ROOT=\"$SQ_ROOT\"" >> $LOCAL_TRAF_CONFIG
+ echo "export MY_SQROOT=\"$MY_SQROOT\"" >> $LOCAL_TRAF_CONFIG
else
- echo "export SQ_ROOT=\"$answer\"" >> $LOCAL_TRAF_CONFIG
+ echo "export MY_SQROOT=\"$answer\"" >> $LOCAL_TRAF_CONFIG
fi
#==============================================
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_secure
----------------------------------------------------------------------
diff --git a/install/installer/traf_secure b/install/installer/traf_secure
index fa64163..fcbdd53 100755
--- a/install/installer/traf_secure
+++ b/install/installer/traf_secure
@@ -27,7 +27,7 @@ export TRAF_CONFIG=/etc/trafodion/trafodion_config
source $TRAF_CONFIG
-rm $SQ_ROOT/logs/securityErrors.txt 2>/dev/null
+rm $MY_SQROOT/logs/securityErrors.txt 2>/dev/null
if [[ "$all_node_count" -eq "1" ]]; then
STARTING_NODE=$NODE_LIST
@@ -37,24 +37,24 @@ fi
#==========================================
-echo "***INFO: Starting Trafodion instance, if not already started" | tee -a $SQ_ROOT/logs/securityErrors.txt
+echo "***INFO: Starting Trafodion instance, if not already started" | tee -a $MY_SQROOT/logs/securityErrors.txt
-ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts; sqstart"
+ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; sqstart"
SQSTART_RC=$?
if [ "$SQSTART_RC" -ne "0" -a "$SQSTART_RC" -ne "1" ]; then
- echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $SQ_ROOT/sqmon.log file for details." | tee -a $SQ_ROOT/logs/securityErrors.txt
+ echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $MY_SQROOT/sqmon.log file for details." | tee -a $MY_SQROOT/logs/securityErrors.txt
exit -1;
fi
# Do initialize authorization and alter predefined users
-echo "***INFO: Initialize authorization and set up predefined users" | tee -a $SQ_ROOT/logs/securityErrors.txt
-ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts; echo \"initialize authorization; alter user DB__ROOT set external name \"$DB_ROOT_NAME\";\" | sqlci" | tee -a $SQ_ROOT/logs/securityErrors.txt
-foundError=$(grep "ERROR" $SQ_ROOT/logs/securityErrors.txt | wc -l)
+echo "***INFO: Initialize authorization and set up predefined users" | tee -a $MY_SQROOT/logs/securityErrors.txt
+ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"initialize authorization; alter user DB__ROOT set external name \"$DB_ROOT_NAME\";\" | sqlci" | tee -a $MY_SQROOT/logs/securityErrors.txt
+foundError=$(grep "ERROR" $MY_SQROOT/logs/securityErrors.txt | wc -l)
if [ "$foundError" -ge "1" ];then
- echo "***ERROR: Security installation failed, continuing. Check files $SQ_ROOT/logs/securityErrors.txt for details." | tee -a $SQ_ROOT/logs/securityErrors.txt
+ echo "***ERROR: Security installation failed, continuing. Check files $MY_SQROOT/logs/securityErrors.txt for details." | tee -a $MY_SQROOT/logs/securityErrors.txt
fi
-echo "***INFO: Please check the install log $SQ_ROOT/logs/securityErrors.txt for any issues" | tee -a $SQ_ROOT/logs/securityErrors.txt
+echo "***INFO: Please check the install log $MY_SQROOT/logs/securityErrors.txt for any issues" | tee -a $MY_SQROOT/logs/securityErrors.txt
#==========================================
-echo "***INFO: Installation setup completed successfully." | tee -a $SQ_ROOT/logs/securityErrors.txt
+echo "***INFO: Installation setup completed successfully." | tee -a $MY_SQROOT/logs/securityErrors.txt
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_sqgen
----------------------------------------------------------------------
diff --git a/install/installer/traf_sqgen b/install/installer/traf_sqgen
index a922da8..fc311a8 100755
--- a/install/installer/traf_sqgen
+++ b/install/installer/traf_sqgen
@@ -28,14 +28,14 @@ STARTING_NODE=$(hostname)
#==========================================
echo "***INFO: starting sqgen" | tee -a $INSTALL_LOG
-cd $SQ_ROOT/sql/scripts
+cd $MY_SQROOT/sql/scripts
#If sqconfig.db exists remove it and then sqgen can be run
-if [[ -e $SQ_ROOT/sql/scripts/sqconfig.db ]]; then
- $TRAF_PDSH rm -rf $SQ_ROOT/sql/scripts/sqconfig.db
+if [[ -e $MY_SQROOT/sql/scripts/sqconfig.db ]]; then
+ $TRAF_PDSH rm -rf $MY_SQROOT/sql/scripts/sqconfig.db
fi
-$SQ_ROOT/sql/scripts/sqgen
+$MY_SQROOT/sql/scripts/sqgen
SQGEN_RC=$?
if [ "$SQGEN_RC" != "0" ]; then
echo "***ERROR: sqgen failed with RC=$SQGEN_RC. Check install log file for details." | tee -a $INSTALL_LOG
@@ -54,7 +54,7 @@ fi
if [ "$all_node_count" -ne "1" ]; then
echo "***INFO: copying install to all nodes" | tee -a $INSTALL_LOG
- $PDCP $ALL_NODES -x $HOSTNAME -r $SQ_ROOT $SQ_ROOT/..
+ $PDCP $ALL_NODES -x $HOSTNAME -r $MY_SQROOT $MY_SQROOT/..
if [ "$?" != "0" ]; then
echo "***ERROR: Unable to copy Trafodion install to all machines in this cluster. Check install log files for details." | tee -a $INSTALL_LOG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/traf_start
----------------------------------------------------------------------
diff --git a/install/installer/traf_start b/install/installer/traf_start
index 414ae29..06f2739 100755
--- a/install/installer/traf_start
+++ b/install/installer/traf_start
@@ -40,10 +40,10 @@ if [ "$START" == "N" ]; then
else
echo "***INFO: starting Trafodion instance" | tee -a $INSTALL_LOG
- ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts; sqstart"
+ ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; sqstart"
SQSTART_RC=$?
if [ "$SQSTART_RC" != "0" ]; then
- echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $SQ_ROOT/sqmon.log file for details." | tee -a $INSTALL_LOG
+ echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $MY_SQROOT/sqmon.log file for details." | tee -a $INSTALL_LOG
exit -1;
fi
@@ -54,17 +54,17 @@ else
echo "***INFO: Trafodion is initializing...this will take a few minutes."
echo
echo
- ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts; echo \"initialize Trafodion;\" | sqlci" | tee -a $SQ_ROOT/initializeErrors.txt
- error1392=$(grep "1392" $SQ_ROOT/initializeErrors.txt | wc -l)
- error1395=$(grep "1395" $SQ_ROOT/initializeErrors.txt | wc -l)
+ ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"initialize Trafodion;\" | sqlci" | tee -a $MY_SQROOT/initializeErrors.txt
+ error1392=$(grep "1392" $MY_SQROOT/initializeErrors.txt | wc -l)
+ error1395=$(grep "1395" $MY_SQROOT/initializeErrors.txt | wc -l)
if [ "$error1395" -ge "1" ] || [ "$error1392" -ge "1" ]; then
- ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts; echo \"get version of metadata;\" | sqlci" | tee $SQ_ROOT/initializeErrors.txt
- metadataCurrent=$(grep "Metadata is current" $SQ_ROOT/initializeErrors.txt | wc -l)
+ ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"get version of metadata;\" | sqlci" | tee $MY_SQROOT/initializeErrors.txt
+ metadataCurrent=$(grep "Metadata is current" $MY_SQROOT/initializeErrors.txt | wc -l)
if [[ "$metadataCurrent" -ne "1" ]]; then
- ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts; echo \"initialize Trafodion, upgrade;\" | sqlci" | tee $SQ_ROOT/initializeErrors.txt
+ ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"initialize Trafodion, upgrade;\" | sqlci" | tee $MY_SQROOT/initializeErrors.txt
fi
fi
- anyError=$(grep "ERROR" $SQ_ROOT/initializeErrors.txt | wc -l)
+ anyError=$(grep "ERROR" $MY_SQROOT/initializeErrors.txt | wc -l)
if [[ "$anyError" != "0" ]]; then
echo "***ERROR: initialize Trafodion failed. Check install log files for details." | tee -a $INSTALL_LOG
exit -1;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index ad99d5f..6f67491 100755
--- a/install/installer/trafodion_config_default
+++ b/install/installer/trafodion_config_default
@@ -110,7 +110,7 @@ export HBASE="hbase"
# First time install : /home/trafodion/traf
# On Upgrade: /home/trafodion/traf_<date>
# By doing this the previous version will remain and allow for an easier rollback.
-export SQ_ROOT="/opt/trafodion/trafodion"
+export MY_SQROOT="/opt/trafodion/trafodion"
# Start Trafodion after install completes
export START="Y"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index 5177660..6590b66 100755
--- a/install/installer/trafodion_install
+++ b/install/installer/trafodion_install
@@ -307,7 +307,7 @@ userForTrafodion=`grep "$TRAF_USER:" /etc/passwd | wc -l`
if [[ "$userForTrafodion" != "0" ]]; then
- if [[ -e $SQ_ROOT/sql/scripts/sqcheck ]]; then
+ if [[ -e $MY_SQROOT/sql/scripts/sqcheck ]]; then
isTrafUp=$(sudo su $TRAF_USER --login --command "sqcheck" 2>/dev/null)
returnCode=$?
@@ -736,8 +736,8 @@ echo "******************************"
echo " TRAFODION CONFIGURATION"
echo "******************************"
echo
-sudo mkdir -p $SQ_ROOT
-sudo chown $TRAF_USER.trafodion $SQ_ROOT
+sudo mkdir -p $MY_SQROOT
+sudo chown $TRAF_USER.trafodion $MY_SQROOT
/bin/cp -rf $LOCAL_WORKDIR/traf_config $TRAF_WORKDIR/installer/traf_config
sudo su $TRAF_USER --login --command "$TRAF_WORKDIR/installer/traf_config" 2>&1 | tee -a $INSTALL_LOG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/installer/trafodion_uninstaller
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_uninstaller b/install/installer/trafodion_uninstaller
index 553cacd..6eaabf0 100755
--- a/install/installer/trafodion_uninstaller
+++ b/install/installer/trafodion_uninstaller
@@ -110,9 +110,9 @@ if [[ "$SECURE_HADOOP" == "Y" ]]; then
echo "***INFO: Stopping Kerberos ticket monitoring process"
if [ $all_node_count -eq 1 ]; then
- sudo su $TRAF_USER --login --command "$SQ_ROOT/sql/scripts/krb5service stop 2>/dev/null"
+ sudo su $TRAF_USER --login --command "$MY_SQROOT/sql/scripts/krb5service stop 2>/dev/null"
else
- $TRAF_PDSH "sudo su $TRAF_USER --login --command \"$SQ_ROOT/sql/scripts/krb5service stop 2>/dev/null\""
+ $TRAF_PDSH "sudo su $TRAF_USER --login --command \"$MY_SQROOT/sql/scripts/krb5service stop 2>/dev/null\""
fi
fi
@@ -139,8 +139,8 @@ $TRAF_PDSH sudo rm -rf $LOCAL_WORKDIR/$TRAF_USER
$TRAF_PDSH sudo /usr/sbin/userdel --force --remove $TRAF_USER
$TRAF_PDSH sudo /usr/sbin/groupdel $TRAF_GROUP 2>/dev/null
-echo "***INFO: removing all files from $SQ_ROOT"
-$TRAF_PDSH sudo rm -rf $SQ_ROOT
+echo "***INFO: removing all files from $MY_SQROOT"
+$TRAF_PDSH sudo rm -rf $MY_SQROOT
echo "***INFO: removing all files from /usr/lib/trafodion and /var/log/trafodion"
$TRAF_PDSH sudo rm -rf /usr/lib/trafodion*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/bashrc.template
----------------------------------------------------------------------
diff --git a/install/python-installer/bashrc.template b/install/python-installer/bashrc.template
index d820285..4f1b798 100644
--- a/install/python-installer/bashrc.template
+++ b/install/python-installer/bashrc.template
@@ -36,15 +36,14 @@ cd $HOME
#-------------------------------------------
# full path of your Trafodion installation
#-------------------------------------------
-export JAVA_HOME="{{ java_home }}"
-export SQ_HOME="{{ sq_home }}"
-export MY_SQROOT=$SQ_HOME
+export MY_SQROOT="{{ my_sqroot }}"
#-------------------------------------------
# other env vars needed by Trafodion
#-------------------------------------------
# These env vars define all nodes in the cluster
+export JAVA_HOME="{{ java_home }}"
export NODE_LIST="{{ node_list }}"
export MY_NODES="{{ my_nodes }}"
export node_count="{{ node_count }}"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/dcs_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/dcs_setup.py b/install/python-installer/dcs_setup.py
index 818a933..c3d1a9a 100755
--- a/install/python-installer/dcs_setup.py
+++ b/install/python-installer/dcs_setup.py
@@ -31,22 +31,22 @@ from common import ParseXML, append_file, write_file, mod_file, cmd_output, run_
def run():
dbcfgs = json.loads(dbcfgs_json)
- SQ_ROOT = os.environ['MY_SQROOT']
+ MY_SQROOT = os.environ['MY_SQROOT']
TRAF_VER = dbcfgs['traf_version']
HBASE_XML_FILE = dbcfgs['hbase_xml_file']
- DCS_INSTALL_ENV = 'export DCS_INSTALL_DIR=%s/dcs-%s' % (SQ_ROOT, TRAF_VER)
- REST_INSTALL_ENV = 'export REST_INSTALL_DIR=%s/rest-%s' % (SQ_ROOT, TRAF_VER)
+ DCS_INSTALL_ENV = 'export DCS_INSTALL_DIR=%s/dcs-%s' % (MY_SQROOT, TRAF_VER)
+ REST_INSTALL_ENV = 'export REST_INSTALL_DIR=%s/rest-%s' % (MY_SQROOT, TRAF_VER)
- DCS_CONF_DIR = '%s/dcs-%s/conf' % (SQ_ROOT, TRAF_VER)
+ DCS_CONF_DIR = '%s/dcs-%s/conf' % (MY_SQROOT, TRAF_VER)
DCS_SRV_FILE = DCS_CONF_DIR + '/servers'
DCS_MASTER_FILE = DCS_CONF_DIR + '/master'
DCS_BKMASTER_FILE = DCS_CONF_DIR + '/backup-masters'
DCS_ENV_FILE = DCS_CONF_DIR + '/dcs-env.sh'
DCS_SITE_FILE = DCS_CONF_DIR + '/dcs-site.xml'
- REST_SITE_FILE = '%s/rest-%s/conf/rest-site.xml' % (SQ_ROOT, TRAF_VER)
- TRAFCI_FILE = SQ_ROOT + '/trafci/bin/trafci'
- SQENV_FILE = SQ_ROOT + '/sqenvcom.sh'
+ REST_SITE_FILE = '%s/rest-%s/conf/rest-site.xml' % (MY_SQROOT, TRAF_VER)
+ TRAFCI_FILE = MY_SQROOT + '/trafci/bin/trafci'
+ SQENV_FILE = MY_SQROOT + '/sqenvcom.sh'
### dcs setting ###
# servers
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/traf_ldap.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_ldap.py b/install/python-installer/traf_ldap.py
index 8cd4b7f..bf9fbd5 100755
--- a/install/python-installer/traf_ldap.py
+++ b/install/python-installer/traf_ldap.py
@@ -33,9 +33,9 @@ def run():
dbcfgs = json.loads(dbcfgs_json)
DB_ROOT_USER = dbcfgs['db_root_user']
- SQ_ROOT = os.environ['MY_SQROOT']
- SQENV_FILE = SQ_ROOT + '/sqenvcom.sh'
- TRAF_AUTH_CONFIG = '%s/sql/scripts/.traf_authentication_config' % SQ_ROOT
+ MY_SQROOT = os.environ['MY_SQROOT']
+ SQENV_FILE = MY_SQROOT + '/sqenvcom.sh'
+ TRAF_AUTH_CONFIG = '%s/sql/scripts/.traf_authentication_config' % MY_SQROOT
TRAF_AUTH_TEMPLATE = '%s/traf_authentication_conf.template' % TMP_DIR
# set traf_authentication_config file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/traf_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_setup.py b/install/python-installer/traf_setup.py
index 91d0faa..828f78b 100755
--- a/install/python-installer/traf_setup.py
+++ b/install/python-installer/traf_setup.py
@@ -34,11 +34,11 @@ def run():
TRAF_HOME = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
TRAF_USER = dbcfgs['traf_user']
- SQ_ROOT = '%s/%s/%s-%s' % (TRAF_HOME, TRAF_USER, dbcfgs['traf_basename'], dbcfgs['traf_version'])
+ MY_SQROOT = '%s/%s/%s-%s' % (TRAF_HOME, TRAF_USER, dbcfgs['traf_basename'], dbcfgs['traf_version'])
TRAF_VER = dbcfgs['traf_version']
DISTRO = dbcfgs['distro']
- TRAF_LIB_PATH = SQ_ROOT + '/export/lib'
+ TRAF_LIB_PATH = MY_SQROOT + '/export/lib'
SCRATCH_LOCS = dbcfgs['scratch_locs'].split(',')
SUDOER_FILE = '/etc/sudoers.d/trafodion'
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/traf_sqconfig.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_sqconfig.py b/install/python-installer/traf_sqconfig.py
index b329155..8da6377 100755
--- a/install/python-installer/traf_sqconfig.py
+++ b/install/python-installer/traf_sqconfig.py
@@ -35,9 +35,9 @@ def run():
scratch_locs = dbcfgs['scratch_locs'].split(',')
# this script is running by trafodion user, so get sqroot from env
- sq_root = os.environ['MY_SQROOT']
- if sq_root == '': err('SQ_ROOT var is empty')
- sqconfig_file = sq_root + '/sql/scripts/sqconfig'
+ MY_SQROOT = os.environ['MY_SQROOT']
+ if MY_SQROOT == '': err('MY_SQROOT var is empty')
+ sqconfig_file = MY_SQROOT + '/sql/scripts/sqconfig'
core, processor = run_cmd("lscpu|grep -E '(^CPU\(s\)|^Socket\(s\))'|awk '{print $2}'").split('\n')[:2]
core = int(core)-1 if int(core) <= 256 else 255
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fbb465ae/install/python-installer/traf_user.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_user.py b/install/python-installer/traf_user.py
index 28e2c81..01c1c50 100755
--- a/install/python-installer/traf_user.py
+++ b/install/python-installer/traf_user.py
@@ -45,7 +45,7 @@ def run():
TRAF_GROUP = TRAF_USER
TRAF_HOME = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
TRAF_USER_DIR = '%s/%s' % (TRAF_HOME, TRAF_USER)
- SQ_ROOT = '%s/%s-%s' % (TRAF_USER_DIR, dbcfgs['traf_basename'], dbcfgs['traf_version'])
+ MY_SQROOT = '%s/%s-%s' % (TRAF_USER_DIR, dbcfgs['traf_basename'], dbcfgs['traf_version'])
KEY_FILE = '/tmp/id_rsa'
AUTH_KEY_FILE = '%s/.ssh/authorized_keys' % TRAF_USER_DIR
@@ -84,7 +84,7 @@ def run():
nodes = dbcfgs['node_list'].split(',')
change_items = {
'{{ java_home }}': dbcfgs['java_home'],
- '{{ sq_home }}': SQ_ROOT,
+ '{{ my_sqroot }}': MY_SQROOT,
'{{ hadoop_type }}': hadoop_type,
'{{ node_list }}': ' '.join(nodes),
'{{ node_count }}': str(len(nodes)),
[04/10] incubator-trafodion git commit: convert all MY_SQROOT to
TRAF_HOME
Posted by li...@apache.org.
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
[08/10] incubator-trafodion git commit: Merge branch 'master' of
https://github.com/apache/incubator-trafodion
Posted by li...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-trafodion
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b4c7c814
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b4c7c814
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b4c7c814
Branch: refs/heads/master
Commit: b4c7c81488c5e6f867d3c3d8c5b9108209eee714
Parents: 0d467ca a61e6bc
Author: Eason <hf...@gmail.com>
Authored: Fri Dec 9 12:39:57 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Fri Dec 9 12:39:57 2016 +0800
----------------------------------------------------------------------
.rat-excludes | 3 +-
core/Makefile | 6 +-
core/conn/odbc/src/odbc/Common/QSData.cpp | 17 +
core/conn/odbc/src/odbc/Common/QSData.h | 33 +
core/conn/trafci/.gitignore | 6 +
core/conn/trafci/Makefile | 37 +
core/conn/trafci/install/Installer.java | 3389 --------------
core/conn/trafci/install/Installer.java-tmpl | 3389 ++++++++++++++
core/conn/trafci/installer_pom.xml | 106 +
core/conn/trafci/pom.xml | 114 +
.../org/trafodion/ci/AWTExceptionHandler.java | 36 +
.../main/java/org/trafodion/ci/CSVDisplay.java | 90 +
.../src/main/java/org/trafodion/ci/Column.java | 131 +
.../java/org/trafodion/ci/ConditionalQuery.java | 435 ++
.../trafodion/ci/ConditionalQueryException.java | 43 +
.../trafodion/ci/ConditionalSyntaxError.java | 123 +
.../java/org/trafodion/ci/ConsoleReader.java | 218 +
.../java/org/trafodion/ci/ConsoleWriter.java | 130 +
.../java/org/trafodion/ci/DatabaseQuery.java | 1804 ++++++++
.../src/main/java/org/trafodion/ci/Display.java | 68 +
.../trafodion/ci/DuplicateParamException.java | 40 +
.../main/java/org/trafodion/ci/ErrorObject.java | 103 +
.../src/main/java/org/trafodion/ci/FCQuery.java | 334 ++
.../main/java/org/trafodion/ci/FileReader.java | 176 +
.../main/java/org/trafodion/ci/FileWriter.java | 80 +
.../main/java/org/trafodion/ci/HTMLDisplay.java | 80 +
.../main/java/org/trafodion/ci/HTMLObject.java | 628 +++
.../main/java/org/trafodion/ci/HelpIndexer.java | 134 +
.../src/main/java/org/trafodion/ci/Helper.java | 225 +
.../main/java/org/trafodion/ci/HostQuery.java | 289 ++
.../main/java/org/trafodion/ci/IDisplay.java | 28 +
.../main/java/org/trafodion/ci/IndexStruct.java | 55 +
.../java/org/trafodion/ci/InterfaceQuery.java | 4378 ++++++++++++++++++
.../trafodion/ci/InterfaceQueryException.java | 35 +
.../org/trafodion/ci/InterfaceSyntaxError.java | 83 +
.../trafodion/ci/InvalidNumberOfArguments.java | 35 +
.../main/java/org/trafodion/ci/JDBCVproc.java | 38 +
.../java/org/trafodion/ci/LFProperties.java | 130 +
.../java/org/trafodion/ci/MaskingThread.java | 73 +
.../java/org/trafodion/ci/MultiByteUtils.java | 56 +
.../org/trafodion/ci/NullKeyWordException.java | 35 +
.../org/trafodion/ci/OutputColumnAttribute.java | 47 +
.../java/org/trafodion/ci/OutputContents.java | 144 +
.../main/java/org/trafodion/ci/ParallelRun.java | 1320 ++++++
.../org/trafodion/ci/ParamStringObject.java | 256 +
.../java/org/trafodion/ci/ParseArguments.java | 660 +++
.../src/main/java/org/trafodion/ci/Parser.java | 1195 +++++
.../ci/ParserMissingParamException.java | 42 +
.../trafciDefaultLookAndFeel.properties | 60 +
.../main/java/org/trafodion/ci/PrunSummary.java | 119 +
.../org/trafodion/ci/PrunUserInterruption.java | 34 +
.../java/org/trafodion/ci/PythonInterface.java | 180 +
.../src/main/java/org/trafodion/ci/Query.java | 188 +
.../main/java/org/trafodion/ci/QueryUtils.java | 37 +
.../java/org/trafodion/ci/QueryWrapper.java | 700 +++
.../main/java/org/trafodion/ci/RawDisplay.java | 189 +
.../src/main/java/org/trafodion/ci/Reader.java | 286 ++
.../java/org/trafodion/ci/RepObjInterface.java | 27 +
.../java/org/trafodion/ci/ReplacementObj.java | 39 +
.../org/trafodion/ci/ScriptSectionNotFound.java | 34 +
.../java/org/trafodion/ci/ScriptsInterface.java | 153 +
.../src/main/java/org/trafodion/ci/Session.java | 1908 ++++++++
.../java/org/trafodion/ci/SessionDefaults.java | 342 ++
.../java/org/trafodion/ci/SessionError.java | 181 +
.../java/org/trafodion/ci/SessionInterface.java | 1487 ++++++
.../org/trafodion/ci/SessionTimeoutTask.java | 93 +
.../src/main/java/org/trafodion/ci/SqlEnum.java | 83 +
.../java/org/trafodion/ci/StatusThread.java | 100 +
.../org/trafodion/ci/TerminalProcessBridge.java | 246 +
.../trafodion/ci/UnKnownInterfaceCommand.java | 34 +
.../java/org/trafodion/ci/UserInterface.java | 421 ++
.../java/org/trafodion/ci/UserInterruption.java | 36 +
.../src/main/java/org/trafodion/ci/Utils.java | 381 ++
.../java/org/trafodion/ci/ValidateQuery.java | 412 ++
.../org/trafodion/ci/ValidationException.java | 39 +
.../main/java/org/trafodion/ci/Vproc.java-tmpl | 36 +
.../main/java/org/trafodion/ci/WCIUtils.java | 122 +
.../src/main/java/org/trafodion/ci/Writer.java | 418 ++
.../main/java/org/trafodion/ci/XMLDisplay.java | 75 +
.../main/java/org/trafodion/ci/XMLObject.java | 607 +++
.../org/trafodion/ci/help/common_common.help | 457 ++
.../java/org/trafodion/ci/help/help_file.idx | 30 +
.../java/org/trafodion/ci/help/sql_common.help | 376 ++
.../org/trafodion/ci/pwdencrypt/ArgMap.java | 61 +
.../org/trafodion/ci/pwdencrypt/ArgsDef.java | 74 +
.../trafodion/ci/pwdencrypt/EncryptUtil.java | 249 +
.../java/org/trafodion/ci/pwdencrypt/JCE.java | 414 ++
.../trafodion/ci/pwdencrypt/PasswordOpts.java | 292 ++
.../org/trafodion/ci/pwdencrypt/RefLookup.java | 127 +
.../org/trafodion/ci/pwdencrypt/WorkTypes.java | 55 +
.../trafci/src/main/resources/install_jar.xml | 71 +
.../trafci/src/main/resources/install_tar.xml | 51 +
.../trafci/src/main/resources/trafci.properties | 5 +
.../org/trafodion/ci/AWTExceptionHandler.java | 36 -
.../trafci/src/org/trafodion/ci/CSVDisplay.java | 90 -
.../trafci/src/org/trafodion/ci/Column.java | 131 -
.../src/org/trafodion/ci/ConditionalQuery.java | 435 --
.../trafodion/ci/ConditionalQueryException.java | 43 -
.../trafodion/ci/ConditionalSyntaxError.java | 123 -
.../src/org/trafodion/ci/ConsoleReader.java | 218 -
.../src/org/trafodion/ci/ConsoleWriter.java | 130 -
.../src/org/trafodion/ci/DatabaseQuery.java | 1804 --------
.../trafci/src/org/trafodion/ci/Display.java | 68 -
.../trafodion/ci/DuplicateParamException.java | 40 -
.../src/org/trafodion/ci/ErrorObject.java | 103 -
.../trafci/src/org/trafodion/ci/FCQuery.java | 334 --
.../trafci/src/org/trafodion/ci/FileReader.java | 176 -
.../trafci/src/org/trafodion/ci/FileWriter.java | 80 -
.../src/org/trafodion/ci/HTMLDisplay.java | 80 -
.../trafci/src/org/trafodion/ci/HTMLObject.java | 628 ---
.../src/org/trafodion/ci/HelpIndexer.java | 134 -
.../trafci/src/org/trafodion/ci/Helper.java | 225 -
.../trafci/src/org/trafodion/ci/HostQuery.java | 289 --
.../trafci/src/org/trafodion/ci/IDisplay.java | 28 -
.../src/org/trafodion/ci/IndexStruct.java | 55 -
.../src/org/trafodion/ci/InterfaceQuery.java | 4378 ------------------
.../trafodion/ci/InterfaceQueryException.java | 35 -
.../org/trafodion/ci/InterfaceSyntaxError.java | 83 -
.../trafodion/ci/InvalidNumberOfArguments.java | 35 -
.../trafci/src/org/trafodion/ci/JDBCVproc.java | 38 -
.../src/org/trafodion/ci/LFProperties.java | 130 -
.../src/org/trafodion/ci/MaskingThread.java | 73 -
.../src/org/trafodion/ci/MultiByteUtils.java | 56 -
.../org/trafodion/ci/NullKeyWordException.java | 35 -
.../org/trafodion/ci/OutputColumnAttribute.java | 47 -
.../src/org/trafodion/ci/OutputContents.java | 144 -
.../src/org/trafodion/ci/ParallelRun.java | 1320 ------
.../src/org/trafodion/ci/ParamStringObject.java | 256 -
.../src/org/trafodion/ci/ParseArguments.java | 660 ---
.../trafci/src/org/trafodion/ci/Parser.java | 1195 -----
.../ci/ParserMissingParamException.java | 42 -
.../trafciDefaultLookAndFeel.properties | 60 -
.../src/org/trafodion/ci/PrunSummary.java | 119 -
.../org/trafodion/ci/PrunUserInterruption.java | 34 -
.../src/org/trafodion/ci/PythonInterface.java | 180 -
.../conn/trafci/src/org/trafodion/ci/Query.java | 188 -
.../trafci/src/org/trafodion/ci/QueryUtils.java | 37 -
.../src/org/trafodion/ci/QueryWrapper.java | 700 ---
.../trafci/src/org/trafodion/ci/RawDisplay.java | 189 -
.../trafci/src/org/trafodion/ci/Reader.java | 286 --
.../src/org/trafodion/ci/RepObjInterface.java | 27 -
.../src/org/trafodion/ci/ReplacementObj.java | 39 -
.../org/trafodion/ci/ScriptSectionNotFound.java | 34 -
.../src/org/trafodion/ci/ScriptsInterface.java | 153 -
.../trafci/src/org/trafodion/ci/Session.java | 1908 --------
.../src/org/trafodion/ci/SessionDefaults.java | 342 --
.../src/org/trafodion/ci/SessionError.java | 181 -
.../src/org/trafodion/ci/SessionInterface.java | 1487 ------
.../org/trafodion/ci/SessionTimeoutTask.java | 93 -
.../trafci/src/org/trafodion/ci/SqlEnum.java | 83 -
.../src/org/trafodion/ci/StatusThread.java | 100 -
.../org/trafodion/ci/TerminalProcessBridge.java | 246 -
.../trafodion/ci/UnKnownInterfaceCommand.java | 34 -
.../src/org/trafodion/ci/UserInterface.java | 421 --
.../src/org/trafodion/ci/UserInterruption.java | 36 -
.../conn/trafci/src/org/trafodion/ci/Utils.java | 381 --
.../src/org/trafodion/ci/ValidateQuery.java | 412 --
.../org/trafodion/ci/ValidationException.java | 39 -
.../conn/trafci/src/org/trafodion/ci/Vproc.java | 36 -
.../trafci/src/org/trafodion/ci/WCIUtils.java | 122 -
.../trafci/src/org/trafodion/ci/Writer.java | 418 --
.../trafci/src/org/trafodion/ci/XMLDisplay.java | 75 -
.../trafci/src/org/trafodion/ci/XMLObject.java | 607 ---
.../org/trafodion/ci/help/common_common.help | 457 --
.../src/org/trafodion/ci/help/help_file.idx | 30 -
.../src/org/trafodion/ci/help/sql_common.help | 376 --
.../src/org/trafodion/ci/pwdencrypt/ArgMap.java | 61 -
.../org/trafodion/ci/pwdencrypt/ArgsDef.java | 74 -
.../trafodion/ci/pwdencrypt/EncryptUtil.java | 249 -
.../src/org/trafodion/ci/pwdencrypt/JCE.java | 414 --
.../trafodion/ci/pwdencrypt/PasswordOpts.java | 292 --
.../org/trafodion/ci/pwdencrypt/RefLookup.java | 127 -
.../org/trafodion/ci/pwdencrypt/WorkTypes.java | 55 -
.../org/trafodion/ci/UserInterfaceTest.java | 116 +
core/sqf/sql/scripts/analyzeMessageGuide.py | 656 +++
core/sqf/src/seatrans/hbase-trx/pp.awk | 152 +-
.../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 212 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 103 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.h | 11 +-
core/sqf/src/tm/macros.gmk | 2 +-
core/sqf/sysinstall/etc/init.d/trafodion | 131 +
core/sql/bin/SqlciErrors.txt | 28 +-
core/sql/common/ComJSON.cpp | 1175 +++++
core/sql/common/ComJSON.h | 159 +
core/sql/common/ComJSONFuncs.cpp | 793 ++++
core/sql/common/ComJSONStringInfo.cpp | 297 ++
core/sql/common/ComJSONStringInfo.h | 176 +
core/sql/common/NAString.cpp | 1 +
core/sql/common/OperTypeEnum.h | 2 +
core/sql/exp/ExpErrorEnums.h | 16 +
core/sql/exp/ExpPackDefs.cpp | 6 +
core/sql/exp/exp_clause.cpp | 9 +
core/sql/exp/exp_clause.h | 3 +-
core/sql/exp/exp_function.cpp | 105 +
core/sql/exp/exp_function.h | 22 +
core/sql/generator/GenItemFunc.cpp | 7 +
core/sql/nskgmake/common/Makefile | 3 +
core/sql/optimizer/BindItemExpr.cpp | 5 +-
core/sql/optimizer/ItemExpr.cpp | 14 +-
core/sql/optimizer/SynthType.cpp | 24 +
core/sql/parser/ParKeyWords.cpp | 3 +-
core/sql/parser/sqlparser.y | 7 +
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 12 +-
dcs/src/test/odbc/README.txt | 47 +
dcs/src/test/odbc/build/Makefile | 43 +
dcs/src/test/odbc/build/odbc.vcxproj | 157 +
dcs/src/test/odbc/build/odbc.vcxproj.filters | 40 +
dcs/src/test/odbc/src/Main.cpp | 57 +
dcs/src/test/odbc/src/common/Global.cpp | 116 +
dcs/src/test/odbc/src/common/Global.h | 60 +
dcs/src/test/odbc/src/common/TestBase.cpp | 263 ++
dcs/src/test/odbc/src/common/TestBase.h | 55 +
.../src/test/varchar32k/LargeVarcharCol.cpp | 2639 +++++++++++
.../odbc/src/test/varchar32k/LargeVarcharCol.h | 52 +
.../src/asciidoc/_chapters/ddl_msgs.adoc | 181 +-
install/python-installer/traf_setup.py | 3 +
licenses/lic-server-src | 29 +-
217 files changed, 36511 insertions(+), 28666 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b4c7c814/core/Makefile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b4c7c814/core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java
----------------------------------------------------------------------
diff --cc core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java
index 0000000,ac22141..0638b79
mode 000000,100644..100644
--- a/core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java
+++ b/core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java
@@@ -1,0 -1,421 +1,421 @@@
+ // @@@ START COPYRIGHT @@@
+ //
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements. See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership. The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License. You may obtain a copy of the License at
+ //
+ // http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied. See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
+ //
+ // @@@ END COPYRIGHT @@@
+
+ package org.trafodion.ci;
+
+ import java.io.File;
+ import java.io.FileInputStream;
+ import java.io.FileNotFoundException;
+ import java.io.IOException;
+ import java.net.UnknownHostException;
+ import java.sql.SQLException;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Enumeration;
+ import java.util.List;
+ import java.util.Properties;
+
+ import org.trafodion.ci.pwdencrypt.RefLookup;
+
+
+ public class UserInterface {
+
+ static String[] myArgs = null;
+
+ /**
+ * Main program called when the user logins using the windows/*nux wrapper
+ * scripts. Creates a console reader & console write for interactive
+ * input/output from the user.
+ */
+ public static void main(String[] args) {
+ // create the console reader and writer objects
+ // for interactive session
+ ConsoleReader crObj = null;
+ ConsoleWriter cwObj = null;
+ myArgs = args;
+ int exitCode = 0;
+ boolean doTrace = Boolean.getBoolean(SessionDefaults.PROP_TRACE);
- String mySQRoot = System.getenv("MY_SQROOT");
++ String mySQRoot = System.getenv("TRAF_HOME");
+
+
+
+ /* handle AWT exceptions */
+ try {
+ Class.forName("org.trafodion.ci.AWTExceptionHandler");
+ System.setProperty("sun.awt.exception.handler",
+ AWTExceptionHandler.class.getName());
+ } catch (Throwable t) {
+ if (doTrace)
+ t.printStackTrace();
+ }
+
+ cwObj = new ConsoleWriter();
+
+ try {
+ cwObj.initialize();
+ } catch (IOException e1) {
+ System.out.println(SessionError.CONSOLE_WRITER_ERR.errorMessage()
+ + e1);
+ if (doTrace)
+ e1.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ }
+ crObj = new ConsoleReader();
+
+ try {
+ crObj.initialize();
+ } catch (IOException e1) {
+ System.out.println(SessionError.CONSOLE_READER_ERR.errorMessage()
+ + e1);
+ if (doTrace)
+ e1.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ }
+
+ banner();
+
+ // parse the arguments
+ ParseArguments paObj = new ParseArguments(crObj, cwObj);
+
+ // set default value to rolename
+ paObj.roleName = "";
+
+ paObj.setDefaults(SessionDefaults.dsnName, SessionDefaults.portNumber);
+
+
+ if ( args.length %2 == 0 && mySQRoot != null && new File(mySQRoot).exists()) {
+ String uname=null, passwd = null, hostname = null, portNumber = null;
+ //EncryptUtil eu = new EncryptUtil();
+ Properties p = new Properties();
+ String matchedValue = null;
+ List<String> argsList= new ArrayList<String>(Arrays.asList(args));
+ int argLength=argsList.size();
+
+ for (int i=0;i < argLength; i++)
+ {
+ String option=args[i++].trim();
+ String value=args[i].trim();
+
+ if (option.equalsIgnoreCase("-u")|| option.equalsIgnoreCase("-user"))
+ {
+ uname=value;
+ }
+ else if (option.equalsIgnoreCase("-p")|| option.equalsIgnoreCase("-password"))
+ {
+ passwd=value;
+ }
+ else if (option.equalsIgnoreCase("-h")|| option.equalsIgnoreCase("-host"))
+ {
+ String[] hostAddr=value.split(":");
+ if (hostAddr.length > 0)
+ hostname=hostAddr[0];
+
+ String portValue="";
+
+ for (int j=1; j < hostAddr.length;j++)
+ {
+ portValue+=":"+hostAddr[j];
+ }
+ if (portValue.length() > 0)
+ {
+ portNumber=portValue;
+ }
+
+ }
+ }
+
+ try
+ {
+
+ if (uname != null)
+ {
+ paObj.userName = uname;
+ }
+ else
+ {
+ paObj.userName = System.getProperty("user.name");
+ }
+
+ if (passwd != null)
+ {
+ paObj.password = passwd;
+ }
+ else
+ {
+ String userHome = System.getenv("USERHOME");//System.getProperty("user.dir");
+ if (userHome != null)
+ {
+ File f = new File(userHome + "/.trafciconf/encprops.txt");
+ if (f.exists())
+ {
+ try
+ {
+ p.load(new FileInputStream(f));
+ Enumeration<?> enumKeys = p.keys();
+ while (enumKeys.hasMoreElements())
+ {
+ uname=enumKeys.nextElement().toString();
+ if (uname.equals(paObj.userName)){
+ matchedValue = p.getProperty(uname);
+ if (matchedValue != null)
+ {
+ passwd = RefLookup.resolve(uname+" = "+matchedValue);
+ break;
+ }
+ }
+ }
+
+ paObj.password = passwd;
+ }
+ catch(Exception e)
+ {
+ System.out.println("Error looking up user's password.");
+ if (doTrace)
+ {
+ System.out.println(e.getMessage());
+ }
+ }
+ }
+ }
+ }
+
+ if (hostname != null)
+ {
+ paObj.serverName = hostname;
+ }
+ else
+ {
+ String serverName = System.getenv("TRAFCI_SERVERNAME");
+ if (serverName == null)
+ {
+ //System.out.println("Can't obtain hostname, please enter hostname:port");
+ //System.exit(SessionDefaults.abruptExit);
+ }
+ else
+ paObj.serverName = serverName;
+ }
+
+ if (portNumber != null)
+ {
+ paObj.portNumber = portNumber;
+ }
+ else
+ {
+ String portName = System.getenv("TRAFCI_PORT");
+ if (portName == null)
+ {
+ //System.out.println("Can't obtain port number, please enter hostname:port");
+ //System.exit(SessionDefaults.abruptExit);
+ }
+ paObj.portNumber = portName;
+ }
+
+ if (paObj.serverName != null && paObj.portNumber != null)
+ System.out.println("Host Name/IP Address: "+paObj.serverName+paObj.portNumber);
+ if (paObj.userName != null)
+ System.out.println("User Name: "+paObj.userName);
+
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ }
+
+ while (paObj.retryCnt > 0) {
+
+ try {
+ // validate the user credentials
+ myArgs = paObj.validateArgs(myArgs, true);
+ } catch (UserInterruption ui) {
+ System.exit(SessionDefaults.abruptExit);
+ } catch (InvalidNumberOfArguments e) {
+ System.out.println(e);
+ if (doTrace)
+ e.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ } catch (UnknownHostException e) {
+ if (doTrace)
+ e.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ } catch (IOException e) {
+ System.out.println(e);
+ if (doTrace)
+ e.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ }
+
+ // create a new session
+ // pass the required credentials details and caller id
+ // for this user interface the caller id will be USERI
+ // A session object is returned by SessionInterface
+ // with the required DB connection, writer and reader objects
+ SessionInterface siObj = new SessionInterface(crObj, cwObj);
+ Session sessObj = null;
+ try {
+ // set the script file if -script option is specified
+ siObj.setScriptFile(paObj.fileName);
+ sessObj = siObj.createSession(paObj.userName,
+ paObj.roleName, paObj.password, paObj.serverName,
+ paObj.portNumber, paObj.dsnName, SessionDefaults.USERI,
+ paObj.noConnectOption);
+
+ // DFM MXCI Migration Settings
+ if (paObj.dfm) {
+ sessObj.setSessView(SessionDefaults.MXCI_VIEW);
+ sessObj.setSessionPrompt(">>");
+ sessObj.setCmdEcho(true);
+ }
+
+ // All credentials are valid, do not prompt for login params
+ // again.
+ paObj.retryCnt = 0;
+
+ // set the mode to query mode if the -sql|-q is option is
+ // specified
+ // show the welcome banner only when the session is interactive
+ // mode ( non-query mode)
+ if (paObj.queryStr != null) {
+ siObj.setQueryOptions(true, paObj.queryStr);
+ } else {
+ System.out.println();
+ if (paObj.noConnectOption)
+ System.out.println("Not connected.");
+ else
+ System.out.println("Connected to " + sessObj.getDatabaseEdition());
+
+ }
+
+ // call the session
+ exitCode = siObj.invokeSession(sessObj);
+ siObj = null;
+ } catch (FileNotFoundException e) {
+ // thrown when the script file specified in the command line is
+ // not found
+ System.out.println();
+ System.out.println(SessionError.SCRIPT_FILE_NOT_FOUND);
+ if (doTrace)
+ e.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ } catch (SQLException sqle) {
+ if (doTrace) {
+ System.out.println("Caught a SQL exception. Error code = "
+ + sqle.getErrorCode() + ", msg="
+ + sqle.getMessage());
+ sqle.printStackTrace();
+ }
+
+ System.out.println();
+
+ // catch the known errors report them with an user friendly text
+ if (sqle.getErrorCode() == SessionDefaults.SQL_ERR_CONN_MAX_LIMIT) {
+ System.out.println(SessionError.CONN_MAX_LIMIT_ERR);
+ if (doTrace)
+ sqle.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ } else {
+ int errCode = sqle.getErrorCode();
+ String errStr = sqle.toString();
+
+ if (errStr.indexOf("org.trafodion.jdbc") != -1)
+ errStr = errStr.substring(errStr.indexOf(":") + 1)
+ .trim();
+
+ if (errStr.startsWith("***"))
+ System.out.println(errStr
+ + SessionDefaults.lineSeperator);
+ else
+ System.out.println(SessionError.ERROR_CODE_PREFIX
+ + Math.abs(errCode)
+ + SessionError.ERROR_CODE_SUFFIX + " " + errStr
+ + SessionDefaults.lineSeperator);
+
+ // identify those args that caused the exception
+ if (SessionDefaults.SQL_ERR_INVALID_AUTH == errCode
+ || SessionDefaults.SQL_ERR_CLI_AUTH == errCode) {
+ paObj.userName = null;
+ paObj.password = null;
+ paObj.roleName = null;
+ } else if (SessionDefaults.NDCS_ERR_DSN_NOT_AVAILABLE == errCode) {
+ paObj.dsnName = null;
+ } else {
+ paObj.serverName = null;
+ }
+
+ // rebuild args list and remove only those that caused the
+ // exception
+ myArgs = paObj.rebuildArgList(myArgs);
+
+ if (--paObj.retryCnt == 0) {
+ if (doTrace)
+ sqle.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ }
+ }
+
+ } // end SQLException
+ catch (InstantiationException e) {
+ System.out.println(SessionError.DRIVER_INIT_ERR);
+ if (doTrace)
+ e.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ } catch (IllegalAccessException e) {
+ System.out.println(SessionError.DRIVER_INIT_ILLEGAL_ERR);
+ if (doTrace)
+ e.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ } catch (ClassNotFoundException e) {
+ System.out.println(SessionError.DRIVER_CLASS_ERR);
+ if (doTrace)
+ e.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ } catch (IOException e) {
+ System.out.println(e);
+ if (doTrace)
+ e.printStackTrace();
+ System.exit(SessionDefaults.abruptExit);
+ } catch (Exception e) {
+ System.out.println(e);
+ //if (doTrace)
+ e.printStackTrace();
+ } finally {
+ if (sessObj != null && sessObj.getConnObj() != null) {
+ try {
+ sessObj.getConnObj().close();
+ } catch (SQLException e) {
+ }
+ }
+ }
+
+ siObj = null;
+ } // end while
+
+ System.exit(exitCode);
+
+ }
+
+ private static void banner() {
+ System.out.println("\nWelcome to " + SessionDefaults.PROD_NAME);
+ String copyright_str = "Copyright (c) "+System.getenv("PRODUCT_COPYRIGHT_HEADER");
+ System.out.println(copyright_str);
+ System.out.println();
+ }
+ }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b4c7c814/core/sqf/src/tm/macros.gmk
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b4c7c814/install/python-installer/traf_setup.py
----------------------------------------------------------------------
[03/10] incubator-trafodion git commit: convert all MY_SQROOT to
TRAF_HOME
Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index cbfb860..ba33e2a 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -3594,7 +3594,7 @@ NABoolean HSGlobalsClass::isAuthorized(NABoolean isShowStats)
// the fully-qualified table names.
void HSGlobalsClass::initJITLogData()
{
- char* sqroot = getenv("MY_SQROOT");
+ char* sqroot = getenv("TRAF_HOME");
if (!sqroot)
return;
@@ -3665,7 +3665,7 @@ void HSGlobalsClass::startJitLogging(const char* checkPointName, Int64 elapsedSe
XPROCESSHANDLE_DECOMPOSE_(&procHandle, &nodeNum, &pin);
NAString filePath;
- char* sqroot = getenv("MY_SQROOT");
+ char* sqroot = getenv("TRAF_HOME");
if (sqroot)
{
filePath = sqroot;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sql/ustat/stats_profile
----------------------------------------------------------------------
diff --git a/core/sql/ustat/stats_profile b/core/sql/ustat/stats_profile
index 3a93964..a385622 100644
--- a/core/sql/ustat/stats_profile
+++ b/core/sql/ustat/stats_profile
@@ -112,10 +112,10 @@ elif [ $LINUX -ne 1 ]; then
MXCI=sqlci
else
# SQ
- LOG=$MY_SQROOT/tmp/USTATS_PROFILE_LOG
- LOADFILE=$MY_SQROOT/tmp/USTATS_PROFILE_LOAD
+ LOG=$TRAF_HOME/tmp/USTATS_PROFILE_LOG
+ LOADFILE=$TRAF_HOME/tmp/USTATS_PROFILE_LOAD
export SQLMX_TERMINAL_CHARSET=UTF8
- MXCI=$MY_SQROOT/export/bin32/sqlci
+ MXCI=$TRAF_HOME/export/bin32/sqlci
fi
# start logging
@@ -238,7 +238,7 @@ if [[ $RUN = TRUE ]]; then
STARTTIME=`date`
if [ $LINUX -eq 1 ]; then
- sh $MY_SQROOT/export/lib/mx_ustat/USAS.sh;
+ sh $TRAF_HOME/export/lib/mx_ustat/USAS.sh;
elif [[ $mxcidir != "" ]]; then
$mxcidir/USAS.sh;
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/Makefile
----------------------------------------------------------------------
diff --git a/dcs/Makefile b/dcs/Makefile
index 93398ea..76c64b9 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -40,7 +40,7 @@ build_all: build_chk
build_chk:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
clean:
-$(MAVEN) clean | grep ERROR
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/bin/dcs
----------------------------------------------------------------------
diff --git a/dcs/bin/dcs b/dcs/bin/dcs
index 84246d0..1c91600 100755
--- a/dcs/bin/dcs
+++ b/dcs/bin/dcs
@@ -112,8 +112,8 @@ IFS=
# CLASSPATH initially contains $DCS_CONF_DIR
CLASSPATH="${DCS_CONF_DIR}"
-if [ "$MY_SQROOT" != "" ]; then
- CLASSPATH=${CLASSPATH}:${MY_SQROOT}/export/lib/jdbcT2.jar
+if [ "$TRAF_HOME" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${TRAF_HOME}/export/lib/jdbcT2.jar
fi
CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
@@ -192,9 +192,9 @@ function append_path() {
JAVA_PLATFORM=""
#If avail, add Trafodion to the JAVA_LIBRARY_PATH
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib$SQ_MBTYPE/libseabasesig.so;
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib$SQ_MBTYPE/libseabasesig.so;
fi
fi
@@ -277,7 +277,7 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
fi
DCS_OPTS="$DCS_OPTS -Ddcs.user.program.home=$DCS_USER_PROGRAM_HOME"
DCS_OPTS="$DCS_OPTS -Ddcs.conf.dir=$DCS_CONF_DIR"
-DCS_OPTS="$DCS_OPTS -Ddcs.trafodion.home=$MY_SQROOT"
+DCS_OPTS="$DCS_OPTS -Ddcs.trafodion.home=$TRAF_HOME"
# Exec unless DCS_NOEXEC is set.
if [ "${DCS_NOEXEC}" != "" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/bin/dcs-config.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/dcs-config.sh b/dcs/bin/dcs-config.sh
index aec9e57..bff96fa 100755
--- a/dcs/bin/dcs-config.sh
+++ b/dcs/bin/dcs-config.sh
@@ -84,9 +84,9 @@ if [ -f "${DCS_CONF_DIR}/dcs-env.sh" ]; then
fi
# Source in sqenv.sh.
-if [ -f "${MY_SQROOT}/sqenv.sh" ]; then
+if [ -f "${TRAF_HOME}/sqenv.sh" ]; then
savedir=`pwd`
- cd $MY_SQROOT
+ cd $TRAF_HOME
. sqenv.sh
cd $savedir
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/conf/dcs-env.sh
----------------------------------------------------------------------
diff --git a/dcs/conf/dcs-env.sh b/dcs/conf/dcs-env.sh
index ed62636..0365fac 100644
--- a/dcs/conf/dcs-env.sh
+++ b/dcs/conf/dcs-env.sh
@@ -31,8 +31,8 @@
# export JAVA_HOME=/usr/java/jdk1.7.0/
# Add Trafodion to the classpath
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
export DCS_CLASSPATH=${CLASSPATH}:
fi
fi
@@ -110,4 +110,4 @@ export DCS_OPTS="-XX:+UseConcMarkSweepGC"
# export DCS_MANAGES_ZK=true
# Tell DCS where the user program environment lives.
- export DCS_USER_PROGRAM_HOME=$MY_SQROOT
+ export DCS_USER_PROGRAM_HOME=$TRAF_HOME
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/genvers
----------------------------------------------------------------------
diff --git a/dcs/genvers b/dcs/genvers
index d2bc305..75d2b55 100755
--- a/dcs/genvers
+++ b/dcs/genvers
@@ -21,4 +21,4 @@
# @@@ END COPYRIGHT @@@
CV_VERS=1.0.1
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
+$TRAF_HOME/export/include/SCMBuildJava.sh $CV_VERS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/src/main/asciidoc/_chapters/configuration.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/configuration.adoc b/dcs/src/main/asciidoc/_chapters/configuration.adoc
index bdb8294..39180c6 100644
--- a/dcs/src/main/asciidoc/_chapters/configuration.adoc
+++ b/dcs/src/main/asciidoc/_chapters/configuration.adoc
@@ -142,7 +142,7 @@ See section <<zookeeper,Zookeeper>> for ZooKeeper setup for DCS.
=== Running and Confirming Your Installation
Make sure Trafodion is running first. Start and stop the Trafodion instance by running _sqstart.sh_ over in the
-`MY_SQROOT/sql/scripts` directory. You can ensure it started properly by testing with _sqcheck_.
+`TRAF_HOME/sql/scripts` directory. You can ensure it started properly by testing with _sqcheck_.
If you are managing your own ZooKeeper, start it and confirm its running else, DCS will start up ZooKeeper
for you as part of its start process.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/src/main/asciidoc/_chapters/getting_started.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/getting_started.adoc b/dcs/src/main/asciidoc/_chapters/getting_started.adoc
index f98a53b..405097c 100644
--- a/dcs/src/main/asciidoc/_chapters/getting_started.adoc
+++ b/dcs/src/main/asciidoc/_chapters/getting_started.adoc
@@ -59,7 +59,7 @@ Install _java_, edit _conf/dcs-env.sh_, uncommenting the `JAVA_HOME` line pointi
Is _Trafodion_ installed and running?
DCS presumes a _Trafodion_ instance is installed and running on your machine and available on your path; i.e. the
-`MY_SQROOT` is set and when you type _sqcheck_, you see output that confirms _Trafodion_ is running. If this is not
+`TRAF_HOME` is set and when you type _sqcheck_, you see output that confirms _Trafodion_ is running. If this is not
the case, DCS may start but you'll see many errors in the DcsServer logs related to user program startup.
At this point, you are ready to start DCS.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
index 3a65662..e44360f 100644
--- a/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
@@ -491,7 +491,7 @@ public final class ServerManager implements Callable {
+ Constants.DCS_SERVER_USER_PROGRAM
+ " is false. "
+ "Please add to your dcs-site.xml file and set <value>false</value> to <value>true</value>.";
- final String msg2 = "Environment variable $MY_SQROOT is not set.";
+ final String msg2 = "Environment variable $TRAF_HOME is not set.";
boolean ready = false;
while (!ready) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
index 8a45c07..5e9babf 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
@@ -91,7 +91,7 @@ public final class ServerManager implements Callable {
private String CLUSTERNAME;
private String HOME;
- private String MY_SQROOT;
+ private String TRAF_HOME;
private byte[] cert;
private String key;
private Integer data;
@@ -218,21 +218,21 @@ public final class ServerManager implements Callable {
}
private void featureCheck() throws IOException{
- String value = System.getenv("MY_SQROOT");
+ String value = System.getenv("TRAF_HOME");
if(value == null || value.length() == 0 ) {
- LOG.error("Environment variable $MY_SQROOT is not set.");
- throw new IOException("Environment variable $MY_SQROOT is not set.");
+ LOG.error("Environment variable $TRAF_HOME is not set.");
+ throw new IOException("Environment variable $TRAF_HOME is not set.");
}
- MY_SQROOT = value;
+ TRAF_HOME = value;
if(LOG.isDebugEnabled())
- LOG.info("Environment variable $MY_SQROOT is set [" + MY_SQROOT + "]");
+ LOG.info("Environment variable $TRAF_HOME is set [" + TRAF_HOME + "]");
}
private void getCertificate() throws IOException {
String path;
CLUSTERNAME = System.getenv("CLUSTERNAME");
if(CLUSTERNAME == null || CLUSTERNAME.length() == 0 ) {
- path = MY_SQROOT + "/sqcert/server.crt";
+ path = TRAF_HOME + "/sqcert/server.crt";
}
else {
HOME = System.getenv("HOME");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
index 1803045..1cc092c 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
@@ -46,7 +46,7 @@ The following table provides an overview of the different {project-name} managem
*Example: Start {project-name}*
```
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
sqstart
sqcheck
```
@@ -145,4 +145,4 @@ If processes are not running as expected, then:
If problems persist please review logs:
-* `$MY_SQROOT/logs`: {project-name} logs.
+* `$TRAF_HOME/logs`: {project-name} logs.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
index eb58b7d..7ce495f 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
@@ -121,11 +121,11 @@ object or operation, then you must enable security, which enforces authenticatio
[[enable-security-configuring-ldap-servers]]
=== Configuring LDAP Servers
To specify the LDAP server(s) to be used for authentication, you need to configure the text file `.traf_authentication_config`,
-located (by default) in `$MY_SQROOT/sql/scripts`. This file is a flat file, organized as a series of attribute/value pairs.
+located (by default) in `$TRAF_HOME/sql/scripts`. This file is a flat file, organized as a series of attribute/value pairs.
Details on all the attributes and values accepted in the authentication configuration file and how to configure alternate locations
can be found in <<enable-security-traf-authentication-config,.traf_authentication_config>> below.
-A sample template file is located in `$MY_SQROOT/sql/scripts/traf_authentication_config`.
+A sample template file is located in `$TRAF_HOME/sql/scripts/traf_authentication_config`.
Attributes and values in the authentication configuration file are separated with a colon immediately following the attribute name.
In general, white space is ignored but spaces may be relevant in some values. Attribute names are always case insensitive. Multiple
@@ -164,7 +164,7 @@ identifier specifiers. | `UniqueIdentifier: uid=,ou=users,dc=com`
• 2: TLS | `LDAPSSL: 2` +
+
If your LDAP server uses TLS you must specify a file containing the certificate used to encrypt the password. By default the {project-name} software
-looks for this file in `$MY_SQROOT/cacerts`, but you may specify a fully qualified filename, or set the environment variable `CACERTS_DIR` to another
+looks for this file in `$TRAF_HOME/cacerts`, but you may specify a fully qualified filename, or set the environment variable `CACERTS_DIR` to another
directory. To specify the file containing the certificate, you set the value of the attribute `TLS_CACERTFilename`, located in the Defaults section. +
+
*Example* +
@@ -181,7 +181,7 @@ There are additional optional attributes that can be used to customize {project-
<<enable-security-traf-authentication-config,.traf_authentication_config>> below.
You can test the authentication configuration file for syntactic errors using the `ldapconfigcheck` tool. If you have loaded the {project-name}
-environment (`sqenv.sh`), then the tool automatically checks the file at `$MY_SQROOT/sql/scripts/.traf_authentication_config`.
+environment (`sqenv.sh`), then the tool automatically checks the file at `$TRAF_HOME/sql/scripts/.traf_authentication_config`.
If not, you can specify the file to be checked.
*Example*
@@ -225,7 +225,7 @@ Authentication successful
{project-name} clients such as `trafci` encrypt the password before sending it to {project-name}. A self-signed certificate is used to encrypt the password.
The certificate and key are generated when the `sqgen` script is invoked. By default, the files `server.key` and `server.crt` are located
in `$HOME/sqcert`. If those files are not present and since {project-name} clients does not send unencrypted passwords, then you need to manually generate
-those files. To do so, run the script `sqcertgen` located in `$MY_SQROOT/sql/scripts`. The script runs `openssl` to generate the certificate and key.
+those files. To do so, run the script `sqcertgen` located in `$TRAF_HOME/sql/scripts`. The script runs `openssl` to generate the certificate and key.
To run openssl manually, follow the example:
@@ -267,7 +267,7 @@ then {project-name} uses the default location (`$HOME/sqcert`) and the default f
The `.traf_authentication_config` file is user to enable the Trafodion security features.
==== File Location
-By default, the {project-name} authentication configuration file is located in `$MY_SQROOT/sql/scripts/.traf_authentication_config`.
+By default, the {project-name} authentication configuration file is located in `$TRAF_HOME/sql/scripts/.traf_authentication_config`.
If you want to store the configuration file in a different location and/or use a different filename, then Trafodion supports environment
variables to specify the alternate location/name.
@@ -277,7 +277,7 @@ authentication configuration file.
If the environment variable is not set, then Trafodion next checks the variable `TRAFAUTH_CONFIGDIR`. If set, the value is prepended to
`.traf_authentication_config` and used as the Trafodion authentication file.
-If neither is set, Trafodion defaults to `$MY_SQROOT/sql/scripts/.traf_authentication_config`.
+If neither is set, Trafodion defaults to `$TRAF_HOME/sql/scripts/.traf_authentication_config`.
<<<
[[enable-security-template]]
@@ -285,7 +285,7 @@ If neither is set, Trafodion defaults to `$MY_SQROOT/sql/scripts/.traf_authentic
```
# To use authentication in Trafodion, this file must be configured
-# as described below and placed in $MY_SQROOT/sql/scripts and be named
+# as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config.
#
# NOTE: the format of this configuration file is expected to change in the
@@ -441,9 +441,9 @@ A fully qualified name is expected.
+
Filename `.traf_authentication_config/` is appended to the specified directory
-3. `MY_SQROOT`
+3. `TRAF_HOME`
+
-`/sql/scripts/.traf_authentication_config` is appended to the value of `MY_SQROOT`.
+`/sql/scripts/.traf_authentication_config` is appended to the value of `TRAF_HOME`.
<<<
[[enable-security-ldapconfigcheck-errors]]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
index 08246c6..bf34fb9 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
@@ -317,7 +317,7 @@ in the <<prepare,Prepare>> chapter, you record the following information.
| RENEW_LIFETIME | Kerberos ticket renewal lifetime for {project-name} principal | 7days
| REST_BUILD | Tar file containing the REST component. |
| SECURE_HADOOP | Indicates whether Hadoop has Kerberos enabled | Based on whether Kerberos is enabled for your Hadoop installation
-| MY_SQROOT | Target directory for the {project-name} software. | /home/trafodion/apache-trafodion-1.3.0-incubating-bin
+| TRAF_HOME | Target directory for the {project-name} software. | /home/trafodion/apache-trafodion-1.3.0-incubating-bin
| START | Whether to start {project-name} after install/upgrade. | Y
| SUSE_LINUX | Whether your installing {project-name} on SUSE Linux. | false
| TRAF_PACKAGE | The location of the {project-name} installation package tar file or core installation tar file. | /home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz
@@ -456,7 +456,7 @@ export HBASE="hbase"
# First time install : /home/trafodion/traf
# On Upgrade: /home/trafodion/traf_<date>
# By doing this the previous version will remain and allow for an easier rollback.
-export MY_SQROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+export TRAF_HOME="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
# Start Trafodion after install completes
export START="Y"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
index bf8fb3c..71034eb 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
@@ -177,7 +177,7 @@ distribution manager's REST API.
| RENEW_LIFETIME^2^ | Number times Kerberos ticket is for the Trafodion principal | 7days | Can be specified when Kerberos is enabled.
| REST_BUILD | Tar file containing the REST component. | None | Not needed if using a {project-name} package installation tar file.
| SECURE_HADOOP^2^ | Indicates whether Hadoop has enabled Kerberos | Y only if Kerberos enabled | Based on whether Kerberos is enabled for your Hadoop installation
-| MY_SQROOT | Target directory for the {project-name} software. | $HOME_DIR/trafodion | {project-name} is installed in this directory on all nodes in `$NODE_LIST`.
+| TRAF_HOME | Target directory for the {project-name} software. | $HOME_DIR/trafodion | {project-name} is installed in this directory on all nodes in `$NODE_LIST`.
| START | Whether to start {project-name} after install/upgrade. | N | Does not apply to Recipe-Based Provisioning.
| SUSE_LINUX | Whether your installing {project-name} on SUSE Linux. | false | Auto-detected by the {project-name} Installer.
| TRAF_KEYTAB^2^ | Name to use when specifying {project-name} keytab | based on distribution | Required if Kerberos is enabled.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
index 70d8faa..16c8f48 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
@@ -38,7 +38,7 @@ Do the following:
```
su trafodion
-cd $MY_SQROOT/sql/scripts or cds
+cd $TRAF_HOME/sql/scripts or cds
sqstop
exit
```
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
index 0f1dd31..f7cb54a 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
@@ -298,7 +298,7 @@ At a minimum, you need to change the following settings:
* `LOCAL_WORKDIR`
* `TRAF_PACKAGE`
-* `MY_SQROOT`
+* `TRAF_HOME`
*Example*
@@ -309,7 +309,7 @@ $ # Pre edit content
export LOCAL_WORKDIR="/home/centos/trafodion-installer/installer"
export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz"
-export MY_SQROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+export TRAF_HOME="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
$ # Use your favorite editor to modify my_config_2.0
$ emacs my_config_2.0
@@ -317,7 +317,7 @@ $ # Post edit changes
export LOCAL_WORKDIR="/home/centos/trafodion-installer-2.0/installer"
export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-2.0.0-incubating-bin.tar.gz"
-export MY_SQROOT="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
+export TRAF_HOME="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
```
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/src/site/markdown/architecture-overview.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/architecture-overview.md b/docs/src/site/markdown/architecture-overview.md
index 2619d3c..88e3281 100644
--- a/docs/src/site/markdown/architecture-overview.md
+++ b/docs/src/site/markdown/architecture-overview.md
@@ -80,7 +80,7 @@ For additional details, please refer to the [Trafodion Distributed Transaction M
The Trafodion Compiler translates SQL statements into query plans that can then be executed by the Trafodion execution engine, commonly called the Executor.
-The Compiler is a multi-pass compiler. Each pass transforms a representation of the SQL statement into a new or augmented representation which is input to the next pass. The sections below give more detail on each pass. The logic that calls each pass is in the CmpMain class, method CmpMain::compile. You can find that logic in file $MY_SQROOT/sql/sqlcomp/CmpMain.cpp.
+The Compiler is a multi-pass compiler. Each pass transforms a representation of the SQL statement into a new or augmented representation which is input to the next pass. The sections below give more detail on each pass. The logic that calls each pass is in the CmpMain class, method CmpMain::compile. You can find that logic in file $TRAF_HOME/sql/sqlcomp/CmpMain.cpp.
A copy of the compiler code runs in the Master process, which avoids inter-process message passing between the Compiler and Executor. At the moment the compiler code is not re-entrant, but it is a serially reusable resource within the Master. Some processing is recursive. For example, the execution logic for DDL statements is packaged with the compiler code. When we execute a DDL statement, the Executor spawns a separate Compiler process to execute that logic. For another example, the UPDATE STATISTICS utility dynamically generates SQL SELECT statements to obtain statistical data. Since we are not re-entrant, we spawn a separate Compiler process for this recursive processing.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/src/site/markdown/management.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/management.md b/docs/src/site/markdown/management.md
index e651cc4..587cab3 100644
--- a/docs/src/site/markdown/management.md
+++ b/docs/src/site/markdown/management.md
@@ -27,7 +27,7 @@ RMS Server | **```rmsstart```** | **```rmsstop```**
**Example: Start Trafodion**
- cd $MY_SQROOT/sql/scripts
+ cd $TRAF_HOME/sql/scripts
sqstart
sqcheck
@@ -58,5 +58,5 @@ If processes are not running as expected, then:
If problems persist please review logs:
-* **```$MY_SQROOT/sql/local_hadoop/\*/log```**: Hadoop, HBase, and Hive logs.
-* **```$MY_SQROOT/logs```**: Trafodion logs.
\ No newline at end of file
+* **```$TRAF_HOME/sql/local_hadoop/\*/log```**: Hadoop, HBase, and Hive logs.
+* **```$TRAF_HOME/logs```**: Trafodion logs.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/docs/src/site/markdown/traf_authentication_config.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/traf_authentication_config.md b/docs/src/site/markdown/traf_authentication_config.md
index 2720428..236b69e 100644
--- a/docs/src/site/markdown/traf_authentication_config.md
+++ b/docs/src/site/markdown/traf_authentication_config.md
@@ -15,20 +15,20 @@
This page describes the settings in the **```.traf_authentication_config```** file, which is the configuration file related to [Enabling Security Features in Trafodion](enable-secure-trafodion.html).
# File Location
-By default the Trafodion authentication configuration file is located at **```$MY_SQROOT/sql/scripts/.traf_authentication_config```**. If you want to store the configuration file in a different location and/or use a different filename, then Trafodion supports environment variables to specify the alternate location/name.
+By default the Trafodion authentication configuration file is located at **```$TRAF_HOME/sql/scripts/.traf_authentication_config```**. If you want to store the configuration file in a different location and/or use a different filename, then Trafodion supports environment variables to specify the alternate location/name.
Trafodion firsts checks the environment variable **```TRAFAUTH_CONFIGFILE```**. If set, the value is used as the fully qualified Trafodion authentication configuration file.
If the environment variable is not set, then Trafodion next checks the variable **```TRAFAUTH_CONFIGDIR```**. If set, the value is prepended to **```.traf_authentication_config```** and used as the Trafodion authentication file.
-If neither is set, Trafodion defaults to **```$MY_SQROOT/sql/scripts/.traf_authentication_config```**.
+If neither is set, Trafodion defaults to **```$TRAF_HOME/sql/scripts/.traf_authentication_config```**.
# Template
# To use authentication in Trafodion, this file must be configured
- # as described below and placed in $MY_SQROOT/sql/scripts and be named
+ # as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config. You must also enable authentication by
- # running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+ # running the script traf_authentication_setup in $TRAF_HOME/sql/scripts.
#
# NOTE: the format of this configuration file is expected to change in the
# next release of Trafodion. Backward compatibility is not guaranteed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/addNode_step1
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step1 b/install/installer/addNode_step1
index 99f4ad9..05302b0 100755
--- a/install/installer/addNode_step1
+++ b/install/installer/addNode_step1
@@ -267,10 +267,10 @@ do
echo
echo "********************************************************************"
- sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $MY_SQROOT/tmp/cluster.conf
- sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $MY_SQROOT/sql/scripts/sqconfig
- sudo rm -rf $MY_SQROOT/tmp/se*
- sudo rm -rf $MY_SQROOT/sql/scripts/se*
+ sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $TRAF_HOME/tmp/cluster.conf
+ sudo sed -i -e "s/\<$oldNODENAME\>/$node/g" $TRAF_HOME/sql/scripts/sqconfig
+ sudo rm -rf $TRAF_HOME/tmp/se*
+ sudo rm -rf $TRAF_HOME/sql/scripts/se*
sudo chmod 777 $TRAF_CONFIG
sed -i '/TRAF_EXCLUDE_LIST\=/d' $TRAF_CONFIG
echo "export TRAF_EXCLUDE_LIST=\"$TRAF_EXCLUDE_LIST\"" >> $TRAF_CONFIG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/addNode_step2
----------------------------------------------------------------------
diff --git a/install/installer/addNode_step2 b/install/installer/addNode_step2
index 20c20ee..ad52013 100755
--- a/install/installer/addNode_step2
+++ b/install/installer/addNode_step2
@@ -181,11 +181,11 @@ echo "***IMPORTANT*** Ignore copy errors to new node."
echo
sleep 5
-sudo cp $MY_SQROOT/tmp/cluster.conf $PWD
+sudo cp $TRAF_HOME/tmp/cluster.conf $PWD
sudo chown $(whoami).$(whoami) $PWD/cluster.conf
$TRAF_PDCP $PWD/cluster.conf $HOME
-$TRAF_PDSH sudo cp $HOME/cluster.conf $MY_SQROOT/tmp/cluster.conf 2>&1 > /dev/null
-$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/tmp/cluster.conf 2>&1 > /dev/null
+$TRAF_PDSH sudo cp $HOME/cluster.conf $TRAF_HOME/tmp/cluster.conf 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $TRAF_HOME/tmp/cluster.conf 2>&1 > /dev/null
$TRAF_PDSH sudo rm $HOME/cluster.conf
}
@@ -199,11 +199,11 @@ echo "***IMPORTANT*** Ignore copy errors to new node."
echo
sleep 5
-sudo cp -r $MY_SQROOT/sql/scripts/sqconfig $PWD
+sudo cp -r $TRAF_HOME/sql/scripts/sqconfig $PWD
sudo chown $(whoami).$(whoami) $PWD/sqconfig
$TRAF_PDCP $PWD/sqconfig $HOME
-$TRAF_PDSH sudo cp $HOME/sqconfig $MY_SQROOT/sql/scripts/sqconfig 2>&1 > /dev/null
-$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/sql/scripts/sqconfig 2>&1 > /dev/null
+$TRAF_PDSH sudo cp $HOME/sqconfig $TRAF_HOME/sql/scripts/sqconfig 2>&1 > /dev/null
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $TRAF_HOME/sql/scripts/sqconfig 2>&1 > /dev/null
$TRAF_PDSH sudo rm $HOME/sqconfig
@@ -223,9 +223,9 @@ function editDCSServers {
echo "***INFO: Create DCS servers file"
source $TRAF_CONFIG
-DCS_DIR=$(sudo ls $MY_SQROOT | grep dcs\*)
+DCS_DIR=$(sudo ls $TRAF_HOME | grep dcs\*)
-sudo cp $MY_SQROOT/$DCS_DIR/conf/servers $PWD
+sudo cp $TRAF_HOME/$DCS_DIR/conf/servers $PWD
sudo chown $(whoami).$(whoami) $PWD/servers
let per_node=$DCS_SERVERS_PARM/$node_count
@@ -253,8 +253,8 @@ done
$TRAF_PDCP $PWD/servers $HOME/tempServers
-$TRAF_PDSH sudo cp $HOME/tempServers $MY_SQROOT/$DCS_DIR/conf/servers
-$TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/$DCS_DIR/conf/servers
+$TRAF_PDSH sudo cp $HOME/tempServers $TRAF_HOME/$DCS_DIR/conf/servers
+$TRAF_PDSH sudo chown $TRAF_USER.trafodion $TRAF_HOME/$DCS_DIR/conf/servers
@@ -265,7 +265,7 @@ function editDCSBackUp {
echo "***INFO: Create DCS Backup Master file"
source $TRAF_CONFIG
-DCS_DIR=$(sudo ls $MY_SQROOT | grep dcs\*)
+DCS_DIR=$(sudo ls $TRAF_HOME | grep dcs\*)
if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
for node_name in $BACKUP_DCS_NODES
@@ -274,8 +274,8 @@ if [[ ! -z $NEW_BACKUP_DCS_NODES ]]; then
done
$TRAF_PDCP $PWD/tempbackup $HOME
- $TRAF_PDSH sudo cp $HOME/tempbackup $MY_SQROOT/$DCS_DIR/conf/backup-master
- $TRAF_PDSH sudo chown $TRAF_USER.trafodion $MY_SQROOT/$DCS_DIR/conf/backup-master
+ $TRAF_PDSH sudo cp $HOME/tempbackup $TRAF_HOME/$DCS_DIR/conf/backup-master
+ $TRAF_PDSH sudo chown $TRAF_USER.trafodion $TRAF_HOME/$DCS_DIR/conf/backup-master
fi
}
@@ -294,7 +294,7 @@ $TRAF_NEW_PDSH sudo mkdir -p $HOME_DIR/$TRAF_USER/.ssh
$TRAF_NEW_PDSH mkdir -p $HOME/tmpTraf
sudo cp -r $HOME_DIR/$TRAF_USER/.bashrc $HOME/tmpTraf/.bashrc
sudo cp -r $HOME_DIR/$TRAF_USER/.ssh $HOME/tmpTraf
-sudo cp -r $MY_SQROOT $HOME/tmpTraf
+sudo cp -r $TRAF_HOME $HOME/tmpTraf
echo "***IMPORTANT: Keep waiting..."
sudo chown -R $(whoami).$(whoami) $HOME/tmpTraf
$TRAF_NEW_PDCP -r $HOME/tmpTraf $HOME
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/bashrc_default
----------------------------------------------------------------------
diff --git a/install/installer/bashrc_default b/install/installer/bashrc_default
index 766296b..bbac162 100755
--- a/install/installer/bashrc_default
+++ b/install/installer/bashrc_default
@@ -44,7 +44,7 @@ fi
#-------------------------------------------
# full path of your Trafodion installation
#-------------------------------------------
-export MY_SQROOT=XXXXXX
+export TRAF_HOME=XXXXXX
#-------------------------------------------
# other env vars needed by Trafodion
@@ -62,9 +62,9 @@ export TOOLSDIR=XXXXX
#-------------------------------------------
PATH=".:$PATH"
-if [ -f $MY_SQROOT/sqenv.sh ]; then
+if [ -f $TRAF_HOME/sqenv.sh ]; then
pushd . >/dev/null
- cd $MY_SQROOT
+ cd $TRAF_HOME
source ./sqenv.sh
popd >/dev/null
export MANPATH=$MANPATH:$MPI_ROOT/share/man
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index d6a3f40..97a892d 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -38,7 +38,7 @@ Usage: $(basename $0) [options]
Options:
--help Print this message and exit.
--dcs_build <file> Path to the DCS build tar file.
- --dcs_install_path <dir> Path to the install directory. (defaults to $MY_SQROOT)
+ --dcs_install_path <dir> Path to the install directory. (defaults to $TRAF_HOME)
--dcs_servers <count> Total number of DCS servers to start. These
will be allocated in a round-robin fashion on
all nodes. (default, 1 per node)
@@ -65,7 +65,7 @@ function checkOpts {
# Default parameters
typeset DCS_BUILD_FILE=""
-typeset DCS_INSTALL_PATH="$MY_SQROOT"
+typeset DCS_INSTALL_PATH="$TRAF_HOME"
typeset DCS_SERVER_COUNT=""
# Parse input parameters
@@ -113,8 +113,8 @@ source $TRAF_CONFIG
echo "***INFO: Start of DCS install"
# Make sure required env vars have been set first
-if [[ -z "$MY_SQROOT" ]]; then
- echo "***ERROR: environment variable MY_SQROOT has no value."
+if [[ -z "$TRAF_HOME" ]]; then
+ echo "***ERROR: environment variable TRAF_HOME has no value."
exit -1
fi
if [[ -z "$NODE_LIST" ]]; then
@@ -131,8 +131,8 @@ mkdir -p $DCS_INSTALL_PATH
cd $DCS_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- DCS_DIR=$(ls $MY_SQROOT | grep dcs)
- DCS_DIR=$MY_SQROOT/$DCS_DIR
+ DCS_DIR=$(ls $TRAF_HOME | grep dcs)
+ DCS_DIR=$TRAF_HOME/$DCS_DIR
echo "***INFO: DCS Install Directory: $DCS_DIR"
else
# untar DCS build into install directory
@@ -146,9 +146,9 @@ else
fi
# set env var in sqenvcom.sh for DCS install directory
-grep --invert-match "DCS_INSTALL_DIR=" $MY_SQROOT/sqenvcom.sh > $MY_SQROOT/sqenvcom.temp
-echo "export DCS_INSTALL_DIR=$DCS_DIR" >> $MY_SQROOT/sqenvcom.temp
-mv $MY_SQROOT/sqenvcom.temp $MY_SQROOT/sqenvcom.sh
+grep --invert-match "DCS_INSTALL_DIR=" $TRAF_HOME/sqenvcom.sh > $TRAF_HOME/sqenvcom.temp
+echo "export DCS_INSTALL_DIR=$DCS_DIR" >> $TRAF_HOME/sqenvcom.temp
+mv $TRAF_HOME/sqenvcom.temp $TRAF_HOME/sqenvcom.sh
cd $DCS_DIR/conf
@@ -215,13 +215,13 @@ if [[ "$ENABLE_HA" == "true" ]]; then
######Configure trafci wrapper script to use Floating IP address
newHName="HNAME=$FLOATING_IP:23400"
- sed -i -e "s/HNAME=localhost:23400/$newHName/g" $MY_SQROOT/trafci/bin/trafci
+ sed -i -e "s/HNAME=localhost:23400/$newHName/g" $TRAF_HOME/trafci/bin/trafci
else
######Configure trafci wrapper script
newHName="HNAME=$DCS_PRIMARY_MASTER_NODE:23400"
- sed -i -e "s/HNAME=localhost:23400/$newHName/g" $MY_SQROOT/trafci/bin/trafci
+ sed -i -e "s/HNAME=localhost:23400/$newHName/g" $TRAF_HOME/trafci/bin/trafci
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index 1ce5208..35b4981 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -37,13 +37,13 @@ Usage: $(basename $0) [options]
Options:
--help Print this message and exit.
--rest_build <file> Path to the REST build tar file.
- --rest_install_path <dir> Path to the install directory. (defaults to $MY_SQROOT)
+ --rest_install_path <dir> Path to the install directory. (defaults to $TRAF_HOME)
EOF
}
# Default parameters
typeset REST_BUILD_FILE=""
-typeset REST_INSTALL_PATH="$MY_SQROOT"
+typeset REST_INSTALL_PATH="$TRAF_HOME"
typeset TRAF_CONFIG="/etc/trafodion/trafodion_config"
# Parse input parameters
while [[ $# -gt 0 ]]; do
@@ -80,8 +80,8 @@ echo "***INFO: Start of REST Server install"
source $TRAF_CONFIG
# Make sure required env vars have been set first
-if [[ -z "$MY_SQROOT" ]]; then
- echo "***ERROR: environment variable MY_SQROOT has no value."
+if [[ -z "$TRAF_HOME" ]]; then
+ echo "***ERROR: environment variable TRAF_HOME has no value."
exit -1
fi
if [[ -z "$NODE_LIST" ]]; then
@@ -94,8 +94,8 @@ mkdir -p $REST_INSTALL_PATH
cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- REST_DIR=$(ls $MY_SQROOT | grep rest)
- REST_DIR=$MY_SQROOT/$REST_DIR
+ REST_DIR=$(ls $TRAF_HOME | grep rest)
+ REST_DIR=$TRAF_HOME/$REST_DIR
echo "***INFO: Rest Install Directory: $REST_DIR"
else
@@ -109,9 +109,9 @@ else
fi
# set env var in sqenvcom.sh for DCS install directory
-grep --invert-match "REST_INSTALL_DIR=" $MY_SQROOT/sqenvcom.sh > $MY_SQROOT/sqenvcom.temp
-echo "export REST_INSTALL_DIR=$REST_DIR" >> $MY_SQROOT/sqenvcom.temp
-mv $MY_SQROOT/sqenvcom.temp $MY_SQROOT/sqenvcom.sh
+grep --invert-match "REST_INSTALL_DIR=" $TRAF_HOME/sqenvcom.sh > $TRAF_HOME/sqenvcom.temp
+echo "export REST_INSTALL_DIR=$REST_DIR" >> $TRAF_HOME/sqenvcom.temp
+mv $TRAF_HOME/sqenvcom.temp $TRAF_HOME/sqenvcom.sh
cd $REST_DIR/conf
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_add_kerberos
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_kerberos b/install/installer/traf_add_kerberos
index 0ff1e74..ca79a60 100755
--- a/install/installer/traf_add_kerberos
+++ b/install/installer/traf_add_kerberos
@@ -141,7 +141,7 @@ echo "***INFO: Done creating principals and keytabs"
# The RENEW_TOOL is a script that get run that automatically
# renews the ticket when it get ready to expire.
-RENEW_TOOL='$MY_SQROOT/sql/scripts/krb5service start'
+RENEW_TOOL='$TRAF_HOME/sql/scripts/krb5service start'
# modify .bashrc to add kinit command
# Steps:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_add_ldap
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_ldap b/install/installer/traf_add_ldap
index d0c8226..2c59813 100755
--- a/install/installer/traf_add_ldap
+++ b/install/installer/traf_add_ldap
@@ -48,14 +48,14 @@ echo "***INFO: Copy $LDAP_AUTH_FILE to all nodes"
if [[ "$all_node_count" -eq "1" ]]; then
sudo cp -r $LOCAL_WORKDIR/$LDAP_AUTH_FILE $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
sudo chown $TRAF_USER.$TRAF_GROUP $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
- sudo su $TRAF_USER --command "cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $MY_SQROOT/sql/scripts/.traf_authentication_config" 2>&1
- sudo su $TRAF_USER --command "chmod 750 $MY_SQROOT/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $TRAF_HOME/sql/scripts/.traf_authentication_config" 2>&1
+ sudo su $TRAF_USER --command "chmod 750 $TRAF_HOME/sql/scripts/.traf_authentication_config"
else
$TRAF_PDCP $LOCAL_WORKDIR/$LDAP_AUTH_FILE $HOME
$TRAF_PDSH sudo cp $HOME/$LDAP_AUTH_FILE $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
$TRAF_PDSH sudo chown $TRAF_USER:$TRAF_GROUP $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
- sudo su $TRAF_USER --command "$TRAF_PDSH cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $MY_SQROOT/sql/scripts/.traf_authentication_config"
- sudo su $TRAF_USER --command "$TRAF_PDSH chmod 750 $MY_SQROOT/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "$TRAF_PDSH cp $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE $TRAF_HOME/sql/scripts/.traf_authentication_config"
+ sudo su $TRAF_USER --command "$TRAF_PDSH chmod 750 $TRAF_HOME/sql/scripts/.traf_authentication_config"
fi
# Check traf_authentication_config for errors
@@ -81,7 +81,7 @@ fi
# change and copy sqenvcom.sh
echo "***INFO: Modifying sqenvcom.sh to turn on authentication"
-sudo cp -r $MY_SQROOT/sqenvcom.sh $LOCAL_WORKDIR/sqenvcom.sh
+sudo cp -r $TRAF_HOME/sqenvcom.sh $LOCAL_WORKDIR/sqenvcom.sh
sudo chown $(whoami).$(whoami) $LOCAL_WORKDIR/sqenvcom.sh
sed -i -e "s@TRAFODION_ENABLE_AUTHENTICATION=NO@TRAFODION_ENABLE_AUTHENTICATION=YES@g" $LOCAL_WORKDIR/sqenvcom.sh
sudo cp $LOCAL_WORKDIR/sqenvcom.sh $HOME_DIR/$TRAF_USER/sqenvcom.sh
@@ -89,9 +89,9 @@ sudo chown $TRAF_USER.$TRAF_GROUP $HOME_DIR/$TRAF_USER/sqenvcom.sh
sudo chmod 664 $HOME_DIR/$TRAF_USER/sqenvcom.sh
echo "***INFO: copying sqenvcom.sh to all nodes"
if [[ "$all_node_count" -ne "1" ]]; then
- sudo su $TRAF_USER --command "$TRAF_PDCP $HOME_DIR/$TRAF_USER/sqenvcom.sh $MY_SQROOT/sqenvcom.sh"
+ sudo su $TRAF_USER --command "$TRAF_PDCP $HOME_DIR/$TRAF_USER/sqenvcom.sh $TRAF_HOME/sqenvcom.sh"
else
- sudo cp $HOME_DIR/$TRAF_USER/sqenvcom.sh $MY_SQROOT/sqenvcom.sh
+ sudo cp $HOME_DIR/$TRAF_USER/sqenvcom.sh $TRAF_HOME/sqenvcom.sh
fi
rm $LOCAL_WORKDIR/sqenvcom.sh
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_authentication_conf_default
----------------------------------------------------------------------
diff --git a/install/installer/traf_authentication_conf_default b/install/installer/traf_authentication_conf_default
index 7562d4a..248d962 100755
--- a/install/installer/traf_authentication_conf_default
+++ b/install/installer/traf_authentication_conf_default
@@ -24,9 +24,9 @@
# directory service configuration.
#
# To use authentication in Trafodion, this file must be configured
-# as described below and placed in $MY_SQROOT/sql/scripts and be named
+# as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config. You must also enable authentication by
-# running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+# running the script traf_authentication_setup in $TRAF_HOME/sql/scripts.
#
# NOTE: the format of this configuration file is expected to change in the
# next release of Trafodion. Backward compatilibity is not guaranteed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_config
----------------------------------------------------------------------
diff --git a/install/installer/traf_config b/install/installer/traf_config
index 74e68e8..2b87173 100755
--- a/install/installer/traf_config
+++ b/install/installer/traf_config
@@ -67,8 +67,8 @@ fi
#============================================
# Create install directory
-mkdir -p $MY_SQROOT
-echo $MY_SQROOT
+mkdir -p $TRAF_HOME
+echo $TRAF_HOME
if [[ "$UPGRADE_TRAF" == "true" ]]; then
echo
@@ -83,17 +83,17 @@ fi
if [[ -f $HOME/sqenvcom.sh ]]; then
echo "****INFO: Copying over sqenvcom.sh"
- cp -rf $HOME/sqenvcom.sh $MY_SQROOT
+ cp -rf $HOME/sqenvcom.sh $TRAF_HOME
fi
-cd $MY_SQROOT
+cd $TRAF_HOME
# untar Trafodion build into install directory
if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
- echo "***INFO: untarring file $TRAF_BUILD to $MY_SQROOT" | tee -a $INSTALL_LOG
+ echo "***INFO: untarring file $TRAF_BUILD to $TRAF_HOME" | tee -a $INSTALL_LOG
tar -xzf $TRAF_BUILD 2>&1 | tee -a $INSTALL_LOG
else
- echo "***INFO: untarring file $TRAF_BUILD to $MY_SQROOT" | tee -a $INSTALL_LOG
+ echo "***INFO: untarring file $TRAF_BUILD to $TRAF_HOME" | tee -a $INSTALL_LOG
tar -xzf $UNTAR_DIR/$traf_filename 2>&1 | tee -a $INSTALL_LOG
fi
if [ "$?" != "0" ]; then
@@ -120,7 +120,7 @@ else
fi
else
# For single node, we use the sqconfig in the build
- SQCONFIG_MASTER=$MY_SQROOT/sql/scripts/sqconfig
+ SQCONFIG_MASTER=$TRAF_HOME/sql/scripts/sqconfig
if [[ ! -f "$SQCONFIG_MASTER" ]]; then
echo "***ERROR: SQ config file cannot be found ($SQCONFIG_MASTER)." | tee -a $INSTALL_LOG
exit -1
@@ -133,8 +133,8 @@ echo "***INFO: modifying .bashrc to set Trafodion environment variables" | tee -
cd $HOME
cp .bashrc bashrc_temp
# NOTE: have to use '@' as delimiter because the usual slash '/' doesn't work
-# because $MY_SQROOT's value has slashes in it
-sed -e "s@export MY_SQROOT=.*@export MY_SQROOT=$MY_SQROOT@" <bashrc_temp >$HOME/.bashrc
+# because $TRAF_HOME's value has slashes in it
+sed -e "s@export TRAF_HOME=.*@export TRAF_HOME=$TRAF_HOME@" <bashrc_temp >$HOME/.bashrc
cp .bashrc bashrc_temp
sed -e "s@export TOOLSDIR=.*@export TOOLSDIR=$TRAF_TOOLSDIR@" <bashrc_temp >$HOME/.bashrc
@@ -153,20 +153,20 @@ fi
#==========================================
if [ "$node_count" -ne "1" ]; then
- echo "***INFO: copying sqconfig file ($SQCONFIG_MASTER) to $MY_SQROOT/sql/scripts/sqconfig" | tee -a $INSTALL_LOG
- cp $SQCONFIG_MASTER $MY_SQROOT/sql/scripts/sqconfig
+ echo "***INFO: copying sqconfig file ($SQCONFIG_MASTER) to $TRAF_HOME/sql/scripts/sqconfig" | tee -a $INSTALL_LOG
+ cp $SQCONFIG_MASTER $TRAF_HOME/sql/scripts/sqconfig
fi
-cd $MY_SQROOT
+cd $TRAF_HOME
#=================================================
if [ "$all_node_count" -ne "1" ]; then
- echo "***INFO: Creating $MY_SQROOT directory on all nodes" | tee -a $INSTALL_LOG
- $PDSH $ALL_NODES -x $HOSTNAME $PDSH_SSH_CMD mkdir -p $MY_SQROOT
+ echo "***INFO: Creating $TRAF_HOME directory on all nodes" | tee -a $INSTALL_LOG
+ $PDSH $ALL_NODES -x $HOSTNAME $PDSH_SSH_CMD mkdir -p $TRAF_HOME
if [[ -f $HOME/sqenvcom.sh ]]; then
echo "****INFO: Copying over sqenvcom.sh"
- $PDCP $ALL_NODES $HOME/sqenvcom.sh $MY_SQROOT
+ $PDCP $ALL_NODES $HOME/sqenvcom.sh $TRAF_HOME
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index a270c45..45a300e 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -856,10 +856,10 @@ fi
function checkSQROOT {
-if [[ -z $MY_SQROOT ]]; then
+if [[ -z $TRAF_HOME ]]; then
errorFound=1
echo "SQ ROOT" >> $ERROR_LOG
- echo "***ERROR: MY_SQROOT variable not set in config file" >> $ERROR_LOG
+ echo "***ERROR: TRAF_HOME variable not set in config file" >> $ERROR_LOG
fi
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index d938b9d..8180ae2 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -58,7 +58,7 @@ HBASE_USER="hbase"
HBASE_GROUP="hbase"
ZOO_USER="zookeeper"
-MY_SQROOT=""
+TRAF_HOME=""
INIT_TRAFODION="N"
START="N"
SQCONFIG=""
@@ -101,7 +101,7 @@ Inputs Requested:
*HDFS username (default is [$HDFS_USER])
*HBase username (default is [$HBASE_USER])
*HBase group (default is [$HBASE_GROUP])
-*Full pathname to the install directory location (default [$MY_SQROOT])
+*Full pathname to the install directory location (default [$TRAF_HOME])
*Full pathname to the DNS build tar file (default [$DCS_BUILD])
*Start Trafodion after install (default is [No])
*Total number of DCS servers to start
@@ -677,15 +677,15 @@ fi
#Install location
traf_filename=$(basename "$TRAF_PACKAGE")
-MY_SQROOT="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
+TRAF_HOME="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
-echo -n "Enter directory to install trafodion to, default is [$MY_SQROOT]: "
+echo -n "Enter directory to install trafodion to, default is [$TRAF_HOME]: "
read answer
if [ -z $answer ]; then
- echo "export MY_SQROOT=\"$MY_SQROOT\"" >> $LOCAL_TRAF_CONFIG
+ echo "export TRAF_HOME=\"$TRAF_HOME\"" >> $LOCAL_TRAF_CONFIG
else
- echo "export MY_SQROOT=\"$answer\"" >> $LOCAL_TRAF_CONFIG
+ echo "export TRAF_HOME=\"$answer\"" >> $LOCAL_TRAF_CONFIG
fi
#==============================================
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_secure
----------------------------------------------------------------------
diff --git a/install/installer/traf_secure b/install/installer/traf_secure
index fcbdd53..cbb3d11 100755
--- a/install/installer/traf_secure
+++ b/install/installer/traf_secure
@@ -27,7 +27,7 @@ export TRAF_CONFIG=/etc/trafodion/trafodion_config
source $TRAF_CONFIG
-rm $MY_SQROOT/logs/securityErrors.txt 2>/dev/null
+rm $TRAF_HOME/logs/securityErrors.txt 2>/dev/null
if [[ "$all_node_count" -eq "1" ]]; then
STARTING_NODE=$NODE_LIST
@@ -37,24 +37,24 @@ fi
#==========================================
-echo "***INFO: Starting Trafodion instance, if not already started" | tee -a $MY_SQROOT/logs/securityErrors.txt
+echo "***INFO: Starting Trafodion instance, if not already started" | tee -a $TRAF_HOME/logs/securityErrors.txt
-ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; sqstart"
+ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; sqstart"
SQSTART_RC=$?
if [ "$SQSTART_RC" -ne "0" -a "$SQSTART_RC" -ne "1" ]; then
- echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $MY_SQROOT/sqmon.log file for details." | tee -a $MY_SQROOT/logs/securityErrors.txt
+ echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $TRAF_HOME/sqmon.log file for details." | tee -a $TRAF_HOME/logs/securityErrors.txt
exit -1;
fi
# Do initialize authorization and alter predefined users
-echo "***INFO: Initialize authorization and set up predefined users" | tee -a $MY_SQROOT/logs/securityErrors.txt
-ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"initialize authorization; alter user DB__ROOT set external name \"$DB_ROOT_NAME\";\" | sqlci" | tee -a $MY_SQROOT/logs/securityErrors.txt
-foundError=$(grep "ERROR" $MY_SQROOT/logs/securityErrors.txt | wc -l)
+echo "***INFO: Initialize authorization and set up predefined users" | tee -a $TRAF_HOME/logs/securityErrors.txt
+ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; echo \"initialize authorization; alter user DB__ROOT set external name \"$DB_ROOT_NAME\";\" | sqlci" | tee -a $TRAF_HOME/logs/securityErrors.txt
+foundError=$(grep "ERROR" $TRAF_HOME/logs/securityErrors.txt | wc -l)
if [ "$foundError" -ge "1" ];then
- echo "***ERROR: Security installation failed, continuing. Check files $MY_SQROOT/logs/securityErrors.txt for details." | tee -a $MY_SQROOT/logs/securityErrors.txt
+ echo "***ERROR: Security installation failed, continuing. Check files $TRAF_HOME/logs/securityErrors.txt for details." | tee -a $TRAF_HOME/logs/securityErrors.txt
fi
-echo "***INFO: Please check the install log $MY_SQROOT/logs/securityErrors.txt for any issues" | tee -a $MY_SQROOT/logs/securityErrors.txt
+echo "***INFO: Please check the install log $TRAF_HOME/logs/securityErrors.txt for any issues" | tee -a $TRAF_HOME/logs/securityErrors.txt
#==========================================
-echo "***INFO: Installation setup completed successfully." | tee -a $MY_SQROOT/logs/securityErrors.txt
+echo "***INFO: Installation setup completed successfully." | tee -a $TRAF_HOME/logs/securityErrors.txt
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_sqgen
----------------------------------------------------------------------
diff --git a/install/installer/traf_sqgen b/install/installer/traf_sqgen
index fc311a8..28aa500 100755
--- a/install/installer/traf_sqgen
+++ b/install/installer/traf_sqgen
@@ -28,14 +28,14 @@ STARTING_NODE=$(hostname)
#==========================================
echo "***INFO: starting sqgen" | tee -a $INSTALL_LOG
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
#If sqconfig.db exists remove it and then sqgen can be run
-if [[ -e $MY_SQROOT/sql/scripts/sqconfig.db ]]; then
- $TRAF_PDSH rm -rf $MY_SQROOT/sql/scripts/sqconfig.db
+if [[ -e $TRAF_HOME/sql/scripts/sqconfig.db ]]; then
+ $TRAF_PDSH rm -rf $TRAF_HOME/sql/scripts/sqconfig.db
fi
-$MY_SQROOT/sql/scripts/sqgen
+$TRAF_HOME/sql/scripts/sqgen
SQGEN_RC=$?
if [ "$SQGEN_RC" != "0" ]; then
echo "***ERROR: sqgen failed with RC=$SQGEN_RC. Check install log file for details." | tee -a $INSTALL_LOG
@@ -54,7 +54,7 @@ fi
if [ "$all_node_count" -ne "1" ]; then
echo "***INFO: copying install to all nodes" | tee -a $INSTALL_LOG
- $PDCP $ALL_NODES -x $HOSTNAME -r $MY_SQROOT $MY_SQROOT/..
+ $PDCP $ALL_NODES -x $HOSTNAME -r $TRAF_HOME $TRAF_HOME/..
if [ "$?" != "0" ]; then
echo "***ERROR: Unable to copy Trafodion install to all machines in this cluster. Check install log files for details." | tee -a $INSTALL_LOG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/traf_start
----------------------------------------------------------------------
diff --git a/install/installer/traf_start b/install/installer/traf_start
index 06f2739..7a74d81 100755
--- a/install/installer/traf_start
+++ b/install/installer/traf_start
@@ -40,10 +40,10 @@ if [ "$START" == "N" ]; then
else
echo "***INFO: starting Trafodion instance" | tee -a $INSTALL_LOG
- ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; sqstart"
+ ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; sqstart"
SQSTART_RC=$?
if [ "$SQSTART_RC" != "0" ]; then
- echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $MY_SQROOT/sqmon.log file for details." | tee -a $INSTALL_LOG
+ echo "***ERROR: sqstart failed with RC=$SQSTART_RC. Check $TRAF_HOME/sqmon.log file for details." | tee -a $INSTALL_LOG
exit -1;
fi
@@ -54,17 +54,17 @@ else
echo "***INFO: Trafodion is initializing...this will take a few minutes."
echo
echo
- ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"initialize Trafodion;\" | sqlci" | tee -a $MY_SQROOT/initializeErrors.txt
- error1392=$(grep "1392" $MY_SQROOT/initializeErrors.txt | wc -l)
- error1395=$(grep "1395" $MY_SQROOT/initializeErrors.txt | wc -l)
+ ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; echo \"initialize Trafodion;\" | sqlci" | tee -a $TRAF_HOME/initializeErrors.txt
+ error1392=$(grep "1392" $TRAF_HOME/initializeErrors.txt | wc -l)
+ error1395=$(grep "1395" $TRAF_HOME/initializeErrors.txt | wc -l)
if [ "$error1395" -ge "1" ] || [ "$error1392" -ge "1" ]; then
- ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"get version of metadata;\" | sqlci" | tee $MY_SQROOT/initializeErrors.txt
- metadataCurrent=$(grep "Metadata is current" $MY_SQROOT/initializeErrors.txt | wc -l)
+ ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; echo \"get version of metadata;\" | sqlci" | tee $TRAF_HOME/initializeErrors.txt
+ metadataCurrent=$(grep "Metadata is current" $TRAF_HOME/initializeErrors.txt | wc -l)
if [[ "$metadataCurrent" -ne "1" ]]; then
- ssh $STARTING_NODE "cd $MY_SQROOT/sql/scripts; echo \"initialize Trafodion, upgrade;\" | sqlci" | tee $MY_SQROOT/initializeErrors.txt
+ ssh $STARTING_NODE "cd $TRAF_HOME/sql/scripts; echo \"initialize Trafodion, upgrade;\" | sqlci" | tee $TRAF_HOME/initializeErrors.txt
fi
fi
- anyError=$(grep "ERROR" $MY_SQROOT/initializeErrors.txt | wc -l)
+ anyError=$(grep "ERROR" $TRAF_HOME/initializeErrors.txt | wc -l)
if [[ "$anyError" != "0" ]]; then
echo "***ERROR: initialize Trafodion failed. Check install log files for details." | tee -a $INSTALL_LOG
exit -1;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index 6f67491..bfea34a 100755
--- a/install/installer/trafodion_config_default
+++ b/install/installer/trafodion_config_default
@@ -110,7 +110,7 @@ export HBASE="hbase"
# First time install : /home/trafodion/traf
# On Upgrade: /home/trafodion/traf_<date>
# By doing this the previous version will remain and allow for an easier rollback.
-export MY_SQROOT="/opt/trafodion/trafodion"
+export TRAF_HOME="/opt/trafodion/trafodion"
# Start Trafodion after install completes
export START="Y"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index 6590b66..a37fda5 100755
--- a/install/installer/trafodion_install
+++ b/install/installer/trafodion_install
@@ -307,7 +307,7 @@ userForTrafodion=`grep "$TRAF_USER:" /etc/passwd | wc -l`
if [[ "$userForTrafodion" != "0" ]]; then
- if [[ -e $MY_SQROOT/sql/scripts/sqcheck ]]; then
+ if [[ -e $TRAF_HOME/sql/scripts/sqcheck ]]; then
isTrafUp=$(sudo su $TRAF_USER --login --command "sqcheck" 2>/dev/null)
returnCode=$?
@@ -736,8 +736,8 @@ echo "******************************"
echo " TRAFODION CONFIGURATION"
echo "******************************"
echo
-sudo mkdir -p $MY_SQROOT
-sudo chown $TRAF_USER.trafodion $MY_SQROOT
+sudo mkdir -p $TRAF_HOME
+sudo chown $TRAF_USER.trafodion $TRAF_HOME
/bin/cp -rf $LOCAL_WORKDIR/traf_config $TRAF_WORKDIR/installer/traf_config
sudo su $TRAF_USER --login --command "$TRAF_WORKDIR/installer/traf_config" 2>&1 | tee -a $INSTALL_LOG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/installer/trafodion_uninstaller
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_uninstaller b/install/installer/trafodion_uninstaller
index 6eaabf0..c0ad19e 100755
--- a/install/installer/trafodion_uninstaller
+++ b/install/installer/trafodion_uninstaller
@@ -110,9 +110,9 @@ if [[ "$SECURE_HADOOP" == "Y" ]]; then
echo "***INFO: Stopping Kerberos ticket monitoring process"
if [ $all_node_count -eq 1 ]; then
- sudo su $TRAF_USER --login --command "$MY_SQROOT/sql/scripts/krb5service stop 2>/dev/null"
+ sudo su $TRAF_USER --login --command "$TRAF_HOME/sql/scripts/krb5service stop 2>/dev/null"
else
- $TRAF_PDSH "sudo su $TRAF_USER --login --command \"$MY_SQROOT/sql/scripts/krb5service stop 2>/dev/null\""
+ $TRAF_PDSH "sudo su $TRAF_USER --login --command \"$TRAF_HOME/sql/scripts/krb5service stop 2>/dev/null\""
fi
fi
@@ -139,8 +139,8 @@ $TRAF_PDSH sudo rm -rf $LOCAL_WORKDIR/$TRAF_USER
$TRAF_PDSH sudo /usr/sbin/userdel --force --remove $TRAF_USER
$TRAF_PDSH sudo /usr/sbin/groupdel $TRAF_GROUP 2>/dev/null
-echo "***INFO: removing all files from $MY_SQROOT"
-$TRAF_PDSH sudo rm -rf $MY_SQROOT
+echo "***INFO: removing all files from $TRAF_HOME"
+$TRAF_PDSH sudo rm -rf $TRAF_HOME
echo "***INFO: removing all files from /usr/lib/trafodion and /var/log/trafodion"
$TRAF_PDSH sudo rm -rf /usr/lib/trafodion*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/bashrc.template
----------------------------------------------------------------------
diff --git a/install/python-installer/bashrc.template b/install/python-installer/bashrc.template
index 4f1b798..a85de3c 100644
--- a/install/python-installer/bashrc.template
+++ b/install/python-installer/bashrc.template
@@ -36,7 +36,7 @@ cd $HOME
#-------------------------------------------
# full path of your Trafodion installation
#-------------------------------------------
-export MY_SQROOT="{{ my_sqroot }}"
+export TRAF_HOME="{{ traf_home }}"
#-------------------------------------------
# other env vars needed by Trafodion
@@ -54,9 +54,9 @@ export ENABLE_HA="{{ enable_ha }}"
# Execute the sqenv.sh script if it exists.
#-------------------------------------------
PATH=".:$PATH"
-if [ -f $MY_SQROOT/sqenv.sh ]; then
+if [ -f $TRAF_HOME/sqenv.sh ]; then
pushd . >/dev/null
- cd $MY_SQROOT
+ cd $TRAF_HOME
source ./sqenv.sh
popd >/dev/null
export MANPATH=$MANPATH:$MPI_ROOT/share/man
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/db_config_default
----------------------------------------------------------------------
diff --git a/install/python-installer/db_config_default b/install/python-installer/db_config_default
index c4a2c4e..3087b5b 100644
--- a/install/python-installer/db_config_default
+++ b/install/python-installer/db_config_default
@@ -55,7 +55,7 @@ traf_package =
dcs_cnt_per_node = 4
# scratch file location, seperated by comma if more than one
-scratch_locs = $MY_SQROOT/tmp
+scratch_locs = $TRAF_HOME/tmp
# start trafodion instance after installation completed
traf_start = Y
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/dcs_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/dcs_setup.py b/install/python-installer/dcs_setup.py
index c3d1a9a..3a196db 100755
--- a/install/python-installer/dcs_setup.py
+++ b/install/python-installer/dcs_setup.py
@@ -31,22 +31,22 @@ from common import ParseXML, append_file, write_file, mod_file, cmd_output, run_
def run():
dbcfgs = json.loads(dbcfgs_json)
- MY_SQROOT = os.environ['MY_SQROOT']
+ TRAF_HOME = os.environ['TRAF_HOME']
TRAF_VER = dbcfgs['traf_version']
HBASE_XML_FILE = dbcfgs['hbase_xml_file']
- DCS_INSTALL_ENV = 'export DCS_INSTALL_DIR=%s/dcs-%s' % (MY_SQROOT, TRAF_VER)
- REST_INSTALL_ENV = 'export REST_INSTALL_DIR=%s/rest-%s' % (MY_SQROOT, TRAF_VER)
+ DCS_INSTALL_ENV = 'export DCS_INSTALL_DIR=%s/dcs-%s' % (TRAF_HOME, TRAF_VER)
+ REST_INSTALL_ENV = 'export REST_INSTALL_DIR=%s/rest-%s' % (TRAF_HOME, TRAF_VER)
- DCS_CONF_DIR = '%s/dcs-%s/conf' % (MY_SQROOT, TRAF_VER)
+ DCS_CONF_DIR = '%s/dcs-%s/conf' % (TRAF_HOME, TRAF_VER)
DCS_SRV_FILE = DCS_CONF_DIR + '/servers'
DCS_MASTER_FILE = DCS_CONF_DIR + '/master'
DCS_BKMASTER_FILE = DCS_CONF_DIR + '/backup-masters'
DCS_ENV_FILE = DCS_CONF_DIR + '/dcs-env.sh'
DCS_SITE_FILE = DCS_CONF_DIR + '/dcs-site.xml'
- REST_SITE_FILE = '%s/rest-%s/conf/rest-site.xml' % (MY_SQROOT, TRAF_VER)
- TRAFCI_FILE = MY_SQROOT + '/trafci/bin/trafci'
- SQENV_FILE = MY_SQROOT + '/sqenvcom.sh'
+ REST_SITE_FILE = '%s/rest-%s/conf/rest-site.xml' % (TRAF_HOME, TRAF_VER)
+ TRAFCI_FILE = TRAF_HOME + '/trafci/bin/trafci'
+ SQENV_FILE = TRAF_HOME + '/sqenvcom.sh'
### dcs setting ###
# servers
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/prompt.json
----------------------------------------------------------------------
diff --git a/install/python-installer/prompt.json b/install/python-installer/prompt.json
index 268eca4..7ea0a90 100644
--- a/install/python-installer/prompt.json
+++ b/install/python-installer/prompt.json
@@ -110,7 +110,7 @@
"scratch_locs":
{
"prompt":"Enter trafodion scratch file folder location(should be a large disk), if more than one folder, use comma seperated",
- "default":"$MY_SQROOT/tmp"
+ "default":"$TRAF_HOME/tmp"
},
"local_repo_dir":
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_authentication_conf.template
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_authentication_conf.template b/install/python-installer/traf_authentication_conf.template
index c3add91..f15dd70 100644
--- a/install/python-installer/traf_authentication_conf.template
+++ b/install/python-installer/traf_authentication_conf.template
@@ -24,9 +24,9 @@
# directory service configuration.
#
# To use authentication in Trafodion, this file must be configured
-# as described below and placed in $MY_SQROOT/sql/scripts and be named
+# as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config. You must also enable authentication by
-# running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+# running the script traf_authentication_setup in $TRAF_HOME/sql/scripts.
#
# NOTE: the format of this configuration file is expected to change in the
# next release of Trafodion. Backward compatilibity is not guaranteed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_kerberos.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_kerberos.py b/install/python-installer/traf_kerberos.py
index f4391a0..2e89d2c 100755
--- a/install/python-installer/traf_kerberos.py
+++ b/install/python-installer/traf_kerberos.py
@@ -101,7 +101,7 @@ fi
# ---------------------------------------------------------------
# Start trafodion kerberos ticket manager process
# ---------------------------------------------------------------
-$MY_SQROOT/sql/scripts/krb5service start >/dev/null 2>&1
+$TRAF_HOME/sql/scripts/krb5service start >/dev/null 2>&1
""" % (traf_keytab, traf_principal)
traf_bashrc = '/home/%s/.bashrc' % traf_user
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_ldap.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_ldap.py b/install/python-installer/traf_ldap.py
index bf9fbd5..e756426 100755
--- a/install/python-installer/traf_ldap.py
+++ b/install/python-installer/traf_ldap.py
@@ -33,9 +33,9 @@ def run():
dbcfgs = json.loads(dbcfgs_json)
DB_ROOT_USER = dbcfgs['db_root_user']
- MY_SQROOT = os.environ['MY_SQROOT']
- SQENV_FILE = MY_SQROOT + '/sqenvcom.sh'
- TRAF_AUTH_CONFIG = '%s/sql/scripts/.traf_authentication_config' % MY_SQROOT
+ TRAF_HOME = os.environ['TRAF_HOME']
+ SQENV_FILE = TRAF_HOME + '/sqenvcom.sh'
+ TRAF_AUTH_CONFIG = '%s/sql/scripts/.traf_authentication_config' % TRAF_HOME
TRAF_AUTH_TEMPLATE = '%s/traf_authentication_conf.template' % TMP_DIR
# set traf_authentication_config file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_setup.py b/install/python-installer/traf_setup.py
index 828f78b..44c83a2 100755
--- a/install/python-installer/traf_setup.py
+++ b/install/python-installer/traf_setup.py
@@ -32,13 +32,13 @@ from common import err, cmd_output, run_cmd
def run():
dbcfgs = json.loads(dbcfgs_json)
- TRAF_HOME = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
+ HOME_DIR = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
TRAF_USER = dbcfgs['traf_user']
- MY_SQROOT = '%s/%s/%s-%s' % (TRAF_HOME, TRAF_USER, dbcfgs['traf_basename'], dbcfgs['traf_version'])
+ TRAF_HOME = '%s/%s/%s-%s' % (HOME_DIR, TRAF_USER, dbcfgs['traf_basename'], dbcfgs['traf_version'])
TRAF_VER = dbcfgs['traf_version']
DISTRO = dbcfgs['distro']
- TRAF_LIB_PATH = MY_SQROOT + '/export/lib'
+ TRAF_LIB_PATH = TRAF_HOME + '/export/lib'
SCRATCH_LOCS = dbcfgs['scratch_locs'].split(',')
SUDOER_FILE = '/etc/sudoers.d/trafodion'
@@ -56,7 +56,7 @@ def run():
# don't set permission for HOME folder
if not os.path.exists(loc):
run_cmd('mkdir -p %s' % loc)
- if TRAF_HOME not in loc:
+ if HOME_DIR not in loc:
run_cmd('chmod 777 %s' % loc)
### copy jar files ###
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_sqconfig.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_sqconfig.py b/install/python-installer/traf_sqconfig.py
index 8da6377..6665afd 100755
--- a/install/python-installer/traf_sqconfig.py
+++ b/install/python-installer/traf_sqconfig.py
@@ -35,9 +35,9 @@ def run():
scratch_locs = dbcfgs['scratch_locs'].split(',')
# this script is running by trafodion user, so get sqroot from env
- MY_SQROOT = os.environ['MY_SQROOT']
- if MY_SQROOT == '': err('MY_SQROOT var is empty')
- sqconfig_file = MY_SQROOT + '/sql/scripts/sqconfig'
+ TRAF_HOME = os.environ['TRAF_HOME']
+ if TRAF_HOME == '': err('TRAF_HOME var is empty')
+ sqconfig_file = TRAF_HOME + '/sql/scripts/sqconfig'
core, processor = run_cmd("lscpu|grep -E '(^CPU\(s\)|^Socket\(s\))'|awk '{print $2}'").split('\n')[:2]
core = int(core)-1 if int(core) <= 256 else 255
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/install/python-installer/traf_user.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_user.py b/install/python-installer/traf_user.py
index 01c1c50..bb2c944 100755
--- a/install/python-installer/traf_user.py
+++ b/install/python-installer/traf_user.py
@@ -43,9 +43,9 @@ def run():
TRAF_USER = dbcfgs['traf_user']
TRAF_PWD = dbcfgs['traf_pwd']
TRAF_GROUP = TRAF_USER
- TRAF_HOME = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
- TRAF_USER_DIR = '%s/%s' % (TRAF_HOME, TRAF_USER)
- MY_SQROOT = '%s/%s-%s' % (TRAF_USER_DIR, dbcfgs['traf_basename'], dbcfgs['traf_version'])
+ HOME_DIR = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
+ TRAF_USER_DIR = '%s/%s' % (HOME_DIR, TRAF_USER)
+ TRAF_HOME = '%s/%s-%s' % (TRAF_USER_DIR, dbcfgs['traf_basename'], dbcfgs['traf_version'])
KEY_FILE = '/tmp/id_rsa'
AUTH_KEY_FILE = '%s/.ssh/authorized_keys' % TRAF_USER_DIR
@@ -84,7 +84,7 @@ def run():
nodes = dbcfgs['node_list'].split(',')
change_items = {
'{{ java_home }}': dbcfgs['java_home'],
- '{{ my_sqroot }}': MY_SQROOT,
+ '{{ traf_home }}': TRAF_HOME,
'{{ hadoop_type }}': hadoop_type,
'{{ node_list }}': ' '.join(nodes),
'{{ node_count }}': str(len(nodes)),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/tests/phx/README.rst
----------------------------------------------------------------------
diff --git a/tests/phx/README.rst b/tests/phx/README.rst
index 42517d1..1907f86 100644
--- a/tests/phx/README.rst
+++ b/tests/phx/README.rst
@@ -63,7 +63,7 @@ Running Tests
* Make sure the Trafodion sqenv.sh file has been sourced into the environment
* Set environment variable LD_PRELOAD ::
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib${SQ_MBTYPE}/libseabasesig.so
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib${SQ_MBTYPE}/libseabasesig.so
* Run ``phoenix_test.py`` with the following options
* For Cloudera ::
@@ -85,7 +85,7 @@ Running Tests
* Make sure the Trafodion sqenv.sh file has been sourced into the environment
* Set environment variable LD_PRELOAD ::
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib${SQ_MBTYPE}/libseabasesig.so
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib${SQ_MBTYPE}/libseabasesig.so
* Run ``phoenix_test.py`` with the following options
* For Cloudera ::
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/tests/phx/phoenix_test.py
----------------------------------------------------------------------
diff --git a/tests/phx/phoenix_test.py b/tests/phx/phoenix_test.py
index d4c288f..dc3974b 100755
--- a/tests/phx/phoenix_test.py
+++ b/tests/phx/phoenix_test.py
@@ -354,8 +354,8 @@ def generate_pom_xml(targettype, jdbc_groupid, jdbc_artid, jdbc_path, hadoop_dis
template_text = re.sub('<!-- START_DISTRO_DEP -->', dep_string, template_text)
# look for Trafodion Hbase TRX file and Trafodion Hbase Access file
- # assume in $MY_SQROOT/export/lib
- traf_lib_file_list = os.listdir(os.environ['MY_SQROOT'] + '/export/lib')
+ # assume in $TRAF_HOME/export/lib
+ traf_lib_file_list = os.listdir(os.environ['TRAF_HOME'] + '/export/lib')
# assume regular expression used for traf_hbase_trx_file and traf_hbase_access_file
# is precise enough to ever return only 1 value
@@ -565,7 +565,7 @@ def prog_parse_args():
elif options.jdbctype == 'T2':
# check for Trafodion ENV variables to be set
req_envs_error_string = ""
- for req_env in ['SQ_MBTYPE', 'MY_SQROOT', 'MPI_TMPDIR', 'LD_PRELOAD', 'LD_LIBRARY_PATH',
+ for req_env in ['SQ_MBTYPE', 'TRAF_HOME', 'MPI_TMPDIR', 'LD_PRELOAD', 'LD_LIBRARY_PATH',
'PATH', 'LANG', 'HADOOP_CNF_DIR', 'HBASE_CNF_DIR', 'HIVE_CNF_DIR',
'HBASE_TRXDIR']:
if req_env not in os.environ:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/tests/phx/pom.xml.template
----------------------------------------------------------------------
diff --git a/tests/phx/pom.xml.template b/tests/phx/pom.xml.template
index f8382be..af79023 100644
--- a/tests/phx/pom.xml.template
+++ b/tests/phx/pom.xml.template
@@ -200,7 +200,7 @@
<artifactId>hbase-trx</artifactId>
<version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/TRAF_HBASE_TRX_FILE</systemPath>
+ <systemPath>${env.TRAF_HOME}/export/lib/TRAF_HBASE_TRX_FILE</systemPath>
</dependency>
<dependency>
@@ -208,7 +208,7 @@
<artifactId>trafodion-dtm</artifactId>
<version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/${env.DTM_COMMON_JAR}</systemPath>
+ <systemPath>${env.TRAF_HOME}/export/lib/${env.DTM_COMMON_JAR}</systemPath>
</dependency>
<dependency>
@@ -216,7 +216,7 @@
<artifactId>trafodion-sql</artifactId>
<version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/${env.SQL_JAR}</systemPath>
+ <systemPath>${env.TRAF_HOME}/export/lib/${env.SQL_JAR}</systemPath>
</dependency>
<!-- END_FOR_T2_ONLY -->
@@ -282,7 +282,7 @@
<HIVE_CNF_DIR>${env.HIVE_CNF_DIR}</HIVE_CNF_DIR>
<HBASE_TRXDIR>${env.HBASE_TRXDIR}</HBASE_TRXDIR>
<SQ_MBTYPE>${env.SQ_MBTYPE}</SQ_MBTYPE>
- <MY_SQROOT>${env.MY_SQROOT}</MY_SQROOT>
+ <TRAF_HOME>${env.TRAF_HOME}</TRAF_HOME>
<TRAFODION_VER>${env.TRAFODION_VER}</TRAFODION_VER>
<MPI_TMPDIR>${env.MPI_TMPDIR}</MPI_TMPDIR>
<LD_PRELOAD>${env.LD_PRELOAD}</LD_PRELOAD>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/wms/conf/wms-env.sh
----------------------------------------------------------------------
diff --git a/wms/conf/wms-env.sh b/wms/conf/wms-env.sh
index 52bb8f0..304ee03 100644
--- a/wms/conf/wms-env.sh
+++ b/wms/conf/wms-env.sh
@@ -31,8 +31,8 @@
# export JAVA_HOME=/usr/java/jdk1.7.0/
# Add Trafodion to the classpath
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
export WMS_CLASSPATH=${CLASSPATH}:
fi
fi
@@ -113,5 +113,5 @@ export WMS_OPTS="-XX:+UseConcMarkSweepGC"
# export WMS_MANAGES_ZK=true
# Tell WMS where the user program environment lives.
- export WMS_USER_PROGRAM_HOME=$MY_SQROOT
+ export WMS_USER_PROGRAM_HOME=$TRAF_HOME
[05/10] incubator-trafodion git commit: convert all MY_SQROOT to
TRAF_HOME
Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/install_traf_components
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_traf_components b/core/sqf/sql/scripts/install_traf_components
index cd8e8af..650d5bc 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -21,23 +21,23 @@
#### Script to install and configure DCS, REST and Phoenix tests...
# Location of hadoop install
-MY_SW_ROOT=$MY_SQROOT/sql/local_hadoop
+MY_SW_ROOT=$TRAF_HOME/sql/local_hadoop
MY_LOG_FILE=$MY_SW_ROOT/log/install_traf_components_$(date +%F_%T).log
# Source in script to get the list of ports
-if [ -f $MY_SQROOT/sql/scripts/sw_env.sh ]; then
- . $MY_SQROOT/sql/scripts/sw_env.sh
+if [ -f $TRAF_HOME/sql/scripts/sw_env.sh ]; then
+ . $TRAF_HOME/sql/scripts/sw_env.sh
else
- echo "Unable to find $MY_SQROOT/sql/scripts/sw_env.sh to get the list of ports"
+ echo "Unable to find $TRAF_HOME/sql/scripts/sw_env.sh to get the list of ports"
exit 1;
fi
# Default location of Trafodion, DCS, REST and Phoenix src folders
-TRAF_SRC=$MY_SQROOT/../../
-DCS_SRC=$MY_SQROOT/../../dcs
-REST_SRC=$MY_SQROOT/../rest
-PHX_SRC=$MY_SQROOT/../../tests/phx
-TRAF_TARS=$MY_SQROOT/../../distribution
+TRAF_SRC=$TRAF_HOME/../../
+DCS_SRC=$TRAF_HOME/../../dcs
+REST_SRC=$TRAF_HOME/../rest
+PHX_SRC=$TRAF_HOME/../../tests/phx
+TRAF_TARS=$TRAF_HOME/../../distribution
if [ -z "$DCS_BLD" ]; then
DCS_BLD=$(ls -d $DCS_SRC/target/dcs-*/dcs-* 2>/dev/null)
@@ -110,13 +110,13 @@ else
elif [[ -d $DCS_SRC ]]; then
echo "DCS built target was not found in $DCS_SRC" | tee -a ${MY_LOG_FILE}
echo "Building DCS" | tee -a ${MY_LOG_FILE}
- if [[ -f $MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
+ if [[ -f $TRAF_HOME/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
echo "JDBCT4 jar file exist. Proceeding to build DCS from $DCS_SRC" | tee -a ${MY_LOG_FILE}
cd $DCS_SRC
${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
cd $MY_SW_ROOT
else
- echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. " | tee -a ${MY_LOG_FILE}
+ echo "JDBCT4 jar file does not exist $TRAF_HOME/export/lib folder. " | tee -a ${MY_LOG_FILE}
echo "Please build the core Trafodion component" | tee -a ${MY_LOG_FILE}
exit 2
fi
@@ -140,12 +140,12 @@ else
grep -v 'DCS_INSTALL_DIR=' ~/.trafodion.orig > ~/.trafodion
fi
DCSDIR=${DCS_HOME##*/}
- echo "export DCS_INSTALL_DIR=\${MY_SQROOT}/sql/local_hadoop/$DCSDIR" >> ~/.trafodion | tee -a ${MY_LOG_FILE}
+ echo "export DCS_INSTALL_DIR=\${TRAF_HOME}/sql/local_hadoop/$DCSDIR" >> ~/.trafodion | tee -a ${MY_LOG_FILE}
echo "Setting DCS env and site.xml file" | tee -a ${MY_LOG_FILE}
cd $DCS_HOME/conf/
mv dcs-env.sh dcs-env.sh.orig
- echo "MY_SQROOT=$MY_SQROOT" > dcs-env.sh
+ echo "TRAF_HOME=$TRAF_HOME" > dcs-env.sh
sed -e "s@#[ ]*export DCS_MANAGES_ZK=true@export DCS_MANAGES_ZK=false@" dcs-env.sh.orig >> dcs-env.sh
mv -f dcs-site.xml dcs-site.xml.orig
sed -e "s@</configuration>@@" dcs-site.xml.orig > dcs-site.xml
@@ -193,13 +193,13 @@ else
elif [[ -d $REST_SRC ]]; then
echo "REST built target was not found in $REST_SRC" | tee -a ${MY_LOG_FILE}
echo "Building REST" | tee -a ${MY_LOG_FILE}
- if [[ -f $MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
+ if [[ -f $TRAF_HOME/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
echo "JDBCT4 jar file exist. Proceeding to build REST from $REST_SRC" | tee -a ${MY_LOG_FILE}
cd $REST_SRC
${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
cd $MY_SW_ROOT
else
- echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. Please build the core Trafodion components" | tee -a ${MY_LOG_FILE}
+ echo "JDBCT4 jar file does not exist $TRAF_HOME/export/lib folder. Please build the core Trafodion components" | tee -a ${MY_LOG_FILE}
exit 2
fi
REST_BLD=$(ls -d $REST_SRC/target/rest-*/rest-* 2>/dev/null)
@@ -223,12 +223,12 @@ else
grep -v 'REST_INSTALL_DIR=' ~/.trafodion.orig >> ~/.trafodion
fi
RESTDIR=${REST_HOME##*/}
- echo "export REST_INSTALL_DIR=\${MY_SQROOT}/sql/local_hadoop/$RESTDIR" >> ~/.trafodion | tee -a ${MY_LOG_FILE}
+ echo "export REST_INSTALL_DIR=\${TRAF_HOME}/sql/local_hadoop/$RESTDIR" >> ~/.trafodion | tee -a ${MY_LOG_FILE}
echo "Setting REST env and site.xml " | tee -a ${MY_LOG_FILE}
cd $REST_HOME/conf/
mv rest-env.sh rest-env.sh.orig
- echo "MY_SQROOT=$MY_SQROOT" > rest-env.sh
+ echo "TRAF_HOME=$TRAF_HOME" > rest-env.sh
sed -e "s@#[ ]*export REST_MANAGES_ZK=true@export REST_MANAGES_ZK=false@" rest-env.sh.orig >> rest-env.sh
mv -f rest-site.xml rest-site.xml.orig
sed -e "s@</configuration>@@" rest-site.xml.orig > rest-site.xml
@@ -253,7 +253,7 @@ EOF
echo "Configured $REST_HOME/conf/rest-site.xml" | tee -a ${MY_LOG_FILE}
echo "Adding swrest script..." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swrest
+ cat <<EOF >$TRAF_HOME/sql/scripts/swrest
#!/bin/sh
# command to run rest tests
#Displays the status of configured servers
@@ -272,7 +272,7 @@ curl -X GET -H "Accept: application/json" http://localhost:$MY_REST_SERVER_PORT/
curl -X GET -H "Accept: application/json" http://localhost:$MY_REST_SERVER_PORT/v1/servers/dcs/connections | python -m json.tool
EOF
- chmod +x $MY_SQROOT/sql/scripts/swrest
+ chmod +x $TRAF_HOME/sql/scripts/swrest
fi
# End of setup for REST
@@ -283,19 +283,19 @@ echo | tee -a ${MY_LOG_FILE}
# Begin setup of TRAFCI
echo "Configuring TRAFCI " | tee -a ${MY_LOG_FILE}
-TRAFCI_BIN_DIR=$MY_SQROOT/trafci/bin
+TRAFCI_BIN_DIR=$TRAF_HOME/trafci/bin
if [[ -f $TRAFCI_BIN_DIR/trafci ]]
then
mv $TRAFCI_BIN_DIR/trafci $TRAFCI_BIN_DIR/trafci.orig | tee -a ${MY_LOG_FILE}
sed -e "s@localhost:23400@localhost:$MY_DCS_MASTER_PORT@" $TRAFCI_BIN_DIR/trafci.orig >> $TRAFCI_BIN_DIR/trafci | tee -a ${MY_LOG_FILE}
chmod +x $TRAFCI_BIN_DIR/trafci | tee -a ${MY_LOG_FILE}
echo "Adding swtrafci script..." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swtrafci
+ cat <<EOF >$TRAF_HOME/sql/scripts/swtrafci
#!/bin/sh
# command to run trafci
-$MY_SQROOT/trafci/bin/trafci.sh -h localhost:$MY_DCS_MASTER_PORT -u zz -p zz
+$TRAF_HOME/trafci/bin/trafci.sh -h localhost:$MY_DCS_MASTER_PORT -u zz -p zz
EOF
- chmod +x $MY_SQROOT/sql/scripts/swtrafci
+ chmod +x $TRAF_HOME/sql/scripts/swtrafci
else
echo "$TRAFCI_BIN_DIR not found" | tee -a ${MY_LOG_FILE}
fi
@@ -321,7 +321,7 @@ else
if [[ -d $PHXDIR ]]; then
echo "Adding swphoenix script..." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swphoenix
+ cat <<EOF >$TRAF_HOME/sql/scripts/swphoenix
#!/bin/sh
# command to run phoenix tests
@@ -329,12 +329,12 @@ cd $PHXDIR
if [[ \$1 == "t4" ]]
then
./phoenix_test.py --target=localhost:$MY_DCS_MASTER_PORT --user=dontcare --pw=dontcare \\
- --targettype=TR --javahome=\$JAVA_HOME --jdbccp=\$MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar
+ --targettype=TR --javahome=\$JAVA_HOME --jdbccp=\$TRAF_HOME/export/lib/jdbcT4-${TRAFODION_VER}.jar
elif [[ \$1 == "t2" ]]
then
- export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$MY_SQROOT/export/lib\$SQ_MBTYPE/libseabasesig.so
+ export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$TRAF_HOME/export/lib\$SQ_MBTYPE/libseabasesig.so
./phoenix_test.py --targettype=TR --javahome=\$JAVA_HOME \\
- --jdbccp=\$MY_SQROOT/export/lib/jdbcT2.jar --jdbctype=T2 \\
+ --jdbccp=\$TRAF_HOME/export/lib/jdbcT2.jar --jdbctype=T2 \\
--nomvntest --tests="AlterTableTest,ArithmeticQueryTest,BinaryRowKeyTest,CoalesceFunctionTest,CompareDecimalToLongTest,CustomEntityDataTest,DeleteRangeTest,DescColumnSortOrderTest,DistinctCountTest,ExtendedQueryExecTest,FunkyNamesTest,IsNullTest,OrderByTest,QueryExecTest,SaltedTableTest,SaltedTableUpsertSelectTest,SaltedTableVarLengthRowKeyTest,SkipScanQueryTest,UpsertSelectAutoCommitTest,UpsertSelectTest,UpsertValuesTest],AutoCommitTest,CreateTableTest,ExecuteStatementsTest,GroupByCaseTest,IndexTest,KeyOnlyTest,MultiCfQueryExecTest,ProductMetricsTest,QueryExecWithoutSCNTest,QueryPlanTest,ReadIsolationLevelTest,ServerExceptionTest,StatementHintsTest,StddevTest,ToCharFunctionTest,ToNumberFunctionTest,TopNTest,UpsertBigValuesTest,VariableLengthPKTest,SaltedTableUpsertSelectTest"
else
echo "Usage: swphoenix (t2|t4)"
@@ -342,7 +342,7 @@ else
fi
EOF
- chmod +x $MY_SQROOT/sql/scripts/swphoenix
+ chmod +x $TRAF_HOME/sql/scripts/swphoenix
fi
fi
@@ -373,7 +373,7 @@ EOF
cd ..
mv TRAFDSN TRAFDSN.orig
sed -e "s@TCP:localhost:23400@TCP:localhost:$MY_DCS_MASTER_PORT@" TRAFDSN.orig >> TRAFDSN
- cp -p TRAFDSN $MY_SQROOT/samples
+ cp -p TRAFDSN $TRAF_HOME/samples
echo "Successfully installed linux driver in $LNXDRVR"| tee -a ${MY_LOG_FILE}
echo "Creating odbcinst.ini file..." |tee -a ${MY_LOG_FILE}
cat <<EOF >$LNXDRVR/odbcinst.ini
@@ -414,14 +414,14 @@ SQL_QUERY_TIMEOUT = NO_TIMEOUT
EOF
echo "Adding swlnx script..." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swlnx
+ cat <<EOF >$TRAF_HOME/sql/scripts/swlnx
#!/bin/sh
# command to run lnx sample
cd $LNXDRVR
g++ -g connect_test.cpp -L$LNXDRVR -I/usr/include/odbc -ltrafodbc64 -o connect_test
./connect_test -d Default_DataSource -u ss -p ss
EOF
- chmod +x $MY_SQROOT/sql/scripts/swlnx
+ chmod +x $TRAF_HOME/sql/scripts/swlnx
fi
fi
@@ -444,7 +444,7 @@ else
tar -xzf $ODB_TAR | tee -a ${MY_LOG_FILE}
echo "Successfully installed ODB tool in $ODBLOC"| tee -a ${MY_LOG_FILE}
echo "Adding swodb script..." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swodb
+ cat <<EOF >$TRAF_HOME/sql/scripts/swodb
#!/bin/sh
# command to run odb sample
cd $ODBLOC/bin
@@ -457,7 +457,7 @@ export LD_LIBRARY_PATH=\$ODBCHOME:$LD_LIBRARY_PATH
./odb64luo -d traf -u ss -p ss -i
EOF
- chmod +x $MY_SQROOT/sql/scripts/swodb
+ chmod +x $TRAF_HOME/sql/scripts/swodb
fi
fi
@@ -490,19 +490,19 @@ else
if [[ -d $DCSTEST_DIR ]]; then
echo "Adding swjdbc script...." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swjdbc
+ cat <<EOF >$TRAF_HOME/sql/scripts/swjdbc
#!/bin/sh
# command to run JDBC tests
cd $JDBCTEST_DIR
./jdbc_test.py --appid=jdbc_test --user=SOMEUSER --pw=SOMEPASSWORD --javahome=\$JAVA_HOME \\
--target=localhost:$MY_DCS_MASTER_PORT --dbmaj=\$TRAFODION_VER_MAJOR --dbmin=\$TRAFODION_VER_MINOR \\
- --jdbctype=T4 --jdbccp=\$MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar "\$@"
+ --jdbctype=T4 --jdbccp=\$TRAF_HOME/export/lib/jdbcT4-${TRAFODION_VER}.jar "\$@"
EOF
- chmod +x $MY_SQROOT/sql/scripts/swjdbc
+ chmod +x $TRAF_HOME/sql/scripts/swjdbc
if [[ -f $LNXDRVR_TAR ]]; then
echo "Linux driver exists. Adding swpyodbc script...." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swpyodbc
+ cat <<EOF >$TRAF_HOME/sql/scripts/swpyodbc
#!/bin/sh
# command to run Python ODBC tests
cd $PYODBCTEST_DIR
@@ -510,7 +510,7 @@ cd $PYODBCTEST_DIR
tox -e py27
EOF
- chmod +x $MY_SQROOT/sql/scripts/swpyodbc
+ chmod +x $TRAF_HOME/sql/scripts/swpyodbc
fi
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/krb5check
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/krb5check b/core/sqf/sql/scripts/krb5check
index cbe3a95..2ab8c2c 100755
--- a/core/sqf/sql/scripts/krb5check
+++ b/core/sqf/sql/scripts/krb5check
@@ -31,8 +31,8 @@ function msg
# ******* main ******
WAIT_INTERVAL=300
REPORT_INTERVAL=12
-LOCK_FILE=$MY_SQROOT/tmp/krb5check
-LOG_FILE=$MY_SQROOT/logs/krb5check
+LOCK_FILE=$TRAF_HOME/tmp/krb5check
+LOG_FILE=$TRAF_HOME/logs/krb5check
CACHE_FILE=""
HOST_NAME=`hostname -f`
getKeytab
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/krb5functions
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/krb5functions b/core/sqf/sql/scripts/krb5functions
index 178e4f2..8cb2670 100755
--- a/core/sqf/sql/scripts/krb5functions
+++ b/core/sqf/sql/scripts/krb5functions
@@ -114,12 +114,12 @@ function getStatus
function getLogFile
{
- LOG_FILE=$MY_SQROOT/logs/krb5check
+ LOG_FILE=$TRAF_HOME/logs/krb5check
}
function getLockFile
{
- LOCK_FILE=$MY_SQROOT/tmp/krb5check
+ LOCK_FILE=$TRAF_HOME/tmp/krb5check
}
function getKeytab
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/krb5service
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/krb5service b/core/sqf/sql/scripts/krb5service
index 6169273..31049ed 100755
--- a/core/sqf/sql/scripts/krb5service
+++ b/core/sqf/sql/scripts/krb5service
@@ -47,9 +47,9 @@
# stop - stops the ticket renewal service
#
# Location attributes (see krb5functions to change these values):
-# [LOG_FILE] : $MY_SQROOT/logs/krb5check - log where all events are stored
+# [LOG_FILE] : $TRAF_HOME/logs/krb5check - log where all events are stored
# (the log file is recreated each time the krb5service is started)
-# [LOCK_FILE] : $MY_SQROOT/tmp/krb5check - file to keep track of krb5check process
+# [LOCK_FILE] : $TRAF_HOME/tmp/krb5check - file to keep track of krb5check process
# (acts as a semiphore to prevent multiple occurrances from running)
# [CACHE_FILE]: /tmp/krb5cc_(trafodion linux UID) - default location for Kerberos
# cache ticket store (CACHE_FILE)
@@ -228,7 +228,7 @@ if [ $doStart -eq 1 ]; then
fi
# remove log, may want to handle log garbage collection differently
- rm $MY_SQROOT/logs/krb5check
+ rm $TRAF_HOME/logs/krb5check
# kick off a process that wakes up once in a while and check for
# ticket expirations
@@ -240,7 +240,7 @@ if [ $doStart -eq 1 ]; then
getStatus
msg "starting service (krb5check)"
msg "$TICKET_STATUS"
- $MY_SQROOT/sql/scripts/krb5check -r 2 -w 300 &
+ $TRAF_HOME/sql/scripts/krb5check -r 2 -w 300 &
krb5checkPID=`echo $!`
# see if process started successfully
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/makemsg.ksh
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/makemsg.ksh b/core/sqf/sql/scripts/makemsg.ksh
index 5d24853..8079ac1 100755
--- a/core/sqf/sql/scripts/makemsg.ksh
+++ b/core/sqf/sql/scripts/makemsg.ksh
@@ -23,7 +23,7 @@
#
function GetSQcnfg {
# Get SQ Node configuration
- TempList=`grep -o 'node-name=.[^A-Za-z].[0-9]*' $MY_SQROOT/sql/scripts/sqconfig | cut -d "=" -f 2 | cut -d ";" -f 1 | sort -u`
+ TempList=`grep -o 'node-name=.[^A-Za-z].[0-9]*' $TRAF_HOME/sql/scripts/sqconfig | cut -d "=" -f 2 | cut -d ";" -f 1 | sort -u`
i=0
for NODE in $TempList
@@ -43,7 +43,7 @@ function GetSQcnfg {
else
echo
- echo "Could not parse $MY_SQROOT/sql/scripts/sqconfig file."
+ echo "Could not parse $TRAF_HOME/sql/scripts/sqconfig file."
echo "Please ensure sqenv.sh has been sourced and the sqconfig file is valid. Then, re-run sqgen."
echo
exit 1;
@@ -57,8 +57,8 @@ if [ -n "$MY_NODES" -a -e $SQ_PDCP ]; then
fi
-error_txt=$MY_SQROOT/export/include/sql/SqlciErrors.txt
-error_cat=$MY_SQROOT/export/bin$SQ_MBTYPE/mxcierrors.cat
+error_txt=$TRAF_HOME/export/include/sql/SqlciErrors.txt
+error_cat=$TRAF_HOME/export/bin$SQ_MBTYPE/mxcierrors.cat
# generate catalog only if it doesn't exist or $error_txt is older
if [ $error_txt -nt $error_cat ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/qmmstart
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/qmmstart b/core/sqf/sql/scripts/qmmstart
index 8285792..3343ebc 100755
--- a/core/sqf/sql/scripts/qmmstart
+++ b/core/sqf/sql/scripts/qmmstart
@@ -32,7 +32,7 @@
# -- tdm_arkqmm location
typeset qmmloc
-qmmloc="$MY_SQROOT/export/bin32"
+qmmloc="$TRAF_HOME/export/bin32"
#--QMM process name
qmmName="ZQM0000"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/rmscheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/rmscheck b/core/sqf/sql/scripts/rmscheck
index ac06524..f631655 100755
--- a/core/sqf/sql/scripts/rmscheck
+++ b/core/sqf/sql/scripts/rmscheck
@@ -24,4 +24,4 @@
# Most of this was stolen from WMScheck... which may have started as NDCScheck
echo "Timestamp Id Status "
-sqlci -i $MY_SQROOT/sql/scripts/rmscheck.sql | grep 'Node\|ERROR' | grep -v varchar
+sqlci -i $TRAF_HOME/sql/scripts/rmscheck.sql | grep 'Node\|ERROR' | grep -v varchar
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/runbats
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/runbats b/core/sqf/sql/scripts/runbats
index 00272d1..1128cfc 100755
--- a/core/sqf/sql/scripts/runbats
+++ b/core/sqf/sql/scripts/runbats
@@ -41,22 +41,22 @@ else
fi
# Run monitor development tests
-cd $MY_SQROOT/sql/scripts
-echo $MY_SQROOT/sql/scripts/bats/runmonitorbats.$enviroment
-$MY_SQROOT/sql/scripts/bats/runmonitorbats.$enviroment
+cd $TRAF_HOME/sql/scripts
+echo $TRAF_HOME/sql/scripts/bats/runmonitorbats.$enviroment
+$TRAF_HOME/sql/scripts/bats/runmonitorbats.$enviroment
# Run monitor development tests
-cd $MY_SQROOT/sql/scripts
-echo $MY_SQROOT/sql/scripts/bats/runseabedbats.$enviroment
-$MY_SQROOT/sql/scripts/bats/runseabedbats.$enviroment
+cd $TRAF_HOME/sql/scripts
+echo $TRAF_HOME/sql/scripts/bats/runseabedbats.$enviroment
+$TRAF_HOME/sql/scripts/bats/runseabedbats.$enviroment
# Run monitor development tests (not working yet)
-cd $MY_SQROOT/sql/scripts
-echo $MY_SQROOT/sql/scripts/bats/runtmbats.$enviroment
-$MY_SQROOT/sql/scripts/bats/runtmbats.$enviroment
+cd $TRAF_HOME/sql/scripts
+echo $TRAF_HOME/sql/scripts/bats/runtmbats.$enviroment
+$TRAF_HOME/sql/scripts/bats/runtmbats.$enviroment
# Run FULL SQL regressions
-cd $MY_SQROOT/sql/scripts
-echo $MY_SQROOT/sql/scripts/bats/runsqlreg.$enviroment
-$MY_SQROOT/sql/scripts/bats/runsqlreg.$enviroment
+cd $TRAF_HOME/sql/scripts
+echo $TRAF_HOME/sql/scripts/bats/runsqlreg.$enviroment
+$TRAF_HOME/sql/scripts/bats/runsqlreg.$enviroment
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheck b/core/sqf/sql/scripts/sqcheck
index 7fbc958..bdb3d94 100755
--- a/core/sqf/sql/scripts/sqcheck
+++ b/core/sqf/sql/scripts/sqcheck
@@ -252,7 +252,7 @@ let cmp_result=0
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"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqcheckmon
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheckmon b/core/sqf/sql/scripts/sqcheckmon
index b280de4..406ee6c 100755
--- a/core/sqf/sql/scripts/sqcheckmon
+++ b/core/sqf/sql/scripts/sqcheckmon
@@ -29,7 +29,7 @@ let lv_sleep_time=5
let lv_first_time=1
while [ $lv_sqmonitor_up '==' 0 ]; do
- sqshell -a <<EOF >$MY_SQROOT/logs/sqcheckmon.log 2>&1
+ sqshell -a <<EOF >$TRAF_HOME/logs/sqcheckmon.log 2>&1
EOF
let lv_sqshell_ret=$?
if [ $lv_sqshell_ret '==' 0 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqconfig
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqconfig b/core/sqf/sql/scripts/sqconfig
index 393600f..985d6d4 100644
--- a/core/sqf/sql/scripts/sqconfig
+++ b/core/sqf/sql/scripts/sqconfig
@@ -41,14 +41,14 @@ end role_node_map
#enc-2=n015,n016,n017,n018,n019,n020,n021,n022,n023,n024,n025,n026
#end enclosure
-storage_loc $MY_SQROOT/sql/database
+storage_loc $TRAF_HOME/sql/database
# Please note that if you have mirroring turned ON, you must specify
# the mirror storage locations. You can either specify a global
# mirror location by uncommenting and changing the line below, or
# you can configure mirror locations on a per volume basis.
-#storage_mir_loc $MY_SQROOT/sql/databasem
+#storage_mir_loc $TRAF_HOME/sql/databasem
# Extents are for data audit volumes only, not $TLOG
# Minimum is 1550
@@ -100,7 +100,7 @@ end tse
# Overflow directories for ssd and hdd. Format: [overflow type] [directory]
begin overflow
-hdd $MY_SQROOT/tmp
+hdd $TRAF_HOME/tmp
#ssd /ssd/directory
end overflow
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqconfig.sample
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqconfig.sample b/core/sqf/sql/scripts/sqconfig.sample
index 31e166e..ed158fb 100644
--- a/core/sqf/sql/scripts/sqconfig.sample
+++ b/core/sqf/sql/scripts/sqconfig.sample
@@ -85,8 +85,8 @@ end role_node_map
#
################################################################
-storage_loc $MY_SQROOT/sql/database
-storage_mir_loc $MY_SQROOT/sql/databasem
+storage_loc $TRAF_HOME/sql/database
+storage_mir_loc $TRAF_HOME/sql/databasem
# Extents are for data audit volumes only, not $TLOG
# Minimum is 1550
@@ -153,7 +153,7 @@ end ase
#
################################################################
-storage_loc $MY_SQROOT/sql/database
+storage_loc $TRAF_HOME/sql/database
################################################################
#
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqcore
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcore b/core/sqf/sql/scripts/sqcore
index bbff31c..acc90cf 100755
--- a/core/sqf/sql/scripts/sqcore
+++ b/core/sqf/sql/scripts/sqcore
@@ -22,7 +22,7 @@
# @@@ END COPYRIGHT @@@
#
#
-# sqcore - script to collect any user core files generated in /database or $MY_SQROOT
+# sqcore - script to collect any user core files generated in /database or $TRAF_HOME
# across the cluster, and move them to a central location on the head node. Currently,
# the script assumes it is run on the head node. The script assumes that the user
# will take space limitations into consideration.
@@ -34,7 +34,7 @@ function Usage {
echo "Usage: $0 [ -d <directory> | -q | -r | -h ]"
echo
echo "-d Head node directory where the users cluster core files are to be moved"
- echo " The default location is \$MY_SQROOT/logs"
+ echo " The default location is \$TRAF_HOME/logs"
echo "-q Quiet mode (no prompts)"
echo "-r Remove all of a users cluster core files (excluding head node)"
echo "-h Help"
@@ -93,7 +93,7 @@ declare -i SQ_REMOVE=0
declare -i ERR_FLAG=0
head=`headnode`
current=`uname -n`
-to_path=$MY_SQROOT/logs
+to_path=$TRAF_HOME/logs
GetOpts $@
@@ -128,20 +128,20 @@ if [ $SQ_QUIET '==' 0 ]; then
echo
fi
-# Create a list of directory to check for core files (/database and $MY_SQROOT/sql searches.
+# Create a list of directory to check for core files (/database and $TRAF_HOME/sql searches.
# Note that '$' is used as the field separator to parse out node, volume, and path
# The following can be used to pull the database locations from the sqconfig file,
# which assumes that the file is correctly configured. Note, that if used the zero-based
# node calculation should be un-commented from the below "if" statement.
-#dirlist=`grep database $MY_SQROOT/sql/scripts/sqconfig | /bin/gawk '{print $2"$"$3"/"$1}'; $SQ_PDSH -a "find -L $MY_SQROOT/sql -name core\.\* | /bin/gawk -F\/core '{print \\\$1}' | uniq" | /bin/gawk '{sub(":",""); print substr($1,2)"$"$2}'`
+#dirlist=`grep database $TRAF_HOME/sql/scripts/sqconfig | /bin/gawk '{print $2"$"$3"/"$1}'; $SQ_PDSH -a "find -L $TRAF_HOME/sql -name core\.\* | /bin/gawk -F\/core '{print \\\$1}' | uniq" | /bin/gawk '{sub(":",""); print substr($1,2)"$"$2}'`
MY_NODES_PRM=" -a "
if [ -n "$MY_NODES" ];then
MY_NODES_PRM=$MY_NODES
fi
-dirlist=`$PDSH $MY_NODES_PRM $PDSH_SSH_CMD "find -L $MY_SQROOT/sql -name core\.\* 2> /dev/null | /bin/gawk -F\/core '{print \\\$1}' | uniq; find -L $MY_SQROOT/export -name core\.\* 2> /dev/null | /bin/gawk -F\/core '{print \\\$1}' | uniq; find -L /database/u*/$USER -name core\.\* 2> /dev/null | /bin/gawk -F \/core '{print \\\$1}'" | /bin/gawk '{sub(":",""); print substr($1,2)"$"$2}' 2> /dev/null`
+dirlist=`$PDSH $MY_NODES_PRM $PDSH_SSH_CMD "find -L $TRAF_HOME/sql -name core\.\* 2> /dev/null | /bin/gawk -F\/core '{print \\\$1}' | uniq; find -L $TRAF_HOME/export -name core\.\* 2> /dev/null | /bin/gawk -F\/core '{print \\\$1}' | uniq; find -L /database/u*/$USER -name core\.\* 2> /dev/null | /bin/gawk -F \/core '{print \\\$1}'" | /bin/gawk '{sub(":",""); print substr($1,2)"$"$2}' 2> /dev/null`
if [[ $dirlist == "" ]]; then
echo "No core files were found. Exiting..."
@@ -189,7 +189,7 @@ do
if [[ $volume != "" ]]; then
scp n$node:$path/$j $head:$to_path/$file.n$node.$volume &> /dev/null
else
- scp n$node:$path/$j $head:$to_path/$file.n$node.MY_SQROOT &> /dev/null
+ scp n$node:$path/$j $head:$to_path/$file.n$node.TRAF_HOME &> /dev/null
fi
if [[ $? != 0 ]]; then
echo " Error while moving n$node:$path/$j..."
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqcorefile
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcorefile b/core/sqf/sql/scripts/sqcorefile
index f8522de..92c49d2 100755
--- a/core/sqf/sql/scripts/sqcorefile
+++ b/core/sqf/sql/scripts/sqcorefile
@@ -46,7 +46,7 @@ coreinfo_environ
eof
rc=$?
if [ $rc = 0 ]; then
- croot=`grep '^MY_SQROOT=' $TMP`
+ croot=`grep '^TRAF_HOME=' $TMP`
if [ -z "$croot" ]; then
rc=1
fi
@@ -88,7 +88,7 @@ eof
#
function chk_core_hard {
from=`file -L $core | sed "s|^.*from '|'|"`
- args="-s MY_SQROOT="
+ args="-s TRAF_HOME="
if [ $ldpath = 1 ]; then
args="$args -s LD_LIBRARY_PATH="
fi
@@ -101,7 +101,7 @@ function chk_core_hard {
LD_LIBRARY_PATH=*)
cldpath=$cd
;;
- MY_SQROOT=*)
+ TRAF_HOME=*)
croot=$cd
;;
PATH=*)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqgen
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqgen b/core/sqf/sql/scripts/sqgen
index a761f08..627194c 100755
--- a/core/sqf/sql/scripts/sqgen
+++ b/core/sqf/sql/scripts/sqgen
@@ -26,11 +26,11 @@
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 " -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
exit 1;
}
@@ -39,7 +39,7 @@ function Usage {
function GetSQcnfg {
# Get SQ Node configuration
- TempList=`grep -o 'node-name=.[A-Za-z0-9\.\-]*' $MY_SQROOT/sql/scripts/sqconfig | cut -d "=" -f 2 | cut -d ";" -f 1 | sort -u`
+ TempList=`grep -o 'node-name=.[A-Za-z0-9\.\-]*' $TRAF_HOME/sql/scripts/sqconfig | cut -d "=" -f 2 | cut -d ";" -f 1 | sort -u`
i=0
for NODE in $TempList
@@ -59,7 +59,7 @@ function GetSQcnfg {
else
echo
- echo "Could not parse $MY_SQROOT/sql/scripts/sqconfig file."
+ echo "Could not parse $TRAF_HOME/sql/scripts/sqconfig file."
echo "Please ensure sqenv.sh has been sourced and the sqconfig file is valid. Then, re-run sqgen."
echo
exit 1;
@@ -75,9 +75,9 @@ FT_FLAG=1
PERF_FLAG=0
SQCONFIG_FILE=sqconfig
-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;
@@ -99,7 +99,7 @@ elif [[ $sq_stat == 2 ]]; then
fi
# Make sure sqgen uses the latest environment
-cd $MY_SQROOT
+cd $TRAF_HOME
if [ "$SQ_BUILD_TYPE" == "release" -a -f sqenvr.sh ]; then
. ./sqenvr.sh
else
@@ -115,7 +115,7 @@ if [ -n "$CHANGED_SQ_ENV_RESTART_SHELL" ]; then
exit 1
fi
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
# Check to make sure this is a real cluster
if [[ -n "$node_count" ]] && [[ "$node_count" -gt "1" ]]; then
@@ -139,8 +139,8 @@ while [ $# != 0 ]
shift
done
-export SQETC_DIR=$MY_SQROOT/etc
-export SQLOG_DIR=$MY_SQROOT/logs
+export SQETC_DIR=$TRAF_HOME/etc
+export SQLOG_DIR=$TRAF_HOME/logs
mkdir -p $SQETC_DIR
mkdir -p $SQLOG_DIR
mkdir -p $MPI_TMPDIR
@@ -167,7 +167,7 @@ fi
SQSCRIPT_FILE=./gomon
SQCLUSTERCONF_FILE=$MPI_TMPDIR/cluster.conf
-SQESPENV_FILE=$MY_SQROOT/sql/scripts/tdm_arkesp.env
+SQESPENV_FILE=$TRAF_HOME/sql/scripts/tdm_arkesp.env
echo
if [ -f $SQETC_DIR/ms.env ]; then
@@ -218,24 +218,24 @@ sq_seamonster=$SQ_SEAMONSTER
if [ -f $SQESPENV_FILE ]; then
if [[ $sq_seamonster == 1 ]]; then
echo
- echo "Enabling tdm_arkesp.env file in $MY_SQROOT/etc/ms.env"
- echo "cat $MY_SQROOT/etc/ms.env | sed -e "s@^# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $MY_SQROOT/etc/ms.env.TEMP"
- if [ -f $MY_SQROOT/etc/ms.env.TEMP ]; then
- rm $MY_SQROOT/etc/ms.env.TEMP
+ echo "Enabling tdm_arkesp.env file in $TRAF_HOME/etc/ms.env"
+ echo "cat $TRAF_HOME/etc/ms.env | sed -e "s@^# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $TRAF_HOME/etc/ms.env.TEMP"
+ if [ -f $TRAF_HOME/etc/ms.env.TEMP ]; then
+ rm $TRAF_HOME/etc/ms.env.TEMP
fi
- cat $MY_SQROOT/etc/ms.env | sed -e "s@^# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $MY_SQROOT/etc/ms.env.TEMP
- cp $MY_SQROOT/etc/ms.env.TEMP $MY_SQROOT/etc/ms.env
- rm $MY_SQROOT/etc/ms.env.TEMP
+ cat $TRAF_HOME/etc/ms.env | sed -e "s@^# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $TRAF_HOME/etc/ms.env.TEMP
+ cp $TRAF_HOME/etc/ms.env.TEMP $TRAF_HOME/etc/ms.env
+ rm $TRAF_HOME/etc/ms.env.TEMP
else
echo
- echo "Disabling tdm_arkesp.env file in $MY_SQROOT/etc/ms.env"
- echo "cat $MY_SQROOT/etc/ms.env | sed -e "s@^SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $MY_SQROOT/etc/ms.env.TEMP"
- if [ -f $MY_SQROOT/etc/ms.env.TEMP ]; then
- rm $MY_SQROOT/etc/ms.env.TEMP
+ echo "Disabling tdm_arkesp.env file in $TRAF_HOME/etc/ms.env"
+ echo "cat $TRAF_HOME/etc/ms.env | sed -e "s@^SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $TRAF_HOME/etc/ms.env.TEMP"
+ if [ -f $TRAF_HOME/etc/ms.env.TEMP ]; then
+ rm $TRAF_HOME/etc/ms.env.TEMP
fi
- cat $MY_SQROOT/etc/ms.env | sed -e "s@^SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $MY_SQROOT/etc/ms.env.TEMP
- cp $MY_SQROOT/etc/ms.env.TEMP $MY_SQROOT/etc/ms.env
- rm $MY_SQROOT/etc/ms.env.TEMP
+ cat $TRAF_HOME/etc/ms.env | sed -e "s@^SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $TRAF_HOME/etc/ms.env.TEMP
+ cp $TRAF_HOME/etc/ms.env.TEMP $TRAF_HOME/etc/ms.env
+ rm $TRAF_HOME/etc/ms.env.TEMP
fi
fi
@@ -267,9 +267,9 @@ if [[ -n "$node_count" ]] && [[ "$node_count" -gt "1" ]]; then
if [[ $sq_seamonster == 1 ]]; then
if [ -f $SQESPENV_FILE ]; then
echo
- echo "Copying $SQESPENV_FILE to $MY_SQROOT/sql/scripts of all the nodes"
- echo "$PDCP -w ${ExNodeList[@]} -x `uname -n` $SQESPENV_FILE $MY_SQROOT/sql/scripts "
- $PDCP -w ${ExNodeList[@]} -x `uname -n` $SQESPENV_FILE $MY_SQROOT/sql/scripts
+ echo "Copying $SQESPENV_FILE to $TRAF_HOME/sql/scripts of all the nodes"
+ echo "$PDCP -w ${ExNodeList[@]} -x `uname -n` $SQESPENV_FILE $TRAF_HOME/sql/scripts "
+ $PDCP -w ${ExNodeList[@]} -x `uname -n` $SQESPENV_FILE $TRAF_HOME/sql/scripts
fi
fi
@@ -293,12 +293,12 @@ echo
echo "******* Generate public/private certificates *******"
echo
# Generate certificates for ODBC, ...
-if (test -f $MY_SQROOT/sql/scripts/sqcertgen); then
- $MY_SQROOT/sql/scripts/sqcertgen 2>/dev/null
+if (test -f $TRAF_HOME/sql/scripts/sqcertgen); then
+ $TRAF_HOME/sql/scripts/sqcertgen 2>/dev/null
echo
else
echo
- echo "ERROR: Certificate generation script (sqcertgen) does not exist in $MY_SQROOT/sql/scripts folder"
+ echo "ERROR: Certificate generation script (sqcertgen) does not exist in $TRAF_HOME/sql/scripts folder"
echo
exit 1
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqnodeipcrm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqnodeipcrm b/core/sqf/sql/scripts/sqnodeipcrm
index 00e9153..233bff7 100755
--- a/core/sqf/sql/scripts/sqnodeipcrm
+++ b/core/sqf/sql/scripts/sqnodeipcrm
@@ -59,13 +59,13 @@ function rm_shm {
}
declare -i portFilesCount
-let portFilesCount=`ls $MY_SQROOT/tmp/monitor.port.*.bak 2>/dev/null | wc -l`
+let portFilesCount=`ls $TRAF_HOME/tmp/monitor.port.*.bak 2>/dev/null | wc -l`
if ( [ "$portFilesCount" '==' 0 ] ); then
echo "Unable to get the monitor port number"
exit 1
fi
-portFiles=`ls $MY_SQROOT/tmp/monitor.port.*.bak`
+portFiles=`ls $TRAF_HOME/tmp/monitor.port.*.bak`
for portFile in $portFiles; do
rm_shm $portFile
done
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqsmdstats
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqsmdstats b/core/sqf/sql/scripts/sqsmdstats
index a14182d..a0802c9 100755
--- a/core/sqf/sql/scripts/sqsmdstats
+++ b/core/sqf/sql/scripts/sqsmdstats
@@ -75,15 +75,15 @@ function printHelp {
# check to see if the Trafodion environment is up
function chkInstance
{
- if [ -z $MY_SQROOT ]; then
- echo "ERROR: You need to set up the MY_SQROOT environment variable "
+ if [ -z $TRAF_HOME ]; then
+ echo "ERROR: You need to set up the TRAF_HOME environment variable "
echo "to continue using this script."
echo
echo "Exiting the sqsmdstats script."
exit 1;
fi
- $MY_SQROOT/sql/scripts/sqcheck -i 1 -d 1 > /dev/null 2>&1
+ $TRAF_HOME/sql/scripts/sqcheck -i 1 -d 1 > /dev/null 2>&1
sqcheck_result=$?
if [ $sqcheck_result -eq 0 ]; then
@@ -279,7 +279,7 @@ function generateOutput
# **************************************************************************
# FUNCTION: adjustSavedFiles
# removes old versions of saved files, only retain $archiveCount versions
-# copies final list of files to $MY_SQROOT/logs/sqsmdstats_logs directory
+# copies final list of files to $TRAF_HOME/logs/sqsmdstats_logs directory
# on all nodes
function adjustSavedFiles
{
@@ -499,7 +499,7 @@ fi
# set up script location, name of results file, etc.
if [ "$scriptAndLogLoc" = "" ]; then
- scriptAndLogLoc=$MY_SQROOT/logs/sqsmdstats_logs
+ scriptAndLogLoc=$TRAF_HOME/logs/sqsmdstats_logs
fi
resultsFile=$scriptAndLogLoc/sqsmdstats_details_$scriptStartTime.log
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqstart
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqstart b/core/sqf/sql/scripts/sqstart
index e231ee0..83f676e 100755
--- a/core/sqf/sql/scripts/sqstart
+++ b/core/sqf/sql/scripts/sqstart
@@ -25,7 +25,7 @@
#SQ Startup Driver Script. Use sqgen prior to this to generate various files required for startup.
function LogIt {
- echo "`date`: $1" >> $MY_SQROOT/logs/startup.log
+ echo "`date`: $1" >> $TRAF_HOME/logs/startup.log
}
function Usage {
@@ -115,10 +115,10 @@ function CheckMonitorLink {
if [ ! -e monitor ]; then
if [ -h monitor ]; then
- echoLog "The monitor link $MY_SQROOT/sql/scripts/monitor points to a non-existent target:"
+ echoLog "The monitor link $TRAF_HOME/sql/scripts/monitor points to a non-existent target:"
ls -al monitor
else
- echoLog "A soft link to 'monitor' is missing in $MY_SQROOT/sql/scripts"
+ echoLog "A soft link to 'monitor' is missing in $TRAF_HOME/sql/scripts"
fi
echoLog "Aborting startup."
LogIt "End $script_name $sq_start, exit code: 1"
@@ -295,11 +295,11 @@ STARTtime=$(date +%s)
GetOpts $BASH_ARGV
-if [ ! -z $MY_SQROOT ]; then
- cd $MY_SQROOT/sql/scripts
+if [ ! -z $TRAF_HOME ]; then
+ cd $TRAF_HOME/sql/scripts
else
echoLog
- echoLog "The MY_SQROOT environment variable does not exist."
+ echoLog "The TRAF_HOME environment variable does not exist."
echoLog "Please ensure sqenv.sh has been sourced, and re-run $script_name."
echoLog
exit 1;
@@ -312,7 +312,7 @@ if [[ $SQ_SEAMONSTER == "1" ]]; then
echoLog
echoLog "SeaMonster is enabled, checking SeaMonster Kernel Module installed version..."
echoLog
- sminfo_out=`$MY_SQROOT/export/bin${SQ_MBTYPE}/sminfo 2>&1`
+ sminfo_out=`$TRAF_HOME/export/bin${SQ_MBTYPE}/sminfo 2>&1`
if [ $? -gt 0 ]; then
echoLog "$sminfo_out"
lv_msg="Correct SeaMonster Kernel Module in not installed; please resolve this issue and re-run $script_name!"
@@ -325,7 +325,7 @@ if [[ $SQ_SEAMONSTER == "1" ]]; then
echoLog
fi
-if [[ ! -e $MY_SQROOT/sql/scripts/sw_env.sh ]]; then
+if [[ ! -e $TRAF_HOME/sql/scripts/sw_env.sh ]]; then
checkKerberos
if [[ $? -ne 0 ]]; then
echo
@@ -340,9 +340,9 @@ fi
declare -i lv_len_mysqroot
declare -i lv_max_mysqroot_len
lv_max_mysqroot_len=78
-lv_len_mysqroot=${#MY_SQROOT}
+lv_len_mysqroot=${#TRAF_HOME}
if [ $lv_len_mysqroot '>' $lv_max_mysqroot_len ]; then
- lv_msg="Length of the string \$MY_SQROOT ($MY_SQROOT) should be less than $lv_max_mysqroot_len. Exiting...";
+ lv_msg="Length of the string \$TRAF_HOME ($TRAF_HOME) should be less than $lv_max_mysqroot_len. Exiting...";
echoLog "$lv_msg"
LogIt "End $script_name $sq_start, exit code: 1, $lv_msg"
exit 1;
@@ -366,7 +366,7 @@ fi
SQCheckOrphanProcesses
if [[ $run_chk_dbperms == 1 ]]; then
- chk_dbperms=$MY_SQROOT/sql/scripts/chk_dbperms
+ chk_dbperms=$TRAF_HOME/sql/scripts/chk_dbperms
if [ -x $chk_dbperms ]; then
echo
echo "Checking ownership and permissions."
@@ -386,12 +386,12 @@ fi
-SQLOG_DIR=$MY_SQROOT/logs
+SQLOG_DIR=$TRAF_HOME/logs
SQMON_LOG=$SQLOG_DIR/sqmon.log
SQSTART_EXIT_STATUS=./sqstart.exit_status
if [[ -z $SQSCRIPTS_DIR ]]; then
- SQSCRIPTS_DIR=$MY_SQROOT/sql/scripts
+ SQSCRIPTS_DIR=$TRAF_HOME/sql/scripts
fi
mkdir -p $SQLOG_DIR
@@ -450,7 +450,7 @@ rm -f $MPI_TMPDIR/monitor.port.*
setup_sqpdsh
# Clear unique strings
-$SQPDSHA 'cd $MY_SQROOT/sql/scripts; utilConfigDb -u'
+$SQPDSHA 'cd $TRAF_HOME/sql/scripts; utilConfigDb -u'
echoLog "Executing sqipcrm (output to sqipcrm.out)"
sqipcrm > sqipcrm.out
@@ -492,8 +492,8 @@ let lv_num_checks=0
#Long recoveries on a cluster could delay TX services
let lv_max_checks=600
# Check if resource is a work station
-if [[ -e ${MY_SQROOT}/etc/ms.env ]] ; then
- VIRT_NODES=`awk '/SQ_VIRTUAL_NODES=/ { fields=split($0,virt,"="); if ( fields == 2 ) { virtnodes=virt[2];}} END {print virtnodes}' < $MY_SQROOT/etc/ms.env`
+if [[ -e ${TRAF_HOME}/etc/ms.env ]] ; then
+ VIRT_NODES=`awk '/SQ_VIRTUAL_NODES=/ { fields=split($0,virt,"="); if ( fields == 2 ) { virtnodes=virt[2];}} END {print virtnodes}' < $TRAF_HOME/etc/ms.env`
if [[ -n "$VIRT_NODES" ]] ; then
#Some utilities on workstations will timeout if we wait too long
lv_max_checks=360
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqstop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqstop b/core/sqf/sql/scripts/sqstop
index e4ecbb1..c09169b 100755
--- a/core/sqf/sql/scripts/sqstop
+++ b/core/sqf/sql/scripts/sqstop
@@ -35,7 +35,7 @@ function Usage {
}
function LogIt {
- echo "`date`: $1" >> $MY_SQROOT/logs/startup.log
+ echo "`date`: $1" >> $TRAF_HOME/logs/startup.log
}
function echoLog {
@@ -44,10 +44,10 @@ function echoLog {
}
script_name=`/bin/basename $0`
-SQLOG_DIR=$MY_SQROOT/logs
+SQLOG_DIR=$TRAF_HOME/logs
SQMON_LOG=$SQLOG_DIR/sqmon.log
-SQGOMON_FILE=$MY_SQROOT/sql/scripts/gomon.cold
-SQSTOP_EXIT_STATUS=$MY_SQROOT/sql/scripts/sqstop.exit_status
+SQGOMON_FILE=$TRAF_HOME/sql/scripts/gomon.cold
+SQSTOP_EXIT_STATUS=$TRAF_HOME/sql/scripts/sqstop.exit_status
if [ $# -eq 0 ]; then
shutdowntype=normal
@@ -197,17 +197,17 @@ $L_PDSH rm -f /dev/shm/sem.rms* 2>/dev/null
# Clean up Floating IP bound
if (test -n "${CLUSTERNAME}"); then
# Check whether floating ip is configured.
- gv_floating_ip=`grep -i "begin floating_ip" $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#'`
+ gv_floating_ip=`grep -i "begin floating_ip" $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#'`
if [ -n "$gv_floating_ip" ]; then
echoLog "Clean up Floating IP..."
cmd_timeout="-u 30"
# Get floating ip addresses.
- gv_float_external_ip=`sed -n '/begin floating_ip/,/end floating_ip/p' $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#' | grep external-ip | awk 'BEGIN{FS=";"}{split($3, ary, "="); print ary[2];}'`
- gv_float_external_interface=`sed -n '/begin floating_ip/,/end floating_ip/p' $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#' | grep external-ip | awk 'BEGIN{FS=";"}{split($2, ary, "="); print ary[2];}'`
- gv_float_internal_ip=`sed -n '/begin floating_ip/,/end floating_ip/p' $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#' | grep internal-ip | awk 'BEGIN{FS=";"}{split($3, ary, "="); print ary[2];}'`
- gv_float_internal_interface=`sed -n '/begin floating_ip/,/end floating_ip/p' $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#' | grep internal-ip | awk 'BEGIN{FS=";"}{split($2, ary, "="); print ary[2];}'`
+ gv_float_external_ip=`sed -n '/begin floating_ip/,/end floating_ip/p' $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#' | grep external-ip | awk 'BEGIN{FS=";"}{split($3, ary, "="); print ary[2];}'`
+ gv_float_external_interface=`sed -n '/begin floating_ip/,/end floating_ip/p' $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#' | grep external-ip | awk 'BEGIN{FS=";"}{split($2, ary, "="); print ary[2];}'`
+ gv_float_internal_ip=`sed -n '/begin floating_ip/,/end floating_ip/p' $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#' | grep internal-ip | awk 'BEGIN{FS=";"}{split($3, ary, "="); print ary[2];}'`
+ gv_float_internal_interface=`sed -n '/begin floating_ip/,/end floating_ip/p' $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#' | grep internal-ip | awk 'BEGIN{FS=";"}{split($2, ary, "="); print ary[2];}'`
# Check and get all the nodes that the ext/int IP address have been set. And do the unbind.
@@ -221,7 +221,7 @@ if (test -n "${CLUSTERNAME}"); then
unbindip=`echo "$match_ip_interface"|awk '{print $2}'`
unbindlb=`echo "$match_ip_interface"|awk '{print $NF}'`
echoLog "pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb"
- pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb >> $MY_SQROOT/logs/ndcsunbind.log
+ pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb >> $TRAF_HOME/logs/ndcsunbind.log
fi
done
done
@@ -236,7 +236,7 @@ if (test -n "${CLUSTERNAME}"); then
unbindip=`echo "$match_ip_interface"|awk '{print $2}'`
unbindlb=`echo "$match_ip_interface"|awk '{print $NF}'`
echoLog "pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb"
- pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb >> $MY_SQROOT/logs/ndcsunbind.log
+ pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb >> $TRAF_HOME/logs/ndcsunbind.log
fi
done
done
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqsystem.pm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqsystem.pm b/core/sqf/sql/scripts/sqsystem.pm
index b380b79..f44144b 100755
--- a/core/sqf/sql/scripts/sqsystem.pm
+++ b/core/sqf/sql/scripts/sqsystem.pm
@@ -40,10 +40,10 @@ sub isProd
sub isSingleNode
{
- my $MY_SQROOT = $ENV{'MY_SQROOT'};
+ my $TRAF_HOME = $ENV{'TRAF_HOME'};
# Get the number of nodes in the instance
- my $TempList = `grep 'node-name=.[^A-Za-z].[0-9]*' $MY_SQROOT/sql/scripts/sqconfig | grep -v "\#" | cut -d"=" -f3 | cut -d";" -f1 | sort -u`;
+ my $TempList = `grep 'node-name=.[^A-Za-z].[0-9]*' $TRAF_HOME/sql/scripts/sqconfig | grep -v "\#" | cut -d"=" -f3 | cut -d";" -f1 | sort -u`;
if (!$TempList)
{# Single-node development system
return 1; # true
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/traf_authentication_config
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/traf_authentication_config b/core/sqf/sql/scripts/traf_authentication_config
index 4165603..62cbc5c 100755
--- a/core/sqf/sql/scripts/traf_authentication_config
+++ b/core/sqf/sql/scripts/traf_authentication_config
@@ -24,9 +24,9 @@
# directory service configuration.
#
# To use authentication in Trafodion, this file must be configured
-# as described below and placed in $MY_SQROOT/sql/scripts and be named
+# as described below and placed in $TRAF_HOME/sql/scripts and be named
# .traf_authentication_config. You must also enable authentication by
-# running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+# running the script traf_authentication_setup in $TRAF_HOME/sql/scripts.
#
# NOTE: the format of this configuration file is expected to change in the
# next release of Trafodion. Backward compatilibity is not guaranteed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/traf_authentication_setup
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/traf_authentication_setup b/core/sqf/sql/scripts/traf_authentication_setup
index 98ead6f..650a7a0 100755
--- a/core/sqf/sql/scripts/traf_authentication_setup
+++ b/core/sqf/sql/scripts/traf_authentication_setup
@@ -33,7 +33,7 @@
# --file <name> (OPTIONAL)
# ==> specifies the name of the ldap configuration file that
# will be used to contact the identity store
-# defaults to: $MY_SQROOT/sql/script/.traf_authentication_config
+# defaults to: $TRAF_HOME/sql/script/.traf_authentication_config
#
# When specifying --setup or --on, the script:
# ==> verifies that the configuration file exists
@@ -41,9 +41,9 @@
# ==> calls ldapcheck to test a connection to LDAP
# ==> if all is good then:
# ==> sets the environment variable TRAFODION_ENABLE_AUTHENTICATION to
-# YES in $MY_SQROOT/sqenvcom.sh
-# ==> copies $MY_SQROOT/sqenvcom.sh to all nodes in cluster
-# ==> propagates $MY_SQROOT/sql/script/.traf_authentication_config to
+# YES in $TRAF_HOME/sqenvcom.sh
+# ==> copies $TRAF_HOME/sqenvcom.sh to all nodes in cluster
+# ==> propagates $TRAF_HOME/sql/script/.traf_authentication_config to
# all nodes in the cluster
#
# When specifying --on
@@ -54,8 +54,8 @@
#
# When specifying --off, the script:
# ==> sets the environment variable TRAFODION_ENABLE_AUTHENTICATION = YES
-# in $MY_SQROOT/sqenvcom.sh
-# ==> copies $MY_SQROOT/sqenvcom.sh to all nodes in cluster
+# in $TRAF_HOME/sqenvcom.sh
+# ==> copies $TRAF_HOME/sqenvcom.sh to all nodes in cluster
#
# To know whether authentication is enable or not, specify:
# -- status
@@ -91,19 +91,19 @@ EOF
function change_sqenvcom
{
echo "INFO: Modifying sqenvcom.sh to adjust the authentication default"
- cp $MY_SQROOT/sqenvcom.sh sqenvcom.sh_temp
+ cp $TRAF_HOME/sqenvcom.sh sqenvcom.sh_temp
if [ $authOn -eq 1 ]; then
- sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=NO@TRAFODION_ENABLE_AUTHENTICATION=YES@" <sqenvcom.sh_temp >$MY_SQROOT/sqenvcom.sh
+ sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=NO@TRAFODION_ENABLE_AUTHENTICATION=YES@" <sqenvcom.sh_temp >$TRAF_HOME/sqenvcom.sh
echo "INFO: Authentication has been enabled"
else
- sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=YES@TRAFODION_ENABLE_AUTHENTICATION=NO@" <sqenvcom.sh_temp >$MY_SQROOT/sqenvcom.sh
+ sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=YES@TRAFODION_ENABLE_AUTHENTICATION=NO@" <sqenvcom.sh_temp >$TRAF_HOME/sqenvcom.sh
echo "INFO: Authentication has been disabled"
fi
rm sqenvcom.sh_temp > /dev/null 2>&1
if [ $isCluster -eq 1 ]; then
- #echo "pdcp -p -x $HOSTNAME $MY_NODES $MY_SQROOT/sqenvcom.sh $MY_SQROOT"
- pdcp -p -x $HOSTNAME $MY_NODES $MY_SQROOT/sqenvcom.sh $MY_SQROOT
+ #echo "pdcp -p -x $HOSTNAME $MY_NODES $TRAF_HOME/sqenvcom.sh $TRAF_HOME"
+ pdcp -p -x $HOSTNAME $MY_NODES $TRAF_HOME/sqenvcom.sh $TRAF_HOME
fi
}
@@ -172,7 +172,7 @@ function copy_config
fi
rm auth_configcheck
- # copy the configuration file to $MY_SQROOT/sql/scripts on
+ # copy the configuration file to $TRAF_HOME/sql/scripts on
# all nodes in the cluster
if [ $isCluster -eq 1 ]; then
@@ -189,7 +189,7 @@ function copy_config
# =============================================================================
function enable_authorization
{
- logLoc=$MY_SQROOT/logs
+ logLoc=$TRAF_HOME/logs
rm $logLoc/authEnable.log > /dev/null 2>&1
#gdb sqlci
sqlci >> "$logLoc/authEnable.log" 2>&1 <<eof
@@ -216,7 +216,7 @@ eof
# =============================================================================
function disable_authorization
{
- logLoc=$MY_SQROOT/logs
+ logLoc=$TRAF_HOME/logs
rm $logLoc/authDisable.log > /dev/null 2>&1
sqlci >> "$logLoc/authDisable.log" 2>&1 <<eof
values (current_timestamp);
@@ -243,7 +243,7 @@ eof
# =============================================================================
function status_authorization
{
- logLoc=$MY_SQROOT/logs
+ logLoc=$TRAF_HOME/logs
rm $logLoc/authStatus.log > /dev/null 2>&1
sqlci >> "$logLoc/authStatus.log" 2>&1 <<eof
values (current_timestamp);
@@ -268,7 +268,7 @@ eof
# main
# =============================================================================
-defaultConfigFileDir="$MY_SQROOT/sql/scripts"
+defaultConfigFileDir="$TRAF_HOME/sql/scripts"
defaultConfigFile="/.traf_authentication_config"
configFileDir=$defaultConfigFileDir
configFile=$defaultConfigFileDir$defaultConfigFile
@@ -282,9 +282,9 @@ doStatus=0
statusSpecified=0
# Make sure required env vars have been set first
-if [[ -z "$MY_SQROOT" ]]; then
+if [[ -z "$TRAF_HOME" ]]; then
echo
- echo "***ERROR: Environment variable MY_SQROOT has no value."
+ echo "***ERROR: Environment variable TRAF_HOME has no value."
echo
exit 1
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/trafnodestatus
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/trafnodestatus b/core/sqf/sql/scripts/trafnodestatus
index f7e5956..86e7d52 100755
--- a/core/sqf/sql/scripts/trafnodestatus
+++ b/core/sqf/sql/scripts/trafnodestatus
@@ -59,13 +59,13 @@ if [[ ! -z $1 ]]; then
fi
fi
-if [[ -z $MY_SQROOT ]]; then
+if [[ -z $TRAF_HOME ]]; then
traf_echo "Looks like the Trafodion environment has not been configured. Exitting..."
traf_exit 5;
fi
if [[ -z $SQSCRIPTS_DIR ]]; then
- SQSCRIPTS_DIR=$MY_SQROOT/sql/scripts
+ SQSCRIPTS_DIR=$TRAF_HOME/sql/scripts
fi
SQCONFIGDB_FILE="$SQSCRIPTS_DIR/sqconfig.db"
if [[ ! -e ${SQCONFIGDB_FILE} ]]; then
@@ -76,7 +76,7 @@ fi
grep_out=`pstat | grep "monitor COLD" | grep -v mpirun`
if [[ $? == '0' ]]; then
- sqshell -c node info | awk -v jason_output=${lv_jason_output} -f $MY_SQROOT/sql/scripts/trafnodestatus.awk
+ sqshell -c node info | awk -v jason_output=${lv_jason_output} -f $TRAF_HOME/sql/scripts/trafnodestatus.awk
traf_exit $?
else
traf_echo "Trafodion is not running on the current node: `hostname`"
@@ -89,12 +89,12 @@ if [[ ! -z ${SQ_VIRTUAL_NODES} ]]; then
traf_exit 1
fi
-grep_out_mon=`$MY_SQROOT/sql/scripts/cstat | grep "monitor COLD" `
+grep_out_mon=`$TRAF_HOME/sql/scripts/cstat | grep "monitor COLD" `
lv_ret=$?
if [[ $lv_ret == 0 ]]; then
grep_out=`cstat | grep "monitor COLD" | grep -v mpirun | sort | cut -d: -f1`
for lv_node in $grep_out; do
- ssh $lv_node sqshell -c node info | awk -v jason_output=${lv_jason_output} -f $MY_SQROOT/sql/scripts/trafnodestatus.awk
+ ssh $lv_node sqshell -c node info | awk -v jason_output=${lv_jason_output} -f $TRAF_HOME/sql/scripts/trafnodestatus.awk
lv_sqcheck_retcode=$?
traf_exit ${lv_exit_code}
done
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/uninstall_traf_components
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/uninstall_traf_components b/core/sqf/sql/scripts/uninstall_traf_components
index 2748413..20641e2 100755
--- a/core/sqf/sql/scripts/uninstall_traf_components
+++ b/core/sqf/sql/scripts/uninstall_traf_components
@@ -23,7 +23,7 @@
RM='/bin/rm -rf'
function usage() {
- LOCAL_HADOOP_DIR=\$MY_SQROOT/sql/local_hadoop
+ LOCAL_HADOOP_DIR=\$TRAF_HOME/sql/local_hadoop
prog=`basename $0`
echo "$prog { all | dcs | rest | clients | tests }"
echo " all --- Removes all the installed components (dcs, rest and clients) from $LOCAL_HADOOP_DIR"
@@ -54,7 +54,7 @@ function uninstall_rest() {
if [[ -d $REST_INSTALL_DIR ]]; then
echo "**** Uninstalling REST Server from $REST_INSTALL_DIR"
- $RM $REST_INSTALL_DIR $MY_SQROOT/sql/scripts/swrest
+ $RM $REST_INSTALL_DIR $TRAF_HOME/sql/scripts/swrest
status_code=$?
if [[ $status_code != 0 ]]; then
echo "**** Failed to uninstall REST from $REST_INSTALL_DIR :" $status_code
@@ -70,12 +70,12 @@ function uninstall_rest() {
function uninstall_clients_dir() {
- CLIENTS_DIR=$MY_SQROOT/sql/local_hadoop/clients
- LNXDRVR_DIR=$MY_SQROOT/sql/local_hadoop/lnxdrvr
- ODB_DIR=$MY_SQROOT/sql/local_hadoop/odb
+ CLIENTS_DIR=$TRAF_HOME/sql/local_hadoop/clients
+ LNXDRVR_DIR=$TRAF_HOME/sql/local_hadoop/lnxdrvr
+ ODB_DIR=$TRAF_HOME/sql/local_hadoop/odb
if [[ -d $CLIENTS_DIR ]]; then
echo "**** Uninstalling clients (lnxdrvr and odb) from $CLIENTS_DIR"
- $RM $CLIENTS_DIR $LNXDRVR_DIR $ODB_DIR $MY_SQROOT/sql/scripts/swodb $MY_SQROOT/sql/scripts/swlnx
+ $RM $CLIENTS_DIR $LNXDRVR_DIR $ODB_DIR $TRAF_HOME/sql/scripts/swodb $TRAF_HOME/sql/scripts/swlnx
status_code=$?
if [[ $status_code != 0 ]]; then
echo "**** Failed to uninstall clients (lnxdrvr and odb) from $CLIENTS_DIR :" $status_code
@@ -91,11 +91,11 @@ function uninstall_clients_dir() {
function uninstall_tests_dir() {
- DCSTEST_DIR=$MY_SQROOT/sql/local_hadoop/dcstests
- TESTS_DIR=$MY_SQROOT/sql/local_hadoop/tests
+ DCSTEST_DIR=$TRAF_HOME/sql/local_hadoop/dcstests
+ TESTS_DIR=$TRAF_HOME/sql/local_hadoop/tests
if [[ -d $DCSTEST_DIR ]]; then
echo "**** Uninstalling dcs(jdbc/odbc) tests from $DCSTEST_DIR"
- $RM $DCSTEST_DIR $MY_SQROOT/sql/scripts/swjdbc $MY_SQROOT/sql/scripts/swpyodbc
+ $RM $DCSTEST_DIR $TRAF_HOME/sql/scripts/swjdbc $TRAF_HOME/sql/scripts/swpyodbc
status_code=$?
if [[ $status_code != 0 ]]; then
echo "**** Failed to uninstall odbc/jdbc tests directory from $DCSTEST_DIR :" $status_code
@@ -110,7 +110,7 @@ function uninstall_tests_dir() {
if [[ -d $TESTS_DIR ]]; then
echo "**** Uninstalling phoenix tests from $TESTS_DIR"
- $RM $TESTS_DIR $MY_SQROOT/sql/scripts/swphoenix
+ $RM $TESTS_DIR $TRAF_HOME/sql/scripts/swphoenix
status_code=$?
if [[ $status_code != 0 ]]; then
echo "**** Failed to uninstall phoenix tests directory from $TESTS_DIR :" $status_code
@@ -126,7 +126,7 @@ function uninstall_tests_dir() {
#Main
echo
-if [ ! -z ${MY_SQROOT} ]; then
+if [ ! -z ${TRAF_HOME} ]; then
case "$1" in
dcs)
uninstall_dcs
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/update_hbase
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/update_hbase b/core/sqf/sql/scripts/update_hbase
index 7aa8e60..17b0669 100644
--- a/core/sqf/sql/scripts/update_hbase
+++ b/core/sqf/sql/scripts/update_hbase
@@ -27,7 +27,7 @@
# Currently, it works for local_hadoop installations only.
#
-if [ -d $MY_SQROOT/sql/local_hadoop/hbase ]; then
+if [ -d $TRAF_HOME/sql/local_hadoop/hbase ]; then
echo "An existing Hadoop installation exists. Will:"
echo " - Stop HBase"
echo " - Copy TRX jar"
@@ -44,7 +44,7 @@ else
exit 1
fi
-cd $MY_SQROOT/sql/local_hadoop/
+cd $TRAF_HOME/sql/local_hadoop/
echo "Stopping HBase"
swstophbase
# Let the HBase env settle down
@@ -54,8 +54,8 @@ HBASE_CONFIG_FILE=hbase/conf/hbase-site.xml
HBASE_ENV_FILE=hbase/conf/hbase-env.sh
# For HBase_Trx (for now)
-echo "Copied ${MY_SQROOT}/export/lib/${HBASE_TRX_JAR} to $PWD/hbase/lib"
-cp -p ${MY_SQROOT}/export/lib/${HBASE_TRX_JAR} hbase/lib
+echo "Copied ${TRAF_HOME}/export/lib/${HBASE_TRX_JAR} to $PWD/hbase/lib"
+cp -p ${TRAF_HOME}/export/lib/${HBASE_TRX_JAR} hbase/lib
echo "Updating file $HBASE_CONFIG_FILE ..."
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/update_sql
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/update_sql b/core/sqf/sql/scripts/update_sql
index 3099c44..c244b57 100755
--- a/core/sqf/sql/scripts/update_sql
+++ b/core/sqf/sql/scripts/update_sql
@@ -22,7 +22,7 @@
# @@@ END COPYRIGHT @@@
#
# update_sql - SQ Script to update sql/sqlmx (or a supplied directory) to all nodes.
-# $MY_SQROOT should be sourced from sqenv.sh prior to running this script.
+# $TRAF_HOME should be sourced from sqenv.sh prior to running this script.
#
function Usage {
@@ -79,13 +79,13 @@ GetOpts $@
# Default is to copy SQL files from current nodes sql/sqlmx if a -i dir isn't supplied
if [ -z $SQ_COPY_FROM ]; then
- SQ_COPY_FROM=$MY_SQROOT/sql/sqlmx
+ SQ_COPY_FROM=$TRAF_HOME/sql/sqlmx
- if [ -e $MY_SQROOT ]; then
- SQ_COPY_TO=$MY_SQROOT/sql/sqlmx
+ if [ -e $TRAF_HOME ]; then
+ SQ_COPY_TO=$TRAF_HOME/sql/sqlmx
else
echo
- echo "Error - MY_SQROOT env variable does not exist."
+ echo "Error - TRAF_HOME env variable does not exist."
echo " Source sqenv.sh and retry $0. Exiting..."
echo
exit 2
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sqvers
----------------------------------------------------------------------
diff --git a/core/sqf/sqvers b/core/sqf/sqvers
index 313474f..a59ab0a 100755
--- a/core/sqf/sqvers
+++ b/core/sqf/sqvers
@@ -58,9 +58,9 @@ if (!$res) {
}
}
-# get MY_SQROOT/who/host
+# get TRAF_HOME/who/host
my $sq_pdsh = defined $ENV{'SQ_PDSH'} ? $ENV{'SQ_PDSH'} : '';
-my $my_sqroot = defined $ENV{'MY_SQROOT'} ? $ENV{'MY_SQROOT'} : '';
+my $traf_home = defined $ENV{'TRAF_HOME'} ? $ENV{'TRAF_HOME'} : '';
my $java_home = defined $ENV{'JAVA_HOME'} ? $ENV{'JAVA_HOME'} : '';
my $sq_mbtype = defined $ENV{'SQ_MBTYPE'} ? $ENV{'SQ_MBTYPE'} : '';
my $host;
@@ -105,12 +105,12 @@ if (-r "/etc/redhat-release") {
$dr=$susevers . "." . $susepatch
}
-print "MY_SQROOT=$my_sqroot\n";
+print "TRAF_HOME=$traf_home\n";
print "who\@host=$w\@$host\n";
print "JAVA_HOME=$java_home\n";
# can't do much if these two env variables are not setup
-if (!defined $ENV{'MY_SQROOT'}) {
- die "MY_SQROOT is not set!";
+if (!defined $ENV{'TRAF_HOME'}) {
+ die "TRAF_HOME is not set!";
}
if (!defined $ENV{'JAVA_HOME'}) {
die "JAVA_HOME is not set!";
@@ -138,7 +138,7 @@ if ($utt) {
sub find_elfs ($$) {
my ($dir, $so) = @_;
- my $chdir = "$my_sqroot/$dir";
+ my $chdir = "$traf_home/$dir";
chdir($chdir) or die "can't chdir to $chdir $!";
my $ls;
if ($so) {
@@ -188,7 +188,7 @@ sub find_elfs ($$) {
sub find_jars ($) {
my ($dir) = @_;
- my $chdir = "$my_sqroot/$dir";
+ my $chdir = "$traf_home/$dir";
chdir($chdir) or die "can't chdir to $chdir $!";
my $ls = `ls *.jar`;
my @files = split(/\n/, $ls);
@@ -310,14 +310,14 @@ sub version_elf ($$) {
}
}
if (!$has_version) {
- print "\$MY_SQROOT/$dir/$elf missing version string\n";
+ print "\$TRAF_HOME/$dir/$elf missing version string\n";
}
}
sub version_jar ($$) {
my ($dir, $jar) = @_;
- my $cmd_vers = "$java_home/bin/java -jar $my_sqroot/export/lib/sqmanvers.jar $jar";
+ my $cmd_vers = "$java_home/bin/java -jar $traf_home/export/lib/sqmanvers.jar $jar";
if ($verbose) {
printf "v: cmd:$cmd_vers\n";
}
@@ -348,7 +348,7 @@ sub version_jar ($$) {
}
if (!$utt && !$has_version) {
- print "\$MY_SQROOT/$dir/$jar missing version string\n";
+ print "\$TRAF_HOME/$dir/$jar missing version string\n";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/macros.gmk b/core/sqf/src/seabed/macros.gmk
index 8d24632..5e36a28 100644
--- a/core/sqf/src/seabed/macros.gmk
+++ b/core/sqf/src/seabed/macros.gmk
@@ -35,7 +35,7 @@ INCMISCDIR += $(INCMONDIR)
# export
-EXPROOT = $(MY_SQROOT)/export
+EXPROOT = $(TRAF_HOME)/export
# seabed
SBROOT = ..
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/src/env.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/env.cpp b/core/sqf/src/seabed/src/env.cpp
index 06bb6cc..9b576b1 100644
--- a/core/sqf/src/seabed/src/env.cpp
+++ b/core/sqf/src/seabed/src/env.cpp
@@ -68,7 +68,7 @@ const char *gp_ms_env_sq_ic = "SQ_IC";
const char *gp_ms_env_sq_msgflow = "SQ_MSGFLOW";
const char *gp_ms_env_sq_snapshot_dir = "SQ_SNAPSHOT_DIR";
const char *gp_ms_env_sq_trans_sock = "SQ_TRANS_SOCK";
-const char *gp_ms_env_sq_root = "MY_SQROOT";
+const char *gp_ms_env_sq_root = "TRAF_HOME";
const char *gp_ms_env_sq_vnid = "SQ_VIRTUAL_NID";
const char *gp_ms_env_sq_vnodes = "SQ_VIRTUAL_NODES";
const char *gp_ms_env_streams_max = "MS_STREAMS_MAX";
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/src/util.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/util.cpp b/core/sqf/src/seabed/src/util.cpp
index 868b6e9..9ea3610 100644
--- a/core/sqf/src/seabed/src/util.cpp
+++ b/core/sqf/src/seabed/src/util.cpp
@@ -1249,7 +1249,7 @@ void sb_util_write_log(char *pp_buf) {
strncpy(gv_ms_save_log, pp_buf, sizeof(gv_ms_save_log) - 1);
gv_ms_save_log[sizeof(gv_ms_save_log) - 1] = '\0';
- lp_root = getenv("MY_SQROOT");
+ lp_root = getenv("TRAF_HOME");
if (lp_root == NULL)
lp_log_file_dir = NULL;
else {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/go284j
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/go284j b/core/sqf/src/seabed/test/go284j
index a766f4b..277d9dc 100755
--- a/core/sqf/src/seabed/test/go284j
+++ b/core/sqf/src/seabed/test/go284j
@@ -28,7 +28,7 @@ rm -f core.* sbt*
go69mon -start
t284srv -attach $* &
sleep 1
-LD_PRELOAD=$MY_SQROOT/export/lib64/libseabasesig.so $JAVA_HOME/bin/java -cp Linux-x86_64/64/rls com.hp.traf.t284cli $*
+LD_PRELOAD=$TRAF_HOME/export/lib64/libseabasesig.so $JAVA_HOME/bin/java -cp Linux-x86_64/64/rls com.hp.traf.t284cli $*
wait %1
go69mon -stop
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/go9
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/go9 b/core/sqf/src/seabed/test/go9
index e2085bc..6f37f8c 100755
--- a/core/sqf/src/seabed/test/go9
+++ b/core/sqf/src/seabed/test/go9
@@ -36,14 +36,14 @@ if [ $check = 1 ]; then
export LD_LIBRARY_PATH=../evsim:$LD_LIBRARY_PATH
vg=`which valgrind`
# strlen/strcmp/memcmp problem workaround on RH6
- sed "s|MY_SQROOT|$MY_SQROOT|" ./t9thread.rh6.supp > ./t9thread.rh6x.supp
+ sed "s|TRAF_HOME|$TRAF_HOME|" ./t9thread.rh6.supp > ./t9thread.rh6x.supp
supp="--suppressions=./t9thread.rh6x.supp"
# To rebuild the suppressions file:
# uncomment the following
# go9 -check -vg 2>zx
# edit zx:
# remove all lines that start with '=='
- # change expanded version of $MY_SQROOT with 'MY_SQROOT' (no $!)
+ # change expanded version of $TRAF_HOME with 'TRAF_HOME' (no $!)
# edit <insert_a_suppression_name_here>
# copy zx to t9thread.rh6.supp
# svn commit t9thread.rh6.supp
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/goshell205
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/goshell205 b/core/sqf/src/seabed/test/goshell205
index 288ccc5..76d0cdc 100755
--- a/core/sqf/src/seabed/test/goshell205
+++ b/core/sqf/src/seabed/test/goshell205
@@ -41,7 +41,7 @@ if [ "$5" = "-attach" ]; then
fi
if [ $attach = 1 ]; then
- sqshell=$MY_SQROOT/sql/scripts/sqshell
+ sqshell=$TRAF_HOME/sql/scripts/sqshell
if [ -r $sqshell ]; then
nodes=`grep -w SQ_VIRTUAL_NODES $sqshell`
if [ $? != 0 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/gostart
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/gostart b/core/sqf/src/seabed/test/gostart
index ddff662..edf1765 100755
--- a/core/sqf/src/seabed/test/gostart
+++ b/core/sqf/src/seabed/test/gostart
@@ -23,6 +23,6 @@
date
rm -f core.* > /dev/null 2>&1
sqipcrm
-if [ ! -d $MY_SQROOT/logs ]; then
- mkdir $MY_SQROOT/logs
+if [ ! -d $TRAF_HOME/logs ]; then
+ mkdir $TRAF_HOME/logs
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/t9thread.rh6.supp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/t9thread.rh6.supp b/core/sqf/src/seabed/test/t9thread.rh6.supp
index 3bcc844..fabc914 100644
--- a/core/sqf/src/seabed/test/t9thread.rh6.supp
+++ b/core/sqf/src/seabed/test/t9thread.rh6.supp
@@ -31,8 +31,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
}
{
@@ -47,8 +47,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
}
{
@@ -62,8 +62,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
}
@@ -78,8 +78,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
}
@@ -95,8 +95,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
}
{
@@ -110,8 +110,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
}
@@ -126,8 +126,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
}
@@ -143,8 +143,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
}
{
@@ -158,8 +158,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
}
@@ -174,8 +174,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
}
@@ -189,8 +189,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
obj:*
@@ -207,8 +207,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
}
{
@@ -222,8 +222,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
}
@@ -238,8 +238,8 @@
fun:_ZN8SB_Trans7Msg_Mgr4initEv
fun:_Z41__static_initialization_and_destruction_0ii
fun:_GLOBAL__sub_I_mpitmsg.cpp
- obj:MY_SQROOT/export/lib64/libsbms.so
- obj:MY_SQROOT/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
+ obj:TRAF_HOME/export/lib64/libsbms.so
obj:*
obj:*
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/tcheck.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/tcheck.cpp b/core/sqf/src/seabed/test/tcheck.cpp
index c5c66f2..337b845 100644
--- a/core/sqf/src/seabed/test/tcheck.cpp
+++ b/core/sqf/src/seabed/test/tcheck.cpp
@@ -100,7 +100,7 @@ int main(int argc, char *argv[]) {
return 0;
}
if (!env.load(config_file)) { // try to load default config
- char *root = getenv("MY_SQROOT");
+ char *root = getenv("TRAF_HOME");
if (root != NULL) {
char la_file[BUFSIZ];
sprintf(la_file, "%s/etc/%s", root, config_file);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/tools/sqmanvers
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/tools/sqmanvers b/core/sqf/src/seabed/tools/sqmanvers
index 601913b..421d682 100755
--- a/core/sqf/src/seabed/tools/sqmanvers
+++ b/core/sqf/src/seabed/tools/sqmanvers
@@ -25,4 +25,4 @@
###########################################################################
CV_VERS=1.0.2
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
+$TRAF_HOME/export/include/SCMBuildJava.sh $CV_VERS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/tools/sqmanvers.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/tools/sqmanvers.java b/core/sqf/src/seabed/tools/sqmanvers.java
index 04c442e..21c853c 100644
--- a/core/sqf/src/seabed/tools/sqmanvers.java
+++ b/core/sqf/src/seabed/tools/sqmanvers.java
@@ -138,7 +138,7 @@ public class sqmanvers {
String lp_jar;
String lp_sqroot;
- lp_sqroot = System.getenv("MY_SQROOT");
+ lp_sqroot = System.getenv("TRAF_HOME");
lp_jar = lp_sqroot + "/export/lib/sqmanvers.jar";
jar_man_vers(lp_jar);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/hbase-trx/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/Makefile b/core/sqf/src/seatrans/hbase-trx/Makefile
index 63f1e51..c52821f 100644
--- a/core/sqf/src/seatrans/hbase-trx/Makefile
+++ b/core/sqf/src/seatrans/hbase-trx/Makefile
@@ -46,62 +46,62 @@ jdk_1_7_cdh54: build_chk_cdh54
echo "$(MAVEN) package -DskipTests"
echo "### For full Maven output, see file build_trx.log"
set -o pipefail && $(MAVEN) -f pom.xml.cdh54 package install -DskipTests | tee -a build_trx.log
- mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ mkdir -p $(TRAF_HOME)/export/lib
+ cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
jdk_1_7_cdh55: build_chk_cdh55
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) CDH5.5
set -o pipefail && $(MAVEN) -f pom.xml.cdh55 package install -DskipTests | tee -a build_trx.log
- mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ mkdir -p $(TRAF_HOME)/export/lib
+ cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
jdk_1_7_cdh57: build_chk_cdh57
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) CDH5.7
set -o pipefail && $(MAVEN) -f pom.xml.cdh57 package install -DskipTests | tee -a build_trx.log
- mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_CDH57_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ mkdir -p $(TRAF_HOME)/export/lib
+ cp -pf target/$(BLD_HBASE_CDH57_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
jdk_1_7_mapr: build_chk_mapr
set -o pipefail && $(MAVEN) -f pom.xml.mapr package -DskipTests | tee -a build_trx.log
- mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_MAPR_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ mkdir -p $(TRAF_HOME)/export/lib
+ cp -pf target/$(BLD_HBASE_MAPR_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
jdk_1_7_hdp: build_chk_hdp
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) HDP2.3
set -o pipefail && $(MAVEN) -f pom.xml.hdp package -DskipTests | tee -a build_trx.log
- mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ mkdir -p $(TRAF_HOME)/export/lib
+ cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
jdk_1_7_apache10: build_chk_apache10
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) APACHE1.0
set -o pipefail && $(MAVEN) -f pom.xml.apache10 package -DskipTests | tee build_trx.log
- mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ mkdir -p $(TRAF_HOME)/export/lib
+ cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
jdk_1_7_apache11: build_chk_apache11
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) APACHE1.1
set -o pipefail && $(MAVEN) -f pom.xml.apache11 package -DskipTests | tee build_trx.log
- mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ mkdir -p $(TRAF_HOME)/export/lib
+ cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
jdk_1_7_apache12: build_chk_apache12
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) APACHE1.2
set -o pipefail && $(MAVEN) -f pom.xml.apache12 package -DskipTests | tee build_trx.log
- mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_APACHE12_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ mkdir -p $(TRAF_HOME)/export/lib
+ cp -pf target/$(BLD_HBASE_APACHE12_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
build_all: jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_cdh57 jdk_1_7_hdp jdk_1_7_apache10 jdk_1_7_apache11 jdk_1_7_apache12
@@ -109,52 +109,52 @@ build_all: jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_cdh57 jdk_1_7_hdp jdk_1_7_apache1
build_chk_apache10:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
build_chk_apache11:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
build_chk_apache12:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE12_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE12_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE12_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE12_TRX_JARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE12_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE12_TRX_JARNAME); fi
build_chk_cdh54:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
build_chk_cdh55:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
build_chk_cdh57:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH57_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH57_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH57_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH57_TRX_JARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH57_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH57_TRX_JARNAME); fi
build_chk_mapr:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_HBASE_MAPR_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_MAPR_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_MAPR_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_MAPR_TRX_JARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_MAPR_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_MAPR_TRX_JARNAME); fi
build_chk_hdp:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
clean:
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME)
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME)
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
$(REINSTATE_ORIG)
-$(MAVEN) -f pom.xml.apache10 clean | grep ERROR
-$(MAVEN) -f pom.xml.apache11 clean | grep ERROR
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/hbase-trx/genvers
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/genvers b/core/sqf/src/seatrans/hbase-trx/genvers
index 49c9bae..ac35489 100755
--- a/core/sqf/src/seatrans/hbase-trx/genvers
+++ b/core/sqf/src/seatrans/hbase-trx/genvers
@@ -24,4 +24,4 @@
#
CV_VERS=1.0.1
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
+$TRAF_HOME/export/include/SCMBuildJava.sh $CV_VERS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
index 9dd0cd7..12859d8 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
@@ -66,12 +66,12 @@ all: $(PROGS) mavenbuild
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-dtm.jar.mf
+ $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >src/main/resources/trafodion-dtm.jar.mf
# run maven
set -o pipefail; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
set -o pipefail; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build_apache.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
set -o pipefail; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build_hdp.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- cp -pf target/trafodion-dtm-*.jar $(MY_SQROOT)/export/lib
+ cp -pf target/trafodion-dtm-*.jar $(TRAF_HOME)/export/lib
$(LIBEXPDIR)/libshbasetmlib.so: $(LIBSTMOBJS)
$(CXX) $(DTMOBJS) $(LNK_FLGS) $(LIBTMB) -shared -o $@ $(LIBSTMOBJS)
@@ -99,7 +99,7 @@ clean:
$(RM) $(PROGS)
$(RM) *.gcda *.gcno *.gcov
$(RM) -f $(OUTDIR)/*.o
- $(RM) -rf $(MY_SQROOT)/export/lib/trafodion-dtm-*.jar
+ $(RM) -rf $(TRAF_HOME)/export/lib/trafodion-dtm-*.jar
-$(MAVEN) -f pom.xml clean
cleanall: clean
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java b/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java
index b7c26ed..8382c19 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java
@@ -62,6 +62,6 @@ public class TM_Interface {
void setupLog4j() {
//System.out.println("In setupLog4J");
- String confFile = System.getenv("MY_SQROOT")
+ String confFile = System.getenv("TRAF_HOME")
+ "/logs/log4j.dtm.config";
PropertyConfigurator.configure(confFile);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
index efc2709..6550926 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
@@ -51,14 +51,14 @@
<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.hbase.coprocessor.transactional.generated</groupId>
<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.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
index 56db70f..3b626e1 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
@@ -51,7 +51,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.slf4j</groupId>
[09/10] incubator-trafodion git commit: change SQ_ROOT to TRAF_HOME
for merging issue
Posted by li...@apache.org.
change SQ_ROOT to TRAF_HOME for merging issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a0b7e216
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a0b7e216
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a0b7e216
Branch: refs/heads/master
Commit: a0b7e216a9d8ec1901e0737273d52d8a25d57408
Parents: b4c7c81
Author: Eason <hf...@gmail.com>
Authored: Fri Dec 9 12:47:59 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Tue Dec 13 14:21:22 2016 +0800
----------------------------------------------------------------------
core/conn/trafci/Makefile | 2 +-
core/sqf/sql/scripts/analyzeMessageGuide.py | 6 +++---
core/sqf/src/tm/macros.gmk | 2 +-
dcs/src/test/odbc/build/Makefile | 2 +-
install/python-installer/traf_setup.py | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/core/conn/trafci/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/trafci/Makefile b/core/conn/trafci/Makefile
index c9c2da5..94d72c5 100644
--- a/core/conn/trafci/Makefile
+++ b/core/conn/trafci/Makefile
@@ -34,4 +34,4 @@ Trafci_installer:
mvn -f installer_pom.xml -DbldId=${buildId} clean package -DskipTests$
Trafci_deploy:
zip -r ../clients/trafci.zip -j target/trafciInstaller.jar utils/README
- java -jar target/trafciInstaller.jar -silent -jdbcFile ${MY_SQROOT}/export/lib/jdbcT4.jar -installDir ${MY_SQROOT}
+ java -jar target/trafciInstaller.jar -silent -jdbcFile ${TRAF_HOME}/export/lib/jdbcT4.jar -installDir ${TRAF_HOME}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/core/sqf/sql/scripts/analyzeMessageGuide.py
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/analyzeMessageGuide.py b/core/sqf/sql/scripts/analyzeMessageGuide.py
index 07295c4..4f9940b 100644
--- a/core/sqf/sql/scripts/analyzeMessageGuide.py
+++ b/core/sqf/sql/scripts/analyzeMessageGuide.py
@@ -591,10 +591,10 @@ exitCode = 0
messagesTable = MessagesTable()
-# check that $MY_SQROOT is set
-mySQroot = os.getenv('MY_SQROOT')
+# check that $TRAF_HOME is set
+mySQroot = os.getenv('TRAF_HOME')
if not mySQroot:
- print "$MY_SQROOT is not defined. Exiting."
+ print "$TRAF_HOME is not defined. Exiting."
exit(1)
# parse the Messages Guide files
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/core/sqf/src/tm/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/macros.gmk b/core/sqf/src/tm/macros.gmk
index 302d677..c37d744 100644
--- a/core/sqf/src/tm/macros.gmk
+++ b/core/sqf/src/tm/macros.gmk
@@ -93,7 +93,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$(MY_SPROOT)/export/include -I$(MY_SPROOT)/source/publications -I$(PROTOBUFS)/include -I$(HBASETMLIB) -I$(INC_JAVA) -I$(INC_JAVALINUX) -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/log4cxx -I$(LIBCLOGGER) -I$(MY_SQROOT)/src/tm
+INCLUDES = -I$(INCEXPDIR) -I$(INCMONDIR) -I$(MY_SPROOT)/export/include -I$(MY_SPROOT)/source/publications -I$(PROTOBUFS)/include -I$(HBASETMLIB) -I$(INC_JAVA) -I$(INC_JAVALINUX) -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/log4cxx -I$(LIBCLOGGER) -I$(TRAF_HOME)/src/tm
#LIBSX = -lpthread
LIBSX = -pthread
ifeq ($(USE_THREADED_IO),1)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/dcs/src/test/odbc/build/Makefile
----------------------------------------------------------------------
diff --git a/dcs/src/test/odbc/build/Makefile b/dcs/src/test/odbc/build/Makefile
index e491dd2..4d64c66 100644
--- a/dcs/src/test/odbc/build/Makefile
+++ b/dcs/src/test/odbc/build/Makefile
@@ -21,7 +21,7 @@
#// @@@ END COPYRIGHT @@@
#**************************************************************************/
-LIB = -L${MY_SQROOT}/export/lib64 -ltrafodbc64
+LIB = -L${TRAF_HOME}/export/lib64 -ltrafodbc64
CXX_FLAGS = -c -g -fshort-wchar -I/usr/include/odbc
CC = /usr/bin/g++
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/install/python-installer/traf_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_setup.py b/install/python-installer/traf_setup.py
index acc7acb..3925fd8 100755
--- a/install/python-installer/traf_setup.py
+++ b/install/python-installer/traf_setup.py
@@ -50,7 +50,7 @@ def run():
### kernel settings ###
run_cmd('sysctl -w kernel.pid_max=65535 2>&1 > /dev/null')
run_cmd('echo "kernel.pid_max=65535" >> /etc/sysctl.conf')
- run_cmd('cp %s/sysinstall/etc/init.d/trafodion /etc/init.d' % SQ_ROOT)
+ run_cmd('cp %s/sysinstall/etc/init.d/trafodion /etc/init.d' % TRAF_HOME)
run_cmd('chkconfig --add trafodion')
run_cmd('chkconfig --level 06 trafodion on')
[07/10] incubator-trafodion git commit: convert all MY_SQROOT to
TRAF_HOME
Posted by li...@apache.org.
convert all MY_SQROOT to TRAF_HOME
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0d467cad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0d467cad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0d467cad
Branch: refs/heads/master
Commit: 0d467cad933d1036ee503041fdc41e858c0d51fb
Parents: 971df7a
Author: Eason <hf...@gmail.com>
Authored: Wed Dec 7 14:05:48 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Wed Dec 7 14:05:48 2016 +0800
----------------------------------------------------------------------
RAT_README | 30 ++---
core/Makefile | 2 +-
core/bldenvchk.sh | 6 +-
core/conn/Makefile | 4 +-
core/conn/jdbcT4/Makefile | 6 +-
core/conn/jdbc_type2/Makefile | 8 +-
core/conn/jdbc_type2/build.xml | 8 +-
core/conn/jdbc_type2/samples/README | 4 +-
core/conn/odb/Makefile | 6 +-
core/conn/odbc/src/odbc/Makefile | 12 +-
core/conn/odbc/src/odbc/macros.gmk | 2 +-
core/conn/odbc/src/odbc/nsksrvr/Makefile | 6 +-
core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 6 +-
core/conn/trafci/manualtests/README | 2 +-
.../src/org/trafodion/ci/UserInterface.java | 2 +-
core/conn/trafci/utils/ciencr.sh | 8 +-
core/conn/trafci/utils/trafci | 2 +-
core/conn/trafci/utils/trafci.cmd-tmpl | 2 +-
core/conn/trafci/utils/trafci_install.sh | 8 +-
.../odbc/odbcclient/unixcli/makefile.lnx | 4 +-
.../odbc/odbcclient/unixcli/package/mklnxpkg.sh | 2 +-
.../unixcli/package/runconnect_test.sh | 2 +-
core/dbsecurity/Makefile | 12 +-
core/dbsecurity/auth/Makefile | 16 +--
core/dbsecurity/auth/src/authEvents.cpp | 4 +-
core/dbsecurity/auth/src/ldapconfigfile.cpp | 18 +--
core/dbsecurity/auth/src/sqldapconfigcheck.cpp | 2 +-
core/dbsecurity/cert/Makefile | 10 +-
core/dbsecurity/cert/src/secsrvr.cpp | 2 +-
core/dbsecurity/macros.gmk | 2 +-
core/dbsecurity/scripts/sqcertgen | 2 +-
core/dbsecurity/scripts/update_auth | 16 +--
core/mpi/Makefile | 4 +-
core/rest/Makefile | 2 +-
core/rest/bin/rest | 8 +-
core/rest/conf/rest-env.sh | 4 +-
core/rest/genvers | 2 +-
.../asciidoc/_chapters/getting_started.adoc | 2 +-
core/seamonster/src/Makefile | 4 +-
core/seamonster/src/macros.gmk | 4 +-
core/sqf/LocalSettingsTemplate.sh | 10 +-
core/sqf/Makefile | 12 +-
core/sqf/build-scripts/check_man | 6 +-
core/sqf/build-scripts/genverhdr.ksh | 2 +-
core/sqf/commonLogger/CommonLogger.cpp | 6 +-
core/sqf/commonLogger/CommonLogger.h | 2 +-
core/sqf/conf/install_features | 2 +-
core/sqf/conf/log4cxx.monitor.mon.config | 2 +-
core/sqf/conf/log4cxx.monitor.mon.snmp.config | 2 +-
core/sqf/conf/log4cxx.monitor.psd.config | 2 +-
core/sqf/conf/log4cxx.monitor.wdg.config | 2 +-
core/sqf/conf/log4cxx.monitor.wdg.snmp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.auth.config | 2 +-
core/sqf/conf/log4cxx.trafodion.lob.config | 2 +-
.../sqf/conf/log4cxx.trafodion.masterexe.config | 2 +-
core/sqf/conf/log4cxx.trafodion.sscp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.ssmp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.tm.config | 2 +-
core/sqf/conf/log4cxx.trafodion.udr.config | 2 +-
core/sqf/conf/trafodion.udr.config | 4 +-
.../sqf/export/limited-support-tools/LSO/README | 14 +--
.../export/limited-support-tools/LSO/offender | 2 +-
core/sqf/export/share/man/man1/createhooks.1 | 2 +-
core/sqf/export/share/man/man1/sqcore.1 | 4 +-
core/sqf/export/share/man/man1/sqcorefile.1 | 2 +-
core/sqf/export/share/man/man1/sqgen.1 | 38 +++---
core/sqf/export/share/man/man1/sqid.1 | 2 +-
core/sqf/export/share/man/man1/sqinfo.1 | 8 +-
core/sqf/export/share/man/man1/sqvers.1 | 8 +-
core/sqf/export/share/man/man1/update_sql.1 | 2 +-
core/sqf/gdb/create-host-tar-lib | 14 +--
core/sqf/hbase_utilities/Makefile | 6 +-
.../backup_restore_functions.sh | 16 +--
core/sqf/macros.gmk | 8 +-
core/sqf/monitor/linux/config.cxx | 4 +-
core/sqf/monitor/linux/macros.gmk | 2 +-
core/sqf/monitor/linux/monitor.cxx | 4 +-
core/sqf/monitor/linux/monlogging.cxx | 4 +-
core/sqf/monitor/linux/montest_run.virtual | 6 +-
core/sqf/monitor/linux/process.cxx | 4 +-
core/sqf/monitor/linux/process.h | 2 +-
core/sqf/monitor/linux/pstartd.cxx | 2 +-
core/sqf/monitor/linux/reqqueue.cxx | 2 +-
core/sqf/monitor/linux/shell.cxx | 10 +-
core/sqf/monitor/test/notes.txt | 2 +-
core/sqf/monitor/test/runtest | 46 ++++----
core/sqf/monitor/test/sqconfig.monitor.cluster | 2 +-
core/sqf/sqenvcom.sh | 54 ++++-----
core/sqf/sqevlog/sq_evl_libs/macros.gmk | 2 +-
core/sqf/sqid | 10 +-
core/sqf/sqinfo | 18 +--
core/sqf/sql/macros.gmk | 2 +-
core/sqf/sql/scripts/UsasRepos | 2 +-
.../sqf/sql/scripts/bats/runmonitorbats.virtual | 6 +-
core/sqf/sql/scripts/bats/runseabedbats.virtual | 8 +-
core/sqf/sql/scripts/bats/runsqlreg.virtual | 8 +-
core/sqf/sql/scripts/bats/runtmbats.virtual | 14 +--
core/sqf/sql/scripts/bats/sqconfig.tm | 4 +-
core/sqf/sql/scripts/build_apidocs.sh | 4 +-
core/sqf/sql/scripts/ckill | 4 +-
core/sqf/sql/scripts/ckillall | 4 +-
core/sqf/sql/scripts/cleanZKNodes | 2 +-
core/sqf/sql/scripts/cleanat | 2 +-
core/sqf/sql/scripts/cleanlogs | 16 +--
core/sqf/sql/scripts/cresumeall | 4 +-
core/sqf/sql/scripts/cstat | 2 +-
core/sqf/sql/scripts/csuspendall | 6 +-
core/sqf/sql/scripts/dbcheck | 12 +-
core/sqf/sql/scripts/genmon | 2 +-
core/sqf/sql/scripts/genms | 10 +-
core/sqf/sql/scripts/gensq.pl | 8 +-
core/sqf/sql/scripts/genstats.sh | 2 +-
core/sqf/sql/scripts/get_libhdfs_files | 6 +-
core/sqf/sql/scripts/ilh_cleanhb | 12 +-
core/sqf/sql/scripts/ilh_hbase_repair | 8 +-
core/sqf/sql/scripts/ilh_hbcheck | 4 +-
core/sqf/sql/scripts/ilh_traf_restart | 16 +--
core/sqf/sql/scripts/ilh_trafinit | 16 +--
core/sqf/sql/scripts/install_apache_hadoop | 48 ++++----
core/sqf/sql/scripts/install_local_drill | 16 +--
core/sqf/sql/scripts/install_local_hadoop | 22 ++--
core/sqf/sql/scripts/install_traf_components | 76 ++++++------
core/sqf/sql/scripts/krb5check | 4 +-
core/sqf/sql/scripts/krb5functions | 4 +-
core/sqf/sql/scripts/krb5service | 8 +-
core/sqf/sql/scripts/makemsg.ksh | 8 +-
core/sqf/sql/scripts/qmmstart | 2 +-
core/sqf/sql/scripts/rmscheck | 2 +-
core/sqf/sql/scripts/runbats | 24 ++--
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqcheckmon | 2 +-
core/sqf/sql/scripts/sqconfig | 6 +-
core/sqf/sql/scripts/sqconfig.sample | 6 +-
core/sqf/sql/scripts/sqcore | 14 +--
core/sqf/sql/scripts/sqcorefile | 6 +-
core/sqf/sql/scripts/sqgen | 62 +++++-----
core/sqf/sql/scripts/sqnodeipcrm | 4 +-
core/sqf/sql/scripts/sqsmdstats | 10 +-
core/sqf/sql/scripts/sqstart | 32 ++---
core/sqf/sql/scripts/sqstop | 22 ++--
core/sqf/sql/scripts/sqsystem.pm | 4 +-
core/sqf/sql/scripts/traf_authentication_config | 4 +-
core/sqf/sql/scripts/traf_authentication_setup | 36 +++---
core/sqf/sql/scripts/trafnodestatus | 10 +-
core/sqf/sql/scripts/uninstall_traf_components | 22 ++--
core/sqf/sql/scripts/update_hbase | 8 +-
core/sqf/sql/scripts/update_sql | 10 +-
core/sqf/sqvers | 20 ++--
core/sqf/src/seabed/macros.gmk | 2 +-
core/sqf/src/seabed/src/env.cpp | 2 +-
core/sqf/src/seabed/src/util.cpp | 2 +-
core/sqf/src/seabed/test/go284j | 2 +-
core/sqf/src/seabed/test/go9 | 4 +-
core/sqf/src/seabed/test/goshell205 | 2 +-
core/sqf/src/seabed/test/gostart | 4 +-
core/sqf/src/seabed/test/t9thread.rh6.supp | 56 ++++-----
core/sqf/src/seabed/test/tcheck.cpp | 2 +-
core/sqf/src/seabed/tools/sqmanvers | 2 +-
core/sqf/src/seabed/tools/sqmanvers.java | 2 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 64 +++++-----
core/sqf/src/seatrans/hbase-trx/genvers | 2 +-
core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 6 +-
.../seatrans/tm/hbasetmlib2/TMInterface.java | 2 +-
.../src/seatrans/tm/hbasetmlib2/pom.xml.apache | 4 +-
.../sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 2 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 4 +-
core/sqf/src/seatrans/tm/macros.gmk | 6 +-
core/sqf/src/tm/Makefile | 6 +-
core/sqf/src/tm/macros.gmk | 4 +-
core/sqf/src/tm/tools/run_dtmci | 4 +-
core/sqf/tools/sqdiag_core_compare | 2 +-
core/sqf/tools/sqdiag_core_mask | 2 +-
core/sqf/tools/sqtools.sh | 116 +++++++++----------
core/sql/SqlCompilerDebugger/cln.sh | 6 +-
core/sql/arkcmp/CmpErrLog.cpp | 6 +-
core/sql/bin/ex_esp_main.cpp | 2 +-
core/sql/cli/Cli.cpp | 2 +-
core/sql/cli/SessionDefaults.cpp | 2 +-
core/sql/common/ComRtUtils.cpp | 2 +-
core/sql/common/Ipc.cpp | 4 +-
core/sql/executor/ExSMTrace.cpp | 6 +-
core/sql/executor/HdfsLogger.h | 2 +-
core/sql/executor/JavaObjectInterface.cpp | 2 +-
core/sql/exp/ExpLOBaccess.cpp | 2 +-
core/sql/export/NAAbort.cpp | 2 +-
core/sql/langman/LmLangManagerJava.cpp | 2 +-
core/sql/lib_mgmt/Makefile | 4 +-
core/sql/lib_mgmt/README.rst | 2 +-
core/sql/lib_mgmt/pom.xml | 2 +-
.../java/org/trafodion/libmgmt/FileMgmt.java | 2 +-
.../lib_mgmt/src/main/resources/init_libmgmt.sh | 2 +-
core/sql/nskgmake/Makerules.linux | 26 ++---
core/sql/nskgmake/Makerules.mk | 10 +-
core/sql/nskgmake/cli/Makefile | 2 +-
core/sql/nskgmake/clitest/Makefile | 2 +-
core/sql/nskgmake/tdm_sqlexp/Makefile | 14 +--
core/sql/optimizer/BindRelExpr.cpp | 2 +-
core/sql/optimizer/RelRoutine.cpp | 4 +-
core/sql/pom.xml.apache | 2 +-
core/sql/pom.xml.hdp | 2 +-
core/sql/qms/QmmQmm.cpp | 2 +-
core/sql/qmscommon/QRLogger.h | 2 +-
core/sql/regress/newregr/mvqr/installMvqrSQ | 6 +-
core/sql/regress/newregr/mvqr/uninstallMvqrSQ | 2 +-
core/sql/regress/tools/dll-compile.ksh | 6 +-
core/sql/regress/tools/java-compile.ksh | 2 +-
core/sql/regress/tools/regrhadoop.ksh | 2 +-
core/sql/regress/tools/regrhbase.ksh | 2 +-
core/sql/regress/tools/regrhive.ksh | 2 +-
core/sql/regress/tools/runallsb | 8 +-
core/sql/regress/tools/runregr_compGeneral.ksh | 2 +-
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/regress/tools/runregr_hive.ksh | 2 +-
core/sql/regress/tools/runregr_seabase.ksh | 2 +-
core/sql/regress/tools/runregr_udr.ksh | 4 +-
core/sql/regress/tools/setupenv | 4 +-
core/sql/regress/tools/setuplnxenv | 24 ++--
core/sql/regress/udr/EXPECTED002 | 10 +-
core/sql/regress/udr/TEST002 | 10 +-
core/sql/regress/udr/TEST107 | 4 +-
core/sql/regress/udr/TEST163 | 4 +-
core/sql/regress/udr/Utils.java | 4 +-
core/sql/regress/udr/tvudf.c | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 6 +-
core/sql/sqlcomp/nadefaults.cpp | 4 +-
core/sql/sqlmsg/GetErrorMessage.cpp | 2 +-
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 4 +-
core/sql/sqludr/doxygen_tmudr.1.6.config | 2 +-
.../java/org/trafodion/sql/HBaseClient.java | 4 +-
.../main/java/org/trafodion/sql/HiveClient.java | 2 +-
.../org/trafodion/sql/TrafConfiguration.java | 2 +-
.../main/java/org/trafodion/sql/udr/UDR.java | 2 +-
.../org/trafodion/sql/udr/predef/JDBCUDR.java | 6 +-
.../org/trafodion/sql/ustat/ChgAutoList.java | 2 +-
.../java/org/trafodion/sql/ustat/UstatUtil.java | 4 +-
core/sql/udrserv/UdrCfgParser.cpp | 2 +-
core/sql/udrserv/spinfoCallback.cpp | 2 +-
core/sql/udrserv/udrload.cpp | 2 +-
core/sql/udrserv/udrserv.cpp | 2 +-
core/sql/ustat/FillAutoTbl.sh | 4 +-
core/sql/ustat/RunLogUstats.sh | 2 +-
core/sql/ustat/StopAutoStats.sh | 2 +-
core/sql/ustat/USAS.sh | 16 +--
core/sql/ustat/hs_globals.cpp | 4 +-
core/sql/ustat/stats_profile | 8 +-
dcs/Makefile | 2 +-
dcs/bin/dcs | 12 +-
dcs/bin/dcs-config.sh | 4 +-
dcs/conf/dcs-env.sh | 6 +-
dcs/genvers | 2 +-
.../main/asciidoc/_chapters/configuration.adoc | 2 +-
.../asciidoc/_chapters/getting_started.adoc | 2 +-
.../org/trafodion/dcs/server/ServerManager.java | 2 +-
.../trafodion/dcs/servermt/ServerManager.java | 14 +--
.../src/asciidoc/_chapters/activate.adoc | 4 +-
.../src/asciidoc/_chapters/enable_security.adoc | 20 ++--
.../src/asciidoc/_chapters/introduction.adoc | 4 +-
.../src/asciidoc/_chapters/prepare.adoc | 2 +-
.../src/asciidoc/_chapters/script_remove.adoc | 2 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 6 +-
docs/src/site/markdown/architecture-overview.md | 2 +-
docs/src/site/markdown/management.md | 6 +-
.../site/markdown/traf_authentication_config.md | 8 +-
install/installer/addNode_step1 | 8 +-
install/installer/addNode_step2 | 28 ++---
install/installer/bashrc_default | 6 +-
install/installer/dcs_installer | 22 ++--
install/installer/rest_installer | 18 +--
install/installer/traf_add_kerberos | 2 +-
install/installer/traf_add_ldap | 14 +--
.../installer/traf_authentication_conf_default | 4 +-
install/installer/traf_config | 30 ++---
install/installer/traf_config_check | 4 +-
install/installer/traf_config_setup | 12 +-
install/installer/traf_secure | 20 ++--
install/installer/traf_sqgen | 10 +-
install/installer/traf_start | 18 +--
install/installer/trafodion_config_default | 2 +-
install/installer/trafodion_install | 6 +-
install/installer/trafodion_uninstaller | 8 +-
install/python-installer/bashrc.template | 6 +-
install/python-installer/db_config_default | 2 +-
install/python-installer/dcs_setup.py | 14 +--
install/python-installer/prompt.json | 2 +-
.../traf_authentication_conf.template | 4 +-
install/python-installer/traf_kerberos.py | 2 +-
install/python-installer/traf_ldap.py | 6 +-
install/python-installer/traf_setup.py | 8 +-
install/python-installer/traf_sqconfig.py | 6 +-
install/python-installer/traf_user.py | 8 +-
tests/phx/README.rst | 4 +-
tests/phx/phoenix_test.py | 6 +-
tests/phx/pom.xml.template | 8 +-
wms/conf/wms-env.sh | 6 +-
295 files changed, 1150 insertions(+), 1150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/RAT_README
----------------------------------------------------------------------
diff --git a/RAT_README b/RAT_README
index 1de62f4..f1b9d8d 100644
--- a/RAT_README
+++ b/RAT_README
@@ -29,32 +29,32 @@ FILE : what the file is used for
.rat-excludes : file used by RAT to exclude files
-> rat does not allow this file to contain comments
-$MY_SQROOT/build-scripts/package.exclude*
+$TRAF_HOME/build-scripts/package.exclude*
: list of files to exclude from packaging
-> make does not handle comments
-$MY_SQROOT/export/limited-support-tools/eclipse.*project*
+$TRAF_HOME/export/limited-support-tools/eclipse.*project*
: Eclipse related project file
-> Eclipse does not handle comments
-$MY_SQROOT/src/tm/*.pb.cc
-$MY_SQROOT/src/seatrans/hbase-trx/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/*
+$TRAF_HOME/src/tm/*.pb.cc
+$TRAF_HOME/src/seatrans/hbase-trx/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/*
: Generated from .proto files that do contain Apache License statement, using google protobuf compiler.
-> generated files do not contain Apache license information
-$MY_SQROOT/src/seatrans/hbase-trx/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp
+$TRAF_HOME/src/seatrans/hbase-trx/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp
: Autogenerated skeleton file copied from hbase used by our coprocessors
-> generated files do not contain Apache license information
-$MY_SQROOT/src/seatrans/hbase-trx/src/main/python/thrift1/gen-py/hbase/__init__.py
+$TRAF_HOME/src/seatrans/hbase-trx/src/main/python/thrift1/gen-py/hbase/__init__.py
: Autogenerated python file copied from hbase
-> generated files do not contain Apache license information
-$MY_SQROOT/../sql/sqludr/doxygen_*.1.6.config
+$TRAF_HOME/../sql/sqludr/doxygen_*.1.6.config
: Configuration file used to generate UDR documentation
-> configuration file do not handle comments
-$MY_SQROOT/../sql/bin/SqlciErrors.txt
+$TRAF_HOME/../sql/bin/SqlciErrors.txt
: file containing all the messages used by Apache Trafodion
-> this file does not handle comments
@@ -69,13 +69,13 @@ dcs/conf/master
The following files are testware, they need to be in specified formats
-> do not support support comment headers
-$MY_SQROOT/../sql/regress/*/EXPECTED*
-$MY_SQROOT/../sql/regress/*/COMPARE*
-$MY_SQROOT/../sql/regress/*/DIFF*
-$MY_SQROOT/../sql/regress/executor/lob_input*.txt
-$MY_SQROOT/../sql/regress/udr/romeo*.txt
+$TRAF_HOME/../sql/regress/*/EXPECTED*
+$TRAF_HOME/../sql/regress/*/COMPARE*
+$TRAF_HOME/../sql/regress/*/DIFF*
+$TRAF_HOME/../sql/regress/executor/lob_input*.txt
+$TRAF_HOME/../sql/regress/udr/romeo*.txt
dcs/src/test/pytests/test-requirements.txt
-$MY_SQROOT/monitor/linux/montest_readme.txt
+$TRAF_HOME/monitor/linux/montest_readme.txt
-------------------------------------------------------------------------------
@@ -99,7 +99,7 @@ copyrights which are covered by MIT
-> cannot overwrite copyright information, license has been added to
LICENSE.txt
- $MY_SQROOT/../sql/qmscommon/expat/*
+ $TRAF_HOME/../sql/qmscommon/expat/*
The following files are open source from The Regents of the University of
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 5cac37d..1c4a3f4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -260,7 +260,7 @@ eclipseclean:
$(RM) .cproject .project
trafinstall:
- cd $(MY_SQROOT)/sql/scripts && install_traf_components
+ cd $(TRAF_HOME)/sql/scripts && install_traf_components
lib_mgmt:
cd sql/lib_mgmt && $(MAKE) all
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/bldenvchk.sh
----------------------------------------------------------------------
diff --git a/core/bldenvchk.sh b/core/bldenvchk.sh
index fac887a..c24d922 100755
--- a/core/bldenvchk.sh
+++ b/core/bldenvchk.sh
@@ -32,9 +32,9 @@ if [[ "$SQ_VERBOSE" == "1" ]]; then
echo CUR_DIR=$CUR_DIR
fi
-if [[ "$MY_SQROOT" != "$CUR_DIR/sqf" ]]; then
- echo "*** Error: MY_SQROOT is set to: $MY_SQROOT"
- echo " MY_SQROOT should be: $CUR_DIR/sqf"
+if [[ "$TRAF_HOME" != "$CUR_DIR/sqf" ]]; then
+ echo "*** Error: TRAF_HOME is set to: $TRAF_HOME"
+ echo " TRAF_HOME should be: $CUR_DIR/sqf"
echo " Be sure to source in sqf/sqenv.sh"
RETVAL=1
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index a0a42a6..5197837 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -56,6 +56,6 @@ clients/DISCLAIMER: ../../DISCLAIMER
cp -f $? $@
clean:
- $(RM) -rf $(MY_SQROOT)/../conn/clients
- $(RM) -f $(MY_SQROOT)/../conn/*.mf
+ $(RM) -rf $(TRAF_HOME)/../conn/clients
+ $(RM) -f $(TRAF_HOME)/../conn/*.mf
$(RM) -f $(CLIENT_TAR)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/jdbcT4/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index 908a14f..50dc7af 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -28,14 +28,14 @@ all: build_all
build_all: LICENSE NOTICE
echo "$(MAVEN) package -DskipTests"
set -o pipefail && $(MAVEN) package -DskipTests | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
- cp target/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib
+ cp target/jdbcT4-${TRAFODION_VER}.jar ${TRAF_HOME}/export/lib
mkdir -p ../clients
mv target/jdbcT4-${TRAFODION_VER}.zip ../clients
- ln -sf ${MY_SQROOT}/export/lib/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib/jdbcT4.jar
+ ln -sf ${TRAF_HOME}/export/lib/jdbcT4-${TRAFODION_VER}.jar ${TRAF_HOME}/export/lib/jdbcT4.jar
clean:
-$(MAVEN) clean | grep ERROR
- $(RM) build_jdbct4.log ${MY_SQROOT}/export/lib/jdbcT4*.jar
+ $(RM) build_jdbct4.log ${TRAF_HOME}/export/lib/jdbcT4*.jar
LICENSE: ../../../licenses/LICENSE-clients
cp -f $? $@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/jdbc_type2/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/Makefile b/core/conn/jdbc_type2/Makefile
index ab13539..165ea24 100644
--- a/core/conn/jdbc_type2/Makefile
+++ b/core/conn/jdbc_type2/Makefile
@@ -22,7 +22,7 @@
# Makefile for building Type 2 driver native code on Linux
#
-include $(MY_SQROOT)/macros.gmk # top level
+include $(TRAF_HOME)/macros.gmk # top level
include ./macros.gmk
#
@@ -59,9 +59,9 @@ T2_OBJS = $(OUTDIR)/CommonDiags.o \
$(OUTDIR)/type2version.o
OBJS = $(COMMON_OBJS) $(T2_OBJS)
-MXODIR = $(MY_SQROOT)/../conn/odbc/src/odbc
+MXODIR = $(TRAF_HOME)/../conn/odbc/src/odbc
-INCLUDES = -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Inative -I$(MXODIR)/Krypton/generated_incs -I$(MXODIR)/dependencies/include -I$(MXODIR)/dependencies/linux -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/inc/rosetta -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/../sql/common -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(MY_SQROOT)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES = -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Inative -I$(MXODIR)/Krypton/generated_incs -I$(MXODIR)/dependencies/include -I$(MXODIR)/dependencies/linux -I$(TRAF_HOME)/export/include/sql -I$(TRAF_HOME)/inc/tmf_tipapi -I$(TRAF_HOME)/inc -I$(TRAF_HOME)/export/include -I$(TRAF_HOME)/inc/rosetta -I$(TRAF_HOME)/../sql/cli -I$(TRAF_HOME)/../sql/common -I$(TRAF_HOME)/../dbsecurity/cert/inc -I$(TRAF_HOME)/../dbsecurity/auth/inc -I$(TRAF_HOME)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
COMMON_DEFINES = -DTRAFODION_JDBCT2_VER_MAJOR=$(TRAFODION_VER_MAJOR) -DTRAFODION_JDBCT2_VER_MINOR=$(TRAFODION_VER_MINOR) -D_LP64 -DNA_LINUX -DSIZEOF_LONG_INT=4 -DSQ_GUARDIAN_CALL -DDISABLE_NOWAIT -D_FASTPATH -DTODO -D_SQ64 -w
DEFINES = $(COMMON_DEFINES)
@@ -75,7 +75,7 @@ all: $(LIBEXPDIR)/libjdbcT2.so
$(LIBEXPDIR)/libjdbcT2.so: $(OBJS)
$(CXX) -shared $(GCCMODE) -o $@ $(DBG_FLGS) -L$(LIBEXPDIR) -lsbfs -lsbms -levlsq -lwin -ltdm_sqlcli -larkcmp_dll -larkcmplib -lcommon -lsort -lexecutor -lcomexe -lcli $(OBJS)
-$(OUTDIR)/type2version.o: $(MY_SQROOT)/export/include/SCMBuildStr.h
+$(OUTDIR)/type2version.o: $(TRAF_HOME)/export/include/SCMBuildStr.h
clean:
$(RM) $(LIBEXPDIR)/libjdbcT2.so
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/jdbc_type2/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/build.xml b/core/conn/jdbc_type2/build.xml
index cc72734..a55c1a7 100644
--- a/core/conn/jdbc_type2/build.xml
+++ b/core/conn/jdbc_type2/build.xml
@@ -29,7 +29,7 @@
</exec>
<property file="buildId"/>
<property name="vproc.str" value="Traf_JDBC_Type2_Build_${bldId}"/>
- <property name="my_sqroot" value="../../sqf"/>
+ <property name="traf_home" value="../../sqf"/>
<property name="src.lic" value="${base.dir}/../../../licenses"/>
<property name="src.notice" value="${base.dir}/../../.."/>
@@ -52,7 +52,7 @@
<target name="dist" depends="native">
<mkdir dir="dist"/>
- <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
+ <property file="${traf_home}/export/include/SCMBuildMan.mf"/>
<jar destfile="dist/jdbcT2.jar" compress="true">
<include name="LICENSE" />
<include name="NOTICE" />
@@ -68,7 +68,7 @@
<attribute name="Implementation-Version-6" value="${Implementation-Version-6}"/>
</manifest>
</jar>
- <copy todir="${my_sqroot}/export/lib" overwrite="yes" file="dist/jdbcT2.jar"/>
+ <copy todir="${traf_home}/export/lib" overwrite="yes" file="dist/jdbcT2.jar"/>
</target>
<target name="clean">
@@ -81,7 +81,7 @@
<exec dir="." executable="/usr/bin/make">
<arg line="clean"/>
</exec>
- <delete file="${my_sqroot}/export/lib/jdbcT2.jar"/>
+ <delete file="${traf_home}/export/lib/jdbcT2.jar"/>
<delete file="buildId"/>
</target>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/jdbc_type2/samples/README
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/samples/README b/core/conn/jdbc_type2/samples/README
index b13bfae..f9cc3b1 100644
--- a/core/conn/jdbc_type2/samples/README
+++ b/core/conn/jdbc_type2/samples/README
@@ -45,8 +45,8 @@ To compile this java program, issue the following command:
Then, run this Java program using the following command:
Set your CLASSPATH and LD_PRELOAD path
- export CLASSPATH=$MY_SQROOT/export/lib/jdbcT2.jar:.:$CLASSPATH
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib64d/libseabasesig.so
+ export CLASSPATH=$TRAF_HOME/export/lib/jdbcT2.jar:.:$CLASSPATH
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib64d/libseabasesig.so
java -Dt2jdbc.schema=<defaultCatalog>.<defaultSchema> T2Sample
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odb/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odb/Makefile b/core/conn/odb/Makefile
index 62016e1..09936ce 100644
--- a/core/conn/odb/Makefile
+++ b/core/conn/odb/Makefile
@@ -23,7 +23,7 @@
.PHONY: clean all
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
#--------------------------------------------------------------------------
# Standard Linux flags
@@ -46,7 +46,7 @@ INCPATH_64luo = -I/use/include \
-I$(HADOOP_INC_DIR) \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -I$(MY_SQROOT)/export/include
+ -I$(TRAF_HOME)/export/include
LIBS_64luo = -lodbc -lodbcinst -lz -ldl
EXEC_64luo = odb64luo
@@ -70,7 +70,7 @@ odb64luo: odb64luo.o mreadline.o memcpy_wrapper.o versodb.o
-o $(EXEC_64luo) bin/memcpy_wrapper.o bin/odb64luo.o bin/mreadline.o bin/versodb.o \
-D ODBBLD=$(ODBBLD_64luo) $(LIBPATH_64luo) $(INCPATH_64luo) $(LIBS_64luo) -o bin/odb64luo
tar -czf ../clients/odb64_linux.tar.gz bin/odb64luo README
- ln -sf $(MY_SQROOT)/../conn/odb/bin/odb64luo $(MY_SQROOT)/export/bin$(SQ_MBTYPE)/odb64luo
+ ln -sf $(TRAF_HOME)/../conn/odb/bin/odb64luo $(TRAF_HOME)/export/bin$(SQ_MBTYPE)/odb64luo
odb64luo.o: odb.c
mkdir -p bin
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odbc/src/odbc/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/Makefile b/core/conn/odbc/src/odbc/Makefile
index 0198085..51f7b2b 100644
--- a/core/conn/odbc/src/odbc/Makefile
+++ b/core/conn/odbc/src/odbc/Makefile
@@ -67,16 +67,16 @@ cleanall: cleanallndcs cleanlnx_drvr
# Linux ODBC Driver targets
.PHONY: bldlnx_drvr
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
bldlnx_drvr:
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx linux64_$(SQ_BUILD_TYPE)
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(MY_SQROOT)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -Pf relfiles/linux64/lib* $(LIBEXPDIR);cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(MY_SQROOT)/samples
+ cd $(TRAF_HOME)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx linux64_$(SQ_BUILD_TYPE)
+ cd $(TRAF_HOME)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(TRAF_HOME)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -Pf relfiles/linux64/lib* $(LIBEXPDIR);cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(TRAF_HOME)/samples
cd $(LIBEXPDIR);ln -sf libicudata.so.44 libicudata.so;ln -sf libicuuc.so.44 libicuuc.so;ln -sf libtrafodbc_l64.so libtrafodbc64.so;ln -sf libtrafodbc_l64_drvr.so libtrafodbc_drvr64.so
# Linux ODBC driver clean targets
.PHONY: cleanlnx_drvr
cleanlnx_drvr:
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx clean;
+ cd $(TRAF_HOME)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx clean;
/bin/rm -f $(LIBEXPDIR)/libtrafodbc* $(LIBEXPDIR)/libicu*
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz relfiles
- cd $(MY_SQROOT)/samples;rm -rf connect_test* runconnect_test.sh TRAFDSN
+ cd $(TRAF_HOME)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz relfiles
+ cd $(TRAF_HOME)/samples;rm -rf connect_test* runconnect_test.sh TRAFDSN
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odbc/src/odbc/macros.gmk
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/macros.gmk b/core/conn/odbc/src/odbc/macros.gmk
index 8497a89..5a323e6 100644
--- a/core/conn/odbc/src/odbc/macros.gmk
+++ b/core/conn/odbc/src/odbc/macros.gmk
@@ -155,6 +155,6 @@ $(OUTDIR)/%.o: ../../../Common/%.cpp
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
# Common logger
-$(OUTDIR)/%.o: $(MY_SQROOT)/commonLogger/%.cpp
+$(OUTDIR)/%.o: $(TRAF_HOME)/commonLogger/%.cpp
@if [ -d "$(OUTDIR)" ]; then x=1; else mkdir -p "$(OUTDIR)"; fi
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odbc/src/odbc/nsksrvr/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Makefile b/core/conn/odbc/src/odbc/nsksrvr/Makefile
index c7894e1..be4bf5b 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvr/Makefile
@@ -22,7 +22,7 @@
# Makefile for building ndcs sql server on Linux
#
-include $(MY_SQROOT)/macros.gmk # top level
+include $(TRAF_HOME)/macros.gmk # top level
include ../macros.gmk # odbc level
#
@@ -103,7 +103,7 @@ ODBC_OBJS = $(OUTDIR)/odbcas_drvr.o \
OBJS = $(COMMON_OBJS) $(COMPRESS_OBJS) $(DBT_OBJS) $(ODBC_OBJS) $(WMS_OBJS)
-INCLUDES = -I. -I../Common -I../Common/linux -I../EventMsgs -I../SrvrMsg -I../nsksrvrcore -I./Interface -I./Interface/linux -I../dependencies/include -I../dependencies/linux -I../dependencies/liblzf -I../Krypton/generated_incs -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/inc/rosetta -I ../OssCfgCl/src -I../CmdCfgDll -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(ZOOKEEPER_DIR)/include -I$(MY_SQROOT)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES = -I. -I../Common -I../Common/linux -I../EventMsgs -I../SrvrMsg -I../nsksrvrcore -I./Interface -I./Interface/linux -I../dependencies/include -I../dependencies/linux -I../dependencies/liblzf -I../Krypton/generated_incs -I$(TRAF_HOME)/export/include/sql -I$(TRAF_HOME)/inc/tmf_tipapi -I$(TRAF_HOME)/inc -I$(TRAF_HOME)/export/include -I$(TRAF_HOME)/inc/rosetta -I ../OssCfgCl/src -I../CmdCfgDll -I$(TRAF_HOME)/../sql/cli -I$(TRAF_HOME)/../dbsecurity/cert/inc -I$(TRAF_HOME)/../dbsecurity/auth/inc -I$(ZOOKEEPER_DIR)/include -I$(TRAF_HOME)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
COMMON_DEFINES = -DNA_LINUX -DSIZEOF_LONG_INT=4 -DSQ_GUARDIAN_CALL -DUSE_NEW_PHANDLE -DTIMER_FIXED -w -DNSK_ODBC_SRVR -D__TIME_LOGGER -DTHREADED
@@ -136,7 +136,7 @@ GCCMODE += -Xlinker --copy-dt-needed-entries
$(BINEXPDIR)/mxosrvr: $(OBJS) $(LIBEXPDIR)/libzookeeper_mt.so
$(CXX) $(GCCMODE) -o $@ $(DBG_FLGS) -L$(LIBEXPDIR) -D_SQ64 -L$(LOC_JSIG) $(EARLY_LIBS) $(COMMON_LIBS) $(DBT_LIBS) -lzookeeper_mt $(HADOOP_LIBS) $(OBJS) -lz
-$(OUTDIR)/ndcsversion.o: $(MY_SQROOT)/export/include/SCMBuildStr.h
+$(OUTDIR)/ndcsversion.o: $(TRAF_HOME)/export/include/SCMBuildStr.h
# copy in lib & any associate versions & links
$(LIBEXPDIR)/libzookeeper_mt.so: $(ZOOKEEPER_DIR)/lib/libzookeeper_mt.so
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
index 25a4843..070aced 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
@@ -21,7 +21,7 @@
# Makefile for building ndcs shared library on Linux
#
-include $(MY_SQROOT)/macros.gmk # top level
+include $(TRAF_HOME)/macros.gmk # top level
include ../macros.gmk # odbc level
#
@@ -64,7 +64,7 @@ OBJS = $(OUTDIR)/CommonDiags.o \
$(OUTDIR)/srvrothers.o \
$(OUTDIR)/libmxocore_version.o
-INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux -I../Krypton/generated_incs -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/sql/nq_w/common -I../OssCfgCl/src -I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/commonLogger -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(MY_SQROOT)/../mpi/src/include/intern
+INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux -I../Krypton/generated_incs -I$(TRAF_HOME)/export/include/sql -I$(TRAF_HOME)/inc/tmf_tipapi -I$(TRAF_HOME)/inc -I$(TRAF_HOME)/export/include -I$(TRAF_HOME)/sql/nq_w/common -I../OssCfgCl/src -I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(TRAF_HOME)/../sql/cli -I$(TRAF_HOME)/commonLogger -I$(TRAF_HOME)/../dbsecurity/cert/inc -I$(TRAF_HOME)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(TRAF_HOME)/../mpi/src/include/intern
DEFINES = -DNA_LINUX -DSIZEOF_LONG_INT=4 -DUSE_NEW_PHANDLE -DSQ_GUARDIAN_CALL -D_M_DG -DINC_QPID_EVENT -w
@@ -76,7 +76,7 @@ libmxocore.so: $(OBJS)
$(CXX) -shared $(GCCMODE) -o $@ $(DBG_FLGS) -L$(LIBEXPDIR) -levlsq -lsqauth -lsqcert $(OBJS)
cp -up $@ $(LIBEXPDIR)
-$(OUTDIR)/libmxocore_version.o: $(MY_SQROOT)/export/include/SCMBuildStr.h
+$(OUTDIR)/libmxocore_version.o: $(TRAF_HOME)/export/include/SCMBuildStr.h
clean:
$(RM) libmxocore.so $(LIBEXPDIR)/libmxocore.so
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/manualtests/README
----------------------------------------------------------------------
diff --git a/core/conn/trafci/manualtests/README b/core/conn/trafci/manualtests/README
index 35ed5d4..96ca357 100644
--- a/core/conn/trafci/manualtests/README
+++ b/core/conn/trafci/manualtests/README
@@ -39,7 +39,7 @@ statcheck.sql - TRAFODION-1765 reported that if statistics are on for a
To check for TRAFODION-1709 do the following while running
this test:
- cd $MY_SQROOT/export/limited-support-tools/LSO
+ cd $TRAF_HOME/export/limited-support-tools/LSO
./offender -s active -t 300
For direct execute queries the EXECUTE_STATE should be
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/UserInterface.java b/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
index ac22141..0638b79 100644
--- a/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
+++ b/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
@@ -53,7 +53,7 @@ public class UserInterface {
myArgs = args;
int exitCode = 0;
boolean doTrace = Boolean.getBoolean(SessionDefaults.PROP_TRACE);
- String mySQRoot = System.getenv("MY_SQROOT");
+ String mySQRoot = System.getenv("TRAF_HOME");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/utils/ciencr.sh
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/ciencr.sh b/core/conn/trafci/utils/ciencr.sh
index fc5bde4..18ccbfb 100644
--- a/core/conn/trafci/utils/ciencr.sh
+++ b/core/conn/trafci/utils/ciencr.sh
@@ -30,11 +30,11 @@
CUR=.
CURR_DIR=`pwd`
-if [ ${MY_SQROOT} ]; then
- #echo "INFO: TRAFCIHOME is set to ${MY_SQROOT}/trafci"
- export TRAFCIHOME=${MY_SQROOT}/trafci
+if [ ${TRAF_HOME} ]; then
+ #echo "INFO: TRAFCIHOME is set to ${TRAF_HOME}/trafci"
+ export TRAFCIHOME=${TRAF_HOME}/trafci
else
- echo "ERROR: \$MY_SQROOT is not set. Please run sqenv.sh first."
+ echo "ERROR: \$TRAF_HOME is not set. Please run sqenv.sh first."
exit 3
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/utils/trafci
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci b/core/conn/trafci/utils/trafci
index 8ba5152..d820a8d 100755
--- a/core/conn/trafci/utils/trafci
+++ b/core/conn/trafci/utils/trafci
@@ -32,4 +32,4 @@ HNAME=localhost:23400
UNAME=zz
PWORD=zz
-$MY_SQROOT/trafci/bin/trafci.sh -h $HNAME -u $UNAME -p $PWORD
+$TRAF_HOME/trafci/bin/trafci.sh -h $HNAME -u $UNAME -p $PWORD
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/utils/trafci.cmd-tmpl
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci.cmd-tmpl b/core/conn/trafci/utils/trafci.cmd-tmpl
index aa195a6..167fb54 100644
--- a/core/conn/trafci/utils/trafci.cmd-tmpl
+++ b/core/conn/trafci/utils/trafci.cmd-tmpl
@@ -21,7 +21,7 @@ REM
REM @@@ END COPYRIGHT @@@
CLS
-set MY_SQROOT=
+set TRAF_HOME=
set CMD_LINE_ARGS=
set TRAFODION_VER_PROD=@prodver@
set PRODUCT_COPYRIGHT_HEADER=@copyrighthdr@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/utils/trafci_install.sh
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci_install.sh b/core/conn/trafci/utils/trafci_install.sh
index 76fc152..3286205 100644
--- a/core/conn/trafci/utils/trafci_install.sh
+++ b/core/conn/trafci/utils/trafci_install.sh
@@ -31,18 +31,18 @@ JAVAE=$JAVA_HOME/bin/java
JAR=$JAVA_HOME/bin/jar
PERL=perl
PYTHON=python
-INSTALL_ROOT=$MY_SQROOT/trafci
+INSTALL_ROOT=$TRAF_HOME/trafci
INSTALL_LIBDIR=$INSTALL_ROOT/lib
INSTALL_SAMPLESDIR=$INSTALL_ROOT/samples
INSTALL_BINDIR=$INSTALL_ROOT/bin
-EXPORTLIBDIR=$MY_SQROOT/export/lib
+EXPORTLIBDIR=$TRAF_HOME/export/lib
CP=/bin/cp
TEMPSRC=../temp
-sed 's/\#\#TRAFCI_CLASSPATH\#\#/\${MY_SQROOT}\/export\/lib\/jdbcT4-${TRAFODION_VER}.jar:\${MY_SQROOT}\/trafci\/lib\/trafci.jar/g' trafci.sh > lnxplatform.sh
+sed 's/\#\#TRAFCI_CLASSPATH\#\#/\${TRAF_HOME}\/export\/lib\/jdbcT4-${TRAFODION_VER}.jar:\${TRAF_HOME}\/trafci\/lib\/trafci.jar/g' trafci.sh > lnxplatform.sh
mv -f lnxplatform.sh $TEMPSRC/trafci.sh
-echo "Creating trafci install folder in $MY_SQROOT "
+echo "Creating trafci install folder in $TRAF_HOME "
if [ ! -d "$INSTALL_LIBDIR" ]; then mkdir -p -m 775 $INSTALL_LIBDIR; fi
echo "Copying library files to trafci install folder "
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx b/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
index 837e23e..9b592e5 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
@@ -20,7 +20,7 @@
# @@@ END COPYRIGHT @@@
# INCLUDES
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
sinclude depend.mk
ODBCVER := $(shell ./bldODBCVer.sh)
@@ -53,7 +53,7 @@ OBJ = .o
LINK = $(CC)
ODBC_SO_FILE = libtrafodbc
-INCLUDE = -I./cli/ -I./Interface -I../../dependencies/windows/ -I../../dependencies/security/include -I./sql/ -I../../../../../sql/cli -I../../../../../sql/common -I./inc -I../../Krypton/ -I./common/ -I./TCPIPV4/ -I./trace/ -I./platform -I./security_dll/common -I./security_dll/header -I $(MY_SQROOT)/export/include
+INCLUDE = -I./cli/ -I./Interface -I../../dependencies/windows/ -I../../dependencies/security/include -I./sql/ -I../../../../../sql/cli -I../../../../../sql/common -I./inc -I../../Krypton/ -I./common/ -I./TCPIPV4/ -I./trace/ -I./platform -I./security_dll/common -I./security_dll/header -I $(TRAF_HOME)/export/include
DMOBJS = dmadmin.o dmcpool.o dmfunctions.o dminstall.o dmmapping.o drvrmanager.o version.o cdatasource.o
#TROBJS = dotrace.o gettrace.o headers.o init.o traceext.o
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
index c790a64..4a83bda 100755
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
@@ -118,7 +118,7 @@ then
((err += $?))
cp ../../runconnect_test.sh runconnect_test.sh
((err += $?))
- cp $MY_SQROOT/../../licenses/Apache license.txt
+ cp $TRAF_HOME/../../licenses/Apache license.txt
((err += $?))
cd ..
# do the tar
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
index 0d6f27c..a4488c3 100755
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
@@ -20,7 +20,7 @@
#
# @@@ END COPYRIGHT @@@
-g++ -g connect_test.cpp -L${MY_SQROOT}/export/lib64 -I/usr/include/odbc -ltrafodbc64 -o connect_test
+g++ -g connect_test.cpp -L${TRAF_HOME}/export/lib64 -I/usr/include/odbc -ltrafodbc64 -o connect_test
./connect_test -d Default_DataSource -u ss -p ss
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/Makefile
----------------------------------------------------------------------
diff --git a/core/dbsecurity/Makefile b/core/dbsecurity/Makefile
index 0733db8..4e0f6a3 100644
--- a/core/dbsecurity/Makefile
+++ b/core/dbsecurity/Makefile
@@ -23,7 +23,7 @@
# Description: Makefile for building security library
#
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
include ./macros.gmk
RM = /bin/rm
@@ -36,7 +36,7 @@ all: verhdr auth cert dist
.PHONY: verhdr
verhdr:
- cd $(MY_SQROOT); $(MAKE) genverhdr;
+ cd $(TRAF_HOME); $(MAKE) genverhdr;
.PHONY: auth
auth: verhdr
@@ -48,14 +48,14 @@ cert: verhdr auth
.PHONY: dist
dist:
- $(CP) -p scripts/sqcertgen $(MY_SQROOT)/sql/scripts
- $(CP) -p scripts/update_auth $(MY_SQROOT)/sql/scripts
+ $(CP) -p scripts/sqcertgen $(TRAF_HOME)/sql/scripts
+ $(CP) -p scripts/update_auth $(TRAF_HOME)/sql/scripts
.PHONY: clean
clean: cleanauth cleancert
- $(RM) -f $(MY_SQROOT)/sql/scripts/sqcertgen
- $(RM) -f $(MY_SQROOT)/sql/scripts/update_auth
+ $(RM) -f $(TRAF_HOME)/sql/scripts/sqcertgen
+ $(RM) -f $(TRAF_HOME)/sql/scripts/update_auth
.PHONY: cleanall
cleanall: cleanallauth cleanallcert
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/auth/Makefile
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/Makefile b/core/dbsecurity/auth/Makefile
index 05f26ba..cc0d13c 100644
--- a/core/dbsecurity/auth/Makefile
+++ b/core/dbsecurity/auth/Makefile
@@ -23,7 +23,7 @@
# Description: Makefile for building authentication library
#
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
include ../macros.gmk
#OUTDIR = .
@@ -61,13 +61,13 @@ OBJS3 = \
INCLUDES = -I. -I./inc -I ../shared/inc \
- -I $(MY_SQROOT)/../sql/cli \
- -I $(MY_SQROOT)/../sql/common \
- -I $(MY_SQROOT)/../sql/executor \
- -I $(MY_SQROOT)/../sql/export \
- -I $(MY_SQROOT)/../sql/porting_layer \
- -I $(MY_SQROOT)/export/include \
- -I $(MY_SQROOT)/commonLogger \
+ -I $(TRAF_HOME)/../sql/cli \
+ -I $(TRAF_HOME)/../sql/common \
+ -I $(TRAF_HOME)/../sql/executor \
+ -I $(TRAF_HOME)/../sql/export \
+ -I $(TRAF_HOME)/../sql/porting_layer \
+ -I $(TRAF_HOME)/export/include \
+ -I $(TRAF_HOME)/commonLogger \
-I $(LOG4CXX_INC_DIR) \
-I ../../sql/common
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/auth/src/authEvents.cpp
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/src/authEvents.cpp b/core/dbsecurity/auth/src/authEvents.cpp
index 24cbcd1..361a148 100644
--- a/core/dbsecurity/auth/src/authEvents.cpp
+++ b/core/dbsecurity/auth/src/authEvents.cpp
@@ -37,7 +37,7 @@ static std::string AUTH_COMPONENT = "DBSECURITY";
// This function inserts an AuthEvent into the current list of authEvents
//
// DB_SECUITY_EVENTID - is the event ID to insert
-// see: $MY_SQROOT/log4cxx.trafodion.auth.config/evl_sqlog_eventnum.h
+// see: $TRAF_HOME/log4cxx.trafodion.auth.config/evl_sqlog_eventnum.h
// eventText - text to insert
// severity - severity of the event
// ****************************************************************************
@@ -56,7 +56,7 @@ void insertAuthEvent(
// ****************************************************************************
// function authInitEventLog()
//
-// This function create a new log in $MY_SQROOT/logs directory with the
+// This function create a new log in $TRAF_HOME/logs directory with the
// following name dbsecurity_<host>_<pid>.log
//
// It is called for standalone executables (e.g. ldapcheck) to log issues
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/auth/src/ldapconfigfile.cpp
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/src/ldapconfigfile.cpp b/core/dbsecurity/auth/src/ldapconfigfile.cpp
index c895652..e4e0541 100755
--- a/core/dbsecurity/auth/src/ldapconfigfile.cpp
+++ b/core/dbsecurity/auth/src/ldapconfigfile.cpp
@@ -512,8 +512,8 @@ static Check_Status checkRequiredAttributes(LDAPFileContents & config)
// * no other env variables are used if this is present *
// * TRAFAUTH_CONFIGDIR -- If present, directory in which file will be found. *
// * overrides any other defaults from below *
-// * MY_SQROOT -- Prefix for standard location: *
-// * $MY_SQROOT/etc/.traf_authentication_config *
+// * TRAF_HOME -- Prefix for standard location: *
+// * $TRAF_HOME/etc/.traf_authentication_config *
// * *
// * Our algorithm for picking the name/location for the config file is: *
// * IF AUTHLDAP_CONFIGFILE is set to a non-empty string *
@@ -523,7 +523,7 @@ static Check_Status checkRequiredAttributes(LDAPFileContents & config)
// * the contents are used as the dir and .traf_authentication_config *
// * is the name of the file in that dir *
// * ELSE *
-// * use MY_SQROOT/etc/.traf_authentication_config *
+// * use TRAF_HOME/etc/.traf_authentication_config *
// * *
// *****************************************************************************
// * *
@@ -581,8 +581,8 @@ char *configFile = getenv("TRAFAUTH_CONFIGFILE");
}
// If we get here the full name or the explicit directory were
-// not specified. Append the name to the value of MY_SQROOT.
-char *sqRoot = getenv("MY_SQROOT"); //ACH changing for Trafodion?
+// not specified. Append the name to the value of TRAF_HOME.
+char *sqRoot = getenv("TRAF_HOME"); //ACH changing for Trafodion?
if (sqRoot == NULL || strlen(sqRoot) == 0)
return configFilename;
@@ -1534,9 +1534,9 @@ char *valuePtr = NULL;
}
// Name is not fully qualified. See if specified filename can be found at
-// $MY_SQROOT/cacerts.
+// $TRAF_HOME/cacerts.
-char *sqRoot = getenv("MY_SQROOT");
+char *sqRoot = getenv("TRAF_HOME");
if (sqRoot == NULL)
return false;
@@ -1559,11 +1559,11 @@ char *certFilename = new char[bufSize];
TLSCACertFilename = certFilename;
delete certFilename;
-// If the filename exists in $MY_SQROOT/cacerts directory, use it.
+// If the filename exists in $TRAF_HOME/cacerts directory, use it.
if ((stat(TLSCACertFilename.c_str(),&sts)) == 0)
return true;
-// Certificate was not in $MY_SQROOT/cacerts directory. Check $CACERTS_DIR.
+// Certificate was not in $TRAF_HOME/cacerts directory. Check $CACERTS_DIR.
char *CACertsDir = getenv("CACERTS_DIR");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/auth/src/sqldapconfigcheck.cpp
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/src/sqldapconfigcheck.cpp b/core/dbsecurity/auth/src/sqldapconfigcheck.cpp
index 72aa558..d9eb1fb 100755
--- a/core/dbsecurity/auth/src/sqldapconfigcheck.cpp
+++ b/core/dbsecurity/auth/src/sqldapconfigcheck.cpp
@@ -57,7 +57,7 @@ void printUsage()
cout << "by environment variables is checked in the following order:." << endl << endl;
cout << "TRAFAUTH_CONFIGFILE: fully qualified filename" << endl;
cout << "TRAFAUTH_CONFIGDIR: Filename '/.traf_authentication_config' is appended" << endl;
- cout << "Otherwise, '/sql/scripts/.traf_authentication_config' is appended to value of MY_SQROOT." << endl;
+ cout << "Otherwise, '/sql/scripts/.traf_authentication_config' is appended to value of TRAF_HOME." << endl;
}
//***************************** End of printUsage ******************************
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/cert/Makefile
----------------------------------------------------------------------
diff --git a/core/dbsecurity/cert/Makefile b/core/dbsecurity/cert/Makefile
index 2b4b76e..d08c46d 100644
--- a/core/dbsecurity/cert/Makefile
+++ b/core/dbsecurity/cert/Makefile
@@ -23,7 +23,7 @@
# Description: Makefile for building authentication library
#
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
include ../macros.gmk
#OUTDIR = .
@@ -36,14 +36,14 @@ DBG_FLAGS = $(DBG_FLGS)
OBJS = $(OUTDIR)/secsrvr.o \
$(OUTDIR)/verssqcert.o
-INCLUDES = -I. -I./inc -I../shared/inc -I$(MY_SQROOT)/export/include
+INCLUDES = -I. -I./inc -I../shared/inc -I$(TRAF_HOME)/export/include
#LINK_OPTIONS = -lldap
LINK_OPTIONS = $(LNK_FLGS)
libsqcert.so: $(OBJS)
$(CXX) -fPIC $(DBG_FLAGS) -shared $(GCCMODEXX) -o $@ $(INCLUDES) $(LINK_OPTIONS) $(OBJS)
$(CP) -p libsqcert.so $(LIBEXPDIR)/.
- $(CP) -p inc/secsrvrmxo.h $(MY_SQROOT)/export/include/.
+ $(CP) -p inc/secsrvrmxo.h $(TRAF_HOME)/export/include/.
clean:
@@ -51,8 +51,8 @@ clean:
$(RM) -rf $(OUTDIR)
$(RM) -f libsqcert.so
$(RM) -f $(LIBEXPDIR)/libsqcert.so
- $(RM) -f $(MY_SQROOT)/inc/security/secsrvrmxo.h
- $(RM) -f $(MY_SQROOT)/export/include/secsrvrmxo.h
+ $(RM) -f $(TRAF_HOME)/inc/security/secsrvrmxo.h
+ $(RM) -f $(TRAF_HOME)/export/include/secsrvrmxo.h
cleanall: clean
$(RM) -rf $(BUILD_PLAT)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/cert/src/secsrvr.cpp
----------------------------------------------------------------------
diff --git a/core/dbsecurity/cert/src/secsrvr.cpp b/core/dbsecurity/cert/src/secsrvr.cpp
index 9e1847f..72b9daa 100755
--- a/core/dbsecurity/cert/src/secsrvr.cpp
+++ b/core/dbsecurity/cert/src/secsrvr.cpp
@@ -227,7 +227,7 @@ static void SetupCertFilename()
char *pub_filename = getenv("SQCERT_PUBKEY");
char *clustername = getenv("CLUSTERNAME");
char *homedir = getenv("HOME");
- char *sqroot = getenv("MY_SQROOT");
+ char *sqroot = getenv("TRAF_HOME");
char *certdir = getenv("SQCERT_DIR");
// Get the Certificate directory and the filename
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/macros.gmk
----------------------------------------------------------------------
diff --git a/core/dbsecurity/macros.gmk b/core/dbsecurity/macros.gmk
index 948a86a..1316c91 100644
--- a/core/dbsecurity/macros.gmk
+++ b/core/dbsecurity/macros.gmk
@@ -49,7 +49,7 @@ $(OUTDIR)/%.o: src/%.cpp
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -fPIC -o $@ $<
# Modules in logging directory
-$(OUTDIR)/%.o: $(MY_SQROOT)/commonLogger/CommonLogger.cpp
+$(OUTDIR)/%.o: $(TRAF_HOME)/commonLogger/CommonLogger.cpp
# echo " *****FLAGS::: $(CXX) *****"
@if [ -d "$(OUTDIR)" ]; then x=1; else mkdir -p "$(OUTDIR)"; fi
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -fPIC -o $@ $<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/scripts/sqcertgen
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/sqcertgen b/core/dbsecurity/scripts/sqcertgen
index 571b596..b8c57c2 100755
--- a/core/dbsecurity/scripts/sqcertgen
+++ b/core/dbsecurity/scripts/sqcertgen
@@ -22,7 +22,7 @@
# @@@ END COPYRIGHT @@@
#
-CERTDIR=$MY_SQROOT/sqcert
+CERTDIR=$TRAF_HOME/sqcert
CLUSTNAME=`echo $CLUSTERNAME`
if (test -n "${CLUSTNAME}"); then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/scripts/update_auth
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/update_auth b/core/dbsecurity/scripts/update_auth
index 9b5fb6f..0f85bca 100755
--- a/core/dbsecurity/scripts/update_auth
+++ b/core/dbsecurity/scripts/update_auth
@@ -57,9 +57,9 @@ while [ $# -gt 0 ]; do
shift
done
-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, and re-run $script_name."
echo
exit 1;
@@ -78,7 +78,7 @@ else
fi
#Create local folder for storing CA certicates
-SQCACERTS_DIR=$MY_SQROOT/cacerts
+SQCACERTS_DIR=$TRAF_HOME/cacerts
if [ ! -d "$SQCACERTS_DIR" ]; then
mkdir -p -m 700 $SQCACERTS_DIR;
else
@@ -86,20 +86,20 @@ else
fi
#Create local folder for storing SQ certicates
-SQCERT_DIR=$MY_SQROOT/sqcert
+SQCERT_DIR=$TRAF_HOME/sqcert
if [ ! -d "$SQCERT_DIR" ]; then
mkdir -p -m 700 $SQCERT_DIR;
else
chmod 700 $SQCERT_DIR
fi
-#cp -p -r $CACERTS_DIR $MY_SQROOT 2> /dev/null
+#cp -p -r $CACERTS_DIR $TRAF_HOME 2> /dev/null
#if [ -n "$CLUSTERNAME" ]; then
-# $SQ_PDCP -p -r $MY_NODES -x `uname -n` $CACERTS_DIR $MY_SQROOT 2> /dev/null
+# $SQ_PDCP -p -r $MY_NODES -x `uname -n` $CACERTS_DIR $TRAF_HOME 2> /dev/null
#
-# cp -p -r $HOME/sqcert $MY_SQROOT 2> /dev/null
-# $SQ_PDCP -p -r $MY_NODES -x `uname -n` $HOME/sqcert $MY_SQROOT 2> /dev/null
+# cp -p -r $HOME/sqcert $TRAF_HOME 2> /dev/null
+# $SQ_PDCP -p -r $MY_NODES -x `uname -n` $HOME/sqcert $TRAF_HOME 2> /dev/null
#
#fi
exit 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/mpi/Makefile
----------------------------------------------------------------------
diff --git a/core/mpi/Makefile b/core/mpi/Makefile
index d753ff0..8fcbced 100644
--- a/core/mpi/Makefile
+++ b/core/mpi/Makefile
@@ -19,7 +19,7 @@
#
# @@@ END COPYRIGHT @@@
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
include ./macros.gmk
MPI_LIBEXPDIR=$(MPI_ROOT)/lib/linux_amd64
@@ -68,7 +68,7 @@ $(BINEXPDIR)/hydra_pmi_proxy: $(MPICH_ROOT)/bin/hydra_pmi_proxy
rm -f $(BINEXPDIR)/hydra_pmi_proxy
cp $(MPICH_ROOT)/bin/hydra_pmi_proxy $(BINEXPDIR)/hydra_pmi_proxy
-$(MPI_LIBEXPDIR)/libmtmpi.so: libmtmpi.c $(MPI_INCEXPDIR)/mpi.h $(MY_SQROOT)/export/include/SCMBuildStr.h
+$(MPI_LIBEXPDIR)/libmtmpi.so: libmtmpi.c $(MPI_INCEXPDIR)/mpi.h $(TRAF_HOME)/export/include/SCMBuildStr.h
-mkdir -p $(MPI_LIBEXPDIR) $(LIBEXPDIR)
$(CC) $(CCFLAGS) $(INCLUDES) $(LIBSRC) $(LDFLAGS) -c
$(CC) $(LDFLAGS) $(CCFLAGS) -Wall -Werror -shared \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/Makefile
----------------------------------------------------------------------
diff --git a/core/rest/Makefile b/core/rest/Makefile
index 46772c9..530e49c 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -40,7 +40,7 @@ build_all: build_chk
build_chk:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_TRAFODION_REST_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_REST_TARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_REST_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_REST_TARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_REST_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_REST_TARNAME); fi
clean:
-$(MAVEN) clean |grep ERROR
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/bin/rest
----------------------------------------------------------------------
diff --git a/core/rest/bin/rest b/core/rest/bin/rest
index 03bba55..96d9ec5 100755
--- a/core/rest/bin/rest
+++ b/core/rest/bin/rest
@@ -187,9 +187,9 @@ function append_path() {
JAVA_PLATFORM=""
#If avail, add Trafodion to the JAVA_LIBRARY_PATH
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib$SQ_MBTYPE/libseabasesig.so;
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib$SQ_MBTYPE/libseabasesig.so;
fi
fi
@@ -257,7 +257,7 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
fi
REST_OPTS="$REST_OPTS -Drest.user.program.home=$REST_USER_PROGRAM_HOME"
REST_OPTS="$REST_OPTS -Drest.conf.dir=$REST_CONF_DIR"
-REST_OPTS="$REST_OPTS -Drest.trafodion.home=$MY_SQROOT"
+REST_OPTS="$REST_OPTS -Drest.trafodion.home=$TRAF_HOME"
# Exec unless REST_NOEXEC is set.
if [ "${REST_NOEXEC}" != "" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/conf/rest-env.sh
----------------------------------------------------------------------
diff --git a/core/rest/conf/rest-env.sh b/core/rest/conf/rest-env.sh
index cb5b838..340c171 100644
--- a/core/rest/conf/rest-env.sh
+++ b/core/rest/conf/rest-env.sh
@@ -31,8 +31,8 @@
# export JAVA_HOME=/usr/java/jdk1.7.0/
# Add Trafodion to the classpath
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
export REST_CLASSPATH=${CLASSPATH}:
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/genvers
----------------------------------------------------------------------
diff --git a/core/rest/genvers b/core/rest/genvers
index f16607a..ecc7848 100755
--- a/core/rest/genvers
+++ b/core/rest/genvers
@@ -20,4 +20,4 @@
#
# @@@ END COPYRIGHT @@@
CV_VERS=1.0.1
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
+$TRAF_HOME/export/include/SCMBuildJava.sh $CV_VERS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/getting_started.adoc b/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
index 5ffc14a..2552329 100644
--- a/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
@@ -48,7 +48,7 @@ or wish to start/stop the server independently.
Is Trafodion installed and running?
The server presumes a Trafodion instance is installed and running on your machine and available on your path; i.e. the
-`MY_SQROOT` environment variable is set and when you type _sqcheck_, you see output that confirms Trafodion is running. If this is not
+`TRAF_HOME` environment variable is set and when you type _sqcheck_, you see output that confirms Trafodion is running. If this is not
the case, the server may start but you'll see many errors.
At this point, you are ready to start the server.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/seamonster/src/Makefile
----------------------------------------------------------------------
diff --git a/core/seamonster/src/Makefile b/core/seamonster/src/Makefile
index 0589219..94b416e 100644
--- a/core/seamonster/src/Makefile
+++ b/core/seamonster/src/Makefile
@@ -19,10 +19,10 @@
#
# @@@ END COPYRIGHT @@@
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
include ./macros.gmk
-SQINSTALL=$(MY_SQROOT)/export
+SQINSTALL=$(TRAF_HOME)/export
#SM library files
LIBSRC=libsm.c verssm.c
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/seamonster/src/macros.gmk
----------------------------------------------------------------------
diff --git a/core/seamonster/src/macros.gmk b/core/seamonster/src/macros.gmk
index a07e57a..8a17180 100644
--- a/core/seamonster/src/macros.gmk
+++ b/core/seamonster/src/macros.gmk
@@ -39,8 +39,8 @@ CXX = $(GCC_TOOL_ROOT)/bin/g++
MPICC = $(MPI_ROOT)/bin/mpicc
# export
-EXPROOT = $(MY_SQROOT)/export
-INCMONDIR = $(MY_SQROOT)/monitor/linux
+EXPROOT = $(TRAF_HOME)/export
+INCMONDIR = $(TRAF_HOME)/monitor/linux
BINEXPDIR = $(EXPROOT)/bin$(SQ_MBTYPE)
INCEXPDIR = $(EXPROOT)/include
LIBEXPDIR = $(EXPROOT)/lib$(SQ_MBTYPE)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/LocalSettingsTemplate.sh
----------------------------------------------------------------------
diff --git a/core/sqf/LocalSettingsTemplate.sh b/core/sqf/LocalSettingsTemplate.sh
index b105fbf..1b5bfee 100644
--- a/core/sqf/LocalSettingsTemplate.sh
+++ b/core/sqf/LocalSettingsTemplate.sh
@@ -31,12 +31,12 @@
#
# This file needs to be copied to ~/.trafodion and updated to override
# build tool locations
-# .trafodion is sourced in when running $MY_SQROOT/sqenvcom.sh
-# sqenvcom.sh is sourced in by $MY_SQROOT/sqenv.sh
+# .trafodion is sourced in when running $TRAF_HOME/sqenvcom.sh
+# sqenvcom.sh is sourced in by $TRAF_HOME/sqenv.sh
# sqenv.sh is sourced in by:
-# $MY_SQROOT/../../env.sh or
-# $MY_SQROOT/sqenvd.sh (debug build) or
-# $MY_SQROOT/sqenvr.sh (release build)
+# $TRAF_HOME/../../env.sh or
+# $TRAF_HOME/sqenvd.sh (debug build) or
+# $TRAF_HOME/sqenvr.sh (release build)
#
# sqenvcom.sh sets up the environment in preparation for building and
# running Trafodion.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 9ab8925..a107cca 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -36,7 +36,7 @@ else
SQENV_MTYPE=sq32env.sh
endif
STUBLIBDIR=stublibs/lib/linux/$(MTYPE_BTYPE)
-SQL_W=$(MY_SQROOT)/../sql
+SQL_W=$(TRAF_HOME)/../sql
DP2=se
@@ -70,7 +70,7 @@ smstub:
make_sql: $(SEAMONSTER_TARGET) win hbase_utilities
cd sql; $(MAKE) WROOT=$(SQL_W) 2>&1 | sed -e "s/$$/ ##(SQL)/" ; exit $${PIPESTATUS[0]}
- cd $(MY_SQROOT)/sql/scripts && ./makemsg.ksh 2>&1 | sed -e "s/$$/ ##(SQL)/" ; exit $${PIPESTATUS[0]}
+ cd $(TRAF_HOME)/sql/scripts && ./makemsg.ksh 2>&1 | sed -e "s/$$/ ##(SQL)/" ; exit $${PIPESTATUS[0]}
make_monitor: stfs make_sqevlog seabed
cd monitor/linux; $(MAKE) 2>&1 | sed -e "s/$$/ ##(SQF)/" ; exit $${PIPESTATUS[0]}
@@ -196,7 +196,7 @@ setupdir:
-ln -sf $(SQL_W)/sqludr/sqludr.h $(EXPORTINCSQL_DIR)
@#
mkdir -p export/include/nsk
- -ln -sf $(MY_SQROOT)/inc/cextdecs/cextdecs.h export/include/nsk
+ -ln -sf $(TRAF_HOME)/inc/cextdecs/cextdecs.h export/include/nsk
@# USTAT
-mkdir -p export/lib/mx_ustat
-ln -sf $(SQL_W)/ustat/USAS.sh export/lib/mx_ustat
@@ -356,14 +356,14 @@ pkglist-symlinks: LICENSE NOTICE DISCLAIMER rest-${TRAFODION_VER} dcs-${TRAFODIO
# Targets to tar/gzip the self installer
packagebin:
- cat $(MY_SQROOT)/sql/scripts/sqinstall > $(PKG_BIN)
+ cat $(TRAF_HOME)/sql/scripts/sqinstall > $(PKG_BIN)
echo "__ARCHIVE_BELOW__" >> $(PKG_BIN)
tar chzf - -X build-scripts/package.exclude $(PKG_BIN_OBJS) >> $(PKG_BIN)
chmod +x $(PKG_BIN)
# Targets to create self-installer with sqinstaller
packageinstaller:
- cat $(MY_SQROOT)/sql/scripts/sqinstaller > $(PKG_BIN)
+ cat $(TRAF_HOME)/sql/scripts/sqinstaller > $(PKG_BIN)
echo "__ARCHIVE_BELOW__" >> $(PKG_BIN)
tar chzf - -X build-scripts/package.exclude $(PKG_BIN_OBJS) >> $(PKG_BIN)
chmod +x $(PKG_BIN)
@@ -387,7 +387,7 @@ package-dcs:
# Targets to tar/gzip the self installer with sources
srcpackagebin:
-rm etc/ms.env
- cat $(MY_SQROOT)/sql/scripts/sqinstall > $(SRC_PKG_BIN)
+ cat $(TRAF_HOME)/sql/scripts/sqinstall > $(SRC_PKG_BIN)
echo "__ARCHIVE_BELOW__" >> $(SRC_PKG_BIN)
tar chzf - -X build-scripts/package.exclude -X build-scripts/package.exclude.$(SQ_MBTYPE) . >> $(SRC_PKG_BIN)
chmod +x $(SRC_PKG_BIN)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/build-scripts/check_man
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/check_man b/core/sqf/build-scripts/check_man
index 00e24c0..b280aa3 100755
--- a/core/sqf/build-scripts/check_man
+++ b/core/sqf/build-scripts/check_man
@@ -20,8 +20,8 @@
#
# @@@ END COPYRIGHT @@@
-echo "MY_SQROOT=$MY_SQROOT"
-cd $MY_SQROOT/sql/scripts
+echo "TRAF_HOME=$TRAF_HOME"
+cd $TRAF_HOME/sql/scripts
files=`ls`
hdr=0
for f in $files; do
@@ -39,7 +39,7 @@ for f in $files; do
continue
fi
MANDIR="export/share/man/man1"
- if [ ! -r $MY_SQROOT/${MANDIR}/$f.1 ]; then
+ if [ ! -r $TRAF_HOME/${MANDIR}/$f.1 ]; then
if [ $hdr = 0 ]; then
echo "WARNING: The following files in sqf/sql/scripts"
echo "do not have a matching man page in sqf/${MANDIR} :"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/build-scripts/genverhdr.ksh
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/genverhdr.ksh b/core/sqf/build-scripts/genverhdr.ksh
index 3af1d19..b5acd16 100755
--- a/core/sqf/build-scripts/genverhdr.ksh
+++ b/core/sqf/build-scripts/genverhdr.ksh
@@ -124,7 +124,7 @@ EOF
#!/bin/sh
VER_PROD=`echo \$TRAFODION_VER_PROD | sed 's/ /_/'`
echo "Implementation-Version-1: Version \$* \$VER_PROD"
-cat \$MY_SQROOT/export/include/SCMBuildMan.mf
+cat \$TRAF_HOME/export/include/SCMBuildMan.mf
EOF
cat > $TMPFILEJ3 <<EOF
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/commonLogger/CommonLogger.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/commonLogger/CommonLogger.cpp b/core/sqf/commonLogger/CommonLogger.cpp
index 1e7f6cf..8a049ee 100644
--- a/core/sqf/commonLogger/CommonLogger.cpp
+++ b/core/sqf/commonLogger/CommonLogger.cpp
@@ -58,8 +58,8 @@ bool CommonLogger::initLog4cxx(const char* configFileName, const char* fileSuffi
logFolder_ = "";
- // Form the config path $MY_SQROOT/conf
- char *installPath = getenv("MY_SQROOT");
+ // Form the config path $TRAF_HOME/conf
+ char *installPath = getenv("TRAF_HOME");
if (installPath)
{
configPath = installPath;
@@ -71,7 +71,7 @@ bool CommonLogger::initLog4cxx(const char* configFileName, const char* fileSuffi
}
else
{
- // Environment variable $MY_SQROOT not found.
+ // Environment variable $TRAF_HOME not found.
// use the current directory.
configPath = "";
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/commonLogger/CommonLogger.h
----------------------------------------------------------------------
diff --git a/core/sqf/commonLogger/CommonLogger.h b/core/sqf/commonLogger/CommonLogger.h
index 8a00573..75ca87d 100644
--- a/core/sqf/commonLogger/CommonLogger.h
+++ b/core/sqf/commonLogger/CommonLogger.h
@@ -84,7 +84,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.
* @param configFileName name of the log4cxx configuration file.
* @return FALSE if the configuration file is not found.
*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/install_features
----------------------------------------------------------------------
diff --git a/core/sqf/conf/install_features b/core/sqf/conf/install_features
index 32bca2c..bef95da 100644
--- a/core/sqf/conf/install_features
+++ b/core/sqf/conf/install_features
@@ -22,7 +22,7 @@
# @@@ END COPYRIGHT @@@
#
-# Install feature file ($MY_SQROOT/conf/install_features)
+# Install feature file ($TRAF_HOME/conf/install_features)
#
# This file allows specific Trafodion core builds to signal to
# the installer the presence of a new feature that requires
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.mon.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.mon.config b/core/sqf/conf/log4cxx.monitor.mon.config
index 5933ed5..06245dc 100644
--- a/core/sqf/conf/log4cxx.monitor.mon.config
+++ b/core/sqf/conf/log4cxx.monitor.mon.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, monAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.mon.snmp.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.mon.snmp.config b/core/sqf/conf/log4cxx.monitor.mon.snmp.config
index 69bcf5f..4c56ffd 100644
--- a/core/sqf/conf/log4cxx.monitor.mon.snmp.config
+++ b/core/sqf/conf/log4cxx.monitor.mon.snmp.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, monSnmpAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.psd.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.psd.config b/core/sqf/conf/log4cxx.monitor.psd.config
index 50d100a..5fcb3ac 100644
--- a/core/sqf/conf/log4cxx.monitor.psd.config
+++ b/core/sqf/conf/log4cxx.monitor.psd.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, psdAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.wdg.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.wdg.config b/core/sqf/conf/log4cxx.monitor.wdg.config
index c935915..39acbc9 100644
--- a/core/sqf/conf/log4cxx.monitor.wdg.config
+++ b/core/sqf/conf/log4cxx.monitor.wdg.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, wdtAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.wdg.snmp.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.wdg.snmp.config b/core/sqf/conf/log4cxx.monitor.wdg.snmp.config
index 0b8a10e..97f1b1e 100644
--- a/core/sqf/conf/log4cxx.monitor.wdg.snmp.config
+++ b/core/sqf/conf/log4cxx.monitor.wdg.snmp.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, wdtSnmpAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.auth.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.auth.config b/core/sqf/conf/log4cxx.trafodion.auth.config
index 34f1dbd..97e8ce9 100644
--- a/core/sqf/conf/log4cxx.trafodion.auth.config
+++ b/core/sqf/conf/log4cxx.trafodion.auth.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, authAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.lob.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.lob.config b/core/sqf/conf/log4cxx.trafodion.lob.config
index a743566..45ca5ff 100644
--- a/core/sqf/conf/log4cxx.trafodion.lob.config
+++ b/core/sqf/conf/log4cxx.trafodion.lob.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, lobAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.masterexe.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.masterexe.config b/core/sqf/conf/log4cxx.trafodion.masterexe.config
index a5c6194..c1e0b80 100644
--- a/core/sqf/conf/log4cxx.trafodion.masterexe.config
+++ b/core/sqf/conf/log4cxx.trafodion.masterexe.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, mxoAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.sscp.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.sscp.config b/core/sqf/conf/log4cxx.trafodion.sscp.config
index d9a74f4..0733514 100644
--- a/core/sqf/conf/log4cxx.trafodion.sscp.config
+++ b/core/sqf/conf/log4cxx.trafodion.sscp.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, sscpAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.ssmp.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.ssmp.config b/core/sqf/conf/log4cxx.trafodion.ssmp.config
index 8c5e760..ce97ea6 100644
--- a/core/sqf/conf/log4cxx.trafodion.ssmp.config
+++ b/core/sqf/conf/log4cxx.trafodion.ssmp.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, ssmpAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.tm.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.tm.config b/core/sqf/conf/log4cxx.trafodion.tm.config
index 214e155..44b4e9b 100644
--- a/core/sqf/conf/log4cxx.trafodion.tm.config
+++ b/core/sqf/conf/log4cxx.trafodion.tm.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, tmAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.udr.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.udr.config b/core/sqf/conf/log4cxx.trafodion.udr.config
index 39145a6..e540c39 100644
--- a/core/sqf/conf/log4cxx.trafodion.udr.config
+++ b/core/sqf/conf/log4cxx.trafodion.udr.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, udrAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/trafodion.udr.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/trafodion.udr.config b/core/sqf/conf/trafodion.udr.config
index 09de7a4..6543fe9 100644
--- a/core/sqf/conf/trafodion.udr.config
+++ b/core/sqf/conf/trafodion.udr.config
@@ -22,12 +22,12 @@
#
# Configuration file for TDM_UDRSERV process
-# Located at $MY_SQROOT/conf/trafodion.udr.config
+# Located at $TRAF_HOME/conf/trafodion.udr.config
# Location of property file can be specified through TRAFUDRCFG env variable
# TRAFUDRCFG will override this default implementation of the property file.
# Properties specfied are passed on to the JVM created by the TDM_UDRSERV
# Can be overridden by env variable TRAF_UDR_JAVA_OPTIONS in
-# $MY_SQROOT/etc/ms.env
+# $TRAF_HOME/etc/ms.env
# Incorrect property values or specification syntax can result in TDM_UDRSERV
# not being able to initialize a JVM.
# Properties must be specified in a section titled "java".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/limited-support-tools/LSO/README
----------------------------------------------------------------------
diff --git a/core/sqf/export/limited-support-tools/LSO/README b/core/sqf/export/limited-support-tools/LSO/README
index 3b4933d..6bfb0bb 100644
--- a/core/sqf/export/limited-support-tools/LSO/README
+++ b/core/sqf/export/limited-support-tools/LSO/README
@@ -90,7 +90,7 @@ between executions establishes the time window. Results, if they exist, will
appear after the second execution. The SQL commands to list CPU offenders are
available at:
-$MY_SQROOT/export/limited-support-tools/LSO/cpu_offender.sql
+$TRAF_HOME/export/limited-support-tools/LSO/cpu_offender.sql
To use these queries you can obey these scripts in trafci or sqlci. The first
time the offender script is obeyed, the results should be ignored, because
@@ -139,7 +139,7 @@ executor and IPC above the given threshold, specified in megabytes.
All of a process\u2019s allocated queries are included in these calculations.
The SQL command to list the memory offenders are avilable at
-$MY_SQROOT/export/limited-support-tools/LSO/mem_offender.sql
+$TRAF_HOME/export/limited-support-tools/LSO/mem_offender.sql
Example output is shown below:
CURRENT_TIMESTAMP NODE PID EXE_MEM_HIGH_WM_MB EXE_MEM_ALLOC_MB IPC_MEM_HIGH_WM_MB IPC_MEM_ALLOC_MB
@@ -160,7 +160,7 @@ SQL Engine (either while executing the query. or fetching the output row)
longer than the given number of seconds.
The SQL commands to list queries blocked in SQL are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/queries_in_sql.sql
+$TRAF_HOME/export/limited-support-tools/LSO/queries_in_sql.sql
Example output is shown below:
CURRENT_TIMESTAMP TIME_IN_SECONDS QUERY_ID SOURCE_TEXT
@@ -175,7 +175,7 @@ This filtering mechanism lists the querie s which are not blocked in SQL longer
than the given number of seconds and haven't finished execution.
The SQL commands to list queries blocked in the client are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/queries_in_client.sql
+$TRAF_HOME/export/limited-support-tools/LSO/queries_in_client.sql
Example output is below:
CURRENT_TIMESTAMP TIME_IN_SECONDS QUERY_ID EXECUTE_STATE SOURCE_TEXT
@@ -208,7 +208,7 @@ executing the given number of seconds ago. Dead queries, explained in the next
section, are not selected.
The SQL commands to list inactive queries are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/inactive_queries.sql
+$TRAF_HOME/export/limited-support-tools/LSO/inactive_queries.sql
Example output is below:
CURRENT_TIMESTAMP LAST_ACTIVITY_SECS QUERY_ID SOURCE_TEXT
@@ -226,7 +226,7 @@ persisted after the process exit for a period longer than the given number of
seconds.
The SQL commands to list dead queries are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/dead_queries.sql
+$TRAF_HOME/export/limited-support-tools/LSO/dead_queries.sql
Example output is below:
CURRENT_TIMESTAMP LAST_ACTIVITY_SECS BLOCKED_IN_SQL BLOCKED_IN_CLIENT QUERY_ID SOURCE_TEXT
@@ -241,7 +241,7 @@ This statement lists the queries for which the statistics collection type is
set to NO_STATS or ALL_STATS, either by SQL engine or by the user.
The SQL commands to list UNMONITORED queries are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/uninstrumented.sql
+$TRAF_HOME/export/limited-support-tools/LSO/uninstrumented.sql
Example output is below:
CURRENT_TIMESTAMP LAST_ACTIVITY_SECS QUERY_TYPE QUERY_SUBTYPE QUERY_STATS_TYPE QUERY_ID SOURCE_TEXT
[10/10] incubator-trafodion git commit: Merge Fix for
[TRAFODION-2388] there should be only one ENV for Trafodion's root directory
instead of many.
Posted by li...@apache.org.
Merge Fix for [TRAFODION-2388] there should be only one ENV for Trafodion's root directory instead of many.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b1114302
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b1114302
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b1114302
Branch: refs/heads/master
Commit: b111430272a5e7c6abc4a86450b2a4f9e9846151
Parents: 97ee8a7 a0b7e21
Author: Liu Ming <li...@apache.org>
Authored: Thu Dec 15 08:39:13 2016 +0000
Committer: Liu Ming <li...@apache.org>
Committed: Thu Dec 15 08:39:13 2016 +0000
----------------------------------------------------------------------
RAT_README | 30 ++---
core/Makefile | 2 +-
core/bldenvchk.sh | 6 +-
core/conn/Makefile | 4 +-
core/conn/jdbcT4/Makefile | 6 +-
core/conn/jdbc_type2/Makefile | 8 +-
core/conn/jdbc_type2/build.xml | 8 +-
core/conn/jdbc_type2/samples/README | 4 +-
core/conn/odb/Makefile | 6 +-
core/conn/odbc/src/odbc/Makefile | 12 +-
core/conn/odbc/src/odbc/macros.gmk | 2 +-
core/conn/odbc/src/odbc/nsksrvr/Makefile | 6 +-
core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 6 +-
core/conn/trafci/Makefile | 2 +-
core/conn/trafci/manualtests/README | 2 +-
.../java/org/trafodion/ci/UserInterface.java | 2 +-
core/conn/trafci/utils/ciencr.sh | 8 +-
core/conn/trafci/utils/trafci | 2 +-
core/conn/trafci/utils/trafci.cmd-tmpl | 2 +-
core/conn/trafci/utils/trafci_install.sh | 8 +-
.../odbc/odbcclient/unixcli/makefile.lnx | 4 +-
.../odbc/odbcclient/unixcli/package/mklnxpkg.sh | 2 +-
.../unixcli/package/runconnect_test.sh | 2 +-
core/dbsecurity/Makefile | 12 +-
core/dbsecurity/auth/Makefile | 16 +--
core/dbsecurity/auth/src/authEvents.cpp | 4 +-
core/dbsecurity/auth/src/ldapconfigfile.cpp | 18 +--
core/dbsecurity/auth/src/sqldapconfigcheck.cpp | 2 +-
core/dbsecurity/cert/Makefile | 10 +-
core/dbsecurity/cert/src/secsrvr.cpp | 2 +-
core/dbsecurity/macros.gmk | 2 +-
core/dbsecurity/scripts/sqcertgen | 2 +-
core/dbsecurity/scripts/update_auth | 16 +--
core/mpi/Makefile | 4 +-
core/rest/Makefile | 2 +-
core/rest/bin/rest | 8 +-
core/rest/conf/rest-env.sh | 4 +-
core/rest/genvers | 2 +-
.../asciidoc/_chapters/getting_started.adoc | 2 +-
core/seamonster/src/Makefile | 4 +-
core/seamonster/src/macros.gmk | 4 +-
core/sqf/LocalSettingsTemplate.sh | 10 +-
core/sqf/Makefile | 12 +-
core/sqf/build-scripts/check_man | 6 +-
core/sqf/build-scripts/genverhdr.ksh | 2 +-
core/sqf/commonLogger/CommonLogger.cpp | 6 +-
core/sqf/commonLogger/CommonLogger.h | 2 +-
core/sqf/conf/install_features | 2 +-
core/sqf/conf/log4cxx.monitor.mon.config | 2 +-
core/sqf/conf/log4cxx.monitor.mon.snmp.config | 2 +-
core/sqf/conf/log4cxx.monitor.psd.config | 2 +-
core/sqf/conf/log4cxx.monitor.wdg.config | 2 +-
core/sqf/conf/log4cxx.monitor.wdg.snmp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.auth.config | 2 +-
core/sqf/conf/log4cxx.trafodion.lob.config | 2 +-
.../sqf/conf/log4cxx.trafodion.masterexe.config | 2 +-
core/sqf/conf/log4cxx.trafodion.sscp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.ssmp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.tm.config | 2 +-
core/sqf/conf/log4cxx.trafodion.udr.config | 2 +-
core/sqf/conf/trafodion.udr.config | 4 +-
.../sqf/export/limited-support-tools/LSO/README | 14 +--
.../export/limited-support-tools/LSO/offender | 2 +-
core/sqf/export/share/man/man1/createhooks.1 | 2 +-
core/sqf/export/share/man/man1/sqcore.1 | 4 +-
core/sqf/export/share/man/man1/sqcorefile.1 | 2 +-
core/sqf/export/share/man/man1/sqgen.1 | 38 +++---
core/sqf/export/share/man/man1/sqid.1 | 2 +-
core/sqf/export/share/man/man1/sqinfo.1 | 8 +-
core/sqf/export/share/man/man1/sqvers.1 | 8 +-
core/sqf/export/share/man/man1/update_sql.1 | 2 +-
core/sqf/gdb/create-host-tar-lib | 14 +--
core/sqf/hbase_utilities/Makefile | 6 +-
.../backup_restore_functions.sh | 16 +--
core/sqf/macros.gmk | 8 +-
core/sqf/monitor/linux/config.cxx | 4 +-
core/sqf/monitor/linux/macros.gmk | 2 +-
core/sqf/monitor/linux/monitor.cxx | 4 +-
core/sqf/monitor/linux/monlogging.cxx | 4 +-
core/sqf/monitor/linux/montest_run.virtual | 6 +-
core/sqf/monitor/linux/process.cxx | 4 +-
core/sqf/monitor/linux/process.h | 2 +-
core/sqf/monitor/linux/pstartd.cxx | 2 +-
core/sqf/monitor/linux/reqqueue.cxx | 2 +-
core/sqf/monitor/linux/shell.cxx | 10 +-
core/sqf/monitor/test/notes.txt | 2 +-
core/sqf/monitor/test/runtest | 46 ++++----
core/sqf/monitor/test/sqconfig.monitor.cluster | 2 +-
core/sqf/sqenvcom.sh | 55 +++++----
core/sqf/sqevlog/sq_evl_libs/macros.gmk | 2 +-
core/sqf/sqid | 10 +-
core/sqf/sqinfo | 18 +--
core/sqf/sql/macros.gmk | 2 +-
core/sqf/sql/scripts/UsasRepos | 2 +-
core/sqf/sql/scripts/analyzeMessageGuide.py | 6 +-
.../sqf/sql/scripts/bats/runmonitorbats.virtual | 6 +-
core/sqf/sql/scripts/bats/runseabedbats.virtual | 8 +-
core/sqf/sql/scripts/bats/runsqlreg.virtual | 8 +-
core/sqf/sql/scripts/bats/runtmbats.virtual | 14 +--
core/sqf/sql/scripts/bats/sqconfig.tm | 4 +-
core/sqf/sql/scripts/build_apidocs.sh | 4 +-
core/sqf/sql/scripts/ckill | 4 +-
core/sqf/sql/scripts/ckillall | 4 +-
core/sqf/sql/scripts/cleanZKNodes | 2 +-
core/sqf/sql/scripts/cleanat | 2 +-
core/sqf/sql/scripts/cleanlogs | 16 +--
core/sqf/sql/scripts/cresumeall | 4 +-
core/sqf/sql/scripts/cstat | 2 +-
core/sqf/sql/scripts/csuspendall | 6 +-
core/sqf/sql/scripts/dbcheck | 12 +-
core/sqf/sql/scripts/genmon | 2 +-
core/sqf/sql/scripts/genms | 10 +-
core/sqf/sql/scripts/gensq.pl | 8 +-
core/sqf/sql/scripts/genstats.sh | 2 +-
core/sqf/sql/scripts/get_libhdfs_files | 6 +-
core/sqf/sql/scripts/ilh_cleanhb | 12 +-
core/sqf/sql/scripts/ilh_hbase_repair | 8 +-
core/sqf/sql/scripts/ilh_hbcheck | 4 +-
core/sqf/sql/scripts/ilh_traf_restart | 16 +--
core/sqf/sql/scripts/ilh_trafinit | 16 +--
core/sqf/sql/scripts/install_apache_hadoop | 48 ++++----
core/sqf/sql/scripts/install_local_drill | 16 +--
core/sqf/sql/scripts/install_local_hadoop | 22 ++--
core/sqf/sql/scripts/install_traf_components | 76 ++++++------
core/sqf/sql/scripts/krb5check | 4 +-
core/sqf/sql/scripts/krb5functions | 4 +-
core/sqf/sql/scripts/krb5service | 8 +-
core/sqf/sql/scripts/makemsg.ksh | 8 +-
core/sqf/sql/scripts/qmmstart | 2 +-
core/sqf/sql/scripts/rmscheck | 2 +-
core/sqf/sql/scripts/runbats | 24 ++--
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqcheckmon | 2 +-
core/sqf/sql/scripts/sqconfig | 6 +-
core/sqf/sql/scripts/sqconfig.sample | 6 +-
core/sqf/sql/scripts/sqcore | 14 +--
core/sqf/sql/scripts/sqcorefile | 6 +-
core/sqf/sql/scripts/sqgen | 62 +++++-----
core/sqf/sql/scripts/sqnodeipcrm | 4 +-
core/sqf/sql/scripts/sqsmdstats | 10 +-
core/sqf/sql/scripts/sqstart | 32 ++---
core/sqf/sql/scripts/sqstop | 22 ++--
core/sqf/sql/scripts/sqsystem.pm | 4 +-
core/sqf/sql/scripts/traf_authentication_config | 4 +-
core/sqf/sql/scripts/traf_authentication_setup | 36 +++---
core/sqf/sql/scripts/trafnodestatus | 10 +-
core/sqf/sql/scripts/uninstall_traf_components | 22 ++--
core/sqf/sql/scripts/update_hbase | 8 +-
core/sqf/sql/scripts/update_sql | 10 +-
core/sqf/sqvers | 20 ++--
core/sqf/src/seabed/macros.gmk | 2 +-
core/sqf/src/seabed/src/env.cpp | 2 +-
core/sqf/src/seabed/src/util.cpp | 2 +-
core/sqf/src/seabed/test/go284j | 2 +-
core/sqf/src/seabed/test/go9 | 4 +-
core/sqf/src/seabed/test/goshell205 | 2 +-
core/sqf/src/seabed/test/gostart | 4 +-
core/sqf/src/seabed/test/t9thread.rh6.supp | 56 ++++-----
core/sqf/src/seabed/test/tcheck.cpp | 2 +-
core/sqf/src/seabed/tools/sqmanvers | 2 +-
core/sqf/src/seabed/tools/sqmanvers.java | 2 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 64 +++++-----
core/sqf/src/seatrans/hbase-trx/genvers | 2 +-
core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 6 +-
.../seatrans/tm/hbasetmlib2/TMInterface.java | 2 +-
.../src/seatrans/tm/hbasetmlib2/pom.xml.apache | 4 +-
.../sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 2 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 4 +-
core/sqf/src/seatrans/tm/macros.gmk | 6 +-
core/sqf/src/tm/Makefile | 6 +-
core/sqf/src/tm/macros.gmk | 6 +-
core/sqf/src/tm/tools/run_dtmci | 4 +-
core/sqf/tools/sqdiag_core_compare | 2 +-
core/sqf/tools/sqdiag_core_mask | 2 +-
core/sqf/tools/sqtools.sh | 116 +++++++++----------
core/sql/SqlCompilerDebugger/cln.sh | 6 +-
core/sql/arkcmp/CmpErrLog.cpp | 6 +-
core/sql/bin/ex_esp_main.cpp | 2 +-
core/sql/cli/Cli.cpp | 2 +-
core/sql/cli/SessionDefaults.cpp | 2 +-
core/sql/common/ComRtUtils.cpp | 2 +-
core/sql/common/Ipc.cpp | 4 +-
core/sql/executor/ExSMTrace.cpp | 6 +-
core/sql/executor/HdfsLogger.h | 2 +-
core/sql/executor/JavaObjectInterface.cpp | 2 +-
core/sql/exp/ExpLOBaccess.cpp | 2 +-
core/sql/export/NAAbort.cpp | 2 +-
core/sql/langman/LmLangManagerJava.cpp | 2 +-
core/sql/lib_mgmt/Makefile | 4 +-
core/sql/lib_mgmt/README.rst | 2 +-
core/sql/lib_mgmt/pom.xml | 2 +-
.../java/org/trafodion/libmgmt/FileMgmt.java | 2 +-
.../lib_mgmt/src/main/resources/init_libmgmt.sh | 2 +-
core/sql/nskgmake/Makerules.linux | 26 ++---
core/sql/nskgmake/Makerules.mk | 10 +-
core/sql/nskgmake/cli/Makefile | 2 +-
core/sql/nskgmake/clitest/Makefile | 2 +-
core/sql/nskgmake/tdm_sqlexp/Makefile | 14 +--
core/sql/optimizer/BindRelExpr.cpp | 2 +-
core/sql/optimizer/RelRoutine.cpp | 4 +-
core/sql/pom.xml.apache | 2 +-
core/sql/pom.xml.hdp | 2 +-
core/sql/qms/QmmQmm.cpp | 2 +-
core/sql/qmscommon/QRLogger.h | 2 +-
core/sql/regress/newregr/mvqr/installMvqrSQ | 6 +-
core/sql/regress/newregr/mvqr/uninstallMvqrSQ | 2 +-
core/sql/regress/tools/dll-compile.ksh | 6 +-
core/sql/regress/tools/java-compile.ksh | 2 +-
core/sql/regress/tools/regrhadoop.ksh | 2 +-
core/sql/regress/tools/regrhbase.ksh | 2 +-
core/sql/regress/tools/regrhive.ksh | 2 +-
core/sql/regress/tools/runallsb | 8 +-
core/sql/regress/tools/runregr_compGeneral.ksh | 2 +-
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/regress/tools/runregr_hive.ksh | 2 +-
core/sql/regress/tools/runregr_seabase.ksh | 2 +-
core/sql/regress/tools/runregr_udr.ksh | 4 +-
core/sql/regress/tools/setupenv | 4 +-
core/sql/regress/tools/setuplnxenv | 24 ++--
core/sql/regress/udr/EXPECTED002 | 10 +-
core/sql/regress/udr/TEST002 | 10 +-
core/sql/regress/udr/TEST107 | 4 +-
core/sql/regress/udr/TEST163 | 4 +-
core/sql/regress/udr/Utils.java | 4 +-
core/sql/regress/udr/tvudf.c | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 6 +-
core/sql/sqlcomp/nadefaults.cpp | 4 +-
core/sql/sqlmsg/GetErrorMessage.cpp | 2 +-
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 4 +-
core/sql/sqludr/doxygen_tmudr.1.6.config | 2 +-
.../java/org/trafodion/sql/HBaseClient.java | 4 +-
.../main/java/org/trafodion/sql/HiveClient.java | 2 +-
.../org/trafodion/sql/TrafConfiguration.java | 2 +-
.../main/java/org/trafodion/sql/udr/UDR.java | 2 +-
.../org/trafodion/sql/udr/predef/JDBCUDR.java | 6 +-
.../org/trafodion/sql/ustat/ChgAutoList.java | 2 +-
.../java/org/trafodion/sql/ustat/UstatUtil.java | 4 +-
core/sql/udrserv/UdrCfgParser.cpp | 2 +-
core/sql/udrserv/spinfoCallback.cpp | 2 +-
core/sql/udrserv/udrload.cpp | 2 +-
core/sql/udrserv/udrserv.cpp | 2 +-
core/sql/ustat/FillAutoTbl.sh | 4 +-
core/sql/ustat/RunLogUstats.sh | 2 +-
core/sql/ustat/StopAutoStats.sh | 2 +-
core/sql/ustat/USAS.sh | 16 +--
core/sql/ustat/hs_globals.cpp | 4 +-
core/sql/ustat/stats_profile | 8 +-
dcs/Makefile | 2 +-
dcs/bin/dcs | 12 +-
dcs/bin/dcs-config.sh | 4 +-
dcs/conf/dcs-env.sh | 6 +-
dcs/genvers | 2 +-
.../main/asciidoc/_chapters/configuration.adoc | 2 +-
.../asciidoc/_chapters/getting_started.adoc | 2 +-
.../org/trafodion/dcs/server/ServerManager.java | 2 +-
.../trafodion/dcs/servermt/ServerManager.java | 14 +--
dcs/src/test/odbc/build/Makefile | 2 +-
.../src/asciidoc/_chapters/activate.adoc | 4 +-
.../src/asciidoc/_chapters/enable_security.adoc | 20 ++--
.../src/asciidoc/_chapters/introduction.adoc | 4 +-
.../src/asciidoc/_chapters/prepare.adoc | 2 +-
.../src/asciidoc/_chapters/script_remove.adoc | 2 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 6 +-
docs/src/site/markdown/architecture-overview.md | 2 +-
docs/src/site/markdown/management.md | 6 +-
.../site/markdown/traf_authentication_config.md | 8 +-
install/installer/addNode_step1 | 8 +-
install/installer/addNode_step2 | 28 ++---
install/installer/bashrc_default | 7 +-
install/installer/dcs_installer | 22 ++--
install/installer/rest_installer | 18 +--
install/installer/traf_add_kerberos | 2 +-
install/installer/traf_add_ldap | 14 +--
.../installer/traf_authentication_conf_default | 4 +-
install/installer/traf_config | 30 ++---
install/installer/traf_config_check | 4 +-
install/installer/traf_config_setup | 12 +-
install/installer/traf_secure | 20 ++--
install/installer/traf_sqgen | 10 +-
install/installer/traf_start | 18 +--
install/installer/trafodion_config_default | 2 +-
install/installer/trafodion_install | 6 +-
install/installer/trafodion_uninstaller | 8 +-
install/python-installer/bashrc.template | 9 +-
install/python-installer/db_config_default | 2 +-
install/python-installer/dcs_setup.py | 14 +--
install/python-installer/prompt.json | 2 +-
.../traf_authentication_conf.template | 4 +-
install/python-installer/traf_kerberos.py | 2 +-
install/python-installer/traf_ldap.py | 6 +-
install/python-installer/traf_setup.py | 10 +-
install/python-installer/traf_sqconfig.py | 6 +-
install/python-installer/traf_user.py | 8 +-
tests/phx/README.rst | 4 +-
tests/phx/phoenix_test.py | 6 +-
tests/phx/pom.xml.template | 8 +-
wms/conf/wms-env.sh | 6 +-
298 files changed, 1158 insertions(+), 1161 deletions(-)
----------------------------------------------------------------------
[02/10] incubator-trafodion git commit: remove duplicate MY_SQROOT in
sqenvcom.sh
Posted by li...@apache.org.
remove duplicate MY_SQROOT in sqenvcom.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/971df7a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/971df7a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/971df7a4
Branch: refs/heads/master
Commit: 971df7a4ef2b932339e8013691c7e3212f1d015e
Parents: fbb465a
Author: Eason <hf...@gmail.com>
Authored: Tue Dec 6 23:52:13 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Tue Dec 6 23:52:13 2016 +0800
----------------------------------------------------------------------
core/sqf/sqenvcom.sh | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/971df7a4/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index d5acf92..75ed593 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -138,7 +138,6 @@ else
export RH_MAJ_VERS=6
fi
export MY_SQROOT=$PWD
-export MY_SQROOT=$PWD
# set common version to be consistent between shared lib and maven dependencies
export HBASE_DEP_VER_CDH=1.2.0-cdh5.7.1
[06/10] incubator-trafodion git commit: convert all MY_SQROOT to
TRAF_HOME
Posted by li...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/limited-support-tools/LSO/offender
----------------------------------------------------------------------
diff --git a/core/sqf/export/limited-support-tools/LSO/offender b/core/sqf/export/limited-support-tools/LSO/offender
index 98e257f..883b19c 100755
--- a/core/sqf/export/limited-support-tools/LSO/offender
+++ b/core/sqf/export/limited-support-tools/LSO/offender
@@ -80,7 +80,7 @@ PREAMBLE=
QUERY_TEXT=
QUERY_FILE=
OFFENDER_NODE=-1
-LSO_DIR="$MY_SQROOT/export/limited-support-tools/LSO"
+LSO_DIR="$TRAF_HOME/export/limited-support-tools/LSO"
ERROR_MESSAGE=
# parse command line arguments
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/share/man/man1/createhooks.1
----------------------------------------------------------------------
diff --git a/core/sqf/export/share/man/man1/createhooks.1 b/core/sqf/export/share/man/man1/createhooks.1
index e673479..dad675b 100644
--- a/core/sqf/export/share/man/man1/createhooks.1
+++ b/core/sqf/export/share/man/man1/createhooks.1
@@ -31,4 +31,4 @@ createhooks \- create hook files
.B createhooks
will create hook files.
.SH FILES
-$MY_SQROOT/etc/ms.env
+$TRAF_HOME/etc/ms.env
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/share/man/man1/sqcore.1
----------------------------------------------------------------------
diff --git a/core/sqf/export/share/man/man1/sqcore.1 b/core/sqf/export/share/man/man1/sqcore.1
index 87d914d..d727c2c 100644
--- a/core/sqf/export/share/man/man1/sqcore.1
+++ b/core/sqf/export/share/man/man1/sqcore.1
@@ -35,12 +35,12 @@ sqcore \- Move core files to the head node
.SH DESCRIPTION
.LP
.B sqcore
-will collect any user core files generated in /database or $MY_SQROOT
+will collect any user core files generated in /database or $TRAF_HOME
across the cluster, and move them to the head node.
.SH USAGE
.TP 7
.BI -d
-Head node directory where the core files are to be moved. (Default $MY_SQROOT/logs)
+Head node directory where the core files are to be moved. (Default $TRAF_HOME/logs)
.TP
.BI -h
will display help.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/share/man/man1/sqcorefile.1
----------------------------------------------------------------------
diff --git a/core/sqf/export/share/man/man1/sqcorefile.1 b/core/sqf/export/share/man/man1/sqcorefile.1
index 8da035f..b885425 100644
--- a/core/sqf/export/share/man/man1/sqcorefile.1
+++ b/core/sqf/export/share/man/man1/sqcorefile.1
@@ -49,7 +49,7 @@ command,
will display other information,
such as
.I
-$MY_SQROOT.
+$TRAF_HOME.
.sp
If no core-files are specified,
.B sqcorefile
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/share/man/man1/sqgen.1
----------------------------------------------------------------------
diff --git a/core/sqf/export/share/man/man1/sqgen.1 b/core/sqf/export/share/man/man1/sqgen.1
index 6e8c144..c5ce087 100644
--- a/core/sqf/export/share/man/man1/sqgen.1
+++ b/core/sqf/export/share/man/man1/sqgen.1
@@ -49,27 +49,27 @@ will display help.
.BI -perf
will configure for performance benchmarks.
.SH FILES GENERATED
-$MY_SQROOT/etc/ms.env
+$TRAF_HOME/etc/ms.env
$MPI_TMPDIR/cluster.conf
.LP
-$MY_SQROOT/sql/scripts/gomon.cold
-$MY_SQROOT/sql/scripts/gomon.warm
+$TRAF_HOME/sql/scripts/gomon.cold
+$TRAF_HOME/sql/scripts/gomon.warm
.LP
-$MY_SQROOT/sql/scripts/sq_tse.create
-$MY_SQROOT/sql/scripts/sq_tse.delete
-$MY_SQROOT/sql/scripts/sq_tse.backup
-$MY_SQROOT/sql/scripts/sq_tse.restore
-$MY_SQROOT/sql/scripts/sq_tse.mount
-$MY_SQROOT/sql/scripts/sq_tse.unmount
+$TRAF_HOME/sql/scripts/sq_tse.create
+$TRAF_HOME/sql/scripts/sq_tse.delete
+$TRAF_HOME/sql/scripts/sq_tse.backup
+$TRAF_HOME/sql/scripts/sq_tse.restore
+$TRAF_HOME/sql/scripts/sq_tse.mount
+$TRAF_HOME/sql/scripts/sq_tse.unmount
.LP
-$MY_SQROOT/sql/scripts/sq_ase.create
-$MY_SQROOT/sql/scripts/sq_ase.delete
-$MY_SQROOT/sql/scripts/sq_ase.backup
-$MY_SQROOT/sql/scripts/sq_ase.restore
-$MY_SQROOT/sql/scripts/sq_ase.mount
-$MY_SQROOT/sql/scripts/sq_ase.unmount
+$TRAF_HOME/sql/scripts/sq_ase.create
+$TRAF_HOME/sql/scripts/sq_ase.delete
+$TRAF_HOME/sql/scripts/sq_ase.backup
+$TRAF_HOME/sql/scripts/sq_ase.restore
+$TRAF_HOME/sql/scripts/sq_ase.mount
+$TRAF_HOME/sql/scripts/sq_ase.unmount
.LP
-$MY_SQROOT/sql/scripts/sqstore.sqlci
-$MY_SQROOT/sql/scripts/ADPINFO.base.orig
-$MY_SQROOT/sql/scripts/sqshell
-$MY_SQROOT/sql/scripts/dbsize
+$TRAF_HOME/sql/scripts/sqstore.sqlci
+$TRAF_HOME/sql/scripts/ADPINFO.base.orig
+$TRAF_HOME/sql/scripts/sqshell
+$TRAF_HOME/sql/scripts/dbsize
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/share/man/man1/sqid.1
----------------------------------------------------------------------
diff --git a/core/sqf/export/share/man/man1/sqid.1 b/core/sqf/export/share/man/man1/sqid.1
index 3e6fb1b..6677c8f 100644
--- a/core/sqf/export/share/man/man1/sqid.1
+++ b/core/sqf/export/share/man/man1/sqid.1
@@ -40,4 +40,4 @@ Display help.
.SH SEE ALSO
.I sqvers.
.SH FILES
-$MY_SQROOT/export/lib64/libsbms.so
+$TRAF_HOME/export/lib64/libsbms.so
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/share/man/man1/sqinfo.1
----------------------------------------------------------------------
diff --git a/core/sqf/export/share/man/man1/sqinfo.1 b/core/sqf/export/share/man/man1/sqinfo.1
index 7daec1c..55d4eed 100644
--- a/core/sqf/export/share/man/man1/sqinfo.1
+++ b/core/sqf/export/share/man/man1/sqinfo.1
@@ -60,10 +60,10 @@ will display detailed SQ information.
.br
/proc/net/dev
.br
-$MY_SQROOT/etc/ms.env
+$TRAF_HOME/etc/ms.env
.br
-$MY_SQROOT/sql/scripts/mon.env
+$TRAF_HOME/sql/scripts/mon.env
.br
-$MY_SQROOT/sql/scripts/shell.env
+$TRAF_HOME/sql/scripts/shell.env
.br
-$MY_SQROOT/sql/scripts/sqconfig
+$TRAF_HOME/sql/scripts/sqconfig
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/share/man/man1/sqvers.1
----------------------------------------------------------------------
diff --git a/core/sqf/export/share/man/man1/sqvers.1 b/core/sqf/export/share/man/man1/sqvers.1
index b2430d3..1b04622 100644
--- a/core/sqf/export/share/man/man1/sqvers.1
+++ b/core/sqf/export/share/man/man1/sqvers.1
@@ -64,10 +64,10 @@ Verbose output (debug usage).
.I nm.
.I whoami.
.SH FILES
-$MY_SQROOT/export/bin64/*
+$TRAF_HOME/export/bin64/*
.br
-$MY_SQROOT/export/lib/*
+$TRAF_HOME/export/lib/*
.br
-$MY_SQROOT/export/lib64/*
+$TRAF_HOME/export/lib64/*
.br
-$MY_SQROOT/opt/hpmpi/lib/linux_amd64/*
+$TRAF_HOME/opt/hpmpi/lib/linux_amd64/*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/share/man/man1/update_sql.1
----------------------------------------------------------------------
diff --git a/core/sqf/export/share/man/man1/update_sql.1 b/core/sqf/export/share/man/man1/update_sql.1
index 3a664c8..dc66f26 100644
--- a/core/sqf/export/share/man/man1/update_sql.1
+++ b/core/sqf/export/share/man/man1/update_sql.1
@@ -33,7 +33,7 @@ update_sql \- Update sql/sqlmx directory
.SH DESCRIPTION
.LP
.B update_sql
-updates the $MY_SQROOT/sql/sqlmx directory on all the nodes.
+updates the $TRAF_HOME/sql/sqlmx directory on all the nodes.
.SH USAGE
.TP 7
.BI -i
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/gdb/create-host-tar-lib
----------------------------------------------------------------------
diff --git a/core/sqf/gdb/create-host-tar-lib b/core/sqf/gdb/create-host-tar-lib
index eb7a32a..2b586e9 100755
--- a/core/sqf/gdb/create-host-tar-lib
+++ b/core/sqf/gdb/create-host-tar-lib
@@ -50,9 +50,9 @@ if (!$res) {
exit(1);
}
-# get MY_SQROOT/who/host
+# get TRAF_HOME/who/host
my $sq_pdsh = defined $ENV{'SQ_PDSH'} ? $ENV{'SQ_PDSH'} : '';
-my $my_sqroot = defined $ENV{'MY_SQROOT'} ? $ENV{'MY_SQROOT'} : '';
+my $traf_home = defined $ENV{'TRAF_HOME'} ? $ENV{'TRAF_HOME'} : '';
my $sq_mbtype = defined $ENV{'SQ_MBTYPE'} ? $ENV{'SQ_MBTYPE'} : '';
my $host;
gethost();
@@ -63,7 +63,7 @@ if ($verbose) {
my $w = `whoami`;
$w =~ s/\s+$//;
-print "MY_SQROOT=$my_sqroot\n";
+print "TRAF_HOME=$traf_home\n";
print "who\@host=$w\@$host\n";
# deal with elfs
@@ -91,7 +91,7 @@ sub add_well_known_libs {
sub find_elfs ($) {
my ($dir) = @_;
- my $chdir = "$my_sqroot/$dir";
+ my $chdir = "$traf_home/$dir";
chdir($chdir) or die "can't chdir to $chdir $!";
my $ls = `ls`;
my @files = split(/\n/, $ls);
@@ -170,7 +170,7 @@ sub libdep ($) {
# forget ld-linux
} else {
if ($lib =~ /^.*.so.* => (.*) \(0x[0-9a-f][0-9a-f]*\)/) {
- if ($1 =~ /$my_sqroot(\/\w)*/) {
+ if ($1 =~ /$traf_home(\/\w)*/) {
# forget SQ
} else {
$ok = 1;
@@ -225,13 +225,13 @@ sub lib_tar {
my $node = $lib_table{$lib_key};
$lib_list = "$lib_list $lib_key";
}
- my $cmd = "tar -chvf $my_sqroot/zlibs-$host.tar $lib_list";
+ my $cmd = "tar -chvf $traf_home/zlibs-$host.tar $lib_list";
if ($verbose) {
printf "v: cmd:$cmd\n";
}
system "$cmd";
print "\n";
- print "Created $my_sqroot/zlibs-$host.tar\n";
+ print "Created $traf_home/zlibs-$host.tar\n";
}
#
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/hbase_utilities/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/hbase_utilities/Makefile b/core/sqf/hbase_utilities/Makefile
index 1311b07..9c960fc 100644
--- a/core/sqf/hbase_utilities/Makefile
+++ b/core/sqf/hbase_utilities/Makefile
@@ -35,12 +35,12 @@ build_all:
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-utility.jar.mf
+ $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 > src/main/resources/trafodion-utility.jar.mf
# run maven
set -o pipefail && $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- cp -pf target/trafodion-utility-*.jar $(MY_SQROOT)/export/lib
+ cp -pf target/trafodion-utility-*.jar $(TRAF_HOME)/export/lib
clean:
$(MAVEN) clean
$(RM) build_utility.log
- $(RM) -rf $(MY_SQROOT)/export/lib/trafodion-utility-*.jar
+ $(RM) -rf $(TRAF_HOME)/export/lib/trafodion-utility-*.jar
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/hbase_utilities/backup_and_restore/backup_restore_functions.sh
----------------------------------------------------------------------
diff --git a/core/sqf/hbase_utilities/backup_and_restore/backup_restore_functions.sh b/core/sqf/hbase_utilities/backup_and_restore/backup_restore_functions.sh
index e3e350b..d8a108e 100755
--- a/core/sqf/hbase_utilities/backup_and_restore/backup_restore_functions.sh
+++ b/core/sqf/hbase_utilities/backup_and_restore/backup_restore_functions.sh
@@ -32,7 +32,7 @@ date_str="$(date '+%Y%m%d-%H%M')"
###############################################################################
which_environment()
{
- if [[ -e $MY_SQROOT/sql/scripts/sw_env.sh ]]; then
+ if [[ -e $TRAF_HOME/sql/scripts/sw_env.sh ]]; then
# we are on a development system where install_local_hadoop has been executed
return 1
elif [[ -n "$(ls /usr/lib/hadoop/hadoop-*cdh*.jar 2>/dev/null)" || -n "$(ls /etc/init.d/ambari* 2>/dev/null)" || -d /opt/cloudera/parcels/CDH || -d /opt/mapr ]]; then
@@ -52,8 +52,8 @@ do_hadoop()
which_environment
local wenv=$?
if [[ ${wenv} -eq 1 ]]; then
- . $MY_SQROOT/sql/scripts/sw_env.sh
- $MY_SQROOT/sql/local_hadoop/hadoop/bin/hadoop $*
+ . $TRAF_HOME/sql/scripts/sw_env.sh
+ $TRAF_HOME/sql/local_hadoop/hadoop/bin/hadoop $*
else
#cluster
return 1
@@ -81,8 +81,8 @@ do_hbase()
which_environment
local wenv=$?
if [[ ${wenv} -eq 1 ]]; then
- . $MY_SQROOT/sql/scripts/sw_env.sh
- $MY_SQROOT/sql/local_hadoop/hbase/bin/hbase $*
+ . $TRAF_HOME/sql/scripts/sw_env.sh
+ $TRAF_HOME/sql/local_hadoop/hbase/bin/hbase $*
else
return 1
fi
@@ -115,7 +115,7 @@ do_sudo()
elif [[ $which_env -eq 2 ]]; then
sudo_cmd="sudo $sudo_options -n -u $sudo_user $cmd"
else
- echo "***[ERROR]: Did not find supported Hadoop distribution or $MY_SQROOT is not set" | tee -a ${log_file}
+ echo "***[ERROR]: Did not find supported Hadoop distribution or $TRAF_HOME is not set" | tee -a ${log_file}
return 1
fi
#run the command
@@ -379,7 +379,7 @@ validate_environment_and_users()
return 1
fi
else
- echo "***[ERROR]: Did not find supported Hadoop distribution or $MY_SQROOT is not set."
+ echo "***[ERROR]: Did not find supported Hadoop distribution or $TRAF_HOME is not set."
return 1
fi
@@ -428,7 +428,7 @@ start_trafodion()
env1=1
fi
if [[ $env1 -eq 1 ]]; then
- $MY_SQROOT/sql/scripts/sqstart
+ $TRAF_HOME/sql/scripts/sqstart
sqstart_rc=$?
elif [[ $env1 -eq 2 ]]; then
sudo -n -u $traf_user sh -c ". /home/trafodion/.bashrc; sqstart"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/macros.gmk b/core/sqf/macros.gmk
index 5bb5162..b21ab1b 100644
--- a/core/sqf/macros.gmk
+++ b/core/sqf/macros.gmk
@@ -69,9 +69,9 @@ else
LNK_FLGS += $(COVER_FLGS)
endif
endif
-BINEXPDIR = $(MY_SQROOT)/export/bin$(SQ_MBTYPE)
-INCEXPDIR = $(MY_SQROOT)/export/include
-LIBEXPDIR = $(MY_SQROOT)/export/lib$(SQ_MBTYPE)
+BINEXPDIR = $(TRAF_HOME)/export/bin$(SQ_MBTYPE)
+INCEXPDIR = $(TRAF_HOME)/export/include
+LIBEXPDIR = $(TRAF_HOME)/export/lib$(SQ_MBTYPE)
ifeq ($(SQ_BUILD_PROFILE),generate)
OPTIM_FLGS += -fprofile-generate
LNK_FLGS += -fprofile-generate
@@ -111,7 +111,7 @@ CXX64FLAGS = $(GCCMODE64) $(DBG_FLGS) $(OPTIM_FLGS) -Wall -Werror $(INTEL_TOOL_F
# $(CHKCIPRE); $(CHKCIGCC); $(CHKCIDEB); $(CHKCI32); $(CHKCIPOST)
#
#
-CHKCIPRE = rm -fr $(BUILD_PLAT); cwd=$$PWD; cd $$MY_SQROOT
+CHKCIPRE = rm -fr $(BUILD_PLAT); cwd=$$PWD; cd $$TRAF_HOME
CHKCIPOST = cd $$cwd; $(MAKE) $(MAKEFLAGS) clean; $(MAKE) $(MAKEFLAGS)
CHKCIGCC = export SQ_OR_INTC=0
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/config.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/config.cxx b/core/sqf/monitor/linux/config.cxx
index dc78ba2..d5312ba 100755
--- a/core/sqf/monitor/linux/config.cxx
+++ b/core/sqf/monitor/linux/config.cxx
@@ -496,10 +496,10 @@ CConfigContainer::CConfigContainer(void)
// Open the configuration database file
char dbase[MAX_PROCESS_PATH];
// snprintf(dbase, sizeof(dbase), "%s/sql/scripts/sqconfig.db.%d",
- // getenv("MY_SQROOT"),MyPNID);
+ // getenv("TRAF_HOME"),MyPNID);
snprintf(dbase, sizeof(dbase), "%s/sql/scripts/sqconfig.db",
- getenv("MY_SQROOT"));
+ getenv("TRAF_HOME"));
int rc = sqlite3_open_v2(dbase, &db_,
SQLITE_OPEN_READWRITE | SQLITE_OPEN_FULLMUTEX,
NULL);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/macros.gmk b/core/sqf/monitor/linux/macros.gmk
index 051e9df..e5324f1 100755
--- a/core/sqf/monitor/linux/macros.gmk
+++ b/core/sqf/monitor/linux/macros.gmk
@@ -19,7 +19,7 @@
#
# @@@ END COPYRIGHT @@@
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
# This builds monitor with fork suspend/resume
#USE_FORK_SUSPEND_RESUME = 1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/monitor.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/monitor.cxx b/core/sqf/monitor/linux/monitor.cxx
index 8228098..08a4708 100755
--- a/core/sqf/monitor/linux/monitor.cxx
+++ b/core/sqf/monitor/linux/monitor.cxx
@@ -1093,12 +1093,12 @@ int main (int argc, char *argv[])
if ( IsRealCluster )
{
snprintf(fname, sizeof(fname), "%s/logs/sqmon.%s.log",
- getenv("MY_SQROOT"), Node_name);
+ getenv("TRAF_HOME"), Node_name);
}
else
{
snprintf(fname, sizeof(fname), "%s/logs/sqmon.%d.%s.log",
- getenv("MY_SQROOT"), MyPNID, Node_name);
+ getenv("TRAF_HOME"), MyPNID, Node_name);
}
remove(fname);
if( freopen (fname, "w", stdout) == NULL )
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/monlogging.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/monlogging.cxx b/core/sqf/monitor/linux/monlogging.cxx
index 7198e88..0de7256 100755
--- a/core/sqf/monitor/linux/monlogging.cxx
+++ b/core/sqf/monitor/linux/monlogging.cxx
@@ -225,7 +225,7 @@ void CMonLog::writeAltLog(int eventType, posix_sqlog_severity_t severity, char *
if ( useAltLog_ )
{
- rootDir = getenv("MY_SQROOT");
+ rootDir = getenv("TRAF_HOME");
if (rootDir == NULL)
{
logFileDirPtr = NULL;
@@ -277,7 +277,7 @@ void CMonLog::writeSnmpAltLog(int eventType, const char *msg)
if ( useAltLog_ )
{
- rootDir = getenv("MY_SQROOT");
+ rootDir = getenv("TRAF_HOME");
if (rootDir == NULL)
{
logFileDirPtr = NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/montest_run.virtual
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/montest_run.virtual b/core/sqf/monitor/linux/montest_run.virtual
index 1384c5e..424d38d 100755
--- a/core/sqf/monitor/linux/montest_run.virtual
+++ b/core/sqf/monitor/linux/montest_run.virtual
@@ -24,13 +24,13 @@
#!/bin/sh
# Cleanup
-cd $MY_SQROOT/monitor/linux/Linux-x86_64/dbg
+cd $TRAF_HOME/monitor/linux/Linux-x86_64/dbg
echo $PWD
rm -f core* *.log *.lst test*sub*
rm -f $MPI_TMPDIR/monitor.port.*
# Setup monitor test files
-cd $MY_SQROOT/monitor/linux
+cd $TRAF_HOME/monitor/linux
echo $PWD
echo Copying monitor test files to execution directory
echo cp -p ./test*sub* ./Linux-x86_64/dbg
@@ -40,7 +40,7 @@ cp -p ./test*sub* ./Linux-x86_64/dbg
export SQ_VIRTUAL_NODES=6
export SQ_VIRTUAL_NID=0
-cd $MY_SQROOT/monitor/linux/Linux-x86_64/dbg
+cd $TRAF_HOME/monitor/linux/Linux-x86_64/dbg
echo $PWD
shell <<eof
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/process.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/process.cxx b/core/sqf/monitor/linux/process.cxx
index 77d5036..d84d6af 100755
--- a/core/sqf/monitor/linux/process.cxx
+++ b/core/sqf/monitor/linux/process.cxx
@@ -1430,7 +1430,7 @@ bool CProcess::Create (CProcess *parent, int & result)
if (env && isdigit(*env))
numProcessThreads = atoi(env);
- env = getenv( "MY_SQROOT" );
+ env = getenv( "TRAF_HOME" );
if (env)
{
sqRoot_ = env ;
@@ -1501,7 +1501,7 @@ bool CProcess::Create (CProcess *parent, int & result)
setEnvStrVal ( childEnv, nextEnv, "MPI_INSTR", filename );
}
- setEnvStrVal ( childEnv, nextEnv, "MY_SQROOT", sqRoot_.c_str() );
+ setEnvStrVal ( childEnv, nextEnv, "TRAF_HOME", sqRoot_.c_str() );
setEnvStrVal ( childEnv, nextEnv, "USER", user );
setEnvStrVal ( childEnv, nextEnv, "HOME", home );
setEnvStrVal ( childEnv, nextEnv, "TERM", term );
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/process.h
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/process.h b/core/sqf/monitor/linux/process.h
index fd26625..957f218 100755
--- a/core/sqf/monitor/linux/process.h
+++ b/core/sqf/monitor/linux/process.h
@@ -458,7 +458,7 @@ private:
strId_t pathStrId_;
strId_t ldpathStrId_;
bool cmpOrEsp_;
- string sqRoot_; // MY_SQROOT passed to object file
+ string sqRoot_; // TRAF_HOME passed to object file
string infile_; // process's stdin
string outfile_; // process's stdout
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/pstartd.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/pstartd.cxx b/core/sqf/monitor/linux/pstartd.cxx
index b6ee2b1..c09ba65 100755
--- a/core/sqf/monitor/linux/pstartd.cxx
+++ b/core/sqf/monitor/linux/pstartd.cxx
@@ -741,7 +741,7 @@ CPStartD::CPStartD()
// Open the configuration database file
char dbase[MAX_PROCESS_PATH];
snprintf(dbase, sizeof(dbase), "%s/sql/scripts/sqconfig.db",
- getenv("MY_SQROOT"));
+ getenv("TRAF_HOME"));
int rc = sqlite3_open_v2(dbase, &db_, SQLITE_OPEN_READONLY, NULL);
if ( rc )
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/reqqueue.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/reqqueue.cxx b/core/sqf/monitor/linux/reqqueue.cxx
index fcf7620..2684633 100644
--- a/core/sqf/monitor/linux/reqqueue.cxx
+++ b/core/sqf/monitor/linux/reqqueue.cxx
@@ -2167,7 +2167,7 @@ void CIntSnapshotReq::performRequest()
// copy sqconfig.db
char cmd[256];
sprintf(cmd, "pdcp -p -w %s %s/sql/scripts/sqconfig.db %s/sql/scripts/.", Monitor->GetIntegratingNode()->GetName(),
- getenv("MY_SQROOT"), getenv("MY_SQROOT") );
+ getenv("TRAF_HOME"), getenv("TRAF_HOME") );
error = system(cmd);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/linux/shell.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/shell.cxx b/core/sqf/monitor/linux/shell.cxx
index 03a911c..f4a754d 100755
--- a/core/sqf/monitor/linux/shell.cxx
+++ b/core/sqf/monitor/linux/shell.cxx
@@ -354,7 +354,7 @@ MonCwd::MonCwd(): cwdChanged_(false)
}
else
{
- env = getenv("MY_SQROOT");
+ env = getenv("TRAF_HOME");
if ( env )
{
string monWdir;
@@ -4798,8 +4798,8 @@ bool start_monitor( char *cmd_tail, bool warmstart, bool reintegrate )
argv[idx+3] = path;
idx+=3;
argv[idx+1] = (char *) "-env";
- argv[idx+2] = (char *) "MY_SQROOT";
- env=getenv("MY_SQROOT");
+ argv[idx+2] = (char *) "TRAF_HOME";
+ env=getenv("TRAF_HOME");
strcpy (sqroot, (env?env:""));
argv[idx+3] = sqroot;
idx+=3;
@@ -5309,7 +5309,7 @@ int up_node( int nid, char *node_name, bool nowait )
// remove shared segment on the node
char cmd[256];
- sprintf(cmd, "pdsh -w %s \"sqipcrm %s >> $MY_SQROOT/logs/node_up_%s.log\"", node_name, node_name, node_name);
+ sprintf(cmd, "pdsh -w %s \"sqipcrm %s >> $TRAF_HOME/logs/node_up_%s.log\"", node_name, node_name, node_name);
system(cmd);
// Start a monitor process on the node
@@ -5583,7 +5583,7 @@ void write_startup_log( char *msg )
char fname[PATH_MAX];
char msgString[MAX_BUFFER] = { 0 };
- char *tmpDir = getenv( "MY_SQROOT" );
+ char *tmpDir = getenv( "TRAF_HOME" );
if ( tmpDir )
{
snprintf( fname, sizeof(fname), "%s/sql/scripts/startup.log", tmpDir );
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/test/notes.txt
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/test/notes.txt b/core/sqf/monitor/test/notes.txt
index b9b54db..4976288 100755
--- a/core/sqf/monitor/test/notes.txt
+++ b/core/sqf/monitor/test/notes.txt
@@ -28,7 +28,7 @@ setup:
export PATH=$PATH:$PWD/Linux-x86_64/dbg
3. Set the following environment variable so the shell looks in the
- current directory instead of $MY_SQROOT/sql/scripts:
+ current directory instead of $TRAF_HOME/sql/scripts:
export SQ_SHELL_NOCWD=1
-----------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/test/runtest
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/test/runtest b/core/sqf/monitor/test/runtest
index b9dae82..f2d0142 100755
--- a/core/sqf/monitor/test/runtest
+++ b/core/sqf/monitor/test/runtest
@@ -21,23 +21,23 @@
#
# @@@ END COPYRIGHT @@@
#
-# Execute this test script from $MY_SQROOT/monitor/test.
+# Execute this test script from $TRAF_HOME/monitor/test.
#
# Cluster environment setup:
# - create directories
-# cd $MY_SQROOT
+# cd $TRAF_HOME
# pdsh $MY_NODES mkdir $PWD/monitor
# pdsh $MY_NODES mkdir $PWD/monitor/test
-# - copy test files to $MY_SQROOT/monitor/test in all nodes
-# cd $MY_SQROOT/monitor/test
+# - copy test files to $TRAF_HOME/monitor/test in all nodes
+# cd $TRAF_HOME/monitor/test
# pdcp $MY_NODES -p -r /home/sqft2/monitor/test/* $PWD/
# - execute runtest -cluster
-# cd $MY_SQROOT/monitor/test
+# cd $TRAF_HOME/monitor/test
# runtest -cluster
#
# Virtual environment setup:
# - execute runtest -virtual
-# cd $MY_SQROOT/monitor/test
+# cd $TRAF_HOME/monitor/test
# runtest -virtual
#
@@ -103,7 +103,7 @@ fi
# Setup test execution
#
export PATH=$PATH:$PWD/Linux-x86_64/64/dbg
-cd $MY_SQROOT/monitor/test
+cd $TRAF_HOME/monitor/test
echo $PWD
if [ "$cluster" = "-cluster" ]; then
@@ -149,8 +149,8 @@ fi
if [ "$nogen" = "-nogen" ]; then
echo "sqgen not executed!"
else
- echo sqgen $MY_SQROOT/monitor/test/$conf
- sqgen $MY_SQROOT/monitor/test/$conf
+ echo sqgen $TRAF_HOME/monitor/test/$conf
+ sqgen $TRAF_HOME/monitor/test/$conf
fi
#
@@ -162,7 +162,7 @@ if ( [ $test '==' -1 ] || [ $test '==' 1 ] ); then
echo "***"
shell <<eof
startup
- exec {name \$CTRLR, nid 0, out $MY_SQROOT/monitor/test/childExit.lst} childExitCtrl $trace
+ exec {name \$CTRLR, nid 0, out $TRAF_HOME/monitor/test/childExit.lst} childExitCtrl $trace
shutdown
exit
eof
@@ -191,7 +191,7 @@ shell <<eof
exec {nowait,name \$SERV0,nid 0} server $trace
exec {nowait,pri 5,name \$SERV1} server $trace
ps
- exec {pri 10,name \$CLIENT,nid 0, out $MY_SQROOT/monitor/test/multiNode.lst} client $trace
+ exec {pri 10,name \$CLIENT,nid 0, out $TRAF_HOME/monitor/test/multiNode.lst} client $trace
shutdown
exit
eof
@@ -212,7 +212,7 @@ fi
echo "***"
shell <<eof
startup
- exec {name \$CTRLR, nid 0, out $MY_SQROOT/monitor/test/regTest.lst} regTestCtrl $trace
+ exec {name \$CTRLR, nid 0, out $TRAF_HOME/monitor/test/regTest.lst} regTestCtrl $trace
shutdown
exit
eof
@@ -244,7 +244,7 @@ if ( [ $test '==' -1 ] || [ $test '==' 4 ] ); then
ps
! To enable tracing add "-t" argument to the end of the "exec" line
!
- exec {name \$DEATH, nid 0, out $MY_SQROOT/monitor/test/deathNotice.lst} deathNotice $trace
+ exec {name \$DEATH, nid 0, out $TRAF_HOME/monitor/test/deathNotice.lst} deathNotice $trace
shutdown
exit
eof
@@ -268,7 +268,7 @@ shell <<eof
startup
down 2 !
delay 15
- exec {name \$PPROC, nid 0, out $MY_SQROOT/monitor/test/persistentProc.lst} persistentProc $trace
+ exec {name \$PPROC, nid 0, out $TRAF_HOME/monitor/test/persistentProc.lst} persistentProc $trace
shutdown
exit
eof
@@ -282,7 +282,7 @@ eof
echo "***"
shell <<eof
startup
- exec {name \$PPROC, nid 0, out $MY_SQROOT/monitor/test/persistentProc.lst} persistentProc $trace
+ exec {name \$PPROC, nid 0, out $TRAF_HOME/monitor/test/persistentProc.lst} persistentProc $trace
shutdown
exit
eof
@@ -300,7 +300,7 @@ if ( [[ $dtm_persistent_process == "1" ]] &&
echo "***"
shell <<eof
startup
- exec {name \$DTMCTRL, nid 0, out $MY_SQROOT/monitor/test/dtmTest.lst} dtmCtrl $trace
+ exec {name \$DTMCTRL, nid 0, out $TRAF_HOME/monitor/test/dtmTest.lst} dtmCtrl $trace
shutdown
exit
eof
@@ -323,7 +323,7 @@ if ( [ $test '==' -1 ] || [ $test '==' 7 ] ); then
echo "***"
shell <<eof
startup
- exec {name \$SPXCTRL, nid 0, out $MY_SQROOT/monitor/test/spxTest.lst} spxCtrl $trace
+ exec {name \$SPXCTRL, nid 0, out $TRAF_HOME/monitor/test/spxTest.lst} spxCtrl $trace
shutdown
exit
eof
@@ -344,7 +344,7 @@ if ( [ $test '==' -1 ] || [ $test '==' 8 ] ); then
echo "***"
shell <<eof
startup
- exec {name \$PCRE8, nid 0, out $MY_SQROOT/monitor/test/procCreate.lst} procCreate $trace -x
+ exec {name \$PCRE8, nid 0, out $TRAF_HOME/monitor/test/procCreate.lst} procCreate $trace -x
exit
eof
sleep 1
@@ -364,7 +364,7 @@ if ( [ $test '==' -1 ] || [ $test '==' 9 ] ); then
echo "***"
shell <<eof
startup
- exec {nowait, name \$PCRE8, nid 0, out $MY_SQROOT/monitor/test/nodeDown.lst} procCreate $trace -y
+ exec {nowait, name \$PCRE8, nid 0, out $TRAF_HOME/monitor/test/nodeDown.lst} procCreate $trace -y
delay 3
down 1 !
delay 10
@@ -391,7 +391,7 @@ if ( [ $test '==' 9 ] ); then
echo "***"
shell <<eof
startup
- exec {nowait, nid 0, name \$CTRLR, out $MY_SQROOT/monitor/test/tmSync.lst} tmSyncCtrl -n 1,3,4,5,6 $trace
+ exec {nowait, nid 0, name \$CTRLR, out $TRAF_HOME/monitor/test/tmSync.lst} tmSyncCtrl -n 1,3,4,5,6 $trace
wait $CTRLR
shutdown
exit
@@ -405,7 +405,7 @@ eof
echo "***"
shell <<eof
startup
- exec {nowait, nid 0, name \$CTRLR, out $MY_SQROOT/monitor/test/tmSync8.lst} tmSyncCtrl -n 8 $trace
+ exec {nowait, nid 0, name \$CTRLR, out $TRAF_HOME/monitor/test/tmSync8.lst} tmSyncCtrl -n 8 $trace
wait $CTRLR
shutdown
exit
@@ -421,7 +421,7 @@ shell <<eof
startup
down 2 !
delay 15
- exec {nowait, nid 0, name \$CTRLR, out $MY_SQROOT/monitor/test/tmSync10.lst} tmSyncCtrl -n 10 $trace
+ exec {nowait, nid 0, name \$CTRLR, out $TRAF_HOME/monitor/test/tmSync10.lst} tmSyncCtrl -n 10 $trace
wait $CTRLR
shutdown
exit
@@ -436,7 +436,7 @@ eof
echo "***"
shell <<eof
startup
- exec {nowait, nid 0, name \$CTRLR, out $MY_SQROOT/monitor/test/tmSync.lst} tmSyncCtrl -n 3,4,5,6,7 $trace
+ exec {nowait, nid 0, name \$CTRLR, out $TRAF_HOME/monitor/test/tmSync.lst} tmSyncCtrl -n 3,4,5,6,7 $trace
wait $CTRLR
shutdown
exit
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/monitor/test/sqconfig.monitor.cluster
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/test/sqconfig.monitor.cluster b/core/sqf/monitor/test/sqconfig.monitor.cluster
index b341a80..75e22bb 100644
--- a/core/sqf/monitor/test/sqconfig.monitor.cluster
+++ b/core/sqf/monitor/test/sqconfig.monitor.cluster
@@ -41,7 +41,7 @@ end node
# Overflow directories for ssd and hdd. Format: [overflow-type] [directory]
begin overflow
-hdd $MY_SQROOT/tmp
+hdd $TRAF_HOME/tmp
#sdd /sdd/directory
end overflow
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 75ed593..e431b0a 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -43,7 +43,7 @@ export PRODUCT_COPYRIGHT_HEADER="2015-2016 Apache Software Foundation"
# Set TRAFODION_ENABLE_AUTHENTICATION to YES to enable
# authentication in the Trafodion environment.
# LDAP configuration must also be setup--see
-# $MY_SQROOT/sql/scripts/traf_authentication_config for details.
+# $TRAF_HOME/sql/scripts/traf_authentication_config for details.
##############################################################
export TRAFODION_ENABLE_AUTHENTICATION=NO
@@ -137,7 +137,7 @@ if [[ "$SUSE_LINUX" == "false" ]]; then
else
export RH_MAJ_VERS=6
fi
-export MY_SQROOT=$PWD
+export TRAF_HOME=$PWD
# set common version to be consistent between shared lib and maven dependencies
export HBASE_DEP_VER_CDH=1.2.0-cdh5.7.1
@@ -180,7 +180,7 @@ export HADOOP_BLD_LIB=${TOOLSDIR}/hadoop-${HADOOP_DEP_VER}/lib/native
export HADOOP_BLD_INC=${TOOLSDIR}/hadoop-${HADOOP_DEP_VER}/include
# general Hadoop & TRX dependencies - not distro specific, choose one to build against
-export HBASE_TRXDIR=$MY_SQROOT/export/lib
+export HBASE_TRXDIR=$TRAF_HOME/export/lib
export HBASE_TRX_JAR=${HBASE_TRX_ID_CDH}-${TRAFODION_VER}.jar
export DTM_COMMON_JAR=trafodion-dtm-cdh-${TRAFODION_VER}.jar
export SQL_JAR=trafodion-sql-cdh-${TRAFODION_VER}.jar
@@ -203,8 +203,8 @@ fi
# check for workstation env
# want to make sure SQ_VIRTUAL_NODES is set in the shell running sqstart
# so we can determine if we are on a workstation or not
-if [[ -e ${MY_SQROOT}/etc/ms.env ]] ; then
- VIRT_NODES=$(awk '/SQ_VIRTUAL_NODES=/ { fields=split($0,virt,"="); if ( fields == 2 ) { virtnodes=virt[2];}} END {print virtnodes}' < $MY_SQROOT/etc/ms.env)
+if [[ -e ${TRAF_HOME}/etc/ms.env ]] ; then
+ VIRT_NODES=$(awk '/SQ_VIRTUAL_NODES=/ { fields=split($0,virt,"="); if ( fields == 2 ) { virtnodes=virt[2];}} END {print virtnodes}' < $TRAF_HOME/etc/ms.env)
if [[ -n "$VIRT_NODES" ]] ; then
export SQ_VIRTUAL_NODES="$VIRT_NODES"
fi
@@ -215,14 +215,14 @@ export SQ_IDTMSRV=1
# Turn on/off generation of Service Monitor
export SQ_SRVMON=1
-export MY_MPI_ROOT="$MY_SQROOT"
-export MPI_ROOT="$MY_SQROOT/opt/hpmpi"
+export MY_MPI_ROOT="$TRAF_HOME"
+export MPI_ROOT="$TRAF_HOME/opt/hpmpi"
unset MPI_CC
export MPI_CXX=/usr/bin/g++
export MPICH_CXX=$MPI_CXX
-export PATH=$MPI_ROOT/bin:$MY_SQROOT/export/bin"$SQ_MBTYPE":$MY_SQROOT/sql/scripts:$MY_SQROOT/tools:$MY_SQROOT/trafci/bin:$PATH
+export PATH=$MPI_ROOT/bin:$TRAF_HOME/export/bin"$SQ_MBTYPE":$TRAF_HOME/sql/scripts:$TRAF_HOME/tools:$TRAF_HOME/trafci/bin:$PATH
# The guiding principle is that the user's own software is preferred over anything else;
# system customizations are likewise preferred over default software.
@@ -281,12 +281,12 @@ else
export LOC_JVMLIBS=$JAVA_HOME/jre/lib/i386/server
fi
-if [[ -e $MY_SQROOT/sql/scripts/sw_env.sh ]]; then
+if [[ -e $TRAF_HOME/sql/scripts/sw_env.sh ]]; then
# we are on a development system where install_local_hadoop has been
# executed
# ----------------------------------------------------------------
- [[ $SQ_VERBOSE == 1 ]] && echo "Sourcing in $MY_SQROOT/sql/scripts/sw_env.sh"
- . $MY_SQROOT/sql/scripts/sw_env.sh
+ [[ $SQ_VERBOSE == 1 ]] && echo "Sourcing in $TRAF_HOME/sql/scripts/sw_env.sh"
+ . $TRAF_HOME/sql/scripts/sw_env.sh
#echo "YARN_HOME = $YARN_HOME"
# native library directories and include directories
@@ -316,9 +316,9 @@ if [[ -e $MY_SQROOT/sql/scripts/sw_env.sh ]]; then
# Configuration directories
- export HADOOP_CNF_DIR=$MY_SQROOT/sql/local_hadoop/hadoop/etc/hadoop
- export HBASE_CNF_DIR=$MY_SQROOT/sql/local_hadoop/hbase/conf
- export HIVE_CNF_DIR=$MY_SQROOT/sql/local_hadoop/hive/conf
+ export HADOOP_CNF_DIR=$TRAF_HOME/sql/local_hadoop/hadoop/etc/hadoop
+ export HBASE_CNF_DIR=$TRAF_HOME/sql/local_hadoop/hbase/conf
+ export HIVE_CNF_DIR=$TRAF_HOME/sql/local_hadoop/hive/conf
elif [[ -d /opt/cloudera/parcels/CDH ]]; then
# we are on a cluster with Cloudera parcels installed
@@ -505,7 +505,7 @@ else
Execute the install_local_hadoop script which performs a single node
install using a popular Hadoop distribution
- cd $MY_SQROOT/sql/scripts
+ cd $TRAF_HOME/sql/scripts
install_local_hadoop [-p <port option>]
install_traf_components
configure Trafodion and start the processes
@@ -659,7 +659,7 @@ else
fi
# Add man pages
-export MANPATH=$MANPATH:$MY_SQROOT/export/share/man
+export MANPATH=$MANPATH:$TRAF_HOME/export/share/man
# Control lunmgr verbosity
export SQ_LUNMGR_VERBOSITY=1
@@ -711,7 +711,7 @@ export SQ_WDT_CHECK_CLUSTER_STATE=0
# This can be useful in troubleshooting problems. There is an overhead cost
# incurred each time a process is started so do not enable this if performance
# is critical.
-# Log process start/end messages in $MY_SQROOT/tmp/monitor.map
+# Log process start/end messages in $TRAF_HOME/tmp/monitor.map
export SQ_PIDMAP=1
#Enable RMS (SQL Run time statistics)
@@ -769,7 +769,7 @@ export SQ_EVLOG_NONE=1
function ckillall {
# echo "In the ckillall function"
export SQ_PS1=$PS1
- $MY_SQROOT/sql/scripts/ckillall
+ $TRAF_HOME/sql/scripts/ckillall
unset SQ_PS1
}
export -f ckillall
@@ -819,7 +819,7 @@ export PROTOBUFS_INC=$PROTOBUFS/include
# Library Path may include local over-rides
# Put Hadoop native dir before Trafodion, so that an available libhdfs will
# be picked up there, otherwise use the libhdfs distributed with Trafodion.
-export LD_LIBRARY_PATH=$CC_LIB_RUNTIME:$MPI_ROOT/lib/$MPILIB:$HADOOP_LIB_DIR:$MY_SQROOT/export/lib"$SQ_MBTYPE":$LOC_JVMLIBS:$LOG4CXX_LIB_DIR:.
+export LD_LIBRARY_PATH=$CC_LIB_RUNTIME:$MPI_ROOT/lib/$MPILIB:$HADOOP_LIB_DIR:$TRAF_HOME/export/lib"$SQ_MBTYPE":$LOC_JVMLIBS:$LOG4CXX_LIB_DIR:.
######################
# classpath calculation may include local over-rides
@@ -880,17 +880,17 @@ if [[ -n "$SQ_CLASSPATH" ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:"; fi
# installer and hbase classpath already contains the correct trx jar.
# In future, installer can put additional hints in bashrc to cleanup
# and fine tune these adjustments for many other jars.
-if [[ -e $MY_SQROOT/sql/scripts/sw_env.sh ]]; then
+if [[ -e $TRAF_HOME/sql/scripts/sw_env.sh ]]; then
SQ_CLASSPATH=${SQ_CLASSPATH}:${HBASE_TRXDIR}/${HBASE_TRX_JAR}
fi
SQ_CLASSPATH=${SQ_CLASSPATH}:\
-$MY_SQROOT/export/lib/${DTM_COMMON_JAR}:\
-$MY_SQROOT/export/lib/${SQL_JAR}:\
-$MY_SQROOT/export/lib/${UTIL_JAR}:\
-$MY_SQROOT/export/lib/${JDBCT4_JAR}:\
-$MY_SQROOT/export/lib/jdbcT2.jar
+$TRAF_HOME/export/lib/${DTM_COMMON_JAR}:\
+$TRAF_HOME/export/lib/${SQL_JAR}:\
+$TRAF_HOME/export/lib/${UTIL_JAR}:\
+$TRAF_HOME/export/lib/${JDBCT4_JAR}:\
+$TRAF_HOME/export/lib/jdbcT2.jar
# Check whether the current shell environment changed from a previous execution of this
@@ -904,7 +904,7 @@ This is not supported. To change environments, do the following:
sqstop
<make any changes, e.g. update Hadoop, HBase, MySQL>
start a new shell and source in sqenv.sh
- rm \$MY_SQROOT/etc/ms.env
+ rm \$TRAF_HOME/etc/ms.env
sqgen
start a new shell and source in sqenv.sh
sqstart
@@ -943,7 +943,7 @@ MANPATH=$(remove_duplicates_in_path "$MANPATH")
###################
# Check variables that should refer to real directories
-VARLIST="MY_SQROOT $VARLIST JAVA_HOME MPI_TMPDIR"
+VARLIST="TRAF_HOME $VARLIST JAVA_HOME MPI_TMPDIR"
if [[ "$SQ_VERBOSE" == "1" ]]; then
echo "Checking variables reference existing directories ..."
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sqevlog/sq_evl_libs/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/sqevlog/sq_evl_libs/macros.gmk b/core/sqf/sqevlog/sq_evl_libs/macros.gmk
index 8e72a42..d4fbc95 100755
--- a/core/sqf/sqevlog/sq_evl_libs/macros.gmk
+++ b/core/sqf/sqevlog/sq_evl_libs/macros.gmk
@@ -19,7 +19,7 @@
#
# @@@ END COPYRIGHT @@@
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
ifndef SQ_MTYPE
SQ_MTYPE = 32
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sqid
----------------------------------------------------------------------
diff --git a/core/sqf/sqid b/core/sqf/sqid
index 8b6a9c5..7eca793 100755
--- a/core/sqf/sqid
+++ b/core/sqf/sqid
@@ -40,7 +40,7 @@ if ($help) {
}
my $sq_pdsh = defined $ENV{'SQ_PDSH'} ? $ENV{'SQ_PDSH'} : '';
-my $my_sqroot = defined $ENV{'MY_SQROOT'} ? $ENV{'MY_SQROOT'} : '';
+my $traf_home = defined $ENV{'TRAF_HOME'} ? $ENV{'TRAF_HOME'} : '';
my $java_home = defined $ENV{'JAVA_HOME'} ? $ENV{'JAVA_HOME'} : '';
my $host;
gethost();
@@ -58,18 +58,18 @@ if ($rhrel =~ /^.*release ([0-9][0-9]*)\.([0-9][0-9]*)/) {
$rr=$1 . "." . $2
}
-print "MY_SQROOT=$my_sqroot\n";
+print "TRAF_HOME=$traf_home\n";
print "who\@host=$w\@$host\n";
print "JAVA_HOME=$java_home\n";
print "linux=$lr\n";
print "redhat=$rr\n";
# can't do much if this env variables is not setup
-if (!defined $ENV{'MY_SQROOT'}) {
- die "MY_SQROOT is not set!";
+if (!defined $ENV{'TRAF_HOME'}) {
+ die "TRAF_HOME is not set!";
}
my $sq_mbtype = defined $ENV{'SQ_MBTYPE'} ? $ENV{'SQ_MBTYPE'} : '?';
-my $dir = "$my_sqroot/export/lib" . $sq_mbtype;
+my $dir = "$traf_home/export/lib" . $sq_mbtype;
chdir($dir) or die "can't chdir to $dir $!";
my $file = "$dir'/libsbms.so'";
version($file);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sqinfo
----------------------------------------------------------------------
diff --git a/core/sqf/sqinfo b/core/sqf/sqinfo
index 6fec91a..dd68282 100755
--- a/core/sqf/sqinfo
+++ b/core/sqf/sqinfo
@@ -88,20 +88,20 @@ function DO_ENV_INFO {
echo
echo "acquiring other environment info..."
if [ $sbi = 0 ]; then
- if [ -r "$MY_SQROOT/sql/scripts/mon.env" ]; then
+ if [ -r "$TRAF_HOME/sql/scripts/mon.env" ]; then
echo "sql/scripts/mon.env:"
- cat $MY_SQROOT/sql/scripts/mon.env|grep -v '^#'|grep -v '^$'
+ cat $TRAF_HOME/sql/scripts/mon.env|grep -v '^#'|grep -v '^$'
echo
fi
fi
- if [ -r "$MY_SQROOT/sql/scripts/mon.env" ]; then
+ if [ -r "$TRAF_HOME/sql/scripts/mon.env" ]; then
echo "sql/scripts/mon.env:"
- cat $MY_SQROOT/sql/scripts/mon.env|grep -v '^#'|grep -v '^$'
+ cat $TRAF_HOME/sql/scripts/mon.env|grep -v '^#'|grep -v '^$'
echo
fi
- if [ -r "$MY_SQROOT/sql/scripts/shell.env" ]; then
+ if [ -r "$TRAF_HOME/sql/scripts/shell.env" ]; then
echo "sql/scripts/shell.env:"
- cat $MY_SQROOT/sql/scripts/shell.env|grep -v '^#'|grep -v '^$'
+ cat $TRAF_HOME/sql/scripts/shell.env|grep -v '^#'|grep -v '^$'
echo
fi
fi
@@ -214,8 +214,8 @@ function DO_SQL_INFO {
echo
echo "acquiring sql info..."
- if [ "$MY_SQROOT" ]; then
- cfg=$MY_SQROOT/sql/scripts/sqconfig
+ if [ "$TRAF_HOME" ]; then
+ cfg=$TRAF_HOME/sql/scripts/sqconfig
if [ -r "$cfg" ]; then
echo "cat $cfg:"
if [ $full = 1 ]; then
@@ -228,7 +228,7 @@ function DO_SQL_INFO {
return
fi
else
- echo "\$MY_SQROOT not set"
+ echo "\$TRAF_HOME not set"
return
fi
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/sql/macros.gmk b/core/sqf/sql/macros.gmk
index 9f09e8c..d625e24 100644
--- a/core/sqf/sql/macros.gmk
+++ b/core/sqf/sql/macros.gmk
@@ -32,7 +32,7 @@ NSK_SQ = ../../..
NSK_SQU = ../../../..
NSK = ../../nsk
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
ifeq ($(SQ_MTYPE),64)
CC = $(CC64) $(GCCMODE64)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/UsasRepos
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/UsasRepos b/core/sqf/sql/scripts/UsasRepos
index de16890..7158a82 100755
--- a/core/sqf/sql/scripts/UsasRepos
+++ b/core/sqf/sql/scripts/UsasRepos
@@ -48,7 +48,7 @@ reorgNeeded()
echo "FALSE"
}
-MXCI="$MY_SQROOT/export/bin$SQ_MBTYPE/sqlci"
+MXCI="$TRAF_HOME/export/bin$SQ_MBTYPE/sqlci"
cat="MANAGEABILITY"
log="RALog"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/bats/runmonitorbats.virtual
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/bats/runmonitorbats.virtual b/core/sqf/sql/scripts/bats/runmonitorbats.virtual
index 5f9608b..975c5a2 100755
--- a/core/sqf/sql/scripts/bats/runmonitorbats.virtual
+++ b/core/sqf/sql/scripts/bats/runmonitorbats.virtual
@@ -27,7 +27,7 @@
echo "***"
echo "*** Stopping SQ Environment"
echo "***"
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
echo $PWD
sqstop
ckillall
@@ -40,10 +40,10 @@ sqgen bats/sqconfig.monitor
echo "***"
echo "*** Running monitor tests"
echo "***"
-cd $MY_SQROOT/monitor/test
+cd $TRAF_HOME/monitor/test
echo $PWD
make clean;make
-$MY_SQROOT/monitor/test/runtest -virtual -nogen
+$TRAF_HOME/monitor/test/runtest -virtual -nogen
echo "***"
echo "*** Last monitor test stops SQ Environment"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/bats/runseabedbats.virtual
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/bats/runseabedbats.virtual b/core/sqf/sql/scripts/bats/runseabedbats.virtual
index 4e5d87a..e73081f 100755
--- a/core/sqf/sql/scripts/bats/runseabedbats.virtual
+++ b/core/sqf/sql/scripts/bats/runseabedbats.virtual
@@ -24,7 +24,7 @@
# This script rebuilds SQ environment
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
echo "***"
echo "*** Stopping SQ Environment"
echo "***"
@@ -39,15 +39,15 @@ sqgen bats/sqconfig.seabed
echo "***"
echo "*** Seabed tests - setup"
echo "***"
-cd $MY_SQROOT/src/seabed/test
+cd $TRAF_HOME/src/seabed/test
echo $PWD
# Copy 'cluster.conf' file generated above to test directory
-cp -fp $MY_SQROOT/tmp/cluster.conf .
+cp -fp $TRAF_HOME/tmp/cluster.conf .
echo "***"
echo "*** Running Seabed tests"
echo "***"
-cd $MY_SQROOT/src/seabed/test
+cd $TRAF_HOME/src/seabed/test
echo $PWD
rm -f core*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/bats/runsqlreg.virtual
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/bats/runsqlreg.virtual b/core/sqf/sql/scripts/bats/runsqlreg.virtual
index 7e332d8..6cc6d34 100755
--- a/core/sqf/sql/scripts/bats/runsqlreg.virtual
+++ b/core/sqf/sql/scripts/bats/runsqlreg.virtual
@@ -24,7 +24,7 @@
# This script rebuilds SQ environment
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
echo $PWD
echo "***"
echo "*** Stopping SQ Environment"
@@ -53,7 +53,7 @@ sqps
echo "***"
echo "*** SQL regressions - setup"
echo "***"
-cd $MY_SQROOT/../sql/regress/tools
+cd $TRAF_HOME/../sql/regress/tools
echo $PWD
. ./setuplnxenv
cd ..
@@ -61,14 +61,14 @@ cd ..
echo "***"
echo "*** Running SQL regressions"
echo "***"
-cd $MY_SQROOT/../sql/regress
+cd $TRAF_HOME/../sql/regress
echo $PWD
./tools/runlnxlocal
echo "***"
echo "*** Stopping SQ Environment"
echo "***"
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
echo $PWD
sqps
sqstop
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/bats/runtmbats.virtual
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/bats/runtmbats.virtual b/core/sqf/sql/scripts/bats/runtmbats.virtual
index 6783562..1ba9d31 100755
--- a/core/sqf/sql/scripts/bats/runtmbats.virtual
+++ b/core/sqf/sql/scripts/bats/runtmbats.virtual
@@ -24,7 +24,7 @@
# This script rebuilds SQ environment
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
echo "***"
echo "*** Stopping SQ Environment"
echo "***"
@@ -40,20 +40,20 @@ cleandb
echo "***"
echo "*** Build TM test files"
echo "***"
-cd $MY_SQROOT/src/tm/tm_test
+cd $TRAF_HOME/src/tm/tm_test
echo $PWD
make
echo "***"
echo "*** TM tests - setup"
echo "***"
-cd $MY_SQROOT/src/tm/tm_test/auto_test
+cd $TRAF_HOME/src/tm/tm_test/auto_test
echo $PWD
./create_links
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
echo $PWD
-export PATH=.:$MY_SQROOT/src/tm/tm_test:$MY_SQROOT/src/tm/tm_test/auto_test:$MY_SQROOT/src/tm/tm_test/tm_perform:${PATH}
+export PATH=.:$TRAF_HOME/src/tm/tm_test:$TRAF_HOME/src/tm/tm_test/auto_test:$TRAF_HOME/src/tm/tm_test/tm_perform:${PATH}
echo "***"
echo "*** Starting SQ Environment"
@@ -71,14 +71,14 @@ sqps
echo "***"
echo "*** Running TM tests"
echo "***"
-cd $MY_SQROOT/src/tm/tm_test/auto_test
+cd $TRAF_HOME/src/tm/tm_test/auto_test
echo $PWD
./goall
echo "***"
echo "*** Stopping SQ Environment"
echo "***"
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
echo $PWD
sqps
sqstop
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/bats/sqconfig.tm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/bats/sqconfig.tm b/core/sqf/sql/scripts/bats/sqconfig.tm
index 2dd7d10..a0073f9 100644
--- a/core/sqf/sql/scripts/bats/sqconfig.tm
+++ b/core/sqf/sql/scripts/bats/sqconfig.tm
@@ -41,14 +41,14 @@ end role_node_map
#enc-2=n015,n016,n017,n018,n019,n020,n021,n022,n023,n024,n025,n026
#end enclosure
-storage_loc $MY_SQROOT/sql/database
+storage_loc $TRAF_HOME/sql/database
# Please note that if you have mirroring turned ON, you must specify
# the mirror storage locations. You can either specify a global
# mirror location by uncommenting and changing the line below, or
# you can configure mirror locations on a per volume basis.
-#storage_mir_loc $MY_SQROOT/sql/databasem
+#storage_mir_loc $TRAF_HOME/sql/databasem
# Extents are for data audit volumes only, not $TLOG
# Minimum is 1550
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/build_apidocs.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/build_apidocs.sh b/core/sqf/sql/scripts/build_apidocs.sh
index e8d228f..6f55da9 100755
--- a/core/sqf/sql/scripts/build_apidocs.sh
+++ b/core/sqf/sql/scripts/build_apidocs.sh
@@ -83,7 +83,7 @@ do
sql_javadoc)
echo "Building Javadocs for SQL project"
- cd $MY_SQROOT/../sql
+ cd $TRAF_HOME/../sql
mvn javadoc:javadoc
APIDOC_DIR=target/site/apidocs
TGT_SUBDIR="/tmudr_javadoc"
@@ -92,7 +92,7 @@ do
udr_doxygen)
echo "Building Doxygen for TMUDF C++ interface"
- cd $MY_SQROOT/../sql/sqludr
+ cd $TRAF_HOME/../sql/sqludr
APIDOC_DIR=tmudr_2.0.1/html
rm -rf $APIDOC_DIR
doxygen doxygen_tmudr*.config
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/ckill
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ckill b/core/sqf/sql/scripts/ckill
index 466603d..ef39456 100755
--- a/core/sqf/sql/scripts/ckill
+++ b/core/sqf/sql/scripts/ckill
@@ -26,8 +26,8 @@ if [ -n "$MY_NODES" ];then
fi
if [ -e $SQ_PDSH ]; then
- $PDSH $MY_NODES_PRM $PDSH_SSH_CMD $MY_SQROOT/sql/scripts/traf_pkill $*
+ $PDSH $MY_NODES_PRM $PDSH_SSH_CMD $TRAF_HOME/sql/scripts/traf_pkill $*
else
- $MY_SQROOT/sql/scripts/traf_pkill $*
+ $TRAF_HOME/sql/scripts/traf_pkill $*
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/ckillall
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ckillall b/core/sqf/sql/scripts/ckillall
index f6e68bd..f62efa4 100755
--- a/core/sqf/sql/scripts/ckillall
+++ b/core/sqf/sql/scripts/ckillall
@@ -23,7 +23,7 @@
#
function LogIt {
- echo "`date`: $1" >> $MY_SQROOT/logs/startup.log
+ echo "`date`: $1" >> $TRAF_HOME/logs/startup.log
}
lv_prog_name="ckillall"
@@ -41,7 +41,7 @@ fi
if [ "$lv_execute_killall" == "1" ]; then
echo "Going to execute $lv_prog_name"
setup_sqpdsh
- eval '$SQPDSHA "$MY_SQROOT/sql/scripts/pkillall"'
+ eval '$SQPDSHA "$TRAF_HOME/sql/scripts/pkillall"'
LogIt "$lv_prog_name"
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/cleanZKNodes
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/cleanZKNodes b/core/sqf/sql/scripts/cleanZKNodes
index 9a9320e..35568ec 100755
--- a/core/sqf/sql/scripts/cleanZKNodes
+++ b/core/sqf/sql/scripts/cleanZKNodes
@@ -21,7 +21,7 @@
#
# @@@ END COPYRIGHT @@@
-if [ -f $MY_SQROOT/sql/scripts/swzkcli ]
+if [ -f $TRAF_HOME/sql/scripts/swzkcli ]
then swzkcli <<EOF
rmr /hbase/Trafodion/recovery
EOF
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/cleanat
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/cleanat b/core/sqf/sql/scripts/cleanat
index 6059a23..e48261d 100755
--- a/core/sqf/sql/scripts/cleanat
+++ b/core/sqf/sql/scripts/cleanat
@@ -22,7 +22,7 @@
# @@@ END COPYRIGHT @@@
sqstop
-if [ -f $MY_SQROOT/sql/scripts/swhbase ]
+if [ -f $TRAF_HOME/sql/scripts/swhbase ]
then swhbase <<EOF
disable_all 'TRAFODION._DTM_.*'
y
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/cleanlogs
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/cleanlogs b/core/sqf/sql/scripts/cleanlogs
index 76ac55e..660b119 100755
--- a/core/sqf/sql/scripts/cleanlogs
+++ b/core/sqf/sql/scripts/cleanlogs
@@ -35,18 +35,18 @@ function usage() {
echo " all --- Remove files from core, dcs and rest logs folder"
echo " dcs --- Remove files from $DCS_INSTALL_DIR/logs folder"
echo " rest --- Remove files from $REST_INSTALL_DIR/logs folder"
- echo " core --- Remove log files residing in $MY_SQROOT/logs folder"
+ echo " core --- Remove log files residing in $TRAF_HOME/logs folder"
}
function core_logs() {
if [[ ! -z $L_PDSH ]]; then
- $L_PDSH "rm -f ${MY_SQROOT}/logs/*.err"
- $L_PDSH "rm -f ${MY_SQROOT}/logs/*.log"
- $L_PDSH "rm -f ${MY_SQROOT}/logs/*log.[0-9]*"
- $L_PDSH "rm -f ${MY_SQROOT}/sql/scripts/stdout_*"
+ $L_PDSH "rm -f ${TRAF_HOME}/logs/*.err"
+ $L_PDSH "rm -f ${TRAF_HOME}/logs/*.log"
+ $L_PDSH "rm -f ${TRAF_HOME}/logs/*log.[0-9]*"
+ $L_PDSH "rm -f ${TRAF_HOME}/sql/scripts/stdout_*"
else
- rm -f ${MY_SQROOT}/logs/*
- rm -f ${MY_SQROOT}/sql/scripts/stdout_*
+ rm -f ${TRAF_HOME}/logs/*
+ rm -f ${TRAF_HOME}/sql/scripts/stdout_*
fi
}
@@ -78,7 +78,7 @@ function all_logs() {
rest_logs
}
-if [ ! -z ${MY_SQROOT} ]; then
+if [ ! -z ${TRAF_HOME} ]; then
case "$1" in
core)
core_logs
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/cresumeall
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/cresumeall b/core/sqf/sql/scripts/cresumeall
index 7a0657d..f3d1867 100755
--- a/core/sqf/sql/scripts/cresumeall
+++ b/core/sqf/sql/scripts/cresumeall
@@ -23,14 +23,14 @@
#
function LogIt {
- echo "`date`: $1" >> $MY_SQROOT/logs/startup.log
+ echo "`date`: $1" >> $TRAF_HOME/logs/startup.log
}
lv_prog_name="cresumeall"
echo "Going to execute $lv_prog_name"
setup_sqpdsh
-eval '$SQPDSHA "$MY_SQROOT/sql/scripts/presumeall"'
+eval '$SQPDSHA "$TRAF_HOME/sql/scripts/presumeall"'
LogIt "$lv_prog_name"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/cstat
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/cstat b/core/sqf/sql/scripts/cstat
index 02b483b..8174dcc 100755
--- a/core/sqf/sql/scripts/cstat
+++ b/core/sqf/sql/scripts/cstat
@@ -23,5 +23,5 @@
#
setup_sqpdsh
-eval '$SQPDSHA "$MY_SQROOT/sql/scripts/pstat $1" 2>/dev/null'
+eval '$SQPDSHA "$TRAF_HOME/sql/scripts/pstat $1" 2>/dev/null'
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/csuspendall
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/csuspendall b/core/sqf/sql/scripts/csuspendall
index f31c931..7447632 100755
--- a/core/sqf/sql/scripts/csuspendall
+++ b/core/sqf/sql/scripts/csuspendall
@@ -23,16 +23,16 @@
#
function LogIt {
- echo "`date`: $1" >> $MY_SQROOT/logs/startup.log
+ echo "`date`: $1" >> $TRAF_HOME/logs/startup.log
}
lv_prog_name="csuspendall"
echo "Going to execute $lv_prog_name"
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
setup_sqpdsh
-eval '$SQPDSHA "$MY_SQROOT/sql/scripts/psuspendall"'
+eval '$SQPDSHA "$TRAF_HOME/sql/scripts/psuspendall"'
LogIt "$lv_prog_name"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/dbcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/dbcheck b/core/sqf/sql/scripts/dbcheck
index bb48169..56710d4 100755
--- a/core/sqf/sql/scripts/dbcheck
+++ b/core/sqf/sql/scripts/dbcheck
@@ -234,11 +234,11 @@ sub mirroring_not_on()
{
my $cmd;
- $cmd = "grep DEVICE-M $ENV{'MY_SQROOT'}/sql/scripts/gomon.cold | egrep \"DATA|SYSTEM\"";
+ $cmd = "grep DEVICE-M $ENV{'TRAF_HOME'}/sql/scripts/gomon.cold | egrep \"DATA|SYSTEM\"";
`$cmd`;
$g_dotse = 0 if ($? != 0);
- $cmd = "grep DEVICE-M $ENV{'MY_SQROOT'}/sql/scripts/gomon.cold | egrep \"AUDIT|TLOG\"";
+ $cmd = "grep DEVICE-M $ENV{'TRAF_HOME'}/sql/scripts/gomon.cold | egrep \"AUDIT|TLOG\"";
`$cmd`;
$g_doase = 0 if ($? != 0);
@@ -284,17 +284,17 @@ sub main()
if ($volcheck)
{
- $cmd = "cat $ENV{'MY_SQROOT'}/sql/scripts/sq_tse.create | grep mkdir | egrep \'$volcheck\\b\'";
+ $cmd = "cat $ENV{'TRAF_HOME'}/sql/scripts/sq_tse.create | grep mkdir | egrep \'$volcheck\\b\'";
$tsevols = `$cmd`;
chomp($tsevols);
- $cmd = "cat $ENV{'MY_SQROOT'}/sql/scripts/sq_ase.create | grep mkdir | egrep \'$volcheck\\b\'";
+ $cmd = "cat $ENV{'TRAF_HOME'}/sql/scripts/sq_ase.create | grep mkdir | egrep \'$volcheck\\b\'";
$asevols = `$cmd`;
chomp($asevols);
}
else
{
- $tsevols = `cat $ENV{'MY_SQROOT'}/sql/scripts/sq_tse.create | grep mkdir`;
- $asevols = `cat $ENV{'MY_SQROOT'}/sql/scripts/sq_ase.create | grep mkdir`;
+ $tsevols = `cat $ENV{'TRAF_HOME'}/sql/scripts/sq_tse.create | grep mkdir`;
+ $asevols = `cat $ENV{'TRAF_HOME'}/sql/scripts/sq_ase.create | grep mkdir`;
}
# Handle cluster case - we will use $SQ_PDSH to run dbcheck on each node,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/genmon
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/genmon b/core/sqf/sql/scripts/genmon
index cb32705..a431197 100755
--- a/core/sqf/sql/scripts/genmon
+++ b/core/sqf/sql/scripts/genmon
@@ -21,4 +21,4 @@ echo "Generating mon.env"
#
# @@@ END COPYRIGHT @@@
#
-echo "MY_SQROOT=$MY_SQROOT" > mon.env
+echo "TRAF_HOME=$TRAF_HOME" > mon.env
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/genms
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/genms b/core/sqf/sql/scripts/genms
index 7c910d5..3b4a342 100755
--- a/core/sqf/sql/scripts/genms
+++ b/core/sqf/sql/scripts/genms
@@ -152,7 +152,7 @@ echo "CMP_NODE_AFFINITY=1"
echo ""
echo "SEAQUEST=1"
echo "SEAQUEST_NO_ROLLBACK_TXN=0"
-echo "SQLMX_MESSAGEFILE=\$MY_SQROOT/export/bin\$SQ_MBTYPE/mxcierrors.cat"
+echo "SQLMX_MESSAGEFILE=\$TRAF_HOME/export/bin\$SQ_MBTYPE/mxcierrors.cat"
echo "YYERROR_QUIET=1"
echo ""
echo "# this is purely for measure use case analysis at this point"
@@ -166,7 +166,7 @@ echo ""
echo "# property file for tdm_arkesp"
echo "SQ_PROPS_TDM_ARKESP=tdm_arkesp.env"
echo ""
-echo "STFS_HDD_LOCATION=\$MY_SQROOT/tmp"
+echo "STFS_HDD_LOCATION=\$TRAF_HOME/tmp"
echo ""
echo "#setting MY_UDR_ROOT"
if [ -d "/home/udr" ]; then
@@ -177,10 +177,10 @@ if [ -d "/home/udr" ]; then
fi
echo "MY_UDR_ROOT=$dircreate"
else
- if [ ! -d "$MY_SQROOT/udr" ]; then
- mkdir $MY_SQROOT/udr 2>/dev/null
+ if [ ! -d "$TRAF_HOME/udr" ]; then
+ mkdir $TRAF_HOME/udr 2>/dev/null
fi
- echo "MY_UDR_ROOT=\$MY_SQROOT/udr"
+ echo "MY_UDR_ROOT=\$TRAF_HOME/udr"
fi
echo ""
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/gensq.pl
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/gensq.pl b/core/sqf/sql/scripts/gensq.pl
index 099022b..e1e21c0 100755
--- a/core/sqf/sql/scripts/gensq.pl
+++ b/core/sqf/sql/scripts/gensq.pl
@@ -122,7 +122,7 @@ my $gFloatingNodeId = -1;
my $gFloatingFailoverNodeId = -1;
-my $MY_SQROOT = $ENV{'MY_SQROOT'};
+my $TRAF_HOME = $ENV{'TRAF_HOME'};
my $HOME = $ENV{'HOME'};
my $MPI_TMPDIR = $ENV{'MPI_TMPDIR'};
my $SQ_SEAMONSTER = $ENV{'SQ_SEAMONSTER'};
@@ -355,7 +355,7 @@ sub printInitialLines {
close (ETC);
if ($gbLunmgrOn == 1) {
- printScript(1, "\n\$SQ_PDSH \$MY_NODES \"rm -rf \$MY_SQROOT/logs/lunmgr.log.LOCKDIR\"\n");
+ printScript(1, "\n\$SQ_PDSH \$MY_NODES \"rm -rf \$TRAF_HOME/logs/lunmgr.log.LOCKDIR\"\n");
}
printScript(1, "\nshell <<eof \n");
@@ -377,7 +377,7 @@ sub printInitialLines {
printScript(1, " echo\n");
printScript(1, "else\n");
printScript(1, " echo \"Aborting startup.\"\n");
- printScript(1, " more $MY_SQROOT/logs/sqcheckmon.log\n");
+ printScript(1, " more $TRAF_HOME/logs/sqcheckmon.log\n");
printScript(1, " exit 1\n");
printScript(1, "fi\n");
@@ -391,7 +391,7 @@ sub printInitialLines {
printScript(0, "\nset MY_NODES=\$MY_NODES\n");
addDbClusterData( "SQ_MBTYPE", $ENV{'SQ_MBTYPE'});
- addDbClusterData( "MY_SQROOT", "$MY_SQROOT"); # comes out null
+ addDbClusterData( "TRAF_HOME", "$TRAF_HOME"); # comes out null
$gbInitialLinesPrinted = 1;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/genstats.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/genstats.sh b/core/sqf/sql/scripts/genstats.sh
index 7d7a7f0..2aed22f 100755
--- a/core/sqf/sql/scripts/genstats.sh
+++ b/core/sqf/sql/scripts/genstats.sh
@@ -28,7 +28,7 @@
# are given, they are passed to the SQL command "get statistics for qid" without
# modification. A common argument is 'default', which generates the per-table stats.
-lso=$MY_SQROOT/export/limited-support-tools/LSO
+lso=$TRAF_HOME/export/limited-support-tools/LSO
qids=`$lso/offender -s active -t 10 | grep -o 'MXID[^ ]*'`
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/get_libhdfs_files
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/get_libhdfs_files b/core/sqf/sql/scripts/get_libhdfs_files
index b023d14..24838ff 100755
--- a/core/sqf/sql/scripts/get_libhdfs_files
+++ b/core/sqf/sql/scripts/get_libhdfs_files
@@ -37,7 +37,7 @@
# Working dir in the Trafodion source tree to extract and build libhdfs files
# (can be specified as an environment variable)
if [[ -z ${LIBHDFS_TEMP_DIR} ]]; then
- LIBHDFS_TEMP_DIR=${MY_SQROOT}/sql/libhdfs_files
+ LIBHDFS_TEMP_DIR=${TRAF_HOME}/sql/libhdfs_files
fi
LOGFILE=${LIBHDFS_TEMP_DIR}/build.log
@@ -61,8 +61,8 @@ PROTOBUF_TAR=${PROTOBUF_ID}.tar.gz
PROTOBUF_TGT_ID=protobuf-tgt
# Directories to copy the built libhdfs library and corresponding include file
-TGT_INC_DIR=$MY_SQROOT/export/include
-TGT_LIB_DIR=$MY_SQROOT/export/lib${SQ_MBTYPE}
+TGT_INC_DIR=$TRAF_HOME/export/include
+TGT_LIB_DIR=$TRAF_HOME/export/lib${SQ_MBTYPE}
FORCE_BUILD=false
SOURCE_BUILD=false
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/ilh_cleanhb
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ilh_cleanhb b/core/sqf/sql/scripts/ilh_cleanhb
index 42d5e20..d1b2bab 100755
--- a/core/sqf/sql/scripts/ilh_cleanhb
+++ b/core/sqf/sql/scripts/ilh_cleanhb
@@ -108,12 +108,12 @@ if [[ ${lv_clean_hb_data} -gt 0 ]]; then
fi
#delete the logs
-echo "Deleting HBase logs in: ${MY_SQROOT}/sql/local_hadoop/hbase/logs"
-if [ ! -z ${MY_SQROOT} ]; then
- rm -rf ${MY_SQROOT}/sql/local_hadoop/hbase/logs/*.log
- rm -rf ${MY_SQROOT}/sql/local_hadoop/hbase/logs/*log.[0-9]*
- rm -rf ${MY_SQROOT}/sql/local_hadoop/hbase/logs/*.out
- rm -rf ${MY_SQROOT}/sql/local_hadoop/hbase/logs/*.out.[0-9]*
+echo "Deleting HBase logs in: ${TRAF_HOME}/sql/local_hadoop/hbase/logs"
+if [ ! -z ${TRAF_HOME} ]; then
+ rm -rf ${TRAF_HOME}/sql/local_hadoop/hbase/logs/*.log
+ rm -rf ${TRAF_HOME}/sql/local_hadoop/hbase/logs/*log.[0-9]*
+ rm -rf ${TRAF_HOME}/sql/local_hadoop/hbase/logs/*.out
+ rm -rf ${TRAF_HOME}/sql/local_hadoop/hbase/logs/*.out.[0-9]*
fi
if [[ ${lv_clean_hb_data} -gt 1 ]]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/ilh_hbase_repair
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ilh_hbase_repair b/core/sqf/sql/scripts/ilh_hbase_repair
index 547a539..605e2da 100755
--- a/core/sqf/sql/scripts/ilh_hbase_repair
+++ b/core/sqf/sql/scripts/ilh_hbase_repair
@@ -28,10 +28,10 @@
#
####################################################
-if [ ! -z $MY_SQROOT ]; then
- cd $MY_SQROOT/sql/scripts
+if [ ! -z $TRAF_HOME ]; then
+ cd $TRAF_HOME/sql/scripts
else
- echo "The environment variable MY_SQROOT does not exist."
+ echo "The environment variable TRAF_HOME does not exist."
echo "Please ensure sqenv.sh has been sourced."
echo
exit 1;
@@ -54,7 +54,7 @@ fi
lv_starttime=`date`
-lv_stderr_file="$MY_SQROOT/logs/hbase_hbck_repair.log"
+lv_stderr_file="$TRAF_HOME/logs/hbase_hbck_repair.log"
echo "Stderr being written to the file: ${lv_stderr_file}"
${HBASE_HOME}/bin/hbase hbck -repair > ${lv_stderr_file} 2>${lv_stderr_file}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/ilh_hbcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ilh_hbcheck b/core/sqf/sql/scripts/ilh_hbcheck
index 2c6149c..91373b3 100755
--- a/core/sqf/sql/scripts/ilh_hbcheck
+++ b/core/sqf/sql/scripts/ilh_hbcheck
@@ -24,12 +24,12 @@
if [ -z $JAVA_HOME ]; then
echo "The environment variable \$JAVA_HOME has not been set"
- echo "Please ensure \$MY_SQROOT/sqenv.sh has been sourced."
+ echo "Please ensure \$TRAF_HOME/sqenv.sh has been sourced."
echo
exit 1;
fi
-cd $MY_SQROOT/tools/check_hbase_available
+cd $TRAF_HOME/tools/check_hbase_available
echo "Building some utility Java programs."
. ./build 2>/dev/null
$JAVA_HOME/bin/java CheckHBase | grep -v "Checking" | grep "HBase is available"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/ilh_traf_restart
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ilh_traf_restart b/core/sqf/sql/scripts/ilh_traf_restart
index ed5141c..8ad7517 100755
--- a/core/sqf/sql/scripts/ilh_traf_restart
+++ b/core/sqf/sql/scripts/ilh_traf_restart
@@ -30,16 +30,16 @@
# - Restarts HBase
# - Repairs HBase (ilh_hbase_repair)
# - Checks whether HBase is ready (uses ilh_hbcheck)
-# - Deletes the Trafodion env file: $MY_SQROOT/etc/ms.env
+# - Deletes the Trafodion env file: $TRAF_HOME/etc/ms.env
# - Regenerates Config (sqgen)
# - Starts up Trafodion (sqstart)
#
####################################################
-if [ ! -z $MY_SQROOT ]; then
- cd $MY_SQROOT/sql/scripts
+if [ ! -z $TRAF_HOME ]; then
+ cd $TRAF_HOME/sql/scripts
else
- echo "The environment variable MY_SQROOT does not exist."
+ echo "The environment variable TRAF_HOME does not exist."
echo "Please ensure sqenv.sh has been sourced."
echo
exit 1;
@@ -51,7 +51,7 @@ echo 'This script will do the following:'
echo ' - Kill the Trafodion env (pkillall)'
echo " - Kill the HBase env and delete the zookeeper data directory (ilh_cleanhb ${lv_ilh_cleanhb_mode})"
echo ' - Restart HBase (swstarthbase)'
-echo ' - Delete the env file: $MY_SQROOT/etc/ms.env'
+echo ' - Delete the env file: $TRAF_HOME/etc/ms.env'
echo ' - sqgen'
echo ' - sqstart'
@@ -87,7 +87,7 @@ echo "Sleeping for 15 seconds before checking the status of HBase"
sleep 15
echo "--------------------------------------"
-if [ -e $MY_SQROOT/sql/scripts/hbcheck ]; then
+if [ -e $TRAF_HOME/sql/scripts/hbcheck ]; then
run_util hbcheck 4 10
else
run_util ilh_hbcheck
@@ -98,8 +98,8 @@ echo "Repairing HBase (hbase hbck -repair)"
ilh_hbase_repair y
echo "--------------------------------------"
-echo "deleting $MY_SQROOT/etc/ms.env"
-rm $MY_SQROOT/etc/ms.env
+echo "deleting $TRAF_HOME/etc/ms.env"
+rm $TRAF_HOME/etc/ms.env
run_util sqgen
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/ilh_trafinit
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/ilh_trafinit b/core/sqf/sql/scripts/ilh_trafinit
index 77669c1..7381169 100755
--- a/core/sqf/sql/scripts/ilh_trafinit
+++ b/core/sqf/sql/scripts/ilh_trafinit
@@ -29,17 +29,17 @@
# (uses ilh_cleanhb)
# - Restarts HBase
# - Checks whether HBase is ready (uses ilh_hbcheck)
-# - Deletes the Trafodion env file: $MY_SQROOT/etc/ms.env
+# - Deletes the Trafodion env file: $TRAF_HOME/etc/ms.env
# - Regenerates Config (sqgen)
# - Starts up Trafodion (sqstart)
# - Initializes Trafodion (sqlci -> initialize trafodion)
#
####################################################
-if [ ! -z $MY_SQROOT ]; then
- cd $MY_SQROOT/sql/scripts
+if [ ! -z $TRAF_HOME ]; then
+ cd $TRAF_HOME/sql/scripts
else
- echo "The environment variable MY_SQROOT does not exist."
+ echo "The environment variable TRAF_HOME does not exist."
echo "Please ensure sqenv.sh has been sourced."
echo
exit 1;
@@ -49,7 +49,7 @@ echo 'This script will do the following:'
echo ' - Kill the Trafodion env (pkillall)'
echo ' - Kill the HBase env and Delete the HDFS data directory associated with HBase (ilh_cleanhb 2)'
echo ' - Restart HBase (swstarthbase)'
-echo ' - Delete the env file: $MY_SQROOT/etc/ms.env'
+echo ' - Delete the env file: $TRAF_HOME/etc/ms.env'
echo ' - sqgen'
echo ' - sqstart'
echo ' - sqlci -> initialize trafodion'
@@ -78,14 +78,14 @@ run_util swstarthbase
echo "Sleeping for 10 seconds before checking the status of HBase"
sleep 10
-if [ -e $MY_SQROOT/sql/scripts/hbcheck ]; then
+if [ -e $TRAF_HOME/sql/scripts/hbcheck ]; then
run_util hbcheck 4 10
else
run_util ilh_hbcheck
fi
-echo "deleting $MY_SQROOT/etc/ms.env"
-rm $MY_SQROOT/etc/ms.env
+echo "deleting $TRAF_HOME/etc/ms.env"
+rm $TRAF_HOME/etc/ms.env
run_util sqgen
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/install_apache_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_apache_hadoop b/core/sqf/sql/scripts/install_apache_hadoop
index 3871b0e..e6978aa 100755
--- a/core/sqf/sql/scripts/install_apache_hadoop
+++ b/core/sqf/sql/scripts/install_apache_hadoop
@@ -28,8 +28,8 @@
##
## - Creates a pseudo-distributed single node installation
## - Sandboxes the installation into a single directory,
-## $MY_SQROOT/sqf/sql/local_hadoop
-## - creates some convenience shell scripts in $MY_SQROOT/sqf/sql/scripts
+## $TRAF_HOME/sqf/sql/local_hadoop
+## - creates some convenience shell scripts in $TRAF_HOME/sqf/sql/scripts
## to start and stop Hadoop and for some interactive shells
## - Does not require sudo privileges for installing or running Hadoop
## - Can run on non-standard ports, if needed, to be able to run multiple
@@ -272,7 +272,7 @@ function listports {
# global config
# directory on local disk that belongs to me
-MY_SW_PARENT=$MY_SQROOT/sql
+MY_SW_PARENT=$TRAF_HOME/sql
# name of subdirectory to install Hadoop/Hive/MySQL in
MY_SW_ROOT=$MY_SW_PARENT/local_hadoop
@@ -881,8 +881,8 @@ EOF
EOF
- mkdir -p $MY_SQROOT/etc
- SYSTEM_DEFAULTS_TEXT_FILE=$MY_SQROOT/etc/SQSystemDefaults.conf
+ mkdir -p $TRAF_HOME/etc
+ SYSTEM_DEFAULTS_TEXT_FILE=$TRAF_HOME/etc/SQSystemDefaults.conf
# alternative method for open source build, system defaults in a text file
cat <<EOF >${SYSTEM_DEFAULTS_TEXT_FILE}.temp
@@ -955,7 +955,7 @@ else
echo "Updating files $H_CORE_FILE, $H_HDFS_FILE and $H_MAPRED_FILE ..."
cat <<EOF >$H_ENV_FILE
export HADOOP_COMMON_LIB_NATIVE_DIR=${MY_SW_ROOT}/hadoop/lib/native
-export HADOOP_OPTS="-Djava.library.path=$MY_SQROOT/hadoop/lib"
+export HADOOP_OPTS="-Djava.library.path=$TRAF_HOME/hadoop/lib"
EOF
mv -f $H_CORE_FILE $H_CORE_FILE.orig
@@ -1398,11 +1398,11 @@ else
# For HBase_Trx
# Do not build if the TRX jar already exists
- if [ ! -e ${MY_SQROOT}/export/lib/${HBASE_TRX_JAR} ]; then
+ if [ ! -e ${TRAF_HOME}/export/lib/${HBASE_TRX_JAR} ]; then
# Build HBase TRX
echo "Building HBase TRX"
- cd $MY_SQROOT ; make genverhdr 2>&1 | tee -a ${MY_LOG_FILE}
- cd $MY_SQROOT/src/seatrans/hbase-trx
+ cd $TRAF_HOME ; make genverhdr 2>&1 | tee -a ${MY_LOG_FILE}
+ cd $TRAF_HOME/src/seatrans/hbase-trx
make clean 2>&1 | tee -a ${MY_LOG_FILE}
make 2>&1 | tee -a ${MY_LOG_FILE}
fi
@@ -1410,7 +1410,7 @@ else
cd $MY_SW_ROOT
# Setup HBase TRX JAR in HBase' CLASSPATH
- echo "export HBASE_CLASSPATH=${MY_SQROOT}/export/lib/\${HBASE_TRX_JAR}:${MY_SQROOT}/export/lib/\${UTIL_JAR}" >> ${HBASE_ENV_FILE}
+ echo "export HBASE_CLASSPATH=${TRAF_HOME}/export/lib/\${HBASE_TRX_JAR}:${TRAF_HOME}/export/lib/\${UTIL_JAR}" >> ${HBASE_ENV_FILE}
echo "Updating file $HBASE_CONFIG_FILE ..."
@@ -1533,16 +1533,16 @@ echo "Setting up DCS, REST and Phoenix tests..."
#Default GIT location
GIT_DIR="git@github.com:apache/incubator-trafodion"
-DCS_SRC=$MY_SQROOT/../../dcs
+DCS_SRC=$TRAF_HOME/../../dcs
if [ -d $DCS_SRC ]; then
- TRAF_SRC=$MY_SQROOT/../../
+ TRAF_SRC=$TRAF_HOME/../../
# Default location of DCS code
- DCS_SRC=$MY_SQROOT/../../dcs
+ DCS_SRC=$TRAF_HOME/../../dcs
# Default location of REST code
- REST_SRC=$MY_SQROOT/../rest
+ REST_SRC=$TRAF_HOME/../rest
# Default location for phoenix_test
- PHX_SRC=$MY_SQROOT/../../tests/phx
+ PHX_SRC=$TRAF_HOME/../../tests/phx
else
TRAF_SRC=$MY_SW_ROOT/src/incubator-trafodion
if [ ! -d $TRAF_SRC ]; then
@@ -1614,12 +1614,12 @@ else
grep -v 'DCS_INSTALL_DIR=' ~/.trafodion.orig > ~/.trafodion
fi
DCSDIR=${DCS_HOME##*/}
- echo "export DCS_INSTALL_DIR=\${MY_SQROOT}/sql/local_hadoop/$DCSDIR" >> ~/.trafodion
+ echo "export DCS_INSTALL_DIR=\${TRAF_HOME}/sql/local_hadoop/$DCSDIR" >> ~/.trafodion
cd $DCS_HOME/conf/
mv dcs-env.sh dcs-env.sh.orig
# SQROOT env var does not propagate thru ssh command
- echo "MY_SQROOT=$MY_SQROOT" > dcs-env.sh
+ echo "TRAF_HOME=$TRAF_HOME" > dcs-env.sh
sed -e "s@#[ ]*export DCS_MANAGES_ZK=true@export DCS_MANAGES_ZK=false@" dcs-env.sh.orig >> dcs-env.sh
mv -f dcs-site.xml dcs-site.xml.orig
sed -e "s@</configuration>@@" dcs-site.xml.orig > dcs-site.xml
@@ -1656,7 +1656,7 @@ EOF
cd $DCS_SRC/src/test/jdbc_test
./jdbc_test.py --appid=jdbc_test --user=SOMEUSER --pw=SOMEPASSWORD --javahome=\$JAVA_HOME \\
--target=localhost:$MY_DCS_MASTER_PORT \\
- --jdbctype=T4 --jdbccp=\$MY_SQROOT/export/lib/jdbcT4.jar "\$@"
+ --jdbctype=T4 --jdbccp=\$TRAF_HOME/export/lib/jdbcT4.jar "\$@"
EOF
chmod +x $MY_SW_SCRIPTS_DIR/swjdbc
fi
@@ -1666,7 +1666,7 @@ fi
# begin of trafci setup
echo "Updating trafci port number" | tee -a ${MY_LOG_FILE}
-TRAFCI_BIN_DIR=$MY_SQROOT/trafci/bin
+TRAFCI_BIN_DIR=$TRAF_HOME/trafci/bin
if [[ -f $TRAFCI_BIN_DIR/trafci ]]
then
mv $TRAFCI_BIN_DIR/trafci $TRAFCI_BIN_DIR/trafci.orig | tee -a ${MY_LOG_FILE}
@@ -1696,12 +1696,12 @@ cd $PHX_SRC
if [[ \$1 == "t4" ]]
then
./phoenix_test.py --target=localhost:$MY_DCS_MASTER_PORT --user=dontcare --pw=dontcare \\
- --targettype=TR --javahome=\$JAVA_HOME --jdbccp=\$MY_SQROOT/export/lib/jdbcT4.jar
+ --targettype=TR --javahome=\$JAVA_HOME --jdbccp=\$TRAF_HOME/export/lib/jdbcT4.jar
elif [[ \$1 == "t2" ]]
then
- export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$MY_SQROOT/export/lib\$SQ_MBTYPE/libseabasesig.so
+ export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$TRAF_HOME/export/lib\$SQ_MBTYPE/libseabasesig.so
./phoenix_test.py --targettype=TR --javahome=\$JAVA_HOME \\
- --jdbccp=\$MY_SQROOT/export/lib/jdbcT2.jar --jdbctype=T2
+ --jdbccp=\$TRAF_HOME/export/lib/jdbcT2.jar --jdbctype=T2
else
echo "Usage: swphoenix (t2|t4)"
exit 1
@@ -1764,11 +1764,11 @@ else
grep -v 'REST_INSTALL_DIR=' ~/.trafodion.orig >> ~/.trafodion
fi
RESTDIR=${REST_HOME##*/}
- echo "export REST_INSTALL_DIR=\${MY_SQROOT}/sql/local_hadoop/$RESTDIR" >> ~/.trafodion
+ echo "export REST_INSTALL_DIR=\${TRAF_HOME}/sql/local_hadoop/$RESTDIR" >> ~/.trafodion
cd $REST_HOME/conf/
mv rest-env.sh rest-env.sh.orig
# SQROOT env var does not propagate thru ssh command
- echo "MY_SQROOT=$MY_SQROOT" > rest-env.sh
+ echo "TRAF_HOME=$TRAF_HOME" > rest-env.sh
sed -e "s@#[ ]*export REST_MANAGES_ZK=true@export REST_MANAGES_ZK=false@" rest-env.sh.orig >> rest-env.sh
mv -f rest-site.xml rest-site.xml.orig
sed -e "s@</configuration>@@" rest-site.xml.orig > rest-site.xml
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/install_local_drill
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_drill b/core/sqf/sql/scripts/install_local_drill
index bc2b3ca..ee124f9 100755
--- a/core/sqf/sql/scripts/install_local_drill
+++ b/core/sqf/sql/scripts/install_local_drill
@@ -30,7 +30,7 @@
##############################################################################
# location of local Hadoop components, we will add Drill here
-MY_SW_ROOT=$MY_SQROOT/sql/local_hadoop
+MY_SW_ROOT=$TRAF_HOME/sql/local_hadoop
# Download info for Drill
DRILL_VERSION=1.2.0
@@ -66,25 +66,25 @@ fi
tar -xzf ${DRILL_TAR}
ln -s ${DRILL_ID} drill
-cat <<EOF >${MY_SQROOT}/sql/scripts/swdrill
+cat <<EOF >${TRAF_HOME}/sql/scripts/swdrill
#!/bin/sh
$MY_SW_ROOT/drill/bin/drill-conf "\$@"
EOF
-cat <<EOF >${MY_SQROOT}/sql/scripts/swstartdrill
+cat <<EOF >${TRAF_HOME}/sql/scripts/swstartdrill
#!/bin/sh
${MY_SW_ROOT}/drill/bin/drillbit.sh --config $MY_SW_ROOT/drill/conf start
EOF
-cat <<EOF >${MY_SQROOT}/sql/scripts/swstopdrill
+cat <<EOF >${TRAF_HOME}/sql/scripts/swstopdrill
#!/bin/sh
${MY_SW_ROOT}/drill/bin/drillbit.sh --config $MY_SW_ROOT/drill/conf stop
EOF
-chmod +x ${MY_SQROOT}/sql/scripts/sw*drill
+chmod +x ${TRAF_HOME}/sql/scripts/sw*drill
# pick up environment variables with the relevant port numbers
-. ${MY_SQROOT}/sql/scripts/sw_env.sh
+. ${TRAF_HOME}/sql/scripts/sw_env.sh
# customize the embedded Drill configuration to use custom
# port numbers and files local to ${MY_SW_ROOT}
@@ -105,8 +105,8 @@ drill.exec: {
EOF
# copy the Drill JDBC driver into the external_libs folder for UDRs
-mkdir -p ${MY_SQROOT}/udr/external_libs
-cp ${MY_SW_ROOT}/drill/jars/jdbc-driver/drill-jdbc-all-${DRILL_VERSION}.jar ${MY_SQROOT}/udr/external_libs
+mkdir -p ${TRAF_HOME}/udr/external_libs
+cp ${MY_SW_ROOT}/drill/jars/jdbc-driver/drill-jdbc-all-${DRILL_VERSION}.jar ${TRAF_HOME}/udr/external_libs
echo "Installed a local copy of Drill. Start a drillbit with the"
echo "swstartdrill command, connect with swdrill."
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index cb92c27..a09d31f 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -28,8 +28,8 @@
##
## - Creates a pseudo-distributed single node installation
## - Sandboxes the installation into a single directory,
-## $MY_SQROOT/sqf/sql/local_hadoop
-## - creates some convenience shell scripts in $MY_SQROOT/sqf/sql/scripts
+## $TRAF_HOME/sqf/sql/local_hadoop
+## - creates some convenience shell scripts in $TRAF_HOME/sqf/sql/scripts
## to start and stop Hadoop and for some interactive shells
## - Does not require sudo privileges for installing or running Hadoop
## - Can run on non-standard ports, if needed, to be able to run multiple
@@ -259,7 +259,7 @@ function listports {
# global config
# directory on local disk that belongs to me
-MY_SW_PARENT=$MY_SQROOT/sql
+MY_SW_PARENT=$TRAF_HOME/sql
# name of subdirectory to install Hadoop/Hive/MySQL in
MY_SW_ROOT=$MY_SW_PARENT/local_hadoop
@@ -997,8 +997,8 @@ EOF
EOF
- mkdir -p $MY_SQROOT/etc
- SYSTEM_DEFAULTS_TEXT_FILE=$MY_SQROOT/etc/SQSystemDefaults.conf
+ mkdir -p $TRAF_HOME/etc
+ SYSTEM_DEFAULTS_TEXT_FILE=$TRAF_HOME/etc/SQSystemDefaults.conf
# alternative method for open source build, system defaults in a text file
cat <<EOF >${SYSTEM_DEFAULTS_TEXT_FILE}.temp
@@ -1361,8 +1361,8 @@ echo "$MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR}"
tar -xf ${MYSQL_JDBC_TAR}
ln -s `dirname mysql-connector-java-*/mysql-connector-java-*.jar` mysql-connector-java
# copy the MySQL JDBC driver to the udr directory, so UDRs can use it
- mkdir -p ${MY_SQROOT}/udr/external_libs
- cp ${MY_SW_ROOT}/mysql-connector-java/mysql-connector-java*.jar ${MY_SQROOT}/udr/external_libs
+ mkdir -p ${TRAF_HOME}/udr/external_libs
+ cp ${MY_SW_ROOT}/mysql-connector-java/mysql-connector-java*.jar ${TRAF_HOME}/udr/external_libs
fi
# end of MySQL JDBC setup
@@ -1523,11 +1523,11 @@ echo "$MY_LOCAL_SW_DIST/${HBASE_TAR}"
# For HBase_Trx
# Do not build if the TRX jar already exists
- if [ ! -e ${MY_SQROOT}/export/lib/${HBASE_TRX_JAR} ]; then
+ if [ ! -e ${TRAF_HOME}/export/lib/${HBASE_TRX_JAR} ]; then
# Build HBase TRX
echo "Building HBase TRX"
- cd $MY_SQROOT ; make genverhdr 2>&1 | tee -a ${MY_LOG_FILE}
- cd $MY_SQROOT/src/seatrans/hbase-trx
+ cd $TRAF_HOME ; make genverhdr 2>&1 | tee -a ${MY_LOG_FILE}
+ cd $TRAF_HOME/src/seatrans/hbase-trx
make clean 2>&1 | tee -a ${MY_LOG_FILE}
make 2>&1 | tee -a ${MY_LOG_FILE}
fi
@@ -1535,7 +1535,7 @@ echo "$MY_LOCAL_SW_DIST/${HBASE_TAR}"
cd $MY_SW_ROOT
# Setup HBase TRX JAR and utility JAR in HBase' CLASSPATH
- echo "export HBASE_CLASSPATH=${MY_SQROOT}/export/lib/\${HBASE_TRX_JAR}:${MY_SQROOT}/export/lib/\${UTIL_JAR}" >> ${HBASE_ENV_FILE}
+ echo "export HBASE_CLASSPATH=${TRAF_HOME}/export/lib/\${HBASE_TRX_JAR}:${TRAF_HOME}/export/lib/\${UTIL_JAR}" >> ${HBASE_ENV_FILE}
echo "Updating file $HBASE_CONFIG_FILE ..."