You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2015/09/30 18:39:27 UTC
[01/14] incubator-trafodion git commit: -Eliminated installing
trafodion components along with install_local_hadoop -Added a new script to
install trafodion components (install_traf_components) -Modifed core
'makefile' so dcs gets built along with 'core'
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 91cd23464 -> 469408f8e
-Eliminated installing trafodion components along with install_local_hadoop
-Added a new script to install trafodion components (install_traf_components)
-Modifed core 'makefile' so dcs gets built along with 'core'
-Introduced a new makefile at the top level
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0b1fce25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0b1fce25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0b1fce25
Branch: refs/heads/master
Commit: 0b1fce255c4697db6400ea50b8ad36e7e99a843c
Parents: cef0573
Author: Anuradha Hegde <he...@dev01.trafodion.org>
Authored: Thu Sep 17 06:18:17 2015 +0000
Committer: Anuradha Hegde <he...@dev01.trafodion.org>
Committed: Thu Sep 17 06:18:17 2015 +0000
----------------------------------------------------------------------
Makefile | 20 ++
core/Makefile | 27 +-
core/conn/Makefile | 6 +-
.../unixcli/package/trafodbclnx_install.sh | 5 -
core/macros.gmk | 1 +
core/rest/Makefile | 4 +
core/sqf/Makefile | 15 +-
core/sqf/sql/scripts/dcscheck | 105 +++++-
core/sqf/sql/scripts/install_local_hadoop | 259 +-------------
core/sqf/sql/scripts/install_traf_components | 349 +++++++++++++++++++
env.sh | 3 +
11 files changed, 522 insertions(+), 272 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ddfd578
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+
+all:
+ echo "Building all Trafodion components"
+ cd core && $(MAKE) all
+
+package: all
+ echo "Packaging Trafodion components"
+ cd core && $(MAKE) package
+
+package-all: package
+ echo "Packaging all Trafodion components"
+ cd core && $(MAKE) package-all
+
+clean:
+ echo "Removing Trafodion objects"
+ cd core && $(MAKE) clean
+
+cleanall:
+ echo "Removing all Trafodion objects"
+ cd core && $(MAKE) cleanall
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 3bf60c5..3d845d8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -27,15 +27,15 @@
include macros.gmk
# Make Targets
-.PHONY: all dbsecurity foundation $(MPI_TARGET) ndcs ci jdbc_jar jdbc_type2_jar sqroot $(SEAMONSTER_TARGET) verhdr rest odb
-.PHONY: package package-all pkg-product pkg-sql-regress check-copyrights
+.PHONY: all dbsecurity foundation $(MPI_TARGET) ndcs ci jdbc_jar jdbc_type2_jar sqroot $(SEAMONSTER_TARGET) verhdr dcs rest odb
+.PHONY: package package-all pkg-product pkg-sql-regress pkg-phx-tests check-copyrights
################
### Main targets
# Server-side only
# Default target (all components)
-all: $(MPI_TARGET) dbsecurity foundation jdbc_jar $(SEAMONSTER_TARGET) ndcs ci jdbc_type2_jar rest odb
+all: $(MPI_TARGET) dbsecurity foundation jdbc_jar $(SEAMONSTER_TARGET) ndcs ci jdbc_type2_jar dcs rest odb
package: pkg-product pkg-client
@@ -69,10 +69,15 @@ foundation: dbsecurity $(MPI_TARGET) $(SEAMONSTER_TARGET)
jdbc_jar: verhdr
cd conn/jdbc_type4 && $(ANT) deploy 2>&1 | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
- mvn install:install-file -Dfile=conn/jdbc_type4/lib/jdbcT4.jar \
+ $(MAVEN) install:install-file -Dfile=conn/jdbc_type4/lib/jdbcT4.jar \
-DgroupId=org.trafodion.jdbc.t4.T4Driver -DartifactId=t4driver -Dversion="$$TRAFODION_VER" \
-Dpackaging=jar -DgeneratePom=true | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
+dcs: verhdr jdbc_jar
+ cd ../dcs && $(MAVEN) site package 2>&1 | sed -e "s/$$/ ##(DCS)/";exit $${PIPESTATUS[0]}
+ mkdir -p ../${DISTRIBUTION_DIR}
+ mv ../dcs/target/dcs*.gz ../${DISTRIBUTION_DIR}/ | sed -e "s/$$/ ##(DCS)/" ; exit $${PIPESTATUS[0]}
+
ndcs: jdbc_jar foundation
cd conn/odbc/src/odbc && $(MAKE) ndcs 2>&1 | sed -e "s/$$/ ##(NDCS)/";exit $${PIPESTATUS[0]}
cd conn/odbc/src/odbc && $(MAKE) bldlnx_drvr 2>&1 | sed -e "s/$$/ ##(NDCS)/";exit $${PIPESTATUS[0]}
@@ -84,7 +89,7 @@ trafci: jdbc_jar
jdbc_type2_jar: ndcs
cd conn/jdbc_type2 && $(ANT) 2>&1 | sed -e "s/$$/ ##(JDBC_TYPE2)/" ; exit $${PIPESTATUS[0]}
cd conn/jdbc_type2 && $(MAKE) 2>&1 | sed -e "s/$$/ ##(JDBC_TYPE2)/" ; exit $${PIPESTATUS[0]}
- mvn install:install-file -Dfile=conn/jdbc_type2/dist/jdbcT2.jar \
+ $(MAVEN) install:install-file -Dfile=conn/jdbc_type2/dist/jdbcT2.jar \
-DgroupId=org.trafodion.jdbc.t2.T2Driver -DartifactId=t2driver -Dversion="$$TRAFODION_VER" \
-Dpackaging=jar -DgeneratePom=true | sed -e "s/$$/ ##(JDBC_TYPE2)/";exit $${PIPESTATUS[0]}
@@ -106,6 +111,8 @@ clean: sqroot
cd conn/jdbc_type2 && $(ANT) clean && $(MAKE) clean
cd rest && $(MAKE) clean
cd conn/odb && $(MAKE) clean
+ cd ../dcs && $(MAVEN) clean
+ $(RM) -r ../${DISTRIBUTION_DIR}
cleanall: sqroot
cd $(MPI_TARGET) && $(MAKE) clean-local
@@ -118,8 +125,10 @@ cleanall: sqroot
cd conn/jdbc_type2 && $(ANT) clean && $(MAKE) clean
cd rest && $(MAKE) clean
cd conn/odb && $(MAKE) clean
+ cd ../dcs && $(MAVEN) clean
+ $(RM) -r ../${DISTRIBUTION_DIR}
-package-all: package pkg-sql-regress
+package-all: package pkg-sql-regress pkg-phx-tests
pkg-product: all
cd sqf && $(MAKE) package 2>&1 | sed -e "s/$$/ ##(Package)/";exit $${PIPESTATUS[0]}
@@ -129,7 +138,11 @@ pkg-client: ci ndcs odb
# Package SQL regression tests (all target produces some regress/tool files so do that first)
pkg-sql-regress: all
- cd sqf && $(MAKE) package-regress 2>&1 | sed -e "s/$$/ ##(Package)/";exit $${PIPESTATUS[0]}
+ cd sqf && $(MAKE) package-regress 2>&1 | sed -e "s/$$/ ##(Package sql regress)/";exit $${PIPESTATUS[0]}
+
+# Package Phoenix test
+pkg-phx-tests: all
+ cd sqf && $(MAKE) package-phx 2>&1 | sed -e "s/$$/ ##(Package phoenix)/";exit $${PIPESTATUS[0]}
version:
@cd sqf; unset SQ_VERBOSE; source sqenv.sh ; echo "$${TRAFODION_VER}"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index 4fc88ac..468f0b7 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -21,13 +21,13 @@
#
# Makefile for packaging client products
-include $(MY_SQROOT)/macros.gmk #top level
+include ../macros.gmk #top level
RM = /bin/rm
ifeq ($(SQ_BUILD_TYPE),release)
- CLIENT_TAR ?= $(MY_SQROOT)/../trafodion_clients-$(TRAFODION_VER).tgz
+ CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/trafodion_clients-$(TRAFODION_VER).tgz
else
- CLIENT_TAR ?= $(MY_SQROOT)/../trafodion_clients-$(TRAFODION_VER)-debug.tgz
+ CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/trafodion_clients-$(TRAFODION_VER)-debug.tgz
endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
index 47de77f..fc0c3f7 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
@@ -109,11 +109,6 @@ function do_prompt {
}
function verify_dir {
- echo $1 | /bin/grep "^/.*" > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo -e "\n** error! path name must begin with a '/'."
- return 1
- fi
if ! [ -d $1 ]; then
mkdir -p $1
if [[ $? != 0 ]]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/core/macros.gmk
----------------------------------------------------------------------
diff --git a/core/macros.gmk b/core/macros.gmk
index 1a92723..c81f816 100644
--- a/core/macros.gmk
+++ b/core/macros.gmk
@@ -22,3 +22,4 @@
# Current code values not configurable
MPI_TARGET=mpi
SEAMONSTER_TARGET=seamonster
+DISTRIBUTION_DIR=distribution
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/core/rest/Makefile
----------------------------------------------------------------------
diff --git a/core/rest/Makefile b/core/rest/Makefile
index 76226d5..a4b4c79 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -21,6 +21,7 @@
# This Makefile is just a thin shell to Maven, which is used to do the real build
+include ../macros.gmk #top level
BLD_TRAFODION_REST_TARNAME =rest-$(TRAFODION_VER).tar.gz
VFILE =trafodion-rest.jar.versions
@@ -35,6 +36,8 @@ build_all:
echo "$(MAVEN) site package -DskipTests"
echo "### For full Maven output, see file build_rest.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_rest.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ mkdir -p ../../${DISTRIBUTION_DIR}
+ mv target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
$(RM) $(VFILE)
build_chk:
@@ -46,3 +49,4 @@ clean:
-$(MAVEN) clean | grep ERROR
$(RM) build_rest.log
$(RM) $(VFILE)
+ $(RM) ../../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_REST_TARNAME)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index c3c917a..dafa12b 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -246,6 +246,7 @@ genverhdr:
-date "${PV_DATE}"
PKG_PROD = trafodion
+PKG_PHX = phoenix
ifeq ($(SQ_BUILD_TYPE),release)
PKG_TYPE="server-$(TRAFODION_VER)"
@@ -253,12 +254,12 @@ else
PKG_TYPE="server-$(TRAFODION_VER)-debug"
endif
-
PKG_BIN ?= "${PKG_PROD}.bin"
-PKG_TAR ?= "../${PKG_PROD}_$(PKG_TYPE).tgz"
+PKG_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}_$(PKG_TYPE).tgz"
PKG_TAR_UN = "${PKG_PROD}_${SQ_BUILD_TYPE}.tar"
-SRC_PKG_BIN ?= "../${PKG_PROD}-src.bin"
-SRC_PKG_TAR ?= "../${PKG_PROD}-src.tgz"
+SRC_PKG_BIN ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}-src.bin"
+SRC_PKG_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}-src.tgz"
+PKG_PHX_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PHX}-tests.tgz"
PKG_BIN_OBJS ?= export/bin$(SQ_MBTYPE) export/include export/lib export/lib$(SQ_MBTYPE) export/share gdb sql/scripts sqenvcom.sh opt tools conf src/seatrans/hbase-trx hbase_utilities/backup_and_restore
@@ -273,7 +274,7 @@ PKG_REGRESS_OBJS ?= $(SQL_W)/regress inc/seaquest/sqtypes.h inc/fs/feerrors.h $(
REGRESS_EXCLUDE_FILES = "--exclude=$(SQL_W)/regress/seabase"
REGRESS_EXCLUDE_FILES =
-PKG_REGRESS_TAR ?= "../${PKG_PROD}-regress.tgz"
+PKG_REGRESS_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}-regress.tgz"
# Package SeaMonster kernel module
@@ -281,6 +282,7 @@ SEAMONSTER_TAR ?= "seamonster_${SQ_BUILD_TYPE}-src.tar.gz"
# Targets to tar/gzip the tree
package: pkglist-files pkglist-symlinks tmp/sqenv.sh
+ mkdir -p ../../${DISTRIBUTION_DIR}
chmod o-rwx $(PKG_BIN_DIRS)
chmod -R o-rwx $(PKG_BIN_OBJS)
tar --mode o-rwx --no-recursion -chf $(PKG_TAR_UN) -X build-scripts/package.exclude -X build-scripts/package.exclude.$(SQ_MBTYPE) -T pkglist-files
@@ -326,6 +328,9 @@ srcpackage:
package-regress:
tar chzf $(PKG_REGRESS_TAR) -X build-scripts/package.exclude $(REGRESS_EXCLUDE_FILES) $(PKG_REGRESS_OBJS)
+# Targets to tar/gzip the phoenix tests
+package-phx:
+ tar chzf $(PKG_PHX_TAR) ../../tests/phx
# Targets to tar/gzip the self installer with sources
srcpackagebin:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/core/sqf/sql/scripts/dcscheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/dcscheck b/core/sqf/sql/scripts/dcscheck
index 23a7f1e..8539786 100755
--- a/core/sqf/sql/scripts/dcscheck
+++ b/core/sqf/sql/scripts/dcscheck
@@ -20,8 +20,84 @@
dcsznode=/$USER/dcs/master
dcstmp=/tmp/dcstmp-$USER.log
+jpscmd=$JAVA_HOME/bin/jps
+cfg_mxo_cnt=0
+act_mxo_cnt=0
+down_mxo_cnt=0
+backup_dcsmaster_cnt=0
+cfg_dcsmaster_cnt=0
+actual_dcsmaster_cnt=0
+down_dcsmaster_cnt=0
+cfg_dcsserver_cnt=0
+actual_dcsserver_cnt=0
+down_dcsserver_cnt=0
-if [ -d $DCS_INSTALL_DIR ];then
+tmp_ps=`mktemp -t`
+if [[ $? != 0 ]]; then
+ echo "Error while getting a temporary file. Exiting."
+ exit 3
+fi
+tmp_chk=`mktemp -t`
+if [[ $? != 0 ]]; then
+ echo "Error while getting a temporary file. Exiting."
+ exit 3
+fi
+
+echo
+#Check if Trafodion is up and running
+sqcheck -f > $tmp_chk 2>&1
+sq_stat=$?
+if [[ $sq_stat == 0 ]]; then
+
+ if [ -d $DCS_INSTALL_DIR ];then
+
+### Get the configured number of DcsMaster's
+ if [ -s ${DCS_INSTALL_DIR}/conf/backup-masters ]; then
+ let backup_dcsmaster_cnt=`/bin/egrep -cv '#|^$' ${DCS_INSTALL_DIR}/conf/backup-masters`
+ let cfg_dcsmaster_cnt=$backup_dcsmaster_cnt+1
+ else
+ let cfg_dcsmaster_cnt=1
+ fi
+
+### Get the configured number of DcsServer and mxosrvr
+ if [ -f ${DCS_INSTALL_DIR}/conf/servers ]; then
+ let cfg_mxo_cnt=`cat $DCS_INSTALL_DIR/conf/servers|awk '{if ($2=="") k=1;else k=$2;cnt+=k} END {print cnt}'`
+ let cfg_dcsserver_cnt=`cat $DCS_INSTALL_DIR/conf/servers|awk '{if ($2=="") p=1;else p+=1;} END {print p}'`
+ fi
+
+### Check if there are any DcsMaster and DcsServer's that are started
+ if [ -e $SQ_PDSH ]; then
+ actual_dcsmaster_cnt=`$SQ_PDSH $MY_NODES $jpscmd |grep DcsMaster |wc -l`
+ actual_dcsserver_cnt=`$SQ_PDSH $MY_NODES $jpscmd |grep DcsServer |wc -l`
+ else
+ actual_dcsmaster_cnt=`$jpscmd |grep DcsMaster |wc -l`
+ actual_dcsserver_cnt=`$jpscmd |grep DcsServer |wc -l`
+ fi
+
+ if ( [ "$cfg_dcsserver_cnt" '!=' "$actual_dcsserver_cnt" ] ); then
+ let down_dcsserver_cnt=cfg_dcsserver_cnt-actual_dcsserver_cnt
+ else
+ down_dcsserver_cnt=''
+ fi
+
+ if ( [ "$cfg_dcsmaster_cnt" '!=' "$actual_dcsmaster_cnt" ] ); then
+ let down_dcsmaster_cnt=cfg_dcsmaster_cnt-actual_dcsmaster_cnt
+ else
+ down_dcsmaster_cnt=''
+ fi
+
+### Get the current process status (all processes)
+ sqps > $tmp_ps 2>&1
+
+### Get the actual number of mxosrvrs
+ let act_mxo_cnt=`< $tmp_ps egrep -a -i ' mxosrvr' | wc -l`
+ if ( [ "$cfg_mxo_cnt" '!=' "$act_mxo_cnt" ] ); then
+ let down_mxo_cnt=cfg_mxo_cnt-act_mxo_cnt
+ else
+ down_mxo_cnt=''
+ fi
+
+ if ( [ "$actual_dcsmaster_cnt" '!=' 0 ] && [ "$actual_dcsserver_cnt" '!=' 0 ] ); then
echo "ls $dcsznode"|$DCS_INSTALL_DIR/bin/dcs zkcli > $dcstmp
zkport=`cat $dcstmp | /usr/bin/head -n 1 | cut -d ":" -f2`
if [ ! -z "$zkport" ]; then
@@ -32,13 +108,28 @@ if [ -d $DCS_INSTALL_DIR ];then
fi
masterport=`cat $dcstmp | /usr/bin/tail -n 1 | cut -d ":" -f4`
if [ ! -z "$masterport" ]; then
- echo "Dcs Master is listening on port $masterport"
- else
- echo "Dcs Master is not started ..."
- exit 1
+ echo "DcsMaster is listening on port $masterport"
+ echo
fi
rm -f $dcstmp
-else
- echo "DCS is not installed..."
+ else
+ if ( [ "$actual_dcsmaster_cnt" '>' 0 ] || [ "$actual_dcsserver_cnt" '>' 0 ] ); then
+ echo "Partial DCS process is up and running. Please stop and restart DCS using 'dcsstop' and 'dcsstart' command..."
+ else
+ echo "DcsMaster is not started. Please start DCS using 'dcsstart' command..."
+ fi
+ echo
+ fi
+ echo -e "Process\t\tConfigured\tActual\t\tDown"
+ echo -e "---------\t----------\t------\t\t----"
+ echo -e "DcsMaster\t$cfg_dcsmaster_cnt\t\t$actual_dcsmaster_cnt\t\t$down_dcsmaster_cnt"
+ echo -e "DcsServer\t$cfg_dcsserver_cnt\t\t$actual_dcsserver_cnt\t\t$down_dcsserver_cnt"
+ echo -e "mxosrvr\t\t$cfg_mxo_cnt\t\t$act_mxo_cnt\t\t$down_mxo_cnt\n"
+ else
+ echo "DCS is not installed. Please install and configure DCS..."
exit 1
+ fi
+else
+ echo "Trafodion is not started..."
+ echo
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/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 44d2555..e789519 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -51,21 +51,6 @@
# also set http_proxy and ftp_proxy if necessary, to download
# files from repositories on the Internet
#
-# DCS to use. This list is in order of precedent.
-# DCS_TAR - Optionally specify a local tar file to use
-# DCS_URL - Optionally specify a URL to download
-# DCS_SRC - Optionally specify a local source tree to use
-# If none specified, download latest code from github
-#
-# Trafodion REST to use. This list is in order of precedent.
-# REST_TAR - Optionally specify a local tar file to use
-# REST_URL - Optionally specify a URL to download
-# REST_SRC - Optionally specify a local source tree to use
-# If none specified, download latest code from github
-#
-# phoenix_test
-# PHX_SRC - Optionally specify a local source tree to use
-# otherwise, download latest code from github
##############################################################################
function usage {
@@ -1518,101 +1503,17 @@ fi
cd $MY_SW_ROOT
-echo "Setting up DCS, REST and Phoenix tests..."
-
-#Default GIT location
-GIT_DIR="git@github.com:apache/incubator-trafodion"
-DCS_SRC=$MY_SQROOT/../../dcs
-
-if [ -d $DCS_SRC ]; then
- TRAF_SRC=$MY_SQROOT/../../
- # Default location of DCS code
- DCS_SRC=$MY_SQROOT/../../dcs
- # Default location of REST code
- REST_SRC=$MY_SQROOT/../rest
- # Default location for phoenix_test
- PHX_SRC=$MY_SQROOT/../../tests/phx
-else
- TRAF_SRC=$MY_SW_ROOT/src/incubator-trafodion
- if [ ! -d $TRAF_SRC ]; then
- mkdir -p $MY_SW_ROOT/src
- cd $MY_SW_ROOT/src
- git clone $GIT_DIR
- fi
- # Default location of DCS code
- DCS_SRC=$TRAF_SRC/dcs
- # Default location of REST code
- REST_SRC=$TRAF_SRC/core/rest
- # Default location for phoenix_test
- PHX_SRC=$TRAF_SRC/tests/phx
+if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
+ echo "------------------------------------------------------------"
+ echo "-- WARNING: libhdfs.so is not present on this system. Please"
+ echo "-- build it, otherwise Trafodion will not compile."
+ echo "------------------------------------------------------------"
fi
-echo "Default Trafodion Source directory..."
-echo "For Core... $TRAF_SRC"
-echo "For DCS... $DCS_SRC"
-echo "For REST... $REST_SRC"
-echo "For PHX... $PHX_SRC"
+echo "Setting up configuration script for dcs, rest and trafci..."
-if [ -d dcs-* ]; then
- echo "DCS files already exist, skipping DCS setup"
-else
- #####################################################
- # four options, depend on user Env variables, as described above
- if [[ -f $DCS_TAR ]]
- then
- echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
- elif [[ -n $DCS_URL ]]
- then
- echo "Downloading DCS Tar: $DCS_URL" | tee -a ${MY_LOG_FILE}
- rm -f dcs_download.tar
- curl ${DCS_URL} -o dcs_download.tar
- DCS_TAR=./dcs_download.tar
- elif [[ -d $DCS_SRC ]]
- then
- if [[ -f $DCS_SRC/target/dcs*tar.gz ]]
- then
- echo "Using DCS tar file in source tree: $DCS_SRC" | tee -a ${MY_LOG_FILE}
- else
- echo "No DCS tar file found, building DCS: $DCS_SRC" | tee -a ${MY_LOG_FILE}
- echo "Building DCS Source in $DCS_SRC" | tee -a ${MY_LOG_FILE}
- cd $DCS_SRC
- ${MAVEN:-mvn} site package >>${MY_LOG_FILE} 2>&1
- cd $MY_SW_ROOT
- fi
- DCS_TAR=$(ls $DCS_SRC/target/dcs*tar.gz)
- fi
- if [[ ! -f $DCS_TAR ]]
- then
- echo '**** ERROR:' | tee -a ${MY_LOG_FILE}
- echo "DCS tar file not found: $DCS_TAR" | tee -a ${MY_LOG_FILE}
- exit 2
- fi
- # install
- echo "Installing DCS from: $DCS_TAR" | tee -a ${MY_LOG_FILE}
- tar xzf $DCS_TAR
- DCS_HOME=$(ls -d $MY_SW_ROOT/dcs-*)
-
- # configure DCS
-
- # use ~/.trafodion to avoid modifying sqenv*.sh in source tree
- echo "Adding DCS_INSTALL_DIR=$DCS_INSTALL_DIR to sqenv via ~/.trafodion" | tee -a ${MY_LOG_FILE}
- echo " Update it if switching between multiple local_hadoop environments" | tee -a ${MY_LOG_FILE}
- if [[ -f ~/.trafodion ]]
- then
- mv -f ~/.trafodion ~/.trafodion.orig
- grep -v 'DCS_INSTALL_DIR=' ~/.trafodion.orig > ~/.trafodion
- fi
- DCSDIR=${DCS_HOME##*/}
- echo "export DCS_INSTALL_DIR=\${MY_SQROOT}/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
- 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
- cat >>dcs-site.xml <<EOF
+# For DCS
+cat >$HOME/.dcs-site.xml-$USER <<EOF
<property>
<name>dcs.master.port</name> <value>$MY_DCS_MASTER_PORT</value>
</property>
@@ -1631,137 +1532,11 @@ else
<property>
<name>dcs.zookeeper.property.clientPort</name> <value>$MY_HBASE_ZOOKEEPER_PROPERTY_CLIENTPORT_NUM</value>
</property>
- </configuration>
-EOF
- echo "localhost 4" > servers
-
- # Configure DCS test scripts
- if [[ -n "$DCS_SRC" ]]
- then
- echo "Adding swjdbc script...." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SW_SCRIPTS_DIR/swjdbc
-#!/bin/sh
-# command to run JDBC tests
-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 "\$@"
-EOF
- chmod +x $MY_SW_SCRIPTS_DIR/swjdbc
- fi
-fi
-# end of DCS setup
-
-# begin of trafci setup
-
-echo "Updating trafci port number" | tee -a ${MY_LOG_FILE}
-TRAFCI_BIN_DIR=$MY_SQROOT/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 "Modified trafci port number to $MY_DCS_MASTER_PORT" | tee -a ${MY_LOG_FILE}
-else
- echo "$TRAFCI_BIN_DIR not found" | tee -a ${MY_LOG_FILE}
-fi
-
-# end of trafci set up
-
-if [[ -d $PHX_SRC ]]; then
- echo "Phoenix files already exist, skipping Phoenix setup" | tee -a ${MY_LOG_FILE}
-
- #######################################################
- # scripts to run tests
- #######################################################
- # adding this in this section to enable adding it to
- # existing local_hadoop installations
- echo "Adding swphoenix script...." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SW_SCRIPTS_DIR/swphoenix
-#!/bin/sh
-# command to run phoenix tests
-
-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
-elif [[ \$1 == "t2" ]]
-then
- export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$MY_SQROOT/export/lib\$SQ_MBTYPE/libseabasesig.so
- ./phoenix_test.py --targettype=TR --javahome=\$JAVA_HOME \\
- --jdbccp=\$MY_SQROOT/export/lib/jdbcT2.jar --jdbctype=T2
-else
- echo "Usage: swphoenix (t2|t4)"
- exit 1
-fi
EOF
- chmod +x $MY_SW_SCRIPTS_DIR/swphoenix
-
-fi
-# end of Phoenix setup
-# Begin of Trafodion REST Server setup
+# For rest
-if [ -d rest-* ]; then
- echo "Trafodion REST files already exist, skipping REST setup"
-else
- #####################################################
- # three options, depend on user Env variables, as described above
- if [[ -f $REST_TAR ]]
- then
- echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
- elif [[ -n $REST_URL ]]
- then
- echo "Downloading REST Tar: $REST_URL" | tee -a ${MY_LOG_FILE}
- rm -f rest_download.tar
- curl ${REST_URL} -o rest_download.tar
- REST_TAR=./rest_download.tar
- elif [[ -d $REST_SRC ]]
- then
- if [[ -f $REST_SRC/target/rest*tar.gz ]]
- then
- echo "Using REST tar file in source tree: $REST_SRC" | tee -a ${MY_LOG_FILE}
- else
- echo "No REST tar file found, building REST: $REST_SRC" | tee -a ${MY_LOG_FILE}
- echo "Building REST Source in $REST_SRC" | tee -a ${MY_LOG_FILE}
- cd $REST_SRC
- ${MAVEN:-mvn} site package >>${MY_LOG_FILE} 2>&1
- cd $MY_SW_ROOT
- fi
- REST_TAR=$(ls $REST_SRC/target/rest*tar.gz)
- fi
- if [[ ! -f $REST_TAR ]]
- then
- echo '**** ERROR:' | tee -a ${MY_LOG_FILE}
- echo "REST tar file not found: $REST_TAR" | tee -a ${MY_LOG_FILE}
- exit 2
- fi
- # install
- echo "Installing REST from: $REST_TAR" | tee -a ${MY_LOG_FILE}
- tar xzf $REST_TAR
- REST_HOME=$(ls -d $MY_SW_ROOT/rest-*)
-
- # configure REST
-
- # use ~/.trafodion to avoid modifying sqenv*.sh in source tree
- echo "Adding REST_INSTALL_DIR=$REST_INSTALL_DIR to sqenv via ~/.trafodion" | tee -a ${MY_LOG_FILE}
- echo " Update it if switching between multiple local_hadoop environments" | tee -a ${MY_LOG_FILE}
- if [[ -f ~/.trafodion ]]
- then
- mv -f ~/.trafodion ~/.trafodion.orig
- grep -v 'REST_INSTALL_DIR=' ~/.trafodion.orig >> ~/.trafodion
- fi
- RESTDIR=${REST_HOME##*/}
- echo "export REST_INSTALL_DIR=\${MY_SQROOT}/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
- 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
- cat >>rest-site.xml <<EOF
+cat >$HOME/.rest-site.xml-$USER <<EOF
<property>
<name>rest.port</name> <value>$MY_REST_SERVER_PORT</value>
</property>
@@ -1777,18 +1552,12 @@ else
<property>
<name>rest.zookeeper.property.clientPort</name> <value>$MY_HBASE_ZOOKEEPER_PROPERTY_CLIENTPORT_NUM</value>
</property>
- </configuration>
EOF
-fi
-
-# End of Trafodion REST Server setup
-if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
- echo "------------------------------------------------------------"
- echo "-- WARNING: libhdfs.so is not present on this system. Please"
- echo "-- build it, otherwise Trafodion will not compile."
- echo "------------------------------------------------------------"
-fi
+#For clients
+cat >$HOME/.dcs-masterport-$USER <<EOF
+$MY_DCS_MASTER_PORT
+EOF
echo
echo "Installed directory size and name = $(du -sh $MY_SW_ROOT)" | tee -a ${MY_LOG_FILE}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/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
new file mode 100755
index 0000000..1b32db8
--- /dev/null
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -0,0 +1,349 @@
+#!/bin/bash
+
+#### Script to install and configure DCS, REST and Phoenix tests...
+
+# Location of hadoop install
+MY_SW_ROOT=$MY_SQROOT/sql/local_hadoop
+MY_LOG_FILE=$MY_SW_ROOT/log/install_traf_components_$(date +%F_%T).log
+
+# 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
+
+MY_DCS_MASTER_PORT=`cat $HOME/.dcs-masterport-$USER`
+
+if [ -z "$DCS_TAR" ]; then
+ DCS_TAR=$TRAF_TARS/dcs*tar.gz
+fi
+
+if [ -z "$REST_TAR" ]; then
+ REST_TAR=$TRAF_TARS/rest*tar.gz
+fi
+
+if [ -z "$PHX_TAR" ]; then
+ PHX_TAR=$TRAF_TARS/phoenix*.tgz
+fi
+
+if [ -z "$CLIENT_TAR" ]; then
+ CLIENT_TAR=$TRAF_TARS/*clients*.tgz
+fi
+
+if [ -f "$CLIENT_TAR" ]; then
+ cd $MY_SW_ROOT
+ tar -xzf $CLIENT_TAR *Linux*
+ tar -xzf $CLIENT_TAR *odb*
+ LNXDRVR_TAR=$MY_SW_ROOT/clients/*Linux*.gz
+ ODB_TAR=$MY_SW_ROOT/clients/*odb*.gz
+fi
+
+echo | tee ${MY_LOG_FILE}
+echo "Installing and configuring DCS, REST, TRAFCI & Phoenix tests for Trafodion..." | tee -a ${MY_LOG_FILE}
+
+echo | tee -a ${MY_LOG_FILE}
+echo "Environment used for core, DCS, REST and Phonenix ..." | tee -a ${MY_LOG_FILE}
+echo | tee -a ${MY_LOG_FILE}
+
+if [ ! -d "$DCS_SRC" ]; then
+ echo "Using only tar distribution and does not include source..."
+ echo | tee -a ${MY_LOG_FILE}
+else
+ echo " For Core... $TRAF_SRC" | tee -a ${MY_LOG_FILE}
+ echo " For DCS... $DCS_SRC" | tee -a ${MY_LOG_FILE}
+ echo " For REST... $REST_SRC" | tee -a ${MY_LOG_FILE}
+ echo " For PHX... $PHX_SRC" | tee -a ${MY_LOG_FILE}
+fi
+
+echo " For local hadoop... $MY_SW_ROOT" | tee -a ${MY_LOG_FILE}
+echo " For DCS_TAR... $DCS_TAR" | tee -a ${MY_LOG_FILE}
+echo " For REST_TAR... $REST_TAR" | tee -a ${MY_LOG_FILE}
+
+if [ -f "$PHX_TAR" ]; then
+ echo " For PHX_TAR... $PHX_TAR" | tee -a ${MY_LOG_FILE}
+fi
+
+if [ -f "$CLIENT_TAR" ]; then
+ echo " For CLIENT_TAR... $CLIENT_TAR" | tee -a ${MY_LOG_FILE}
+ echo " For ODB_TAR... $ODB_TAR" | tee -a ${MY_LOG_FILE}
+ echo " For LNXDRVR_TAR... $LNXDRVR_TAR" | tee -a ${MY_LOG_FILE}
+fi
+
+cd $MY_SW_ROOT
+
+echo | tee -a ${MY_LOG_FILE}
+# Begin set up of DCS
+
+if [ -d dcs-* ]; then
+ echo "DCS files already exist, skipping DCS setup" | tee -a ${MY_LOG_FILE}
+else
+ if [ -n "$DCS_URL" ]; then
+ echo "Downloading DCS Tar: $DCS_URL" | tee -a ${MY_LOG_FILE}
+ rm -f dcs_download.tar
+ curl ${DCS_URL} -o dcs_download.tar
+ DCS_TAR=./dcs_download.tar
+ else
+ if [ -f "$DCS_TAR" ]; then
+ echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
+ elif [ -d "$DCS_SRC" ]; then
+ echo "DCS tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
+ echo "Building DCS tar file" | tee -a ${MY_LOG_FILE}
+ if [ -f "$MY_SQROOT/export/lib/jdbcT4.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
+ mv $DCS_SRC/target/dcs*.gz $TRAF_TARS
+ cd $MY_SW_ROOT
+ else
+ echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. " | tee -a ${MY_LOG_FILE}
+ echo "Please build the core Trafodion component" | tee -a ${MY_LOG_FILE}
+ exit 2
+ fi
+ fi
+ fi
+
+# Install DCS
+ echo "Installing DCS from: $DCS_TAR" | tee -a ${MY_LOG_FILE}
+ tar xzf $DCS_TAR | tee -a ${MY_LOG_FILE}
+ DCS_HOME=$(/bin/ls -d $MY_SW_ROOT/dcs-*)
+
+# Configure DCS
+ echo "Adding DCS_INSTALL_DIR=$DCS_INSTALL_DIR to ~/.trafodion" | tee -a ${MY_LOG_FILE}
+ if [[ -f ~/.trafodion ]]
+ then
+ mv -f ~/.trafodion ~/.trafodion.orig
+ 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 "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
+ 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
+ cat $HOME/.dcs-site.xml-$USER >> $DCS_HOME/conf/dcs-site.xml
+ echo "</configuration>" >> $DCS_HOME/conf/dcs-site.xml
+
+ echo "Configured $DCS_HOME/conf/dcs-site.xml" | tee -a ${MY_LOG_FILE}
+
+ echo "localhost 4" > servers
+ echo "Configured $DCS_HOME/conf/servers" | tee -a ${MY_LOG_FILE}
+
+# Configure DCS test scripts
+ if [[ -n "$DCS_SRC" ]]
+ then
+ echo "Adding swjdbc script...." | tee -a ${MY_LOG_FILE}
+ cat <<EOF >$MY_SQROOT/sql/scripts/swjdbc
+#!/bin/sh
+# command to run JDBC tests
+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 "\$@"
+EOF
+ chmod +x $MY_SQROOT/sql/scripts/swjdbc
+ fi
+fi
+
+# End of DCS setup
+
+cd $MY_SW_ROOT
+
+echo | tee -a ${MY_LOG_FILE}
+# Begin setup of REST Server
+
+if [ -d rest-* ]; then
+ echo "REST files already exist, skipping REST setup"
+else
+ if [ -n "$REST_URL" ]; then
+ echo "Downloading REST Tar: $REST_URL" | tee -a ${MY_LOG_FILE}
+ rm -f rest_download.tar
+ curl ${REST_URL} -o rest_download.tar
+ REST_TAR=./rest_download.tar
+ else
+ if [ -f "$REST_TAR" ]; then
+ echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
+ elif [ -d "$REST_SRC" ]; then
+ echo "REST tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
+ echo "Building REST tar file" | tee -a ${MY_LOG_FILE}
+ if [ -f $MY_SQROOT/export/lib/jdbcT4.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
+ mv $REST_SRC/target/rest*.gz $TRAF_TARS
+ 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}
+ exit 2
+ fi
+ fi
+ fi
+
+# Install REST
+ echo "Installing REST from: $REST_TAR" | tee -a ${MY_LOG_FILE}
+ tar xzf $REST_TAR | tee -a ${MY_LOG_FILE}
+ REST_HOME=$(/bin/ls -d $MY_SW_ROOT/rest-*)
+
+# Configure REST
+ echo "Adding REST_INSTALL_DIR=$REST_INSTALL_DIR to via ~/.trafodion" | tee -a ${MY_LOG_FILE}
+ if [[ -f ~/.trafodion ]]
+ then
+ mv -f ~/.trafodion ~/.trafodion.orig
+ 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 "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
+ 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
+ cat $HOME/.rest-site.xml-$USER >> $REST_HOME/conf/rest-site.xml
+ echo "</configuration>" >> $REST_HOME/conf/rest-site.xml
+
+ echo "Configured $REST_HOME/conf/rest-site.xml" | tee -a ${MY_LOG_FILE}
+fi
+
+# End of setup for REST
+
+cd $MY_SW_ROOT
+
+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
+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
+#!/bin/sh
+# command to run trafci
+HNAME=localhost:$MY_DCS_MASTER_PORT
+UNAME=zz
+PWORD=zz
+
+$MY_SQROOT/trafci/bin/trafci.sh -h $HNAME -u $UNAME -p $PWORD
+EOF
+ chmod +x $MY_SQROOT/sql/scripts/swtrafci
+else
+ echo "$TRAFCI_BIN_DIR not found" | tee -a ${MY_LOG_FILE}
+fi
+
+# End setup for TRAFCI
+
+echo | tee -a ${MY_LOG_FILE}
+# Begin setup of Phoenix test
+
+PHXDIR=$MY_SW_ROOT/tests/phx
+
+if [ -d "$PHXDIR" ]; then
+ echo "Phoenix tests already exist $PHXDIR, skipping Phoenix test setup" | tee -a ${MY_LOG_FILE}
+else
+ if [ -f "$PHX_TAR" ]; then
+ echo "Installing Phoenix tests $PHX_TAR"| tee -a ${MY_LOG_FILE}
+ tar -xzf $PHX_TAR | tee -a ${MY_LOG_FILE}
+ echo "Successfully installed Phoenix tests "| tee -a ${MY_LOG_FILE}
+ elif [ -d "$PHX_SRC" ]; then
+ echo "Phoenix files already exist $PHX_SRC skipping Phoenix setup" | tee -a ${MY_LOG_FILE}
+ PHXDIR=$PHX_SRC
+ fi
+
+echo "Adding swphoenix script..." | tee -a ${MY_LOG_FILE}
+ cat <<EOF >$MY_SQROOT/sql/scripts/swphoenix
+#!/bin/sh
+# command to run phoenix tests
+
+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.jar
+elif [[ \$1 == "t2" ]]
+then
+ export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$MY_SQROOT/export/lib\$SQ_MBTYPE/libseabasesig.so
+ ./phoenix_test.py --targettype=TR --javahome=\$JAVA_HOME \\
+ --jdbccp=\$MY_SQROOT/export/lib/jdbcT2.jar --jdbctype=T2
+else
+ echo "Usage: swphoenix (t2|t4)"
+ exit 1
+fi
+EOF
+
+ chmod +x $MY_SQROOT/sql/scripts/swphoenix
+fi
+
+# End of Phoenix setup
+
+cd $MY_SW_ROOT
+
+echo | tee -a ${MY_LOG_FILE}
+# Begin setup of Linux driver
+
+LNXDRVR=$MY_SW_ROOT/lnxdrvr
+
+if [ -d $LNXDRVR ]; then
+ echo "Linux driver files already exist $LNXDRVR, skipping Linux Driver setup" | tee -a ${MY_LOG_FILE}
+else
+ if [ -f "$LNXDRVR_TAR" ]; then
+ echo "Installing Linux driver: $LNXDRV"| tee -a ${MY_LOG_FILE}
+ mkdir -p $LNXDRVR | tee -a ${MY_LOG_FILE}
+ cd $LNXDRVR
+ tar -xzf $LNXDRVR_TAR | tee -a ${MY_LOG_FILE}
+ cd PkgTmp
+ ./install.sh <<EOF | tee -a ${MY_LOG_FILE}
+YES
+../
+../
+../
+EOF
+ cd .. | tee -a ${MY_LOG_FILE}
+ mv TRAFDSN TRAFDSN.orig | tee -a ${MY_LOG_FILE}
+ sed -e "s@TCP:1.2.3.4:23400@TCP:localhost:$MY_DCS_MASTER_PORT@" TRAFDSN.orig >> TRAFDSN | tee -a ${MY_LOG_FILE}
+ echo "Successfully installed linux driver in $LNXDRVR"| tee -a ${MY_LOG_FILE}
+ else
+ echo "Linux driver tar file not found. Please install it manually..." | tee -a ${MY_LOG_FILE}
+ fi
+fi
+
+# End setup of Linux driver
+
+cd $MY_SW_ROOT
+
+echo | tee -a ${MY_LOG_FILE}
+# Begin setup of ODB load tool
+
+ODBLOC=$MY_SW_ROOT/odb
+
+if [ -d $ODBLOC ]; then
+ echo "ODB files already exist $ODBLOC, skipping ODB setup" | tee -a ${MY_LOG_FILE}
+else
+ if [ -f "$ODB_TAR" ]; then
+ echo "Installing ODB tool: $ODBLOC"| tee -a ${MY_LOG_FILE}
+ mkdir -p $ODBLOC | tee -a ${MY_LOG_FILE}
+ cd $ODBLOC
+ tar -xzf $ODB_TAR | tee -a ${MY_LOG_FILE}
+ echo "Successfully installed ODB tool in $ODBLOC"| tee -a ${MY_LOG_FILE}
+ else
+ echo "ODB tar file not found. Please install it manually after installing linux odbc driver..." | tee -a ${MY_LOG_FILE}
+ fi
+fi
+
+# End setup of ODB load told
+
+echo | tee -a ${MY_LOG_FILE}
+echo "Configuration scripts for DCS, REST, TRAFCI and Phoenix test are set up " | tee -a ${MY_LOG_FILE}
+
+echo | tee -a ${MY_LOG_FILE}
+echo " Open a new session and start Trafodion by executing sqgen and sqstart scripts" | tee -a ${MY_LOG_FILE}
+echo | tee -a ${MY_LOG_FILE}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b1fce25/env.sh
----------------------------------------------------------------------
diff --git a/env.sh b/env.sh
new file mode 100755
index 0000000..28191e0
--- /dev/null
+++ b/env.sh
@@ -0,0 +1,3 @@
+cd core/sqf
+. ./sqenv.sh
+cd ../..
[04/14] incubator-trafodion git commit: Incorporated building eclipse
project as part of the top level makefile
Posted by db...@apache.org.
Incorporated building eclipse project as part of the top level makefile
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e80eefc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e80eefc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e80eefc0
Branch: refs/heads/master
Commit: e80eefc0e5a0ff9ed7a6332440bba08e6073355e
Parents: e2cfb6e
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Mon Sep 21 03:09:28 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Mon Sep 21 03:09:28 2015 +0000
----------------------------------------------------------------------
Makefile | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e80eefc0/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index ddfd578..daaa96c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,11 @@ package-all: package
echo "Packaging all Trafodion components"
cd core && $(MAKE) package-all
+eclipse:
+ echo "Making eclipse projects for Trafodion components"
+ cd core && $(MAKE) eclipse
+
+
clean:
echo "Removing Trafodion objects"
cd core && $(MAKE) clean
[06/14] incubator-trafodion git commit: Incorporated review comments
Posted by db...@apache.org.
Incorporated review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/020e6481
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/020e6481
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/020e6481
Branch: refs/heads/master
Commit: 020e648139cef413ac954d80c63f01fa3a2f6384
Parents: 29dc56e
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Thu Sep 24 06:10:44 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Thu Sep 24 06:10:44 2015 +0000
----------------------------------------------------------------------
.gitignore | 1 +
core/Makefile | 8 +--
core/rest/Makefile | 4 +-
core/sqf/sql/scripts/dcscheck | 1 +
core/sqf/sql/scripts/install_local_hadoop | 2 +-
core/sqf/sql/scripts/install_traf_components | 77 +++++++++++++++++------
dcs/Makefile | 52 +++++++++++++++
dcs/genvers | 3 +
8 files changed, 120 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/020e6481/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8508a5c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/distribution/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/020e6481/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 4378452..94e3b7b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -74,9 +74,7 @@ jdbc_jar: verhdr
-Dpackaging=jar -DgeneratePom=true | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
dcs: verhdr jdbc_jar
- cd ../dcs && $(MAVEN) site package 2>&1 | sed -e "s/$$/ ##(DCS)/";exit $${PIPESTATUS[0]}
- mkdir -p ../${DISTRIBUTION_DIR}
- mv ../dcs/target/dcs*.gz ../${DISTRIBUTION_DIR}/ | sed -e "s/$$/ ##(DCS)/" ; exit $${PIPESTATUS[0]}
+ cd ../dcs && $(MAKE) 2>&1 | sed -e "s/$$/ ##(DCS)/" ; exit $${PIPESTATUS[0]}
ndcs: jdbc_jar foundation
cd conn/odbc/src/odbc && $(MAKE) ndcs 2>&1 | sed -e "s/$$/ ##(NDCS)/";exit $${PIPESTATUS[0]}
@@ -111,7 +109,7 @@ clean: sqroot
cd conn/jdbc_type2 && $(ANT) clean && $(MAKE) clean
cd rest && $(MAKE) clean
cd conn/odb && $(MAKE) clean
- cd ../dcs && $(MAVEN) clean
+ cd ../dcs && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
cleanall: sqroot
@@ -125,7 +123,7 @@ cleanall: sqroot
cd conn/jdbc_type2 && $(ANT) clean && $(MAKE) clean
cd rest && $(MAKE) clean
cd conn/odb && $(MAKE) clean
- cd ../dcs && $(MAVEN) clean
+ cd ../dcs && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/020e6481/core/rest/Makefile
----------------------------------------------------------------------
diff --git a/core/rest/Makefile b/core/rest/Makefile
index a4b4c79..0d74718 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -37,7 +37,7 @@ build_all:
echo "### For full Maven output, see file build_rest.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_rest.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
mkdir -p ../../${DISTRIBUTION_DIR}
- mv target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
+ cp target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
$(RM) $(VFILE)
build_chk:
@@ -46,7 +46,7 @@ build_chk:
@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
clean:
- -$(MAVEN) clean | grep ERROR
+ -$(MAVEN) clean | grep ERROR
$(RM) build_rest.log
$(RM) $(VFILE)
$(RM) ../../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_REST_TARNAME)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/020e6481/core/sqf/sql/scripts/dcscheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/dcscheck b/core/sqf/sql/scripts/dcscheck
index 8539786..4f5274e 100755
--- a/core/sqf/sql/scripts/dcscheck
+++ b/core/sqf/sql/scripts/dcscheck
@@ -133,3 +133,4 @@ else
echo "Trafodion is not started..."
echo
fi
+exit 0
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/020e6481/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 ed06708..d4b2aa4 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -860,7 +860,7 @@ EOF
<a href="http://${MY_HOST_1}:${MY_HADOOP_NN_HTTP_PORT_NUM}">HDFS Admin</a>
<a href="http://${MY_HOST_1}:${MY_YARN_HTTP_PORT_NUM}">Yarn</a>
<a href="http://${MY_HOST_1}:${MY_HBASE_MASTER_INFO_PORT_NUM}">HBase Master</a>
-<a href="http://${MY_HOST_1}:${MY_DCS_MASTER_PORT}">DCS Master</a>
+<a href="http://${MY_HOST_1}:${MY_DCS_MASTER_INFO_PORT}">DCS Master</a>
</pre>
</BODY>
</HTML>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/020e6481/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 87ee72d..a4ea09f 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -1,4 +1,22 @@
#!/bin/bash
+# @@@ 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 @@@
#### Script to install and configure DCS, REST and Phoenix tests...
@@ -27,6 +45,10 @@ if [ -z "$PHX_TAR" ]; then
PHX_TAR=$(ls $TRAF_TARS/phoenix*.tgz 2>/dev/null)
fi
+if [ -z "$DCSTEST_TAR" ]; then
+ DCSTEST_TAR=$(ls $TRAF_TARS/dcs-test*.tgz 2>/dev/null)
+fi
+
if [ -z "$CLIENT_TAR" ]; then
CLIENT_TAR=$(ls $TRAF_TARS/*clients*.tgz 2>/dev/null)
fi
@@ -129,20 +151,6 @@ else
echo "localhost 4" > servers
echo "Configured $DCS_HOME/conf/servers" | tee -a ${MY_LOG_FILE}
-# Configure DCS test scripts
- if [[ -n "$DCS_SRC" ]]
- then
- echo "Adding swjdbc script...." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swjdbc
-#!/bin/sh
-# command to run JDBC tests
-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 "\$@"
-EOF
- chmod +x $MY_SQROOT/sql/scripts/swjdbc
- fi
fi
# End of DCS setup
@@ -329,27 +337,56 @@ fi
# End setup of ODB load tool
-# Begin setup of PyODBC test
-
cd $MY_SW_ROOT
echo | tee -a ${MY_LOG_FILE}
-# Begin configure of PyODBC test
+# Begin setup of PyODBC test
+
+DCSTEST_DIR=$MY_SW_ROOT/dcstests
+
+if [[ -d $DCSTEST_DIR ]]; then
+ echo "DCS tests already exist $DCSTEST_DIR, skipping dcs test setup" | tee -a ${MY_LOG_FILE}
+else
+ if [[ -f $DCSTEST_TAR ]]; then
+ echo "Installing DCS tests $DCSTEST_DIR"| tee -a ${MY_LOG_FILE}
+ mkdir -p $DCSTEST_DIR | tee -a ${MY_LOG_FILE}
+ cd $DCSTEST_DIR
+ tar -xzf $DCSTEST_TAR | tee -a ${MY_LOG_FILE}
+ echo "Successfully installed DCS tests "| tee -a ${MY_LOG_FILE}
+ JDBCTEST_DIR=$DCSTEST_DIR/dcs/src/test/jdbc_test
+ PYODBCTEST_DIR=$DCSTEST_DIR/dcs/src/test/pytests
+ elif [[ -d $DCS_SRC ]]; then
+ echo "DCS test files already exist $DCS_SRC skipping test setup" | tee -a ${MY_LOG_FILE}
+ DCSTEST_DIR=$DCS_SRC
+ JDBCTEST_DIR=$DCSTEST_DIR/src/test/jdbc_test
+ PYODBCTEST_DIR=$DCSTEST_DIR/src/test/pytests
+ fi
+
+ if [[ -d $DCSTEST_DIR ]]; then
+ echo "Adding swjdbc script...." | tee -a ${MY_LOG_FILE}
+ cat <<EOF >$MY_SQROOT/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 \\
+ --jdbctype=T4 --jdbccp=\$MY_SQROOT/export/lib/jdbcT4.jar "\$@"
+EOF
+ chmod +x $MY_SQROOT/sql/scripts/swjdbc
-if [[ -n "$DCS_SRC" ]]
- then
if [[ -f $LNXDRVR_TAR ]]; then
echo "Linux driver exists. Adding swpyodbc script...." | tee -a ${MY_LOG_FILE}
cat <<EOF >$MY_SQROOT/sql/scripts/swpyodbc
#!/bin/sh
# command to run Python ODBC tests
-cd $DCS_SRC/src/test/pytests
+cd $PYODBCTEST_DIR
./config.sh -d localhost:$MY_DCS_MASTER_PORT -t $LNXDRVR_TAR
tox -e py27
EOF
chmod +x $MY_SQROOT/sql/scripts/swpyodbc
fi
+ fi
fi
# End setup of PyODBC test
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/020e6481/dcs/Makefile
----------------------------------------------------------------------
diff --git a/dcs/Makefile b/dcs/Makefile
new file mode 100644
index 0000000..6238f82
--- /dev/null
+++ b/dcs/Makefile
@@ -0,0 +1,52 @@
+# @@@ 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 @@@
+
+# This Makefile is just a thin shell to Maven, which is used to do the real build
+
+include ../core/macros.gmk #top level
+BLD_TRAFODION_DCS_TARNAME =dcs-$(TRAFODION_VER).tar.gz
+
+VFILE =trafodion-dcs.jar.versions
+GENVERS =./genvers
+
+.NOTPARALLEL: all
+
+all: build_all
+
+build_all:
+ $(MAKE) build_chk
+ echo "$(MAVEN) site package -DskipTests"
+ echo "### For full Maven output, see file build_dcs.log"
+ set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ mkdir -p ../../${DISTRIBUTION_DIR}
+ cp target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}/
+ $(RM) $(VFILE)
+
+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
+
+clean:
+ -$(MAVEN) clean | grep ERROR
+ $(RM) build_dcs.log
+ $(RM) $(VFILE)
+ $(RM) ../../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/020e6481/dcs/genvers
----------------------------------------------------------------------
diff --git a/dcs/genvers b/dcs/genvers
new file mode 100755
index 0000000..4139c48
--- /dev/null
+++ b/dcs/genvers
@@ -0,0 +1,3 @@
+#!/bin/sh
+CV_VERS=1.0.1
+$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
\ No newline at end of file
[12/14] incubator-trafodion git commit: Added copyrights
Posted by db...@apache.org.
Added copyrights
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/11763f66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/11763f66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/11763f66
Branch: refs/heads/master
Commit: 11763f66c6158cc5c4182ecf85bab41c2c53e767
Parents: 026de94
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Sep 25 22:57:28 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Sep 25 22:57:28 2015 +0000
----------------------------------------------------------------------
core/rest/genvers | 22 +++++++++++++++++++++-
dcs/Makefile | 6 +++---
dcs/genvers | 23 ++++++++++++++++++++++-
env.sh | 21 +++++++++++++++++++++
4 files changed, 67 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/11763f66/core/rest/genvers
----------------------------------------------------------------------
diff --git a/core/rest/genvers b/core/rest/genvers
index 4139c48..f16607a 100755
--- a/core/rest/genvers
+++ b/core/rest/genvers
@@ -1,3 +1,23 @@
#!/bin/sh
+# @@@ 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 @@@
CV_VERS=1.0.1
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
\ No newline at end of file
+$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/11763f66/dcs/Makefile
----------------------------------------------------------------------
diff --git a/dcs/Makefile b/dcs/Makefile
index a3338a3..e8feb3f 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -36,8 +36,8 @@ build_all:
echo "$(MAVEN) site package -DskipTests"
echo "### For full Maven output, see file build_dcs.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
- mkdir -p ../../${DISTRIBUTION_DIR}
- cp -pf target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}/
+ mkdir -p ../${DISTRIBUTION_DIR}
+ cp -pf target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}
$(RM) $(VFILE)
build_chk:
@@ -49,4 +49,4 @@ clean:
-$(MAVEN) clean | grep ERROR
$(RM) build_dcs.log
$(RM) $(VFILE)
- $(RM) ../../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME)
+ $(RM) ../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/11763f66/dcs/genvers
----------------------------------------------------------------------
diff --git a/dcs/genvers b/dcs/genvers
index 4139c48..d2bc305 100755
--- a/dcs/genvers
+++ b/dcs/genvers
@@ -1,3 +1,24 @@
#!/bin/sh
+# @@@ 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 @@@
+
CV_VERS=1.0.1
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
\ No newline at end of file
+$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/11763f66/env.sh
----------------------------------------------------------------------
diff --git a/env.sh b/env.sh
index 28191e0..c3b5f65 100755
--- a/env.sh
+++ b/env.sh
@@ -1,3 +1,24 @@
+# @@@ 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 @@@
+
cd core/sqf
. ./sqenv.sh
cd ../..
[13/14] incubator-trafodion git commit: Incorporated review comments
Posted by db...@apache.org.
Incorporated review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9cfd17d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9cfd17d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9cfd17d7
Branch: refs/heads/master
Commit: 9cfd17d7d263903a4be073b48fefe5021618b059
Parents: 11763f6
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Sat Sep 26 00:28:07 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Sat Sep 26 00:28:07 2015 +0000
----------------------------------------------------------------------
core/rest/Makefile | 2 +-
dcs/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9cfd17d7/core/rest/Makefile
----------------------------------------------------------------------
diff --git a/core/rest/Makefile b/core/rest/Makefile
index e206c05..7508621 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -37,7 +37,7 @@ build_all:
echo "### For full Maven output, see file build_rest.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_rest.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
mkdir -p ../../${DISTRIBUTION_DIR}
- cp -pf target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
+ mv target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
$(RM) $(VFILE)
build_chk:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9cfd17d7/dcs/Makefile
----------------------------------------------------------------------
diff --git a/dcs/Makefile b/dcs/Makefile
index e8feb3f..144e763 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -37,7 +37,7 @@ build_all:
echo "### For full Maven output, see file build_dcs.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
mkdir -p ../${DISTRIBUTION_DIR}
- cp -pf target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}
+ mv target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}
$(RM) $(VFILE)
build_chk:
[11/14] incubator-trafodion git commit: rebased Merge remote branch
'origin/master' into wrk-brnch
Posted by db...@apache.org.
rebased
Merge remote branch 'origin/master' into wrk-brnch
Conflicts:
core/sqf/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/026de945
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/026de945
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/026de945
Branch: refs/heads/master
Commit: 026de9457af96e68fab45bc224dd6284cf124fe6
Parents: 61b39c4 183dd39
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Sep 25 18:22:38 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Sep 25 18:22:38 2015 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/jdbcUtil.cpp | 1 -
.../src/main/java/JdbcMxLobAdmin.java | 3 +-
.../jdbc/t4/HPT4ConnectionPoolDataSource.java | 2 +-
.../src/org/trafodion/jdbc/t4/T4Driver.java | 2 +-
.../src/org/trafodion/jdbc/t4/T4Properties.java | 2 +-
core/conn/jdbc_type4/test/RunAllTests.java | 36 +-
.../test/org/trafodion/jdbc/t4/BaseTest.java | 36 +-
.../org/trafodion/jdbc/t4/T4DriverTest.java | 36 +-
.../src/org/trafodion/ci/SessionDefaults.java | 2 +-
.../src/org/trafodion/ci/UserInterface.java | 3 +-
.../odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC | 4 +-
core/dbsecurity/scripts/sqcertgen | 7 +-
core/rest/bin/rest | 33 +-
core/rest/bin/rest-config.sh | 33 +-
core/rest/bin/rest-daemon.sh | 33 +-
core/rest/bin/scripts/sys_shell.py | 33 +-
core/rest/bin/start-rest.sh | 33 +-
core/rest/bin/stop-rest.sh | 33 +-
core/rest/conf/rest-env.sh | 33 +-
core/rest/conf/rest-site.xml | 33 +-
core/rest/pom.xml | 37 +-
core/rest/src/assembly/all.xml | 36 +-
core/rest/src/main/asciidoc/_chapters/apis.adoc | 33 +-
.../appendix_contributing_to_documentation.adoc | 33 +-
.../main/asciidoc/_chapters/architecture.adoc | 33 +-
.../main/asciidoc/_chapters/configuration.adoc | 33 +-
.../asciidoc/_chapters/getting_started.adoc | 33 +-
.../src/main/asciidoc/_chapters/preface.adoc | 33 +-
.../asciidoc/_chapters/troubleshooting.adoc | 33 +-
core/rest/src/main/asciidoc/index.adoc | 59 +-
core/rest/src/main/asciidoc/rest.css | 33 +-
.../main/java/org/trafodion/rest/Constants.java | 33 +-
.../org/trafodion/rest/GetStatusResponse.java | 34 +-
.../java/org/trafodion/rest/RESTServlet.java | 33 +-
.../org/trafodion/rest/RegisteredServer.java | 33 +-
.../java/org/trafodion/rest/ResourceBase.java | 34 +-
.../java/org/trafodion/rest/ResourceConfig.java | 34 +-
.../java/org/trafodion/rest/RestConstants.java | 33 +-
.../java/org/trafodion/rest/RootResource.java | 34 +-
.../java/org/trafodion/rest/RunningServer.java | 33 +-
.../java/org/trafodion/rest/ServerResource.java | 59 +-
.../java/org/trafodion/rest/TrafodionRest.java | 33 +-
.../trafodion/rest/TransactionsResource.java | 42 +-
.../org/trafodion/rest/VersionAnnotation.java | 41 +-
.../org/trafodion/rest/VersionResource.java | 62 +-
.../java/org/trafodion/rest/client/Client.java | 33 +-
.../java/org/trafodion/rest/client/Cluster.java | 33 +-
.../org/trafodion/rest/client/Response.java | 33 +-
.../org/trafodion/rest/model/VersionModel.java | 33 +-
.../rest/provider/JAXBContextResolver.java | 61 +-
.../producer/PlainTextMessageBodyProducer.java | 61 +-
.../trafodion/rest/script/ScriptContext.java | 33 +-
.../trafodion/rest/script/ScriptManager.java | 33 +-
.../rest/script/ScriptManagerWatcher.java | 33 +-
.../java/org/trafodion/rest/util/Base64.java | 33 +-
.../java/org/trafodion/rest/util/Bytes.java | 33 +-
.../java/org/trafodion/rest/util/ConfTool.java | 33 +-
.../trafodion/rest/util/GetJavaProperty.java | 33 +-
.../org/trafodion/rest/util/JdbcT2Util.java | 33 +-
.../org/trafodion/rest/util/JdbcT4Util.java | 33 +-
.../rest/util/NetworkConfiguration.java | 33 +-
.../trafodion/rest/util/RestConfiguration.java | 33 +-
.../org/trafodion/rest/util/RetryCounter.java | 33 +-
.../rest/util/RetryCounterFactory.java | 33 +-
.../java/org/trafodion/rest/util/Strings.java | 33 +-
.../org/trafodion/rest/util/VersionInfo.java | 33 +-
.../org/trafodion/rest/version/util/VerGen.java | 33 +-
.../org/trafodion/rest/zookeeper/ZKConfig.java | 33 +-
.../trafodion/rest/zookeeper/ZKServerTool.java | 33 +-
.../org/trafodion/rest/zookeeper/ZkClient.java | 33 +-
.../trafodion/rest/zookeeper/ZkQuorumPeer.java | 33 +-
.../org/trafodion/rest/zookeeper/ZkUtil.java | 33 +-
.../rest/zookeeper/ZooKeeperMainServerArg.java | 33 +-
core/rest/src/main/resources/rest-default.xml | 38 +-
.../xslt/configuration_to_asciidoc_chapter.xsl | 67 +-
core/rest/src/saveVersion.sh | 40 +-
.../org/trafodion/rest/IntegrationTests.java | 33 +-
.../java/org/trafodion/rest/LargeTests.java | 33 +-
.../java/org/trafodion/rest/MediumTests.java | 33 +-
.../org/trafodion/rest/ResourceChecker.java | 33 +-
.../rest/ResourceCheckerJUnitRule.java | 33 +-
.../java/org/trafodion/rest/SmallTests.java | 33 +-
core/rest/src/test/resources/rest-default.xml | 33 +-
core/sqf/build-scripts/genverhdr.ksh | 16 +
core/sqf/commonLogger/CommonLogger.cpp | 4 +-
core/sqf/conf/install_features | 24 +-
.../sqf/conf/log4cxx.trafodion.masterexe.config | 5 +-
core/sqf/conf/trafodion.udr.config | 52 +
core/sqf/export/include/SCMVersHelp.h | 28 +-
.../backup_restore_functions.sh | 4 +-
.../run_full_trafodion_backup.sh | 6 +-
.../run_full_trafodion_restore.sh | 10 +-
core/sqf/sqenvcom.sh | 170 +-
core/sqf/sql/scripts/install_apache_hadoop | 1807 ++++++++++++++++++
.../sql/scripts/install_hadoop_regr_test_env | 15 +-
core/sqf/sqvers | 6 +-
.../transactional/TrxRegionObserver.java | 40 +-
core/sqf/src/tm/tmddlrequests.cpp | 36 +-
core/sql/bin/vprocmxlobsrvr.cpp | 4 +-
core/sql/cli/memorymonitor.cpp | 46 +-
core/sql/comexe/ComTdbHbaseAccess.cpp | 12 +-
core/sql/comexe/ComTdbHbaseAccess.h | 6 +-
core/sql/common/ComMisc.cpp | 2 +-
core/sql/common/ComSmallDefs.h | 5 +-
core/sql/common/copyright.h | 34 +-
core/sql/executor/ExHbaseAccess.cpp | 11 +-
core/sql/executor/ExHbaseAccess.h | 11 +-
core/sql/executor/ExHbaseIUD.cpp | 150 +-
core/sql/executor/HBaseClient.java | 4 +-
core/sql/executor/HBaseClient_JNI.cpp | 5 +-
core/sql/executor/HTableClient.java | 82 +-
core/sql/executor/JavaObjectInterface.cpp | 2 +-
core/sql/exp/ExpHbaseInterface.cpp | 10 +-
core/sql/exp/ExpHbaseInterface.h | 14 +-
core/sql/generator/GenPreCode.cpp | 44 +-
core/sql/generator/GenRelUpdate.cpp | 45 +-
core/sql/nskgmake/sqlcilib/Makefile | 3 +-
core/sql/nskgmake/sqlmsg/Makefile | 5 +-
core/sql/optimizer/BindRelExpr.cpp | 66 +-
core/sql/optimizer/BindWA.cpp | 4 +-
core/sql/optimizer/BindWA.h | 4 +-
core/sql/optimizer/ImplRule.cpp | 3 +-
core/sql/optimizer/Inlining.cpp | 64 +-
core/sql/optimizer/Inlining.h | 80 +-
core/sql/optimizer/NATable.cpp | 139 +-
core/sql/optimizer/NATable.h | 22 +-
core/sql/optimizer/NormRelExpr.cpp | 18 +-
core/sql/optimizer/ObjectNames.cpp | 12 +
core/sql/optimizer/ObjectNames.h | 3 +
core/sql/optimizer/RelExpr.cpp | 37 +-
core/sql/optimizer/RelUpdate.h | 33 +-
core/sql/qmscommon/QRLogger.cpp | 28 +-
core/sql/regress/executor/EXPECTED002.SB | 29 +-
core/sql/regress/executor/EXPECTED015.SB | 275 ++-
core/sql/regress/executor/TEST002 | 3 +
core/sql/regress/executor/TEST015 | 36 +-
core/sql/regress/hive/EXPECTED001 | 133 +-
core/sql/regress/hive/EXPECTED003 | 24 +-
core/sql/regress/hive/EXPECTED004 | 4 +-
core/sql/regress/hive/EXPECTED009 | 4 +-
core/sql/regress/hive/EXPECTED020 | 18 +-
core/sql/regress/hive/EXPECTED021 | 27 +
core/sql/regress/hive/FILTER021 | 96 +
core/sql/regress/hive/TEST001 | 3 +-
core/sql/regress/hive/TEST009 | 4 +-
core/sql/regress/hive/TEST009_b.hive.sql | 48 +
core/sql/regress/hive/TEST021 | 48 +
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C | 16 -
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N | 15 -
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640 | 15 -
core/sql/regress/newregr/mvs/BIG/TESTMV215C | 15 -
core/sql/regress/newregr/mvs/BIG/TESTMV640 | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215 | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215IR | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215_DE | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215_RU | 15 -
.../mvs/BIG/TestMV215_With_RefreshUtilty | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215b | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215e | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215g | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215h | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215j | 15 -
core/sql/regress/newregr/mvs/BIG/TestMV215n | 15 -
core/sql/regress/newregr/mvs/BIG/Testmv215m | 15 -
core/sql/regress/newregr/mvs/BIG/expectedMV215e | 15 -
core/sql/regress/newregr/mvs/BIG/expectedMV215g | 15 -
core/sql/regress/newregr/mvs/BIG/expectedMV215h | 15 -
core/sql/regress/newregr/mvs/BIG/expectedmv215 | 15 -
.../sql/regress/newregr/mvs/BIG/expectedmv215IR | 15 -
.../regress/newregr/mvs/BIG/expectedmv215_DE | 15 -
.../regress/newregr/mvs/BIG/expectedmv215_RU | 15 -
core/sql/regress/newregr/mvs/BIG/expectedmv215b | 15 -
core/sql/regress/newregr/mvs/BIG/expectedmv215m | 15 -
core/sql/regress/newregr/rowsets/teste001.sql | 4 -
core/sql/regress/newregr/rowsets/teste005.sql | 4 -
core/sql/regress/newregr/rowsets/teste011.sql | 4 -
core/sql/regress/newregr/rowsets/teste015.sql | 4 -
core/sql/regress/newregr/rowsets/teste021.sql | 4 -
core/sql/regress/newregr/rowsets/teste025.sql | 4 -
core/sql/regress/newregr/rowsets/teste041.sql | 4 -
core/sql/regress/newregr/rowsets/teste045.sql | 4 -
core/sql/regress/newregr/rowsets/teste051.sql | 4 -
core/sql/regress/newregr/rowsets/teste055.sql | 4 -
core/sql/regress/newregr/rowsets/teste061.sql | 4 -
core/sql/regress/newregr/rowsets/teste065.sql | 4 -
core/sql/regress/newregr/rowsets/teste071.sql | 4 -
core/sql/regress/newregr/rowsets/teste075.sql | 4 -
core/sql/regress/newregr/rowsets/teste081.sql | 4 -
core/sql/regress/newregr/rowsets/teste085.sql | 4 -
core/sql/regress/newregr/rowsets/teste091.sql | 4 -
core/sql/regress/newregr/rowsets/teste101.sql | 4 -
core/sql/regress/newregr/rowsets/teste105.sql | 4 -
core/sql/regress/newregr/rowsets/teste111.sql | 4 -
core/sql/regress/newregr/rowsets/teste121.sql | 4 -
core/sql/regress/newregr/rowsets/teste135.sql | 4 -
core/sql/regress/newregr/rowsets/teste140.sql | 4 -
core/sql/regress/newregr/rowsets/teste141.sql | 4 -
core/sql/regress/newregr/rowsets/teste145.sql | 4 -
core/sql/regress/newregr/rowsets/teste201.sql | 4 -
core/sql/regress/newregr/rowsets/teste205.sql | 4 -
core/sql/regress/newregr/rowsets/teste211.sql | 4 -
core/sql/regress/newregr/rowsets/teste215.sql | 4 -
core/sql/regress/newregr/rowsets/teste221.sql | 4 -
core/sql/regress/newregr/rowsets/teste225.sql | 4 -
core/sql/regress/newregr/rowsets/teste232.sql | 4 -
core/sql/regress/newregr/rowsets/teste235.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_1.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_2.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_3.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_4.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_5.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_6.sql | 4 -
core/sql/regress/seabase/EXPECTED028 | 84 +
core/sql/regress/seabase/FILTER028 | 96 +
core/sql/regress/seabase/TEST028 | 31 +
core/sql/regress/seabase/ddl.sb028 | 45 +
core/sql/regress/seabase/dml.sb028 | 33 +
core/sql/regress/tools/regress-filter-linux | 1 +
core/sql/regress/tools/runregr_seabase.ksh | 5 +
core/sql/regress/tools/setuplnxenv | 2 +
core/sql/regress/udr/EXPECTED100.SB | 2 +-
core/sql/regress/udr/FILTER100 | 3 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 14 +-
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/PrivMgr.cpp | 3 -
core/sql/sqlcomp/nadefaults.cpp | 7 +-
core/sql/sqlmsg/ComDiagsMsg.cpp | 3 +-
core/sql/sqlmxevents/logmxevent_traf.cpp | 2 +-
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 18 +-
core/sql/udrserv/UdrCfgParser.cpp | 17 +-
core/sql/udrserv/udrserv.cpp | 20 +-
core/sql/ustat/hs_cli.cpp | 12 +
core/sql/ustat/hs_globals.cpp | 38 +-
core/sql/ustat/hs_globals.h | 16 +-
core/sql/ustat/hs_la.cpp | 124 +-
core/sql/ustat/hs_la.h | 21 +-
core/sql/ustat/hs_parser.cpp | 98 +-
core/sql/ustat/hs_read.cpp | 3 +-
core/sql/ustat/hs_util.cpp | 3 +
core/sql/ustat/hs_yacc.y | 5 +-
dcs/bin/dcs | 33 +-
dcs/bin/dcs-config.sh | 33 +-
dcs/bin/dcs-daemon.sh | 33 +-
dcs/bin/dcs-daemons.sh | 33 +-
dcs/bin/local-servers.sh | 33 +-
dcs/bin/scripts/dcsbind.sh | 33 +-
dcs/bin/scripts/sys_shell.py | 35 +-
dcs/conf/dcs-env.sh | 53 +-
dcs/conf/dcs-site.xml | 63 +-
dcs/pom.xml | 56 +-
dcs/src/assembly/all.xml | 21 +-
.../appendix_contributing_to_documentation.adoc | 3 +-
.../main/asciidoc/_chapters/architecture.adoc | 32 +-
.../main/asciidoc/_chapters/configuration.adoc | 34 +-
.../main/asciidoc/_chapters/external_apis.adoc | 3 +-
dcs/src/main/asciidoc/_chapters/faq.adoc | 3 +-
.../asciidoc/_chapters/getting_started.adoc | 34 +-
dcs/src/main/asciidoc/_chapters/ops_mgt.adoc | 3 +-
.../main/asciidoc/_chapters/performance.adoc | 3 +-
dcs/src/main/asciidoc/_chapters/preface.adoc | 32 +-
.../asciidoc/_chapters/troubleshooting.adoc | 3 +-
dcs/src/main/asciidoc/dcs.css | 33 +-
dcs/src/main/asciidoc/index.adoc | 61 +-
.../dcs/tmpl/master/MasterStatusTmpl.jamon | 50 +-
.../dcs/tmpl/server/ServerStatusTmpl.jamon | 51 +-
.../dcs/tmpl/servermt/ServerStatusTmpl.jamon | 51 +-
.../main/java/org/trafodion/dcs/Constants.java | 53 +-
.../org/trafodion/dcs/VersionAnnotation.java | 22 +-
.../org/trafodion/dcs/http/FilterContainer.java | 33 +-
.../org/trafodion/dcs/http/HtmlQuoting.java | 33 +-
.../java/org/trafodion/dcs/http/HttpServer.java | 33 +-
.../org/trafodion/dcs/master/DcsMaster.java | 33 +-
.../org/trafodion/dcs/master/FloatingIp.java | 33 +-
.../dcs/master/MasterLeaderElection.java | 33 +-
.../dcs/master/MasterStatusServlet.java | 33 +-
.../java/org/trafodion/dcs/master/Metrics.java | 33 +-
.../trafodion/dcs/master/RegisteredServer.java | 33 +-
.../org/trafodion/dcs/master/RunningServer.java | 33 +-
.../org/trafodion/dcs/master/ServerItem.java | 33 +-
.../org/trafodion/dcs/master/ServerManager.java | 33 +-
.../dcs/master/listener/ClientData.java | 33 +-
.../dcs/master/listener/ConnectReply.java | 33 +-
.../dcs/master/listener/ConnectionContext.java | 33 +-
.../dcs/master/listener/DataEvent.java | 33 +-
.../dcs/master/listener/GetObjRefException.java | 33 +-
.../trafodion/dcs/master/listener/Header.java | 33 +-
.../dcs/master/listener/ListenerConstants.java | 33 +-
.../dcs/master/listener/ListenerMetrics.java | 33 +-
.../dcs/master/listener/ListenerService.java | 33 +-
.../dcs/master/listener/ListenerWorker.java | 33 +-
.../dcs/master/listener/PendingRequest.java | 33 +-
.../dcs/master/listener/RequestCancelQuery.java | 33 +-
.../master/listener/RequestGetObjectRef.java | 33 +-
.../dcs/master/listener/RequestUnknown.java | 33 +-
.../trafodion/dcs/master/listener/UserDesc.java | 33 +-
.../org/trafodion/dcs/master/listener/Util.java | 33 +-
.../trafodion/dcs/master/listener/Version.java | 33 +-
.../dcs/master/listener/VersionList.java | 33 +-
.../java/org/trafodion/dcs/rest/DcsRest.java | 33 +-
.../trafodion/dcs/rest/GetStatusResponse.java | 54 +-
.../org/trafodion/dcs/rest/RESTServlet.java | 33 +-
.../org/trafodion/dcs/rest/ResourceBase.java | 54 +-
.../org/trafodion/dcs/rest/ResourceConfig.java | 54 +-
.../org/trafodion/dcs/rest/RestConstants.java | 33 +-
.../org/trafodion/dcs/rest/RootResource.java | 54 +-
.../org/trafodion/dcs/rest/ServerConnector.java | 33 +-
.../org/trafodion/dcs/rest/ServerResource.java | 22 +-
.../org/trafodion/dcs/rest/VersionResource.java | 25 +-
.../trafodion/dcs/rest/WorkloadResource.java | 22 +-
.../org/trafodion/dcs/rest/client/Client.java | 33 +-
.../org/trafodion/dcs/rest/client/Cluster.java | 33 +-
.../org/trafodion/dcs/rest/client/Response.java | 33 +-
.../trafodion/dcs/rest/model/ServerModel.java | 54 +-
.../trafodion/dcs/rest/model/VersionModel.java | 33 +-
.../dcs/rest/model/WorkloadListModel.java | 21 +-
.../trafodion/dcs/rest/model/WorkloadModel.java | 21 +-
.../dcs/rest/provider/JAXBContextResolver.java | 24 +-
.../producer/PlainTextMessageBodyProducer.java | 24 +-
.../org/trafodion/dcs/script/ScriptManager.java | 33 +-
.../dcs/script/ScriptManagerWatcher.java | 33 +-
.../org/trafodion/dcs/server/DcsServer.java | 33 +-
.../java/org/trafodion/dcs/server/Metrics.java | 33 +-
.../dcs/server/ServerStatusServlet.java | 33 +-
.../org/trafodion/dcs/servermt/DcsServer.java | 33 +-
.../org/trafodion/dcs/servermt/Metrics.java | 33 +-
.../trafodion/dcs/servermt/ServerConstants.java | 33 +-
.../trafodion/dcs/servermt/ServerManager.java | 33 +-
.../dcs/servermt/ServerStatusServlet.java | 33 +-
.../org/trafodion/dcs/servermt/ServerUtils.java | 33 +-
.../servermt/serverDriverInputOutput/Close.java | 33 +-
.../ConnectionContext.java | 33 +-
.../serverDriverInputOutput/Descriptor2.java | 33 +-
.../Descriptor2List.java | 33 +-
.../serverDriverInputOutput/ErrorDesc.java | 33 +-
.../serverDriverInputOutput/ErrorDescList.java | 33 +-
.../serverDriverInputOutput/Header.java | 33 +-
.../OutConnectionContext.java | 33 +-
.../serverDriverInputOutput/SQLDataValue.java | 33 +-
.../serverDriverInputOutput/SQLValue.java | 33 +-
.../serverDriverInputOutput/SQLValueList.java | 33 +-
.../SQLWarningOrError.java | 33 +-
.../SQLWarningOrErrorList.java | 33 +-
.../ServerException.java | 33 +-
.../SetConnectionOption.java | 33 +-
.../serverDriverInputOutput/UserDesc.java | 33 +-
.../serverDriverInputOutput/Version.java | 33 +-
.../serverDriverInputOutput/VersionList.java | 33 +-
.../dcs/servermt/serverHandler/ClientData.java | 33 +-
.../dcs/servermt/serverHandler/DataEvent.java | 33 +-
.../servermt/serverHandler/PendingRequest.java | 33 +-
.../serverHandler/ServerApiGetCatalogs.java | 33 +-
.../serverHandler/ServerApiSqlClose.java | 33 +-
.../serverHandler/ServerApiSqlConnect.java | 33 +-
.../serverHandler/ServerApiSqlDisconnect.java | 33 +-
.../serverHandler/ServerApiSqlEndTransact.java | 33 +-
.../serverHandler/ServerApiSqlExecDirect.java | 33 +-
.../serverHandler/ServerApiSqlExecute.java | 33 +-
.../serverHandler/ServerApiSqlFetch.java | 33 +-
.../serverHandler/ServerApiSqlPrepare.java | 33 +-
.../ServerApiSqlSetConnectAttr.java | 33 +-
.../servermt/serverHandler/ServerHandler.java | 33 +-
.../servermt/serverHandler/ServerWorker.java | 33 +-
.../dcs/servermt/serverSql/TrafConnection.java | 33 +-
.../dcs/servermt/serverSql/TrafStatement.java | 33 +-
.../java/org/trafodion/dcs/util/Base64.java | 14 -
.../main/java/org/trafodion/dcs/util/Bytes.java | 14 -
.../org/trafodion/dcs/util/DcsConfTool.java | 14 -
.../trafodion/dcs/util/DcsConfiguration.java | 14 -
.../org/trafodion/dcs/util/GetJavaProperty.java | 14 -
.../java/org/trafodion/dcs/util/InfoServer.java | 14 -
.../org/trafodion/dcs/util/RetryCounter.java | 14 -
.../trafodion/dcs/util/RetryCounterFactory.java | 14 -
.../java/org/trafodion/dcs/util/Strings.java | 14 -
.../org/trafodion/dcs/util/VersionInfo.java | 14 -
.../org/trafodion/dcs/version/util/VerGen.java | 33 +-
.../trafodion/dcs/zookeeper/DcsQuorumPeer.java | 33 +-
.../org/trafodion/dcs/zookeeper/ZKConfig.java | 33 +-
.../trafodion/dcs/zookeeper/ZKServerTool.java | 33 +-
.../org/trafodion/dcs/zookeeper/ZkClient.java | 35 +-
.../org/trafodion/dcs/zookeeper/ZkUtil.java | 33 +-
.../dcs/zookeeper/ZooKeeperMainServerArg.java | 33 +-
dcs/src/main/resources/dcs-default.xml | 56 +-
.../dcs-webapps/master/aggr_querystats.html | 33 +-
.../dcs-webapps/master/aggr_querystats.jsp | 31 +-
.../dcs-webapps/master/css/Spacetree.css | 33 +-
.../resources/dcs-webapps/master/css/base.css | 33 +-
.../dcs-webapps/master/executeQuery.jsp | 31 +-
.../resources/dcs-webapps/master/explain.html | 33 +-
.../resources/dcs-webapps/master/index.html | 14 -
.../dcs-webapps/master/js/ExplainPlanView.js | 33 +-
.../main/resources/dcs-webapps/master/logs.html | 33 +-
.../resources/dcs-webapps/master/master.jsp | 14 -
.../resources/dcs-webapps/master/queryPlan.jsp | 31 +-
.../dcs-webapps/master/querystats.html | 33 +-
.../resources/dcs-webapps/master/querystats.jsp | 35 +-
.../resources/dcs-webapps/master/repository.jsp | 31 +-
.../resources/dcs-webapps/master/servers.jsp | 30 +-
.../resources/dcs-webapps/master/sessions.html | 33 +-
.../resources/dcs-webapps/master/sessions.jsp | 36 +-
.../resources/dcs-webapps/server/index.html | 14 -
.../resources/dcs-webapps/server/server.jsp | 14 -
.../main/resources/dcs-webapps/static/dcs.css | 14 -
dcs/src/saveVersion.sh | 49 +-
.../trafodion/dcs/IntegrationTestEndurance.java | 33 +-
.../org/trafodion/dcs/IntegrationTests.java | 33 +-
.../test/java/org/trafodion/dcs/LargeTests.java | 33 +-
.../java/org/trafodion/dcs/MediumTests.java | 33 +-
.../org/trafodion/dcs/ReposPublicationTest.java | 33 +-
.../org/trafodion/dcs/ReposTableAccessTest.java | 33 +-
.../java/org/trafodion/dcs/ResourceChecker.java | 33 +-
.../trafodion/dcs/ResourceCheckerJUnitRule.java | 33 +-
.../test/java/org/trafodion/dcs/SmallTests.java | 33 +-
dcs/src/test/jdbc_test/README.rst | 38 +-
dcs/src/test/jdbc_test/jdbc_test.py | 39 +-
dcs/src/test/jdbc_test/pom.xml.template | 4 -
.../java/org/trafodion/jdbc_test/PropTest.java | 53 +-
.../java/org/trafodion/jdbc_test/TestBasic.java | 77 +-
.../java/org/trafodion/jdbc_test/TestBatch.java | 77 +-
.../org/trafodion/jdbc_test/TestBigCol.java | 79 +-
.../trafodion/jdbc_test/TestBigColumnSize.java | 53 +-
.../java/org/trafodion/jdbc_test/TestCat.java | 53 +-
.../java/org/trafodion/jdbc_test/TestMisc.java | 53 +-
.../java/org/trafodion/jdbc_test/TestTrx.java | 77 +-
.../java/org/trafodion/jdbc_test/Utils.java | 53 +-
dcs/src/test/pytests/test_p2.py | 35 +-
dcs/src/test/resources/dcs-default.xml | 35 +-
install/installer/tools/cloudera_setup | 18 +-
install/installer/traf_add_user | 9 +-
.../installer/traf_apache_hadoop_config_setup | 842 ++++++++
install/installer/traf_cloudera_mods98 | 18 +-
install/installer/traf_config_setup | 136 +-
install/installer/traf_hortonworks_mods98 | 10 +-
install/installer/traf_package_setup | 229 +++
install/installer/traf_setup | 172 +-
install/installer/traf_sqconfig | 3 -
.../installer/trafodion_apache_hadoop_install | 771 ++++++++
install/installer/trafodion_install | 62 +-
pom.xml | 35 +-
tests/phx/pom.xml.template | 4 -
win-odbc64/Common/Compression.cpp | 27 +-
win-odbc64/Common/Compression.h | 33 +-
win-odbc64/Common/DrvrSrvr.h | 25 +-
win-odbc64/Common/ExpConvMxcs.cpp | 25 +-
win-odbc64/Common/NLSFunctions.cpp | 25 +-
win-odbc64/Common/NLSFunctions.h | 25 +-
win-odbc64/Common/OdbcMsg.cpp | 25 +-
win-odbc64/Common/OdbcMsg.h | 25 +-
win-odbc64/Common/RegValues.h | 25 +-
win-odbc64/Common/TCPIPSystemDrvr.cpp | 33 +-
win-odbc64/Common/TCPIPSystemDrvr.h | 25 +-
win-odbc64/Common/TransportBase.cpp | 25 +-
win-odbc64/Common/TransportBase.h | 25 +-
win-odbc64/Common/inoutparams.h | 25 +-
win-odbc64/Common/iputils.h | 25 +-
win-odbc64/Common/marshaling.cpp | 25 +-
win-odbc64/Common/marshaling.h | 25 +-
win-odbc64/Common/marshalingdrvr_drvr.cpp | 25 +-
win-odbc64/Common/marshalingdrvr_drvr.h | 25 +-
win-odbc64/Common/nskieee.cpp | 25 +-
win-odbc64/Common/nskieee.h | 25 +-
win-odbc64/Common/odbcMxSecurity.h | 25 +-
win-odbc64/Common/ping.cpp | 25 +-
win-odbc64/Common/ping.h | 25 +-
win-odbc64/Common/swap.cpp | 25 +-
win-odbc64/Common/swap.h | 25 +-
.../SetCertificateDirReg/SetCertDirDlg.cpp | 25 +-
.../SetCertificateDirReg/SetCertDirDlg.h | 25 +-
.../SetCertificateDirReg.cpp | 25 +-
.../SetCertificateDirReg/SetCertificateDirReg.h | 25 +-
.../SetCertificateDirReg/resource.h | 25 +-
.../SetCertificateDirReg/stdafx.cpp | 25 +-
.../SetCertificateDirReg/stdafx.h | 25 +-
.../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp | 25 +-
.../Install/UpdateDSN/UpdateDSN/stdafx.cpp | 25 +-
win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h | 25 +-
win-odbc64/odbcclient/DSNConverter/DSList.cpp | 25 +-
win-odbc64/odbcclient/DSNConverter/DSList.h | 25 +-
.../odbcclient/DSNConverter/DSNConverter.cpp | 25 +-
.../odbcclient/DSNConverter/DSNConverter.def | 33 +-
.../odbcclient/DSNConverter/DSNConverter.h | 25 +-
.../odbcclient/DSNConverter/ODBCMXAttribs.h | 25 +-
win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp | 25 +-
win-odbc64/odbcclient/DSNConverter/OdbcDS.h | 25 +-
win-odbc64/odbcclient/DSNConverter/StdAfx.cpp | 25 +-
win-odbc64/odbcclient/DSNConverter/StdAfx.h | 25 +-
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp | 25 +-
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def | 33 +-
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h | 25 +-
win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp | 25 +-
win-odbc64/odbcclient/Drvr35Res/StdAfx.h | 25 +-
win-odbc64/odbcclient/README.txt | 33 +-
win-odbc64/odbcclient/TranslationDll/StdAfx.cpp | 25 +-
win-odbc64/odbcclient/TranslationDll/StdAfx.h | 25 +-
.../TranslationDll/TranslationDll.cpp | 25 +-
.../TranslationDll/TranslationDll.def | 33 +-
.../odbcclient/TranslationDll/TranslationDll.h | 25 +-
win-odbc64/odbcclient/build_os.bat | 33 +-
.../odbcclient/drvr35/Interface/Transport.cpp | 25 +-
.../odbcclient/drvr35/Interface/Transport.h | 25 +-
.../odbcclient/drvr35/Interface/odbcas_drvr.cpp | 25 +-
.../odbcclient/drvr35/Interface/odbcas_drvr.h | 25 +-
.../odbcclient/drvr35/Interface/odbcs_drvr.cpp | 25 +-
.../odbcclient/drvr35/Interface/odbcs_drvr.h | 25 +-
win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp | 25 +-
win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h | 25 +-
.../odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp | 25 +-
.../odbcclient/drvr35/TCPIPV4/TCPIPV4.def | 21 +-
win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h | 25 +-
win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp | 25 +-
win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h | 25 +-
.../odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp | 25 +-
.../odbcclient/drvr35/TCPIPV6/TCPIPV6.def | 21 +-
win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h | 25 +-
win-odbc64/odbcclient/drvr35/cconnect.cpp | 33 +-
win-odbc64/odbcclient/drvr35/cconnect.h | 25 +-
win-odbc64/odbcclient/drvr35/cdatasource.cpp | 33 +-
win-odbc64/odbcclient/drvr35/cdatasource.h | 25 +-
win-odbc64/odbcclient/drvr35/cdesc.cpp | 25 +-
win-odbc64/odbcclient/drvr35/cdesc.h | 25 +-
win-odbc64/odbcclient/drvr35/cdiag.cpp | 25 +-
win-odbc64/odbcclient/drvr35/cdiag.h | 25 +-
win-odbc64/odbcclient/drvr35/cenv.cpp | 25 +-
win-odbc64/odbcclient/drvr35/cenv.h | 25 +-
win-odbc64/odbcclient/drvr35/chandle.cpp | 25 +-
win-odbc64/odbcclient/drvr35/chandle.h | 25 +-
win-odbc64/odbcclient/drvr35/charsetconv.cpp | 25 +-
win-odbc64/odbcclient/drvr35/charsetconv.h | 25 +-
win-odbc64/odbcclient/drvr35/cstmt.h | 25 +-
win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 25 +-
win-odbc64/odbcclient/drvr35/ctosqlconv.h | 25 +-
win-odbc64/odbcclient/drvr35/diagfunctions.cpp | 25 +-
win-odbc64/odbcclient/drvr35/diagfunctions.h | 25 +-
win-odbc64/odbcclient/drvr35/drvr35.def | 21 +-
win-odbc64/odbcclient/drvr35/drvrglobal.cpp | 25 +-
win-odbc64/odbcclient/drvr35/drvrglobal.h | 25 +-
win-odbc64/odbcclient/drvr35/drvrnet.cpp | 25 +-
win-odbc64/odbcclient/drvr35/drvrnet.h | 25 +-
win-odbc64/odbcclient/drvr35/netcommon.cpp | 25 +-
win-odbc64/odbcclient/drvr35/netconnect.cpp | 25 +-
win-odbc64/odbcclient/drvr35/netstmt.cpp | 25 +-
win-odbc64/odbcclient/drvr35/sqlconnect.cpp | 25 +-
win-odbc64/odbcclient/drvr35/sqlconnect.h | 25 +-
win-odbc64/odbcclient/drvr35/sqldesc.cpp | 25 +-
win-odbc64/odbcclient/drvr35/sqldesc.h | 25 +-
win-odbc64/odbcclient/drvr35/sqlenv.cpp | 25 +-
win-odbc64/odbcclient/drvr35/sqlenv.h | 25 +-
win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp | 25 +-
win-odbc64/odbcclient/drvr35/sqlhandle.cpp | 25 +-
win-odbc64/odbcclient/drvr35/sqlhandle.h | 25 +-
win-odbc64/odbcclient/drvr35/sqlstmt.cpp | 25 +-
win-odbc64/odbcclient/drvr35/sqlstmt.h | 25 +-
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 33 +-
win-odbc64/odbcclient/drvr35/sqltocconv.h | 25 +-
win-odbc64/odbcclient/drvr35/sqltrace.h | 25 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.def | 21 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.h | 25 +-
win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h | 25 +-
win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/pagegeneral.h | 25 +-
win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/pagelocaltr.h | 25 +-
win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp | 33 +-
win-odbc64/odbcclient/drvr35adm/pagenetwork.h | 25 +-
win-odbc64/odbcclient/drvr35adm/pageoptions.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/pageoptions.h | 25 +-
win-odbc64/odbcclient/drvr35adm/pagetesting.h | 25 +-
win-odbc64/odbcclient/drvr35adm/pagetracing.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/pagetracing.h | 25 +-
win-odbc64/odbcclient/drvr35adm/propsheet.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/propsheet.h | 25 +-
win-odbc64/odbcclient/drvr35adm/stdafx.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/stdafx.h | 25 +-
.../odbcclient/drvr35adm/tabpagegeneral.cpp | 25 +-
.../odbcclient/drvr35adm/tabpagegeneral.h | 25 +-
.../odbcclient/drvr35adm/tabpagelocaltr.cpp | 25 +-
.../odbcclient/drvr35adm/tabpagelocaltr.h | 25 +-
.../odbcclient/drvr35adm/tabpagenetwork.cpp | 33 +-
.../odbcclient/drvr35adm/tabpagenetwork.h | 25 +-
.../odbcclient/drvr35adm/tabpageoptions.cpp | 25 +-
.../odbcclient/drvr35adm/tabpageoptions.h | 25 +-
.../odbcclient/drvr35adm/tabpagetesting.cpp | 25 +-
.../odbcclient/drvr35adm/tabpagetesting.h | 25 +-
.../odbcclient/drvr35adm/tabpagetracing.cpp | 25 +-
.../odbcclient/drvr35adm/tabpagetracing.h | 25 +-
win-odbc64/odbcclient/drvr35adm/testdialog.cpp | 25 +-
win-odbc64/odbcclient/drvr35adm/testdialog.h | 25 +-
win-odbc64/odbcclient/inc/trafsqlext.h | 25 +-
win-odbc64/odbcclient/pkg.bat | 33 +-
.../security_dll/native/common/clientErrCode.h | 25 +-
.../security_dll/native/common/secdefsCommon.h | 25 +-
win-odbc64/security_dll/native/common/timeval.h | 25 +-
win-odbc64/security_dll/native/common/utils.h | 25 +-
win-odbc64/security_dll/native/header/Cipher.h | 25 +-
win-odbc64/security_dll/native/header/Key.h | 25 +-
.../security_dll/native/header/MessageDigest.h | 25 +-
.../security_dll/native/header/StaticLocking.h | 25 +-
win-odbc64/security_dll/native/header/secpwd.h | 25 +-
.../security_dll/native/header/security.h | 25 +-
.../native/header/securityException.h | 25 +-
.../security_dll/native/source/Cipher.cpp | 25 +-
win-odbc64/security_dll/native/source/Key.cpp | 25 +-
.../native/source/MessageDigest.cpp | 25 +-
.../security_dll/native/source/Security.cpp | 25 +-
.../native/source/StaticLocking.cpp | 25 +-
.../native/source/securityException.cpp | 25 +-
win-odbc64/security_dll/native/source/utils.cpp | 25 +-
.../security_dll/native/source/version.cpp | 25 +-
win-odbc64/sql/cli/sqlcli.h | 25 +-
win-odbc64/sql/common/Platform.h | 25 +-
win-odbc64/sql/common/UCS_jp_data.c | 25 +-
win-odbc64/sql/common/UCS_ko_data.c | 25 +-
win-odbc64/sql/common/UCS_zb_data.c | 25 +-
win-odbc64/sql/common/UCS_zs_data.c | 25 +-
win-odbc64/sql/common/csconvert.cpp | 25 +-
win-odbc64/sql/common/csconvert.h | 25 +-
win-odbc64/sql/common/fcconv.h | 25 +-
win-odbc64/sql/common/from_GB18030.c | 25 +-
win-odbc64/sql/common/from_GB2312.c | 25 +-
win-odbc64/sql/common/from_GBK.c | 25 +-
win-odbc64/sql/common/gb18030_data.c | 25 +-
win-odbc64/sql/common/iconv_gen.c | 25 +-
win-odbc64/sql/common/mb_iconv.c | 25 +-
win-odbc64/sql/common/mb_lconv.c | 25 +-
win-odbc64/sql/common/multi-byte.h | 33 +-
wms/bin/local-servers.sh | 33 +-
wms/bin/scripts/sys_shell.py | 33 +-
wms/bin/servers.sh | 33 +-
wms/bin/start-wms.sh | 50 +-
wms/bin/stop-wms.sh | 50 +-
wms/bin/wms | 49 +-
wms/bin/wms-config.sh | 50 +-
wms/bin/wms-daemon.sh | 50 +-
wms/bin/wms-daemons.sh | 50 +-
wms/bin/zookeepers.sh | 50 +-
wms/conf/wms-env.sh | 50 +-
wms/conf/wms-site.xml | 50 +-
wms/pom.xml | 17 -
wms/src/assembly/all.xml | 53 +-
.../wms/tmpl/master/MasterStatusTmpl.jamon | 18 +-
.../wms/tmpl/server/ServerStatusTmpl.jamon | 18 +-
.../main/java/org/trafodion/wms/Constants.java | 52 +-
.../org/trafodion/wms/http/FilterContainer.java | 51 +-
.../org/trafodion/wms/http/HtmlQuoting.java | 51 +-
.../java/org/trafodion/wms/http/HttpServer.java | 53 +-
.../wms/master/MasterStatusServlet.java | 53 +-
.../java/org/trafodion/wms/master/Metrics.java | 33 +-
.../org/trafodion/wms/master/ServerManager.java | 33 +-
.../org/trafodion/wms/master/WmsMaster.java | 33 +-
.../org/trafodion/wms/script/ScriptContext.java | 33 +-
.../org/trafodion/wms/script/ScriptManager.java | 33 +-
.../wms/script/ScriptManagerWatcher.java | 33 +-
.../java/org/trafodion/wms/server/Metrics.java | 33 +-
.../wms/server/ServerStatusServlet.java | 33 +-
.../java/org/trafodion/wms/util/InfoServer.java | 53 +-
.../org/trafodion/wms/util/VersionInfo.java | 53 +-
.../trafodion/wms/util/WmsConfiguration.java | 53 +-
.../org/trafodion/wms/version/util/VerGen.java | 53 +-
.../trafodion/wms/zookeeper/WmsQuorumPeer.java | 33 +-
.../org/trafodion/wms/zookeeper/ZKConfig.java | 53 +-
.../trafodion/wms/zookeeper/ZKServerTool.java | 53 +-
.../org/trafodion/wms/zookeeper/ZkClient.java | 53 +-
.../wms/zookeeper/ZooKeeperMainServerArg.java | 53 +-
wms/src/main/resources/wms-default.xml | 54 +-
.../resources/wms-webapps/master/index.html | 48 +-
.../resources/wms-webapps/master/master.jsp | 48 +-
.../resources/wms-webapps/server/index.html | 48 +-
.../resources/wms-webapps/server/server.jsp | 48 +-
.../main/resources/wms-webapps/static/wms.css | 48 +-
671 files changed, 14586 insertions(+), 8510 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/026de945/core/rest/src/saveVersion.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/026de945/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/026de945/dcs/src/saveVersion.sh
----------------------------------------------------------------------
[03/14] incubator-trafodion git commit: fixed issues
Posted by db...@apache.org.
fixed issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e2cfb6ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e2cfb6ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e2cfb6ef
Branch: refs/heads/master
Commit: e2cfb6ef1c57cc9fcdc0799ba5384dc98eb98a4c
Parents: 67f8566
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Sep 18 17:09:17 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Sep 18 17:09:17 2015 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_traf_components | 42 ++++++++---------------
dcs/src/test/pytests/test-requirements.txt | 2 +-
2 files changed, 15 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e2cfb6ef/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 1b32db8..8b61d40 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -31,7 +31,7 @@ if [ -z "$CLIENT_TAR" ]; then
CLIENT_TAR=$TRAF_TARS/*clients*.tgz
fi
-if [ -f "$CLIENT_TAR" ]; then
+if [ -f $CLIENT_TAR ]; then
cd $MY_SW_ROOT
tar -xzf $CLIENT_TAR *Linux*
tar -xzf $CLIENT_TAR *odb*
@@ -60,11 +60,11 @@ echo " For local hadoop... $MY_SW_ROOT" | tee -a ${MY_LOG_FILE}
echo " For DCS_TAR... $DCS_TAR" | tee -a ${MY_LOG_FILE}
echo " For REST_TAR... $REST_TAR" | tee -a ${MY_LOG_FILE}
-if [ -f "$PHX_TAR" ]; then
+if [ -f $PHX_TAR ]; then
echo " For PHX_TAR... $PHX_TAR" | tee -a ${MY_LOG_FILE}
fi
-if [ -f "$CLIENT_TAR" ]; then
+if [ -f $CLIENT_TAR ]; then
echo " For CLIENT_TAR... $CLIENT_TAR" | tee -a ${MY_LOG_FILE}
echo " For ODB_TAR... $ODB_TAR" | tee -a ${MY_LOG_FILE}
echo " For LNXDRVR_TAR... $LNXDRVR_TAR" | tee -a ${MY_LOG_FILE}
@@ -78,18 +78,12 @@ echo | tee -a ${MY_LOG_FILE}
if [ -d dcs-* ]; then
echo "DCS files already exist, skipping DCS setup" | tee -a ${MY_LOG_FILE}
else
- if [ -n "$DCS_URL" ]; then
- echo "Downloading DCS Tar: $DCS_URL" | tee -a ${MY_LOG_FILE}
- rm -f dcs_download.tar
- curl ${DCS_URL} -o dcs_download.tar
- DCS_TAR=./dcs_download.tar
- else
- if [ -f "$DCS_TAR" ]; then
+ if [ -f $DCS_TAR ]; then
echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
- elif [ -d "$DCS_SRC" ]; then
+ elif [ -d "$DCS_SRC" ]; then
echo "DCS tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
echo "Building DCS tar file" | tee -a ${MY_LOG_FILE}
- if [ -f "$MY_SQROOT/export/lib/jdbcT4.jar" ]; then
+ if [ -f $MY_SQROOT/export/lib/jdbcT4.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
@@ -100,7 +94,6 @@ else
echo "Please build the core Trafodion component" | tee -a ${MY_LOG_FILE}
exit 2
fi
- fi
fi
# Install DCS
@@ -159,15 +152,9 @@ echo | tee -a ${MY_LOG_FILE}
if [ -d rest-* ]; then
echo "REST files already exist, skipping REST setup"
else
- if [ -n "$REST_URL" ]; then
- echo "Downloading REST Tar: $REST_URL" | tee -a ${MY_LOG_FILE}
- rm -f rest_download.tar
- curl ${REST_URL} -o rest_download.tar
- REST_TAR=./rest_download.tar
- else
- if [ -f "$REST_TAR" ]; then
+ if [ -f $REST_TAR ]; then
echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
- elif [ -d "$REST_SRC" ]; then
+ elif [ -d "$REST_SRC" ]; then
echo "REST tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
echo "Building REST tar file" | tee -a ${MY_LOG_FILE}
if [ -f $MY_SQROOT/export/lib/jdbcT4.jar ]; then
@@ -180,7 +167,6 @@ else
echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. Please build the core Trafodion components" | tee -a ${MY_LOG_FILE}
exit 2
fi
- fi
fi
# Install REST
@@ -233,7 +219,7 @@ HNAME=localhost:$MY_DCS_MASTER_PORT
UNAME=zz
PWORD=zz
-$MY_SQROOT/trafci/bin/trafci.sh -h $HNAME -u $UNAME -p $PWORD
+$MY_SQROOT/trafci/bin/trafci.sh -h "$HNAME" -u "$UNAME" -p "$PWORD"
EOF
chmod +x $MY_SQROOT/sql/scripts/swtrafci
else
@@ -250,7 +236,7 @@ PHXDIR=$MY_SW_ROOT/tests/phx
if [ -d "$PHXDIR" ]; then
echo "Phoenix tests already exist $PHXDIR, skipping Phoenix test setup" | tee -a ${MY_LOG_FILE}
else
- if [ -f "$PHX_TAR" ]; then
+ if [ -f $PHX_TAR ]; then
echo "Installing Phoenix tests $PHX_TAR"| tee -a ${MY_LOG_FILE}
tar -xzf $PHX_TAR | tee -a ${MY_LOG_FILE}
echo "Successfully installed Phoenix tests "| tee -a ${MY_LOG_FILE}
@@ -292,10 +278,10 @@ echo | tee -a ${MY_LOG_FILE}
LNXDRVR=$MY_SW_ROOT/lnxdrvr
-if [ -d $LNXDRVR ]; then
+if [ -d "$LNXDRVR" ]; then
echo "Linux driver files already exist $LNXDRVR, skipping Linux Driver setup" | tee -a ${MY_LOG_FILE}
else
- if [ -f "$LNXDRVR_TAR" ]; then
+ if [ -f $LNXDRVR_TAR ]; then
echo "Installing Linux driver: $LNXDRV"| tee -a ${MY_LOG_FILE}
mkdir -p $LNXDRVR | tee -a ${MY_LOG_FILE}
cd $LNXDRVR
@@ -325,10 +311,10 @@ echo | tee -a ${MY_LOG_FILE}
ODBLOC=$MY_SW_ROOT/odb
-if [ -d $ODBLOC ]; then
+if [ -d "$ODBLOC" ]; then
echo "ODB files already exist $ODBLOC, skipping ODB setup" | tee -a ${MY_LOG_FILE}
else
- if [ -f "$ODB_TAR" ]; then
+ if [ -f $ODB_TAR ]; then
echo "Installing ODB tool: $ODBLOC"| tee -a ${MY_LOG_FILE}
mkdir -p $ODBLOC | tee -a ${MY_LOG_FILE}
cd $ODBLOC
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e2cfb6ef/dcs/src/test/pytests/test-requirements.txt
----------------------------------------------------------------------
diff --git a/dcs/src/test/pytests/test-requirements.txt b/dcs/src/test/pytests/test-requirements.txt
index 6a0ba66..c606808 100644
--- a/dcs/src/test/pytests/test-requirements.txt
+++ b/dcs/src/test/pytests/test-requirements.txt
@@ -6,6 +6,6 @@ mock>=1.0
sphinx>=1.1.2,<1.2
testrepository>=0.0.17
testtools>=0.9.32
-configparser>=3.3.0r2
+configparser>=3.3.0
xmlrunner>=1.7.4
http://pyodbc.googlecode.com/files/pyodbc-3.0.7.zip
[10/14] incubator-trafodion git commit: Updateed .gitignore for dcs
Posted by db...@apache.org.
Updateed .gitignore for dcs
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/61b39c48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/61b39c48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/61b39c48
Branch: refs/heads/master
Commit: 61b39c48b1214057d397176e65be17e700956966
Parents: 1a4ca5d
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Sep 25 16:57:22 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Sep 25 16:57:22 2015 +0000
----------------------------------------------------------------------
dcs/.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61b39c48/dcs/.gitignore
----------------------------------------------------------------------
diff --git a/dcs/.gitignore b/dcs/.gitignore
index f166c78..aa3579f 100644
--- a/dcs/.gitignore
+++ b/dcs/.gitignore
@@ -1,3 +1,4 @@
mvn.out
target/*
/target/
+*.log
[05/14] incubator-trafodion git commit: additional fixes
Posted by db...@apache.org.
additional fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/29dc56e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/29dc56e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/29dc56e3
Branch: refs/heads/master
Commit: 29dc56e391d2e276c0e48ab423828f283b4cba9f
Parents: e80eefc
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Wed Sep 23 05:04:56 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Wed Sep 23 05:04:56 2015 +0000
----------------------------------------------------------------------
core/Makefile | 8 +-
core/sqf/Makefile | 6 ++
core/sqf/sqenvcom.sh | 2 +
core/sqf/sql/scripts/install_local_hadoop | 14 ++-
core/sqf/sql/scripts/install_traf_components | 109 ++++++++++++++--------
core/sqf/sql/scripts/sqconfig | 24 -----
6 files changed, 93 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/29dc56e3/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 3d845d8..4378452 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -28,7 +28,7 @@ include macros.gmk
# Make Targets
.PHONY: all dbsecurity foundation $(MPI_TARGET) ndcs ci jdbc_jar jdbc_type2_jar sqroot $(SEAMONSTER_TARGET) verhdr dcs rest odb
-.PHONY: package package-all pkg-product pkg-sql-regress pkg-phx-tests check-copyrights
+.PHONY: package package-all pkg-product pkg-sql-regress pkg-phx-tests pkg-dcs-tests check-copyrights
################
### Main targets
@@ -128,7 +128,7 @@ cleanall: sqroot
cd ../dcs && $(MAVEN) clean
$(RM) -r ../${DISTRIBUTION_DIR}
-package-all: package pkg-sql-regress pkg-phx-tests
+package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
pkg-product: all
cd sqf && $(MAKE) package 2>&1 | sed -e "s/$$/ ##(Package)/";exit $${PIPESTATUS[0]}
@@ -144,6 +144,10 @@ pkg-sql-regress: all
pkg-phx-tests: all
cd sqf && $(MAKE) package-phx 2>&1 | sed -e "s/$$/ ##(Package phoenix)/";exit $${PIPESTATUS[0]}
+# Package dcs tests
+pkg-dcs-tests: all
+ cd sqf && $(MAKE) package-dcs 2>&1 | sed -e "s/$$/ ##(Package dcs tests)/";exit $${PIPESTATUS[0]}
+
version:
@cd sqf; unset SQ_VERBOSE; source sqenv.sh ; echo "$${TRAFODION_VER}"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/29dc56e3/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index dafa12b..f2da684 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -247,6 +247,7 @@ genverhdr:
PKG_PROD = trafodion
PKG_PHX = phoenix
+PKG_DCS = dcs
ifeq ($(SQ_BUILD_TYPE),release)
PKG_TYPE="server-$(TRAFODION_VER)"
@@ -260,6 +261,7 @@ PKG_TAR_UN = "${PKG_PROD}_${SQ_BUILD_TYPE}.tar"
SRC_PKG_BIN ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}-src.bin"
SRC_PKG_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}-src.tgz"
PKG_PHX_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PHX}-tests.tgz"
+PKG_DCS_TEST_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_DCS}-tests.tgz"
PKG_BIN_OBJS ?= export/bin$(SQ_MBTYPE) export/include export/lib export/lib$(SQ_MBTYPE) export/share gdb sql/scripts sqenvcom.sh opt tools conf src/seatrans/hbase-trx hbase_utilities/backup_and_restore
@@ -332,6 +334,10 @@ package-regress:
package-phx:
tar chzf $(PKG_PHX_TAR) ../../tests/phx
+# Targets to tar/gzip the dcs tests
+package-dcs:
+ tar chzf $(PKG_DCS_TEST_TAR) ../../dcs/src/test
+
# Targets to tar/gzip the self installer with sources
srcpackagebin:
-rm etc/ms.env
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/29dc56e3/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index cf94e7c..8e20c94 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -495,6 +495,7 @@ elif [[ -e $MY_SQROOT/sql/scripts/install_local_hadoop
&& -e ${HBASE_TRXDIR}/${HBASE_TRX_JAR}
&& -e $MY_SQROOT/export/lib/trafodion-sql-${TRAFODION_VER}.jar
&& -e $MY_SQROOT/export/lib/trafodion-HBaseAccess-${TRAFODION_VER}.jar
+ && -e $MY_SQROOT/export/lib/jdbcT4.jar
&& -e $MY_SQROOT/export/lib/jdbcT2.jar ]]; then
# Several built files exist, perhaps by unpackaging a file from downloads.trafodion.org,
@@ -744,6 +745,7 @@ SQ_CLASSPATH=${SQ_CLASSPATH}${HBASE_TRXDIR}:\
${HBASE_TRXDIR}/${HBASE_TRX_JAR}:\
$MY_SQROOT/export/lib/trafodion-sql-${TRAFODION_VER}.jar:\
$MY_SQROOT/export/lib/trafodion-HBaseAccess-${TRAFODION_VER}.jar:\
+$MY_SQROOT/export/lib/jdbcT4.jar:\
$MY_SQROOT/export/lib/jdbcT2.jar
# Check whether the current shell environment changed from a previous execution of this
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/29dc56e3/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 dda586e..ed06708 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -245,7 +245,9 @@ function listports {
MY_YARN_NM_PORT_NUM
MY_YARN_RESMAN_PORT_NUM
MY_YARN_SCHED_PORT_NUM
- MY_YARN_TRACKER_PORT_NUM"
+ MY_YARN_TRACKER_PORT_NUM
+ MY_DB_MGR_PORT
+ MY_DB_MGR_SECURE_PORT"
for AVAR in $VARS_FOR_PORTS; do
AVALUE="$(eval "echo \$$AVAR")"
@@ -858,7 +860,7 @@ EOF
<a href="http://${MY_HOST_1}:${MY_HADOOP_NN_HTTP_PORT_NUM}">HDFS Admin</a>
<a href="http://${MY_HOST_1}:${MY_YARN_HTTP_PORT_NUM}">Yarn</a>
<a href="http://${MY_HOST_1}:${MY_HBASE_MASTER_INFO_PORT_NUM}">HBase Master</a>
-<a href="http://${MY_HOST_1}:${MY_DCS_MASTER_INFO_PORT}">DCS Master</a>
+<a href="http://${MY_HOST_1}:${MY_DCS_MASTER_PORT}">DCS Master</a>
</pre>
</BODY>
</HTML>
@@ -1561,8 +1563,12 @@ cat >$HOME/.rest-site.xml-$USER <<EOF
EOF
#For clients
-cat >$HOME/.dcs-masterport-$USER <<EOF
-$MY_DCS_MASTER_PORT
+cat >$HOME/.traf-clports-$USER <<EOF
+DCS_MASTER=$MY_DCS_MASTER_PORT
+REST_SERVER=$MY_REST_SERVER_PORT
+REST_SECURE_SERVER=$MY_REST_SERVER_SECURE_PORT
+DB_MGR=$MY_DB_MGR_PORT
+DB_SECURE_MGR=$MY_DB_MGR_SECURE_PORT
EOF
echo
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/29dc56e3/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 8b61d40..87ee72d 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -13,30 +13,29 @@ REST_SRC=$MY_SQROOT/../rest
PHX_SRC=$MY_SQROOT/../../tests/phx
TRAF_TARS=$MY_SQROOT/../../distribution
-MY_DCS_MASTER_PORT=`cat $HOME/.dcs-masterport-$USER`
+MY_DCS_MASTER_PORT=`cat $HOME/.traf-clports-$USER |grep DCS_MASTER |cut -d "=" -f2`
if [ -z "$DCS_TAR" ]; then
- DCS_TAR=$TRAF_TARS/dcs*tar.gz
+ DCS_TAR=$(ls $TRAF_TARS/dcs*tar.gz 2>/dev/null)
fi
if [ -z "$REST_TAR" ]; then
- REST_TAR=$TRAF_TARS/rest*tar.gz
+ REST_TAR=$(ls $TRAF_TARS/rest*tar.gz 2>/dev/null)
fi
if [ -z "$PHX_TAR" ]; then
- PHX_TAR=$TRAF_TARS/phoenix*.tgz
+ PHX_TAR=$(ls $TRAF_TARS/phoenix*.tgz 2>/dev/null)
fi
if [ -z "$CLIENT_TAR" ]; then
- CLIENT_TAR=$TRAF_TARS/*clients*.tgz
+ CLIENT_TAR=$(ls $TRAF_TARS/*clients*.tgz 2>/dev/null)
fi
-if [ -f $CLIENT_TAR ]; then
+if [[ -f $CLIENT_TAR ]]; then
cd $MY_SW_ROOT
- tar -xzf $CLIENT_TAR *Linux*
- tar -xzf $CLIENT_TAR *odb*
- LNXDRVR_TAR=$MY_SW_ROOT/clients/*Linux*.gz
- ODB_TAR=$MY_SW_ROOT/clients/*odb*.gz
+ tar -xzf $CLIENT_TAR
+ LNXDRVR_TAR=$(ls $MY_SW_ROOT/clients/*Linux*.gz 2>/dev/null)
+ ODB_TAR=$(ls $MY_SW_ROOT/clients/*odb*.gz 2>/dev/null)
fi
echo | tee ${MY_LOG_FILE}
@@ -46,7 +45,7 @@ echo | tee -a ${MY_LOG_FILE}
echo "Environment used for core, DCS, REST and Phonenix ..." | tee -a ${MY_LOG_FILE}
echo | tee -a ${MY_LOG_FILE}
-if [ ! -d "$DCS_SRC" ]; then
+if [[ ! -d $DCS_SRC ]]; then
echo "Using only tar distribution and does not include source..."
echo | tee -a ${MY_LOG_FILE}
else
@@ -60,11 +59,11 @@ echo " For local hadoop... $MY_SW_ROOT" | tee -a ${MY_LOG_FILE}
echo " For DCS_TAR... $DCS_TAR" | tee -a ${MY_LOG_FILE}
echo " For REST_TAR... $REST_TAR" | tee -a ${MY_LOG_FILE}
-if [ -f $PHX_TAR ]; then
+if [[ -f $PHX_TAR ]]; then
echo " For PHX_TAR... $PHX_TAR" | tee -a ${MY_LOG_FILE}
fi
-if [ -f $CLIENT_TAR ]; then
+if [[ -f $CLIENT_TAR ]]; then
echo " For CLIENT_TAR... $CLIENT_TAR" | tee -a ${MY_LOG_FILE}
echo " For ODB_TAR... $ODB_TAR" | tee -a ${MY_LOG_FILE}
echo " For LNXDRVR_TAR... $LNXDRVR_TAR" | tee -a ${MY_LOG_FILE}
@@ -78,12 +77,12 @@ echo | tee -a ${MY_LOG_FILE}
if [ -d dcs-* ]; then
echo "DCS files already exist, skipping DCS setup" | tee -a ${MY_LOG_FILE}
else
- if [ -f $DCS_TAR ]; then
+ if [[ -f $DCS_TAR ]]; then
echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
- elif [ -d "$DCS_SRC" ]; then
+ elif [[ -d $DCS_SRC ]]; then
echo "DCS tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
echo "Building DCS tar file" | tee -a ${MY_LOG_FILE}
- if [ -f $MY_SQROOT/export/lib/jdbcT4.jar ]; then
+ if [[ -f $MY_SQROOT/export/lib/jdbcT4.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
@@ -96,6 +95,10 @@ else
fi
fi
+ if [[ ! -f $DCS_TAR ]]; then
+ echo "**** ERROR: DCS tar file not found. " | tee -a ${MY_LOG_FILE}
+ exit 2
+ fi
# Install DCS
echo "Installing DCS from: $DCS_TAR" | tee -a ${MY_LOG_FILE}
tar xzf $DCS_TAR | tee -a ${MY_LOG_FILE}
@@ -152,12 +155,12 @@ echo | tee -a ${MY_LOG_FILE}
if [ -d rest-* ]; then
echo "REST files already exist, skipping REST setup"
else
- if [ -f $REST_TAR ]; then
+ if [[ -f $REST_TAR ]]; then
echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
- elif [ -d "$REST_SRC" ]; then
+ elif [[ -d $REST_SRC ]]; then
echo "REST tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
echo "Building REST tar file" | tee -a ${MY_LOG_FILE}
- if [ -f $MY_SQROOT/export/lib/jdbcT4.jar ]; then
+ if [[ -f $MY_SQROOT/export/lib/jdbcT4.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
@@ -169,6 +172,11 @@ else
fi
fi
+ if [[ ! -f $REST_TAR ]]; then
+ echo "**** ERROR: REST tar file not found" | tee -a ${MY_LOG_FILE}
+ exit 2
+ fi
+
# Install REST
echo "Installing REST from: $REST_TAR" | tee -a ${MY_LOG_FILE}
tar xzf $REST_TAR | tee -a ${MY_LOG_FILE}
@@ -215,11 +223,7 @@ then
cat <<EOF >$MY_SQROOT/sql/scripts/swtrafci
#!/bin/sh
# command to run trafci
-HNAME=localhost:$MY_DCS_MASTER_PORT
-UNAME=zz
-PWORD=zz
-
-$MY_SQROOT/trafci/bin/trafci.sh -h "$HNAME" -u "$UNAME" -p "$PWORD"
+$MY_SQROOT/trafci/bin/trafci.sh -h localhost:$MY_DCS_MASTER_PORT -u zz -p zz
EOF
chmod +x $MY_SQROOT/sql/scripts/swtrafci
else
@@ -233,20 +237,21 @@ echo | tee -a ${MY_LOG_FILE}
PHXDIR=$MY_SW_ROOT/tests/phx
-if [ -d "$PHXDIR" ]; then
+if [[ -d $PHXDIR ]]; then
echo "Phoenix tests already exist $PHXDIR, skipping Phoenix test setup" | tee -a ${MY_LOG_FILE}
else
- if [ -f $PHX_TAR ]; then
+ if [[ -f $PHX_TAR ]]; then
echo "Installing Phoenix tests $PHX_TAR"| tee -a ${MY_LOG_FILE}
tar -xzf $PHX_TAR | tee -a ${MY_LOG_FILE}
echo "Successfully installed Phoenix tests "| tee -a ${MY_LOG_FILE}
- elif [ -d "$PHX_SRC" ]; then
+ elif [[ -d $PHX_SRC ]]; then
echo "Phoenix files already exist $PHX_SRC skipping Phoenix setup" | tee -a ${MY_LOG_FILE}
PHXDIR=$PHX_SRC
fi
-echo "Adding swphoenix script..." | tee -a ${MY_LOG_FILE}
- cat <<EOF >$MY_SQROOT/sql/scripts/swphoenix
+ if [[ -d $PHXDIR ]]; then
+ echo "Adding swphoenix script..." | tee -a ${MY_LOG_FILE}
+ cat <<EOF >$MY_SQROOT/sql/scripts/swphoenix
#!/bin/sh
# command to run phoenix tests
@@ -266,7 +271,8 @@ else
fi
EOF
- chmod +x $MY_SQROOT/sql/scripts/swphoenix
+ chmod +x $MY_SQROOT/sql/scripts/swphoenix
+ fi
fi
# End of Phoenix setup
@@ -278,11 +284,11 @@ echo | tee -a ${MY_LOG_FILE}
LNXDRVR=$MY_SW_ROOT/lnxdrvr
-if [ -d "$LNXDRVR" ]; then
+if [[ -d $LNXDRVR ]]; then
echo "Linux driver files already exist $LNXDRVR, skipping Linux Driver setup" | tee -a ${MY_LOG_FILE}
else
- if [ -f $LNXDRVR_TAR ]; then
- echo "Installing Linux driver: $LNXDRV"| tee -a ${MY_LOG_FILE}
+ if [[ -f $LNXDRVR_TAR ]]; then
+ echo "Installing Linux driver: $LNXDRVR"| tee -a ${MY_LOG_FILE}
mkdir -p $LNXDRVR | tee -a ${MY_LOG_FILE}
cd $LNXDRVR
tar -xzf $LNXDRVR_TAR | tee -a ${MY_LOG_FILE}
@@ -297,8 +303,6 @@ EOF
mv TRAFDSN TRAFDSN.orig | tee -a ${MY_LOG_FILE}
sed -e "s@TCP:1.2.3.4:23400@TCP:localhost:$MY_DCS_MASTER_PORT@" TRAFDSN.orig >> TRAFDSN | tee -a ${MY_LOG_FILE}
echo "Successfully installed linux driver in $LNXDRVR"| tee -a ${MY_LOG_FILE}
- else
- echo "Linux driver tar file not found. Please install it manually..." | tee -a ${MY_LOG_FILE}
fi
fi
@@ -311,21 +315,46 @@ echo | tee -a ${MY_LOG_FILE}
ODBLOC=$MY_SW_ROOT/odb
-if [ -d "$ODBLOC" ]; then
+if [[ -d $ODBLOC ]]; then
echo "ODB files already exist $ODBLOC, skipping ODB setup" | tee -a ${MY_LOG_FILE}
else
- if [ -f $ODB_TAR ]; then
+ if [[ -f $ODB_TAR ]]; then
echo "Installing ODB tool: $ODBLOC"| tee -a ${MY_LOG_FILE}
mkdir -p $ODBLOC | tee -a ${MY_LOG_FILE}
cd $ODBLOC
tar -xzf $ODB_TAR | tee -a ${MY_LOG_FILE}
echo "Successfully installed ODB tool in $ODBLOC"| tee -a ${MY_LOG_FILE}
- else
- echo "ODB tar file not found. Please install it manually after installing linux odbc driver..." | tee -a ${MY_LOG_FILE}
fi
fi
-# End setup of ODB load told
+# End setup of ODB load tool
+
+# Begin setup of PyODBC test
+
+cd $MY_SW_ROOT
+
+echo | tee -a ${MY_LOG_FILE}
+# Begin configure of PyODBC test
+
+if [[ -n "$DCS_SRC" ]]
+ then
+ if [[ -f $LNXDRVR_TAR ]]; then
+ echo "Linux driver exists. Adding swpyodbc script...." | tee -a ${MY_LOG_FILE}
+ cat <<EOF >$MY_SQROOT/sql/scripts/swpyodbc
+#!/bin/sh
+# command to run Python ODBC tests
+cd $DCS_SRC/src/test/pytests
+./config.sh -d localhost:$MY_DCS_MASTER_PORT -t $LNXDRVR_TAR
+tox -e py27
+
+EOF
+ chmod +x $MY_SQROOT/sql/scripts/swpyodbc
+ fi
+fi
+
+# End setup of PyODBC test
+
+cds
echo | tee -a ${MY_LOG_FILE}
echo "Configuration scripts for DCS, REST, TRAFCI and Phoenix test are set up " | tee -a ${MY_LOG_FILE}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/29dc56e3/core/sqf/sql/scripts/sqconfig
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqconfig b/core/sqf/sql/scripts/sqconfig
index 5f4b8d5..393600f 100644
--- a/core/sqf/sql/scripts/sqconfig
+++ b/core/sqf/sql/scripts/sqconfig
@@ -98,33 +98,9 @@ $DATA3
$DATA4
end tse
-# NDCS association server
-# port [port range] [edgenode 1] [edgenode 2]
-# If the block is present with no entries only the single default port (18650)
-# is configured.
-# begin ndcs
-port 17000
-# end ndcs
-
# Overflow directories for ssd and hdd. Format: [overflow type] [directory]
begin overflow
hdd $MY_SQROOT/tmp
#ssd /ssd/directory
end overflow
-# Section to configure BDR (Bulk Data Replicator).
-# To configure BDR, uncomment the following section and
-# provide appropriate values for the attributes.
-#begin bdr
-#bdr_cluster_name <Seven character SQ cluster name>
-#bdr_ip_address <External IP Address of the node where the mxbdrsrv process $ZBDR would run>
-#bdr_node_id <Logical node id where the mxbdrsrv process $ZBDR process would run
-#bdr_port_number <Listening port number for the mxbdrsrv process - should reserve m+1 port numbers where m is the number of sql nodes>
-#end bdr
-
-#begin floating_ip
-#process=$MXOAS;interface=bond1;external-ip=xxx.xxx.xx.xxx
-#process=$MXOAS;interface=eth0;internal-ip=xxx.xxx.xxx.xxx
-#floating_ip_node_id 1
-#floating_ip_failover_node_id 0
-#end floating_ip
[14/14] incubator-trafodion git commit: Merge [TRAFODION-1498] PR 93
Fix DCS problem in install_local_hadoop
Posted by db...@apache.org.
Merge [TRAFODION-1498] PR 93 Fix DCS problem in install_local_hadoop
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/469408f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/469408f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/469408f8
Branch: refs/heads/master
Commit: 469408f8e7e27d7239b6f16bdb1a2e43e564f207
Parents: 91cd234 9cfd17d
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Sep 30 16:36:55 2015 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Sep 30 16:36:55 2015 +0000
----------------------------------------------------------------------
.gitignore | 1 +
Makefile | 25 ++
core/Makefile | 45 ++-
core/conn/Makefile | 6 +-
.../unixcli/package/trafodbclnx_install.sh | 5 -
core/macros.gmk | 1 +
core/rest/Makefile | 6 +-
core/rest/genvers | 22 +-
core/rest/src/saveVersion.sh | 11 +-
core/sqf/Makefile | 21 +-
core/sqf/sqenvcom.sh | 1 +
core/sqf/sql/scripts/dcscheck | 108 ++++-
core/sqf/sql/scripts/install_local_hadoop | 273 ++-----------
core/sqf/sql/scripts/install_traf_components | 401 +++++++++++++++++++
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqconfig | 24 --
dcs/.gitignore | 1 +
dcs/Makefile | 52 +++
dcs/genvers | 24 ++
dcs/src/saveVersion.sh | 15 +-
env.sh | 24 ++
wms/src/saveVersion.sh | 7 +-
22 files changed, 752 insertions(+), 323 deletions(-)
----------------------------------------------------------------------
[09/14] incubator-trafodion git commit: Fixed the version for DCS and
REST
Posted by db...@apache.org.
Fixed the version for DCS and REST
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1a4ca5dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1a4ca5dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1a4ca5dd
Branch: refs/heads/master
Commit: 1a4ca5dd6282ddc670950f2c4ad9825a1d31ad13
Parents: 8f5d14f
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Sep 25 03:32:01 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Sep 25 03:32:01 2015 +0000
----------------------------------------------------------------------
core/rest/src/saveVersion.sh | 8 ++++----
dcs/src/saveVersion.sh | 13 ++++++-------
wms/src/saveVersion.sh | 2 +-
3 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1a4ca5dd/core/rest/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/core/rest/src/saveVersion.sh b/core/rest/src/saveVersion.sh
index cef343b..c0cd4a3 100644
--- a/core/rest/src/saveVersion.sh
+++ b/core/rest/src/saveVersion.sh
@@ -26,10 +26,10 @@ outputDirectory=$2
user=`whoami`
date=`date`
cwd=`pwd`
-if [ -d ../../.git ]; then
- revision=`git log -1 --pretty=format:"%H"`
- hostname=`hostname`
- url="git://${hostname}${cwd}"
+if [[ -d ../../.git ]]; then
+ revision=`git log -1 --pretty=format:"%h"`
+ hostname=`hostname`
+ url="git://${hostname}${cwd}"
else
revision="Unknown"
url="file://$cwd"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1a4ca5dd/dcs/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/dcs/src/saveVersion.sh b/dcs/src/saveVersion.sh
index 446729a..d4d8d76 100644
--- a/dcs/src/saveVersion.sh
+++ b/dcs/src/saveVersion.sh
@@ -41,15 +41,14 @@ outputDirectory=$2
user=`whoami`
date=`date`
cwd=`pwd`
-if [ -d ../../.git ]; then
- revision=`git log -1 --pretty=format:"%H"`
- hostname=`hostname`
- url="git://${hostname}${cwd}"
+if [[ -d ../../.git ]]; then
+ revision=`git log -1 --pretty=format:"%h"`
+ hostname=`hostname`
+ url="git://${hostname}${cwd}"
else
- revision="Unknown"
- url="file://$cwd"
+ revision="Unknown"
+ url="file://$cwd"
fi
-
mkdir -p "$outputDirectory/org.trafodion.dcs"
cat >"$outputDirectory/org.trafodion.dcs/package-info.java" <<EOF
/*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1a4ca5dd/wms/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/wms/src/saveVersion.sh b/wms/src/saveVersion.sh
index 91232bc..4fee8fc 100644
--- a/wms/src/saveVersion.sh
+++ b/wms/src/saveVersion.sh
@@ -26,7 +26,7 @@ user=`whoami`
date=`date`
cwd=`pwd`
if [ -d ../../.git ]; then
- revision=`git log -1 --pretty=format:"%H"`
+ revision=`git log -1 --pretty=format:"%h"`
hostname=`hostname`
url="git://${hostname}${cwd}"
else
[07/14] incubator-trafodion git commit: Included eclipse project for
dcs
Posted by db...@apache.org.
Included eclipse project for dcs
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c07c6711
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c07c6711
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c07c6711
Branch: refs/heads/master
Commit: c07c67116d0c1967a4b870d71c737ddd591decd3
Parents: 020e648
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Thu Sep 24 06:20:15 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Thu Sep 24 06:20:15 2015 +0000
----------------------------------------------------------------------
core/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c07c6711/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 94e3b7b..70e5ccf 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -160,7 +160,7 @@ find-absolute-dlls:
check-copyrights:
python ./updateCopyrightCheck.py
-eclipse: rest/.project sql/.project sqf/src/seatrans/hbase-trx/.project .project
+eclipse: rest/.project dcs/.project sql/.project sqf/src/seatrans/hbase-trx/.project .project
@echo
@echo
@echo " Now you can import 5 projects in Eclipse:"
@@ -175,6 +175,9 @@ eclipse: rest/.project sql/.project sqf/src/seatrans/hbase-trx/.project .project
rest/.project:
cd rest && $(MAVEN) eclipse:eclipse
+dcs/.project:
+ cd ../dcs && $(MAVEN) eclipse:eclipse
+
sql/.project:
cd sql && $(MAVEN) eclipse:eclipse
[08/14] incubator-trafodion git commit: Additional cleanup
Posted by db...@apache.org.
Additional cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8f5d14f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8f5d14f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8f5d14f4
Branch: refs/heads/master
Commit: 8f5d14f45b6275dd3558e25bd252f0ac3b8ef158
Parents: c07c671
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Thu Sep 24 18:35:21 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Thu Sep 24 18:35:21 2015 +0000
----------------------------------------------------------------------
core/Makefile | 11 +++++++++++
core/rest/Makefile | 2 +-
core/rest/src/saveVersion.sh | 5 +----
core/sqf/sql/scripts/dcscheck | 2 +-
core/sqf/sql/scripts/sqcheck | 2 +-
dcs/Makefile | 2 +-
dcs/src/saveVersion.sh | 12 +++++-------
wms/src/saveVersion.sh | 5 +----
8 files changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f5d14f4/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 70e5ccf..c63384e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -97,6 +97,10 @@ rest: verhdr jdbc_jar
odb: ndcs
cd conn/odb && $(MAKE) 2>&1 | sed -e "s/$$/ ##(ODB)/" ; exit $${PIPESTATUS[0]}
+cleantests:
+ cd ../dcs/src/test/pytests && $(RM) -r odbc* tox.ini config.ini .tox .testrep* env.sh test_p2.pyc
+ cd ../dcs/src/test/jdbc_test && $(RM) -r jdbcprop pom.xml target
+
clean: sqroot
cd $(MPI_TARGET) && $(MAKE) clean-local
cd $(SEAMONSTER_TARGET)/src && $(MAKE) clean
@@ -187,3 +191,10 @@ sqf/src/seatrans/hbase-trx/.project:
.project:
cp sqf/export/limited-support-tools/eclipse.project .project
cp sqf/export/limited-support-tools/eclipse.cproject .cproject
+
+eclipseclean:
+ $(RM) rest/.classpath rest/.project
+ $(RM) ../dcs/.classpath ../dcs/.project
+ $(RM) sql/.classpath sql/.project
+ $(RM) sqf/src/seatrans/hbase-trx/.classpath sqf/src/seatrans/hbase-trx/.project
+ $(RM) .cproject .project
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f5d14f4/core/rest/Makefile
----------------------------------------------------------------------
diff --git a/core/rest/Makefile b/core/rest/Makefile
index 0d74718..e206c05 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -37,7 +37,7 @@ build_all:
echo "### For full Maven output, see file build_rest.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_rest.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
mkdir -p ../../${DISTRIBUTION_DIR}
- cp target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
+ cp -pf target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
$(RM) $(VFILE)
build_chk:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f5d14f4/core/rest/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/core/rest/src/saveVersion.sh b/core/rest/src/saveVersion.sh
index 032630b..cef343b 100644
--- a/core/rest/src/saveVersion.sh
+++ b/core/rest/src/saveVersion.sh
@@ -26,10 +26,7 @@ outputDirectory=$2
user=`whoami`
date=`date`
cwd=`pwd`
-if [ -d .svn ]; then
- revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
- url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
-elif [ -d .git ]; then
+if [ -d ../../.git ]; then
revision=`git log -1 --pretty=format:"%H"`
hostname=`hostname`
url="git://${hostname}${cwd}"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f5d14f4/core/sqf/sql/scripts/dcscheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/dcscheck b/core/sqf/sql/scripts/dcscheck
index 4f5274e..ef132e1 100755
--- a/core/sqf/sql/scripts/dcscheck
+++ b/core/sqf/sql/scripts/dcscheck
@@ -111,7 +111,7 @@ if [[ $sq_stat == 0 ]]; then
echo "DcsMaster is listening on port $masterport"
echo
fi
- rm -f $dcstmp
+ rm -f $dcstmp $tmp_chk $tmp_ps
else
if ( [ "$actual_dcsmaster_cnt" '>' 0 ] || [ "$actual_dcsserver_cnt" '>' 0 ] ); then
echo "Partial DCS process is up and running. Please stop and restart DCS using 'dcsstop' and 'dcsstart' command..."
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f5d14f4/core/sqf/sql/scripts/sqcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheck b/core/sqf/sql/scripts/sqcheck
index 7a0a858..19d2c80 100755
--- a/core/sqf/sql/scripts/sqcheck
+++ b/core/sqf/sql/scripts/sqcheck
@@ -497,7 +497,7 @@ if [ $sq_up '==' 1 ]; then
elif ( [ $total_procs_result '==' 0 ] ); then
if [ $json_output '==' 0 ]; then
echo
- echo "The SQ environment is down."]
+ echo "The SQ environment is down."
fi
exit -1;
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f5d14f4/dcs/Makefile
----------------------------------------------------------------------
diff --git a/dcs/Makefile b/dcs/Makefile
index 6238f82..a3338a3 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -37,7 +37,7 @@ build_all:
echo "### For full Maven output, see file build_dcs.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
mkdir -p ../../${DISTRIBUTION_DIR}
- cp target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}/
+ cp -pf target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}/
$(RM) $(VFILE)
build_chk:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f5d14f4/dcs/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/dcs/src/saveVersion.sh b/dcs/src/saveVersion.sh
index 6d82e64..446729a 100644
--- a/dcs/src/saveVersion.sh
+++ b/dcs/src/saveVersion.sh
@@ -41,17 +41,15 @@ outputDirectory=$2
user=`whoami`
date=`date`
cwd=`pwd`
-if [ -d .svn ]; then
- revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
- url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
-elif [ -d .git ]; then
- revision=`git log -1 --pretty=format:"%H"`
- hostname=`hostname`
- url="git://${hostname}${cwd}"
+if [ -d ../../.git ]; then
+ revision=`git log -1 --pretty=format:"%H"`
+ hostname=`hostname`
+ url="git://${hostname}${cwd}"
else
revision="Unknown"
url="file://$cwd"
fi
+
mkdir -p "$outputDirectory/org.trafodion.dcs"
cat >"$outputDirectory/org.trafodion.dcs/package-info.java" <<EOF
/*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f5d14f4/wms/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/wms/src/saveVersion.sh b/wms/src/saveVersion.sh
index d604e26..91232bc 100644
--- a/wms/src/saveVersion.sh
+++ b/wms/src/saveVersion.sh
@@ -25,10 +25,7 @@ outputDirectory=$2
user=`whoami`
date=`date`
cwd=`pwd`
-if [ -d .svn ]; then
- revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
- url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
-elif [ -d .git ]; then
+if [ -d ../../.git ]; then
revision=`git log -1 --pretty=format:"%H"`
hostname=`hostname`
url="git://${hostname}${cwd}"
[02/14] incubator-trafodion git commit: Assigned ports to database
manager
Posted by db...@apache.org.
Assigned ports to database manager
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/67f8566f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/67f8566f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/67f8566f
Branch: refs/heads/master
Commit: 67f8566f621bf9964745017d37663bb0132f6d3e
Parents: 0b1fce2
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Thu Sep 17 16:22:53 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Thu Sep 17 16:22:53 2015 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_local_hadoop | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/67f8566f/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 e789519..dda586e 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -439,6 +439,10 @@ if [ $USE_DEFAULT_PORTS == 'yes' ]; then
MY_REST_SERVER_PORT=4200
# trafodion.rest.https.port
MY_REST_SERVER_SECURE_PORT=4201
+ # database.mgr.port
+ MY_DB_MGR_PORT=4205
+ # database.mgr.secure.port
+ MY_DB_MGR_SECURE_PORT=4206
else
# fs.default.name
MY_HADOOP_HDFS_PORT_NUM=$MY_START_PORT
@@ -467,6 +471,8 @@ else
MY_DCS_SERVER_INFO_PORT=`expr $MY_START_PORT + 182`
MY_REST_SERVER_PORT=`expr $MY_START_PORT + 183`
MY_REST_SERVER_SECURE_PORT=`expr $MY_START_PORT + 184`
+ MY_DB_MGR_PORT=`expr $MY_START_PORT + 185`
+ MY_DB_MGR_SECURE_PORT=`expr $MY_START_PORT + 186`
fi
# handle ports in the range of 50000 to 50199