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 2016/05/27 16:40:56 UTC
[01/15] incubator-trafodion git commit: sqcheck now displays
RESTServer status along with other components
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 5337acf49 -> 8a59ad263
sqcheck now displays RESTServer status along with other components
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8ac0b9f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8ac0b9f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8ac0b9f3
Branch: refs/heads/master
Commit: 8ac0b9f360db9b65bee08af1a963527b79524685
Parents: 8c87a9a
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 17 16:28:01 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 17 16:28:01 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/sqcheck | 40 +++++++++++++++++++++++++++++++++++----
1 file changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8ac0b9f3/core/sqf/sql/scripts/sqcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheck b/core/sqf/sql/scripts/sqcheck
index 6aaf0c0..e55bf7c 100755
--- a/core/sqf/sql/scripts/sqcheck
+++ b/core/sqf/sql/scripts/sqcheck
@@ -35,7 +35,7 @@ function Usage {
echo
echo "-i <nn> Number of times the check for SQ processes be done (Default $max_checks)"
echo "-d <nn> Duration of sleep (in seconds) between each check (Default $sleep_duration)"
- echo "-c <cc> Which component to check: [all | dtm | dcs | rms ] (Default $sqck_component)"
+ echo "-c <cc> Which component to check: [all | dtm | dcs | rms | rest ] (Default $sqck_component)"
echo "-f fast - (it's like running $0 -i 1 -d 0)"
echo "-r reset the iteration counter if the process count increases (as compared to the count in the last iteration)"
echo "-j Format the output in JSON. Used by REST server"
@@ -58,7 +58,8 @@ function GetOpts {
[ $t_ck == "all" ] ||
[ $t_ck == "dtm" ] ||
[ $t_ck == "dcs" ] ||
- [ $t_ck == "rms" ]
+ [ $t_ck == "rms" ] ||
+ [ $t_ck == "rest" ]
); then
sqck_component=${OPTARG}
else
@@ -149,6 +150,27 @@ function getDcsInfo {
fi
}
+function getRestInfo {
+ jpscmd=$JAVA_HOME/bin/jps
+
+ if [ -d $REST_INSTALL_DIR ];then
+
+### Check if there are any DcsMaster and DcsServer's that are started
+ if [ -e $SQ_PDSH ]; then
+ actual_restserver_cnt=`$SQ_PDSH $MY_NODES $jpscmd |grep TrafodionRest |wc -l`
+ else
+ actual_restserver_cnt=`$jpscmd |grep TrafodionRest |wc -l`
+ fi
+ let cfg_restserver_cnt=actual_restserver_cnt
+ if ( [ "$cfg_restserver_cnt" '!=' "$actual_restserver_cnt" ] ); then
+ let down_restserver_cnt=cfg_restserver_cnt-actual_restserver_cnt
+ else
+ down_restserver_cnt=''
+ fi
+ fi
+
+}
+
begin_time_seconds=$(date +%s)
declare -i max_checks
@@ -349,6 +371,9 @@ fi
done
fi
+ #TrafodionRestServer
+ getRestInfo
+
#MXOSRVR
getDcsInfo
let act_mxo_cnt=`< $sq_tmp_ps egrep -a -i ' mxosrvr' | wc -l`
@@ -505,7 +530,8 @@ if [ $json_output '==' 1 ]; then
json_rms=""\""PROCESS"\"":"\""RMS"\"","\""CONFIGURED"\"":$cfg_rms_cnt,"\""ACTUAL"\"":$act_rms_cnt,"\""DOWN"\"":\"${down_rms[*]}\""
json_mxosrvr=""\""PROCESS"\"":"\""MXOSRVR"\"","\""CONFIGURED"\"":$cfg_mxo_cnt,"\""ACTUAL"\"":$act_mxo_cnt,"\""DOWN"\"":\"${act_mxo_down_cnt}\""
json_dcsmaster=""\""PROCESS"\"":"\""DCSMASTER"\"","\""CONFIGURED"\"":$cfg_dcsmaster_cnt,"\""ACTUAL"\"":$actual_dcsmaster_cnt,"\""DOWN"\"":\"${down_dcsmaster_cnt}\""
- echo "[{$json_dtm},{$json_rms},{$json_dcsmaster},{$json_mxosrvr}]"
+ json_restserver=""\""PROCESS"\"":"\""RESTSERVER"\"","\""CONFIGURED"\"":$cfg_restserver_cnt,"\""ACTUAL"\"":$actual_restserver_cnt,"\""DOWN"\"":\"${down_restserver_cnt}\""
+ echo "[{$json_dtm},{$json_rms},{$json_dcsmaster},{$json_mxosrvr}, {$json_restserver}]"
elif [[ $sqck_component == "dtm" ]]; then
json_dtm=""\""PROCESS"\"":"\""DTM"\"","\""CONFIGURED"\"":$cfg_dtm_cnt,"\""ACTUAL"\"":$act_dtm_cnt,"\""DOWN"\"":\"${down_dtms[*]}\""
echo "[{$json_dtm}]"
@@ -516,6 +542,9 @@ if [ $json_output '==' 1 ]; then
json_mxosrvr=""\""PROCESS"\"":"\""MXOSRVR"\"","\""CONFIGURED"\"":$cfg_mxo_cnt,"\""ACTUAL"\"":$act_mxo_cnt,"\""DOWN"\"":\"${act_mxo_down_cnt}\""
json_dcsmaster=""\""PROCESS"\"":"\""DCSMASTER"\"","\""CONFIGURED"\"":$cfg_dcsmaster_cnt,"\""ACTUAL"\"":$actual_dcsmaster_cnt,"\""DOWN"\"":\"${down_dcsmaster_cnt}\""
echo "[{$json_dcsmaster},{$json_mxosrvr}]"
+ elif [[ $sqck_component == "rest" ]]; then
+ json_restserver=""\""PROCESS"\"":"\""RESTSERVER"\"","\""CONFIGURED"\"":$cfg_restserver_cnt,"\""ACTUAL"\"":$actual_restserver_cnt,"\""DOWN"\"":\"${down_restserver_cnt}\""
+ echo "[{$json_restserver}]"
fi
else
echo
@@ -526,7 +555,8 @@ else
echo -e "RMS\t\t$cfg_rms_cnt\t\t$act_rms_cnt\t ${down_rms[*]}"
echo -e "DcsMaster\t$cfg_dcsmaster_cnt\t\t$actual_dcsmaster_cnt\t $down_dcsmaster_cnt"
echo -e "DcsServer\t$cfg_dcsserver_cnt\t\t$actual_dcsserver_cnt\t $down_dcsserver_cnt"
- echo -e "mxosrvr\t\t$cfg_mxo_cnt\t\t$act_mxo_cnt\t ${act_mxo_down_cnt}\n"
+ echo -e "mxosrvr\t\t$cfg_mxo_cnt\t\t$act_mxo_cnt\t ${act_mxo_down_cnt}"
+ echo -e "RestServer\t$cfg_restserver_cnt\t\t$actual_restserver_cnt\t $down_restserver_cnt\n"
elif [[ $sqck_component == "dtm" ]]; then
echo -e "DTM\t\t$cfg_dtm_cnt\t\t$act_dtm_cnt\t ${down_dtms[*]}\n"
elif [[ $sqck_component == "rms" ]]; then
@@ -535,6 +565,8 @@ else
echo -e "DcsMaster\t$cfg_dcsmaster_cnt\t\t$actual_dcsmaster_cnt\t $down_dcsmaster_cnt"
echo -e "DcsServer\t$cfg_dcsserver_cnt\t\t$actual_dcsserver_cnt\t $down_dcsserver_cnt"
echo -e "mxosrvr\t\t$cfg_mxo_cnt\t\t$act_mxo_cnt\t ${act_mxo_down_cnt}\n"
+ elif [[ $sqck_component == "rest" ]]; then
+ echo -e "RestServer\t$cfg_restserver_cnt\t\t$actual_restserver_cnt\t $down_restserver_cnt\n"
fi
fi
[07/15] incubator-trafodion git commit: Linux odbc driver will now be
installed along with Server component Installer tar is packaged and
distributed with 'make pacakge-all' Fixed minor issues
Posted by db...@apache.org.
Linux odbc driver will now be installed along with Server component
Installer tar is packaged and distributed with 'make pacakge-all'
Fixed minor 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/9623bf17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9623bf17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9623bf17
Branch: refs/heads/master
Commit: 9623bf179cfee064deda6af60a17cb907b9ab4d4
Parents: 92aaccd
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 05:44:10 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 05:44:10 2016 +0000
----------------------------------------------------------------------
Makefile | 1 +
core/Makefile | 10 ++++++++--
core/conn/jdbcT4/src/main/java/T4Messages.properties | 4 ++--
core/conn/odbc/src/odbc/Makefile | 3 ++-
core/dbsecurity/scripts/sqcertgen | 5 -----
core/dbsecurity/scripts/update_auth | 9 +--------
install/Makefile | 6 ++++--
install/installer/traf_cloudera_mods | 1 -
install/installer/traf_config | 6 ------
9 files changed, 18 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 7258f30..c69e51e 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ package-src: $(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE
git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}-incubating/ HEAD > distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
tar rf distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar $^
gzip distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
+ rm -rf $(SRCDIR)-${TRAFODION_VER}-incubating LICENSE
$(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE:
cd licenses && $(MAKE) LICENSE-src
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index c6c3606..63ce053 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 pkg-dcs-tests check-copyrights
+.PHONY: package package-all pkg-product pkg-sql-regress pkg-phx-tests pkg-dcs-tests check-copyrights pkg-installer
################
### Main targets
@@ -113,6 +113,7 @@ clean: sqroot
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
cd sql/lib_mgmt && $(MAKE) clean
+ cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
cleanall: sqroot eclipseclean cleantests
@@ -128,9 +129,10 @@ cleanall: sqroot eclipseclean cleantests
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
cd sql/lib_mgmt && $(MAKE) cleanall
+ cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
-package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
+package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests pkg-installer
pkg-product: all
cd sqf && $(MAKE) package 2>&1 | sed -e "s/$$/ ##(Package)/";exit $${PIPESTATUS[0]}
@@ -150,6 +152,10 @@ pkg-phx-tests: all
pkg-dcs-tests: all
cd sqf && $(MAKE) package-dcs 2>&1 | sed -e "s/$$/ ##(Package dcs tests)/";exit $${PIPESTATUS[0]}
+# Package installer
+pkg-installer:
+ cd ../install && $(MAKE) 2>&1 | sed -e "s/$$/ ##(Package installer)/";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/9623bf17/core/conn/jdbcT4/src/main/java/T4Messages.properties
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/T4Messages.properties b/core/conn/jdbcT4/src/main/java/T4Messages.properties
index 24d6fb1..70f4c0c 100644
--- a/core/conn/jdbcT4/src/main/java/T4Messages.properties
+++ b/core/conn/jdbcT4/src/main/java/T4Messages.properties
@@ -492,7 +492,7 @@ driver_err_error_from_server_msg=An error was returned from the server. Error: {
driver_err_error_from_server_sqlstate=HY000
driver_err_error_from_server_sqlcode=29156
-problem_with_server_read_msg=There was a problem reading from the server
+problem_with_server_read_msg=Server aborted abnormally or Connection timed out
problem_with_server_read_sqlstate=HY000
problem_with_server_read_sqlcode=29157
@@ -683,4 +683,4 @@ cursor_is_before_first_row_sqlcode=29189
cursor_after_last_row_msg=The cursor is after last row, which could be due to the result set containing no rows, or all rows have been retrieved.
cursor_after_last_row_sqlstate=HY109
-cursor_after_last_row_sqlcode=29190
\ No newline at end of file
+cursor_after_last_row_sqlcode=29190
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/conn/odbc/src/odbc/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/Makefile b/core/conn/odbc/src/odbc/Makefile
index 7c7ccb9..29ec9ca 100644
--- a/core/conn/odbc/src/odbc/Makefile
+++ b/core/conn/odbc/src/odbc/Makefile
@@ -72,7 +72,8 @@ cleanall: cleanallndcs cleanlnx_drvr
include $(MY_SQROOT)/macros.gmk
bldlnx_drvr:
cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx linux64_$(SQ_BUILD_TYPE)
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(MY_SQROOT)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -p relfiles/linux64/lib* $(LIBEXPDIR);ln -s $(LIBEXPDIR)/libicudata.so.44 $(LIBEXPDIR)/libicudata.so;ln -s $(LIBEXPDIR)/libicuuc.so.44 $(LIBEXPDIR)/libicuuc.so;ln -s $(LIBEXPDIR)/libtrafodbc_l64.so $(LIBEXPDIR)/libtrafodbc64.so;ln -s $(LIBEXPDIR)/libtrafodbc_l64_drvr.so $(LIBEXPDIR)/libtrafodbc_drvr64.so;cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(MY_SQROOT)/samples
+ cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(MY_SQROOT)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -Pf relfiles/linux64/lib* $(LIBEXPDIR);cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(MY_SQROOT)/samples
+ cd $(LIBEXPDIR);ln -sf libicudata.so.44 libicudata.so;ln -sf libicuuc.so.44 libicuuc.so;ln -sf libtrafodbc_l64.so libtrafodbc64.so;ln -sf libtrafodbc_l64_drvr.so libtrafodbc_drvr64.so
# Linux ODBC driver clean targets
.PHONY: cleanlnx_drvr
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/dbsecurity/scripts/sqcertgen
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/sqcertgen b/core/dbsecurity/scripts/sqcertgen
index 68012b5..571b596 100755
--- a/core/dbsecurity/scripts/sqcertgen
+++ b/core/dbsecurity/scripts/sqcertgen
@@ -172,11 +172,6 @@ server|ss|selfsigned)
echo " Certificate/Private key created in directory :"$CERTDIR
echo "***********************************************************"
echo
- echo "***********************************************************"
- echo " Updating Authentication Configuration"
- echo "***********************************************************"
-
- $MY_SQROOT/sql/scripts/update_auth
;;
view_pk)
if [ x$2 != x ]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/dbsecurity/scripts/update_auth
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/update_auth b/core/dbsecurity/scripts/update_auth
index c25d280..9b5fb6f 100755
--- a/core/dbsecurity/scripts/update_auth
+++ b/core/dbsecurity/scripts/update_auth
@@ -69,14 +69,7 @@ if [ -z "$CACERTS_DIR" ]; then
CACERTS_DIR=$HOME/cacerts
fi
-# Creating folders for storing certificates
-
-# Note - For Bright Clusters, installer sets up all files on the head node
-# and then puts the copy of the image on the slave nodes.
-# Hence any file copied to the slave nodes by scripts via pdcp get wiped out.
-# All the files should first get copied to the local node.
-# In case of clusters this is the head node - not part of MY_NODES.
-
+# Creating folders for storing CA certificates
echo "Creating folders for storing certificates"
if [ ! -d "$CACERTS_DIR" ]; then
mkdir -p -m 700 $CACERTS_DIR;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index 014c01c..5499cea 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -22,12 +22,14 @@
# * Installer version number (starting from 1 for each Trafodion version)
#
# "v000" indicates an internal/development version of installer
-RELEASE_VER ?= 1.0.0_v002
+RELEASE_VER ?= $(shell echo $(TRAFODION_VER))
all: pkg-installer
pkg-installer: installer/LICENSE installer/NOTICE
tar czf installer-$(RELEASE_VER).tar.gz installer --exclude=tools
+ mkdir -p ../distribution
+ mv installer-$(RELEASE_VER).tar.gz ../distribution
installer/LICENSE: ../licenses/LICENSE-install
cp -f $? $@
@@ -42,4 +44,4 @@ version:
@echo "$(RELEASE_VER)"
clean:
- rm installer-$(RELEASE_VER).tar.gz
+ rm -f installer-$(RELEASE_VER).tar.gz
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/install/installer/traf_cloudera_mods
----------------------------------------------------------------------
diff --git a/install/installer/traf_cloudera_mods b/install/installer/traf_cloudera_mods
index 2f98efa..ed4af27 100755
--- a/install/installer/traf_cloudera_mods
+++ b/install/installer/traf_cloudera_mods
@@ -319,7 +319,6 @@ restart_info=$(curl -k -X POST -u $ADMIN:$PASSWORD \
$URL/api/v1/clusters/$CLUSTER_NAME/commands/restart)
echo $restart_info
command_id=$(echo $restart_info | grep id | awk '{print $4}' | sed -e 's@,@@' )
-echo "***DEBUG: Cloudera command_id=$command_id"
# poll until restart is completed as a restart can take a while
active=1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/install/installer/traf_config
----------------------------------------------------------------------
diff --git a/install/installer/traf_config b/install/installer/traf_config
index 7bffc03..c6cf371 100755
--- a/install/installer/traf_config
+++ b/install/installer/traf_config
@@ -72,12 +72,6 @@ if [[ "$userId" != "$TRAF_USER" ]]; then
fi
#============================================
-echo "*************************"
-echo "*************************"
-echo " Trafodion Configuration"
-echo "*************************"
-echo "*************************"
-#============================================
# Check if an existing instance is up
process_count=$(cstat -noheader 2>/dev/null | wc -l)
if [ "$process_count" -ne 0 ]; then
[11/15] incubator-trafodion git commit: Fixed the dependency for
installer package
Posted by db...@apache.org.
Fixed the dependency for installer package
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/30093ab4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/30093ab4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/30093ab4
Branch: refs/heads/master
Commit: 30093ab44c35df3cde2825162cde2c7c431b798a
Parents: 0365574
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 23:43:27 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 23:43:27 2016 +0000
----------------------------------------------------------------------
core/Makefile | 4 ++--
install/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/30093ab4/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 63ce053..6ef3e9a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -37,7 +37,7 @@ include macros.gmk
# Default target (all components)
all: $(MPI_TARGET) dbsecurity foundation jdbc_jar $(SEAMONSTER_TARGET) ndcs ci jdbc_type2_jar dcs rest odb lib_mgmt
-package: pkg-product pkg-client
+package: pkg-product pkg-client pkg-installer
#############
# Components
@@ -132,7 +132,7 @@ cleanall: sqroot eclipseclean cleantests
cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
-package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests pkg-installer
+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]}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/30093ab4/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index cf14d65..bea8413 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -15,8 +15,8 @@
#
# @@@ END COPYRIGHT @@@
RELEASE_VER ?= $(shell echo $(TRAFODION_VER))
-RELEASE_TYPE ?= $(shell echo $(TRAFODION_VER_PROD)| sed -e 's/ /_/g')
-INSTALLER_TARNAME = $(shell echo ${RELEASE_TYPE}_installer_${RELEASE_VER}.tar.gz |tr '[A-Z]' '[a-z]')
+RELEASE_TYPE ?= $(shell echo $(TRAFODION_VER_PROD)| sed -e 's/ /-/g')
+INSTALLER_TARNAME = $(shell echo ${RELEASE_TYPE}_installer-${RELEASE_VER}.tar.gz |tr '[A-Z]' '[a-z]')
all: pkg-installer
[14/15] incubator-trafodion git commit: Added the missing directory
Posted by db...@apache.org.
Added the missing directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f74e7d1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f74e7d1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f74e7d1c
Branch: refs/heads/master
Commit: f74e7d1ce744c8b62c093a20e8fd26352aa85259
Parents: a2bd4ac
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Thu May 26 20:49:16 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Thu May 26 20:49:16 2016 +0000
----------------------------------------------------------------------
core/sqf/samples/.gitignore | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f74e7d1c/core/sqf/samples/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/samples/.gitignore b/core/sqf/samples/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/core/sqf/samples/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
[12/15] incubator-trafodion git commit: eliminated the redundant jps
command from the check scripts
Posted by db...@apache.org.
eliminated the redundant jps command from the check scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a5b4b963
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a5b4b963
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a5b4b963
Branch: refs/heads/master
Commit: a5b4b9631478acec7a1b6ea10752e5051db399e6
Parents: 30093ab
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Wed May 25 23:34:48 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Wed May 25 23:34:48 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/dcscheck | 20 ++++++++++----------
core/sqf/sql/scripts/sqcheck | 29 +++++++++++++++--------------
2 files changed, 25 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a5b4b963/core/sqf/sql/scripts/dcscheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/dcscheck b/core/sqf/sql/scripts/dcscheck
index b0bc689..a478451 100755
--- a/core/sqf/sql/scripts/dcscheck
+++ b/core/sqf/sql/scripts/dcscheck
@@ -20,6 +20,7 @@
dcsznode=/$USER/dcs/master
dcstmp=/tmp/dcstmp-$USER.log
+tmpjps=/tmp/jpstmp-$USER.log
jpscmd=$JAVA_HOME/bin/jps
cfg_mxo_cnt=0
act_mxo_cnt=0
@@ -50,7 +51,6 @@ if [[ $? != 0 ]]; then
exit 3
fi
-echo
#Check if Trafodion is up and operational
sqcheck -f > $tmp_chk 2>&1
sq_stat=$?
@@ -58,6 +58,9 @@ if ( [ $sq_stat == 0 ] || [ $sq_stat == 1 ] ); then
if [ -d $DCS_INSTALL_DIR ];then
+### Get the list of DcsServer and DcsMaster
+ $L_PDSH $jpscmd |/bin/egrep 'DcsMaster|DcsServer' > $tmpjps
+
### Get the configured primary node for DcsMaster
if [ -s ${DCS_INSTALL_DIR}/conf/master ]; then
primary_dcsmaster=`cat ${DCS_INSTALL_DIR}/conf/master | /bin/egrep -v '^#|^$'`
@@ -79,8 +82,8 @@ if ( [ $sq_stat == 0 ] || [ $sq_stat == 1 ] ); then
fi
### Check if there are any DcsMaster and DcsServer's that are started
- actual_dcsmaster_cnt=`$L_PDSH $jpscmd |grep DcsMaster |wc -l`
- actual_dcsserver_cnt=`$L_PDSH $jpscmd |grep DcsServer |wc -l`
+ actual_dcsmaster_cnt=`cat $tmpjps |grep DcsMaster |wc -l`
+ actual_dcsserver_cnt=`cat $tmpjps |grep DcsServer |wc -l`
### Get the node where the active master is running
if [[ ! -z $CLUSTERNAME ]]; then
@@ -98,18 +101,15 @@ if ( [ $sq_stat == 0 ] || [ $sq_stat == 1 ] ); then
fi
activeMaster=`$L_PDSH /sbin/ip addr show |grep $interface_to_use$ |cut -d':' -f1`
if [[ ! -z $activeMaster ]]; then
- activeDcsPid=`$L_PDSH $jpscmd |grep DcsMaster |grep $activeMaster |cut -d" " -f2 |paste -sd ' ' -`
+ activeDcsPid=`cat $tmpjps |grep DcsMaster |grep $activeMaster |cut -d" " -f2 |paste -sd ' ' -`
fi
else
- activeMaster=`$L_PDSH $jpscmd |grep DcsMaster |cut -d":" -f1 |paste -sd ' ' -`
- fi
-
- if ( [ -z $activeMaster ] && [ "$actual_dcsmaster_cnt" '>' 0 ] && [ "$actual_dcsserver_cnt" '>' 0 ] ); then
echo "Cluster Running : Non-HA"
+ activeMaster=`cat $tmpjps |grep DcsMaster |cut -d":" -f1 |paste -sd ' ' -`
fi
else
### Get the pid of the active DcsMaster
- activeDcsPid=`$L_PDSH $jpscmd |grep DcsMaster |cut -d" " -f1`
+ activeDcsPid=`cat $tmpjps |grep DcsMaster |cut -d" " -f1`
fi
@@ -162,7 +162,7 @@ if ( [ $sq_stat == 0 ] || [ $sq_stat == 1 ] ); then
fi
echo
fi
- rm -f $dcstmp $tmp_chk $tmp_ps
+ rm -f $dcstmp $tmp_chk $tmp_ps $tmpjps
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/a5b4b963/core/sqf/sql/scripts/sqcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheck b/core/sqf/sql/scripts/sqcheck
index e55bf7c..95b2f95 100755
--- a/core/sqf/sql/scripts/sqcheck
+++ b/core/sqf/sql/scripts/sqcheck
@@ -109,7 +109,6 @@ function fillArray {
function getDcsInfo {
dcsznode=/$USER/dcs/master
- jpscmd=$JAVA_HOME/bin/jps
if [ -d $DCS_INSTALL_DIR ];then
@@ -128,13 +127,8 @@ function getDcsInfo {
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
+ actual_dcsmaster_cnt=`cat $tmpjps |grep DcsMaster |wc -l`
+ actual_dcsserver_cnt=`cat $tmpjps |grep DcsServer |wc -l`
if ( [ "$cfg_dcsserver_cnt" '!=' "$actual_dcsserver_cnt" ] ); then
let down_dcsserver_cnt=cfg_dcsserver_cnt-actual_dcsserver_cnt
@@ -151,16 +145,11 @@ function getDcsInfo {
}
function getRestInfo {
- jpscmd=$JAVA_HOME/bin/jps
if [ -d $REST_INSTALL_DIR ];then
### Check if there are any DcsMaster and DcsServer's that are started
- if [ -e $SQ_PDSH ]; then
- actual_restserver_cnt=`$SQ_PDSH $MY_NODES $jpscmd |grep TrafodionRest |wc -l`
- else
- actual_restserver_cnt=`$jpscmd |grep TrafodionRest |wc -l`
- fi
+ actual_restserver_cnt=`cat $tmpjps |grep TrafodionRest |wc -l`
let cfg_restserver_cnt=actual_restserver_cnt
if ( [ "$cfg_restserver_cnt" '!=' "$actual_restserver_cnt" ] ); then
let down_restserver_cnt=cfg_restserver_cnt-actual_restserver_cnt
@@ -171,6 +160,8 @@ function getRestInfo {
}
+jpscmd=$JAVA_HOME/bin/jps
+tmpjps=/tmp/tmpjps-$USER.log
begin_time_seconds=$(date +%s)
declare -i max_checks
@@ -370,6 +361,13 @@ fi
fi
done
fi
+
+ #Get the list of DcsMaster, DcsServer and TrafodionRest
+ if [ -e $SQ_PDSH ]; then
+ $SQ_PDSH $MY_NODES $jpscmd |egrep 'DcsMaster|DcsServer|TrafodionRest' > $tmpjps
+ else
+ $jpscmd |egrep 'DcsMaster|DcsServer|TrafodionRest' > $tmpjps
+ fi
#TrafodionRestServer
getRestInfo
@@ -383,6 +381,9 @@ fi
act_mxo_down_cnt=''
fi
+ #Cleanup the tmpjps file
+ rm -f $tmpjps
+
#RMS
let act_rms_cnt=`< $sq_tmp_ps egrep -a -i ' mxssmp| mxsscp' | wc -l`
if [ $reset_counter '==' 1 ]; then
[02/15] incubator-trafodion git commit: Updated jar files to display
the database edition so 'sqvers -u' output is displayed correctly
Posted by db...@apache.org.
Updated jar files to display the database edition so 'sqvers -u'
output is displayed correctly
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4ac9c9a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4ac9c9a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4ac9c9a8
Branch: refs/heads/master
Commit: 4ac9c9a84be1caaeaecf632ab4cdc3de7c0ab310
Parents: 8ac0b9f
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 17 18:23:29 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 17 18:23:29 2016 +0000
----------------------------------------------------------------------
core/conn/jdbcT4/pom.xml | 7 +++----
core/conn/jdbc_type2/build.xml | 11 ++++++++++-
core/sql/lib_mgmt/pom.xml | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ac9c9a8/core/conn/jdbcT4/pom.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml
index 8e19b9f..bada198 100644
--- a/core/conn/jdbcT4/pom.xml
+++ b/core/conn/jdbcT4/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.trafodion.jdbc.t4</groupId>
<artifactId>jdbcT4</artifactId>
- <version>${env.TRAFODION_VER}</version>
+ <version>${TRAFODION_VER}</version>
<name>Trafodion JDBC Type4 Driver</name>
<url>http://wiki.trafodion.org</url>
@@ -107,10 +107,9 @@
<classpathPrefix>dependency-jars/</classpathPrefix>
</manifest>
<manifestEntries>
- <!-- <Implementation-Version-1>${TRAFODION_VER_PROD}</Implementation-Version-1> -->
<Implementation-Version-1>Version ${project.version}</Implementation-Version-1>
- <Implementation-Version-2>Release ${project.version}</Implementation-Version-2>
- <Implementation-Version-3>Build release</Implementation-Version-3>
+ <Implementation-Version-2>${TRAFODION_VER_PROD} Release ${project.version}</Implementation-Version-2>
+ <Implementation-Version-3>Build release </Implementation-Version-3>
<Implementation-Version-4>[${user.name}]</Implementation-Version-4>
<Implementation-Version-5>branch ${mvngit.commit.abbrev}-${mvngit.branch}</Implementation-Version-5>
<Implementation-Version-6>date ${maven.build.timestamp}</Implementation-Version-6>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ac9c9a8/core/conn/jdbc_type2/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/build.xml b/core/conn/jdbc_type2/build.xml
index 54d2e61..cc72734 100644
--- a/core/conn/jdbc_type2/build.xml
+++ b/core/conn/jdbc_type2/build.xml
@@ -41,6 +41,15 @@
<format property="now.timestamp" pattern="yyyy_MM_dd" locale="en" />
</tstamp>
+ <property environment="my_env"/>
+
+ <target name="ProductVersion">
+ <echo>
+ ${my_env.TRAFODION_VER_PROD}
+ ${my_env.PRODUCT_COPYRIGHT_HEADER}
+ </echo>
+ </target>
+
<target name="dist" depends="native">
<mkdir dir="dist"/>
<property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
@@ -52,7 +61,7 @@
<attribute name="Main-Class" value="JdbcT2"/>
<attribute name="VPROC" value="${vproc.str}"/>
<attribute name="Implementation-Version-1" value="Version 1.0.0"/>
- <attribute name="Implementation-Version-2" value="${Implementation-Version-2}"/>
+ <attribute name="Implementation-Version-2" value="${my_env.TRAFODION_VER_PROD} ${Implementation-Version-2}"/>
<attribute name="Implementation-Version-3" value="${Implementation-Version-3}"/>
<attribute name="Implementation-Version-4" value="${Implementation-Version-4}"/>
<attribute name="Implementation-Version-5" value="${Implementation-Version-5}"/>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ac9c9a8/core/sql/lib_mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/pom.xml b/core/sql/lib_mgmt/pom.xml
index ae3c7c1..aafb2e1 100644
--- a/core/sql/lib_mgmt/pom.xml
+++ b/core/sql/lib_mgmt/pom.xml
@@ -64,7 +64,7 @@
<echo file="${manifest.file}" append="true">${line.separator}Main-Class: org.trafodion.libmgmt.Vproc</echo>
<echo file="${manifest.file}" append="true">${line.separator}Vproc: Traf_JDBC_Type4_Build_${rev_head}</echo>
<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-1: Version 1.0.0</echo>
-<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-2: ${Implementation-Version-2}</echo>
+<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-2: ${TRAFODION_VER_PROD} ${Implementation-Version-2}</echo>
<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-3: ${Implementation-Version-3}</echo>
<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-4: ${Implementation-Version-4}</echo>
<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-5: ${Implementation-Version-5}</echo>
[04/15] incubator-trafodion git commit: Installing odbc linux driver
along with server component
Posted by db...@apache.org.
Installing odbc linux driver along with server component
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/908e2422
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/908e2422
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/908e2422
Branch: refs/heads/master
Commit: 908e2422c56f6fd1aba46dd53b00dcf265cf3af4
Parents: 6c7cac6
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Thu May 19 23:55:19 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Thu May 19 23:55:19 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/Makefile | 7 ++++---
core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx | 6 +-----
.../conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh | 2 ++
.../odbc/odbcclient/unixcli/package/runconnect_test.sh | 5 +++++
core/sqf/Makefile | 1 +
core/sqf/sql/scripts/install_traf_components | 3 ++-
core/sqf/sqvers | 2 +-
install/installer/traf_package_setup | 2 +-
8 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/908e2422/core/conn/odbc/src/odbc/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/Makefile b/core/conn/odbc/src/odbc/Makefile
index 4fd630c..7c7ccb9 100644
--- a/core/conn/odbc/src/odbc/Makefile
+++ b/core/conn/odbc/src/odbc/Makefile
@@ -72,11 +72,12 @@ cleanall: cleanallndcs cleanlnx_drvr
include $(MY_SQROOT)/macros.gmk
bldlnx_drvr:
cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx linux64_$(SQ_BUILD_TYPE)
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(MY_SQROOT)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz
+ cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(MY_SQROOT)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -p relfiles/linux64/lib* $(LIBEXPDIR);ln -s $(LIBEXPDIR)/libicudata.so.44 $(LIBEXPDIR)/libicudata.so;ln -s $(LIBEXPDIR)/libicuuc.so.44 $(LIBEXPDIR)/libicuuc.so;ln -s $(LIBEXPDIR)/libtrafodbc_l64.so $(LIBEXPDIR)/libtrafodbc64.so;ln -s $(LIBEXPDIR)/libtrafodbc_l64_drvr.so $(LIBEXPDIR)/libtrafodbc_drvr64.so;cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(MY_SQROOT)/samples
# Linux ODBC driver clean targets
.PHONY: cleanlnx_drvr
cleanlnx_drvr:
cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx clean;
- /bin/rm -f $(LIBEXPDIR)/libtrafodbc*
-
+ /bin/rm -f $(LIBEXPDIR)/libtrafodbc* $(LIBEXPDIR)/libicu*
+ cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz relfiles
+ cd $(MY_SQROOT)/samples;rm -rf connect_test* runconnect_test.sh TRAFDSN
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/908e2422/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx b/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
index 926b3eb..1d5d935 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
@@ -72,14 +72,10 @@ DRVREXPOBJ = $(addprefix $(OBJDIR), $(EXPOBJS))
linux64_debug: dmanager cli interface common ipv4 exp trace
$(LINK) -fPIC -m64 -shared -rdynamic -Wl,-soname,$(ODBC_SO_FILE)_l64.so -o $(ODBC_SO_FILE)_l64.so $(DRVROBJ) $(DRVRMGROBJ) $(INCLUDE) $(LIBS)
$(LINK) -fPIC -m64 -shared -rdynamic -Wl,-soname,$(ODBC_SO_FILE)_l64_drvr.so -o $(ODBC_SO_FILE)_l64_drvr.so $(DRVROBJ) $(DRVREXPOBJ) $(INCLUDE) $(LIBS)
- ln -s -f $(ODBC_SO_FILE)_l64_drvr.so $(ODBC_SO_FILE)_drvr_l64.so
- cp -p $(ODBC_SO_FILE)_drvr_l64.so $(LIBEXPDIR)/.
linux64_release: dmanager cli interface common ipv4 exp trace
$(LINK) -m64 -shared -rdynamic -Wl,-soname,$(ODBC_SO_FILE)_l64.so -o $(ODBC_SO_FILE)_l64.so $(DRVROBJ) $(DRVRMGROBJ) $(INCLUDE) $(LIBS)
$(LINK) -m64 -shared -rdynamic -Wl,-soname,$(ODBC_SO_FILE)_l64_drvr.so -o $(ODBC_SO_FILE)_l64_drvr.so $(DRVROBJ) $(DRVREXPOBJ) $(INCLUDE) $(LIBS)
- ln -s -f $(ODBC_SO_FILE)_l64_drvr.so $(ODBC_SO_FILE)_drvr_l64.so
- cp -p $(ODBC_SO_FILE)_drvr_l64.so $(LIBEXPDIR)/.
dmanager: $(DMOBJS)
@@ -97,7 +93,7 @@ exp: $(EXPOBJS)
clean:
rm -rf obj
- rm -rf libtrafodbc_*
+ rm -rf libtrafodbc_*
rm -rf trace/version.cpp trace/version_drvr.cpp
.cpp.o:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/908e2422/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
index 7c20984..c790a64 100755
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
@@ -116,6 +116,8 @@ then
((err += $?))
cp ../../connect_test.cpp connect_test.cpp
((err += $?))
+ cp ../../runconnect_test.sh runconnect_test.sh
+ ((err += $?))
cp $MY_SQROOT/../../licenses/Apache license.txt
((err += $?))
cd ..
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/908e2422/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
new file mode 100755
index 0000000..d2e7f92
--- /dev/null
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+g++ -g connect_test.cpp -L${MY_SQROOT}/export/lib64 -I/usr/include/odbc -ltrafodbc64 -o connect_test
+
+./connect_test -d Default_DataSource -u ss -p ss
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/908e2422/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 1a13269..551f649 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -286,6 +286,7 @@ PKG_BIN_OBJS += LICENSE NOTICE
PKG_BIN_DIRS ?= sql export
PKG_BIN_DIRS += trafci
+PKG_BIN_DIRS += samples
# Package Regression variables (parser file is for compGeneral/TESTTOK2)
PKG_REGRESS_OBJS ?= $(SQL_W)/regress inc/seaquest/sqtypes.h inc/fs/feerrors.h $(SQL_W)/cli/sqlcli.h $(SQL_W)/cli/SQLCLIdev.h $(SQL_W)/parser/sqlparser.y
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/908e2422/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 921de71..626a9dd 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -371,7 +371,8 @@ YES
EOF
cd ..
mv TRAFDSN TRAFDSN.orig
- sed -e "s@TCP:1.2.3.4:23400@TCP:localhost:$MY_DCS_MASTER_PORT@" TRAFDSN.orig >> TRAFDSN
+ sed -e "s@TCP:localhost:23400@TCP:localhost:$MY_DCS_MASTER_PORT@" TRAFDSN.orig >> TRAFDSN
+ cp -p TRAFDSN $MY_SQROOT/samples
echo "Successfully installed linux driver in $LNXDRVR"| tee -a ${MY_LOG_FILE}
echo "Creating odbcinst.ini file..." |tee -a ${MY_LOG_FILE}
cat <<EOF >$LNXDRVR/odbcinst.ini
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/908e2422/core/sqf/sqvers
----------------------------------------------------------------------
diff --git a/core/sqf/sqvers b/core/sqf/sqvers
index 6f753a8..313474f 100755
--- a/core/sqf/sqvers
+++ b/core/sqf/sqvers
@@ -171,7 +171,7 @@ sub find_elfs ($$) {
if ($file =~ /libQtGuiCmpDbg.so.4/) {
$dochk = 0;
}
- if ($file =~ /libhdfs.so|libhadoop.so|libmysql|libthrift|libzookeeper|libcurl|^liblog4cxx/) {
+ if ($file =~ /libhdfs.so|libhadoop.so|libmysql|libthrift|libzookeeper|libcurl|^liblog4cxx|^libicu/) {
$dochk = 0;
}
if ($file =~ /mpirun|hydra_pmi_proxy/) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/908e2422/install/installer/traf_package_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_package_setup b/install/installer/traf_package_setup
index e9cf949..4469e06 100755
--- a/install/installer/traf_package_setup
+++ b/install/installer/traf_package_setup
@@ -151,7 +151,7 @@ if [[ $SUSE_LINUX == "false" ]]; then
# it doesn't hurt if it was already enabled and we try to enable it again
$TRAF_PDSH sudo yum-config-manager --enable RedHat-6-x86_64-Fedora-EPEL 2>> $YUM_LOG >> $YUM_LOG
- package_list="apr apr-util sqlite expect perl-DBD-SQLite* protobuf xerces-c perl-Params-Validate perl-Time-HiRes gzip lzo lzop unzip"
+ package_list="apr apr-util sqlite expect perl-DBD-SQLite* protobuf xerces-c perl-Params-Validate perl-Time-HiRes gzip lzo lzop unzip unixODBC unixODBC-devel libiodbc libiodbc-devel"
if [[ $internetAccess == "true" ]]; then
for package in $package_list
do
[15/15] incubator-trafodion git commit: Merge [TRAFODION-1664] PR 504
Various install and packing fixes
Posted by db...@apache.org.
Merge [TRAFODION-1664] PR 504 Various install and packing 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/8a59ad26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8a59ad26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8a59ad26
Branch: refs/heads/master
Commit: 8a59ad263f25c9766fa03ad7544f99873597cd10
Parents: 5337acf f74e7d1
Author: Dave Birdsall <db...@apache.org>
Authored: Fri May 27 16:39:46 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri May 27 16:39:46 2016 +0000
----------------------------------------------------------------------
Makefile | 1 +
core/Makefile | 12 +++--
core/conn/jdbcT4/pom.xml | 7 ++-
.../jdbcT4/src/main/java/T4Messages.properties | 4 +-
core/conn/jdbc_type2/build.xml | 11 +++-
core/conn/odbc/src/odbc/Makefile | 8 +--
core/conn/trafci/install/Installer.java | 7 +--
.../odbc/odbcclient/unixcli/makefile.lnx | 6 +--
.../odbc/odbcclient/unixcli/package/TRAFDSN | 2 +-
.../odbc/odbcclient/unixcli/package/mklnxpkg.sh | 2 +
.../unixcli/package/runconnect_test.sh | 26 +++++++++
core/dbsecurity/scripts/sqcertgen | 5 --
core/dbsecurity/scripts/update_auth | 9 +---
core/sqf/Makefile | 2 +
core/sqf/samples/.gitignore | 4 ++
core/sqf/sql/scripts/dcscheck | 20 +++----
core/sqf/sql/scripts/install_traf_components | 3 +-
core/sqf/sql/scripts/sqcheck | 57 +++++++++++++++-----
core/sqf/sqvers | 2 +-
core/sql/lib_mgmt/pom.xml | 2 +-
install/Makefile | 18 +++----
install/installer/traf_cloudera_mods | 1 -
install/installer/traf_package_setup | 2 +-
23 files changed, 136 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
[09/15] incubator-trafodion git commit: Changed installer tar file
name
Posted by db...@apache.org.
Changed installer tar file name
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b8df0e25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b8df0e25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b8df0e25
Branch: refs/heads/master
Commit: b8df0e25cf4b6d9ac29cb84c3798d09bb4b98aa9
Parents: 9fb1bdd
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 17:15:37 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 17:15:37 2016 +0000
----------------------------------------------------------------------
install/Makefile | 16 +++++-----------
install/installer/traf_package_setup | 2 +-
2 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b8df0e25/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index 5499cea..cf14d65 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -14,22 +14,16 @@
# limitations under the License.
#
# @@@ END COPYRIGHT @@@
-
-# Default version number
-# daily, pre-release, & release builds are named based on build ID (tag or date)
-# Version identifier is two parts:
-# * Trafodion version supported
-# * Installer version number (starting from 1 for each Trafodion version)
-#
-# "v000" indicates an internal/development version of installer
RELEASE_VER ?= $(shell echo $(TRAFODION_VER))
+RELEASE_TYPE ?= $(shell echo $(TRAFODION_VER_PROD)| sed -e 's/ /_/g')
+INSTALLER_TARNAME = $(shell echo ${RELEASE_TYPE}_installer_${RELEASE_VER}.tar.gz |tr '[A-Z]' '[a-z]')
all: pkg-installer
pkg-installer: installer/LICENSE installer/NOTICE
- tar czf installer-$(RELEASE_VER).tar.gz installer --exclude=tools
+ tar czf ${INSTALLER_TARNAME} installer --exclude=tools
mkdir -p ../distribution
- mv installer-$(RELEASE_VER).tar.gz ../distribution
+ mv ${INSTALLER_TARNAME} ../distribution
installer/LICENSE: ../licenses/LICENSE-install
cp -f $? $@
@@ -44,4 +38,4 @@ version:
@echo "$(RELEASE_VER)"
clean:
- rm -f installer-$(RELEASE_VER).tar.gz
+ rm -f ${INSTALLER_TARNAME}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b8df0e25/install/installer/traf_package_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_package_setup b/install/installer/traf_package_setup
index 4469e06..3afae38 100755
--- a/install/installer/traf_package_setup
+++ b/install/installer/traf_package_setup
@@ -151,7 +151,7 @@ if [[ $SUSE_LINUX == "false" ]]; then
# it doesn't hurt if it was already enabled and we try to enable it again
$TRAF_PDSH sudo yum-config-manager --enable RedHat-6-x86_64-Fedora-EPEL 2>> $YUM_LOG >> $YUM_LOG
- package_list="apr apr-util sqlite expect perl-DBD-SQLite* protobuf xerces-c perl-Params-Validate perl-Time-HiRes gzip lzo lzop unzip unixODBC unixODBC-devel libiodbc libiodbc-devel"
+ package_list="apr apr-util sqlite expect perl-DBD-SQLite* protobuf xerces-c perl-Params-Validate perl-Time-HiRes gzip lzo lzop unzip gcc-c++ unixODBC unixODBC-devel libiodbc libiodbc-devel"
if [[ $internetAccess == "true" ]]; then
for package in $package_list
do
[10/15] incubator-trafodion git commit: Updated the legal disclaimer
in install wizard
Posted by db...@apache.org.
Updated the legal disclaimer in install wizard
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0365574a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0365574a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0365574a
Branch: refs/heads/master
Commit: 0365574a3a6648f06ecfe043e0856d28b6e80376
Parents: b8df0e2
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 17:52:07 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 17:52:07 2016 +0000
----------------------------------------------------------------------
core/conn/trafci/install/Installer.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0365574a/core/conn/trafci/install/Installer.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/install/Installer.java b/core/conn/trafci/install/Installer.java
index cc5e94b..8b5caaa 100644
--- a/core/conn/trafci/install/Installer.java
+++ b/core/conn/trafci/install/Installer.java
@@ -1920,7 +1920,7 @@ public class Installer
c.insets = new Insets(0,0,5,0);
legalPanel.add(componentsLabel,c);
- JTextArea disclaimerText = new JTextArea("The ability to download open source extensions is provided for your convenience only. HP neither recommends nor requires you to download this software. The decision to download or use any non-HP branded software is at your sole risk and discretion. Software provided under any open source licensing model is governed solely by such open source licensing terms.");
+ JTextArea disclaimerText = new JTextArea("The ability to download open source extensions is provided for your convenience only. Software provided under any open source licensing model is governed solely by such open source licensing terms.");
c.gridheight = 15;
c.gridwidth=20;
c.ipadx = 150;
@@ -2483,10 +2483,7 @@ public class Installer
System.out.println("*** Terms and Conditions ***");
System.out.println("*** ***");
System.out.println("*** The ability to download open source extensions is provided ***");
- System.out.println("*** for your convenience only. HP neither recommends nor ***");
- System.out.println("*** requires you to download this software. The decision to ***");
- System.out.println("*** download or use any non-HP branded software is at your ***");
- System.out.println("*** sole risk and discretion. Software provided under any ***");
+ System.out.println("*** for your convenience only. Software provided under any ***");
System.out.println("*** open source licensing model is governed solely by such ***");
System.out.println("*** open source licensing terms. ***");
System.out.println("*** ***");
[03/15] incubator-trafodion git commit: Modified servername in
TRAFDSN to use localhost instead of dummy hostname
Posted by db...@apache.org.
Modified servername in TRAFDSN to use localhost instead of dummy hostname
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6c7cac6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6c7cac6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6c7cac6c
Branch: refs/heads/master
Commit: 6c7cac6c1a6d99f4c09ffaaa0bbd773133792c24
Parents: 4ac9c9a
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 17 19:48:57 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 17 19:48:57 2016 +0000
----------------------------------------------------------------------
core/conn/unixodbc/odbc/odbcclient/unixcli/package/TRAFDSN | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6c7cac6c/core/conn/unixodbc/odbc/odbcclient/unixcli/package/TRAFDSN
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/TRAFDSN b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/TRAFDSN
index 07da82b..e445e30 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/TRAFDSN
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/TRAFDSN
@@ -39,7 +39,7 @@ Catalog = TRAFODION
Schema = SEABASE
DataLang = 0
FetchBufferSize = SYSTEM_DEFAULT
-Server = TCP:1.2.3.4:23400
+Server = TCP:localhost:23400
SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
SQL_LOGIN_TIMEOUT = SYSTEM_DEFAULT
SQL_QUERY_TIMEOUT = NO_TIMEOUT
[06/15] incubator-trafodion git commit: Fixed the clean target
Posted by db...@apache.org.
Fixed the clean target
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/92aaccd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/92aaccd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/92aaccd2
Branch: refs/heads/master
Commit: 92aaccd2e1fdc15f7e2d109ee2a152bfa834c3ca
Parents: ccb6a7e
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Fri May 20 16:14:27 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Fri May 20 16:14:27 2016 +0000
----------------------------------------------------------------------
licenses/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/92aaccd2/licenses/Makefile
----------------------------------------------------------------------
diff --git a/licenses/Makefile b/licenses/Makefile
index 597c080..5bd3b7b 100644
--- a/licenses/Makefile
+++ b/licenses/Makefile
@@ -43,4 +43,4 @@ LICENSE-clients:
cat Apache lic-clients-bin > $@
clean:
- rm LICENSE*
+ rm -f LICENSE*
[13/15] incubator-trafodion git commit: Merge remote branch
'origin/master' into wrkbrnch-2.1
Posted by db...@apache.org.
Merge remote branch 'origin/master' into wrkbrnch-2.1
Conflicts:
licenses/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/a2bd4ac1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a2bd4ac1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a2bd4ac1
Branch: refs/heads/master
Commit: a2bd4ac12834931d7bb2dfce662c47e2d99cd6a6
Parents: a5b4b96 45c2e76
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Thu May 26 18:50:24 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Thu May 26 18:50:24 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 -
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/conn/jdbcT4/Makefile | 1 +
.../jdbcT4/src/main/java/T4Messages.properties | 6 +-
.../java/org/trafodion/jdbc/t4/Address.java | 2 +-
.../jdbc/t4/HPT4ConnectionPoolDataSource.java | 346 ----
.../t4/HPT4ConnectionPoolDataSourceFactory.java | 68 -
.../org/trafodion/jdbc/t4/HPT4DataSource.java | 366 ----
.../jdbc/t4/HPT4DataSourceFactory.java | 62 -
.../java/org/trafodion/jdbc/t4/HPT4Desc.java | 542 ------
.../org/trafodion/jdbc/t4/HPT4Exception.java | 38 -
.../java/org/trafodion/jdbc/t4/HPT4Handle.java | 84 -
.../org/trafodion/jdbc/t4/HPT4Messages.java | 324 ----
.../jdbc/t4/HPT4ParameterMetaData.java | 243 ---
.../trafodion/jdbc/t4/HPT4PooledConnection.java | 238 ---
.../jdbc/t4/HPT4PooledConnectionManager.java | 385 ----
.../jdbc/t4/HPT4ResultSetMetaData.java | 309 ---
.../jdbc/t4/InitializeDialogueReply.java | 6 +-
.../java/org/trafodion/jdbc/t4/InputOutput.java | 50 +-
.../trafodion/jdbc/t4/InterfaceConnection.java | 52 +-
.../trafodion/jdbc/t4/InterfaceResultSet.java | 34 +-
.../trafodion/jdbc/t4/InterfaceStatement.java | 148 +-
.../java/org/trafodion/jdbc/t4/NCSAddress.java | 22 +-
.../jdbc/t4/PreparedStatementManager.java | 2 +-
.../java/org/trafodion/jdbc/t4/T4Address.java | 24 +-
.../org/trafodion/jdbc/t4/T4Connection.java | 36 +-
.../org/trafodion/jdbc/t4/T4DSProperties.java | 6 +-
.../trafodion/jdbc/t4/T4DatabaseMetaData.java | 132 +-
.../java/org/trafodion/jdbc/t4/T4Driver.java | 14 +-
.../org/trafodion/jdbc/t4/T4Properties.java | 20 +-
.../java/org/trafodion/jdbc/t4/T4ResultSet.java | 12 +-
.../java/org/trafodion/jdbc/t4/T4Statement.java | 20 +-
.../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java | 2 +-
.../org/trafodion/jdbc/t4/T4_Dcs_Connect.java | 10 +-
.../jdbc/t4/TrafT4CallableStatement.java | 58 +-
.../org/trafodion/jdbc/t4/TrafT4Connection.java | 108 +-
.../jdbc/t4/TrafT4ConnectionPoolDataSource.java | 346 ++++
.../TrafT4ConnectionPoolDataSourceFactory.java | 68 +
.../org/trafodion/jdbc/t4/TrafT4DataSource.java | 366 ++++
.../jdbc/t4/TrafT4DataSourceFactory.java | 62 +
.../java/org/trafodion/jdbc/t4/TrafT4Desc.java | 542 ++++++
.../org/trafodion/jdbc/t4/TrafT4Exception.java | 38 +
.../org/trafodion/jdbc/t4/TrafT4Handle.java | 84 +
.../org/trafodion/jdbc/t4/TrafT4Messages.java | 324 ++++
.../jdbc/t4/TrafT4ParameterMetaData.java | 243 +++
.../jdbc/t4/TrafT4PooledConnection.java | 238 +++
.../jdbc/t4/TrafT4PooledConnectionManager.java | 385 ++++
.../jdbc/t4/TrafT4PreparedStatement.java | 118 +-
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 296 +--
.../jdbc/t4/TrafT4ResultSetMetaData.java | 309 +++
.../org/trafodion/jdbc/t4/TrafT4Statement.java | 70 +-
.../java/org/trafodion/jdbc/t4/Utility.java | 24 +-
.../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java | 16 +-
.../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java | 8 +-
.../jdbc/t4/odbc_SQLSvc_Close_exc_.java | 8 +-
.../t4/odbc_SQLSvc_EndTransaction_exc_.java | 8 +-
.../jdbc/t4/odbc_SQLSvc_Execute_exc_.java | 10 +-
.../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java | 10 +-
.../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java | 6 +-
.../t4/odbc_SQLSvc_InitializeDialogue_exc_.java | 6 +-
.../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java | 10 +-
.../odbc_SQLSvc_SetConnectionOption_exc_.java | 12 +-
.../t4/odbc_SQLSvc_TerminateDialogue_exc_.java | 8 +-
.../java/org/trafodion/jdbc/t4/RunAllTests.java | 2 +
core/conn/odb/build.bat | 56 +
core/conn/odb/odb/odb.vcxproj | 2 +
core/rest/Makefile | 16 +-
core/rest/pom.xml | 40 +-
core/rest/src/assembly/all.xml | 11 +-
.../org/trafodion/rest/util/JdbcT4Util.java | 6 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
core/sqf/sql/scripts/install_traf_components | 50 +-
.../TransactionalScanner.java.tmpl | 2 +-
.../transactional/SplitBalanceHelper.java | 51 +-
.../transactional/TrxRegionObserver.java.tmpl | 4 +-
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/regress/executor/EXPECTED013.SB | 42 +-
core/sql/regress/executor/TEST013 | 4 -
core/sql/regress/hive/EXPECTED018 | 191 +-
core/sql/regress/hive/TEST018 | 6 +
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
core/sql/sqlcomp/NADefaults.h | 6 +
core/sql/sqlcomp/nadefaults.cpp | 43 +-
.../java/org/trafodion/sql/HTableClient.java | 5 +-
core/sql/ustat/hs_const.h | 1 +
core/sql/ustat/hs_parser.cpp | 13 +
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
.../java/org/trafodion/dcs/util/JdbcT4Util.java | 24 +-
.../src/asciidoc/_chapters/jdbct4.adoc | 9 +-
.../src/asciidoc/_chapters/odbc_windows.adoc | 6 +-
.../src/asciidoc/_chapters/commands.adoc | 4 +-
.../src/asciidoc/_chapters/activate.adoc | 2 +-
.../src/asciidoc/_chapters/enable_security.adoc | 12 +-
.../src/asciidoc/_chapters/introduction.adoc | 26 +-
.../src/asciidoc/_chapters/prepare.adoc | 12 +-
.../src/asciidoc/_chapters/requirements.adoc | 6 +-
.../src/asciidoc/_chapters/script_install.adoc | 38 +-
.../src/asciidoc/_chapters/script_remove.adoc | 8 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 26 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 9 +-
docs/src/site/markdown/documentation.md | 2 +
docs/src/site/markdown/download.md | 6 +-
docs/src/site/markdown/index.md | 16 +-
docs/src/site/resources/css/site.css | 2 +-
docs/src/site/site.xml | 3 +-
install/installer/dcs_installer | 19 +-
install/installer/rest_installer | 21 +-
.../installer/traf_apache_hadoop_config_setup | 842 --------
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 56 +-
install/installer/traf_config_check | 44 +-
install/installer/traf_config_setup | 69 +-
install/installer/traf_hortonworks_mods | 4 +-
install/installer/traf_package_setup | 2 +
.../installer/trafodion_apache_hadoop_install | 763 --------
install/installer/trafodion_config_default | 14 +-
install/installer/trafodion_install | 148 +-
install/traf_tools_setup.sh | 1 +
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 -------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 --------------
licenses/lic-server-bin | 1834 ++++++++++++++++++
licenses/lic-server-src | 69 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
pom.xml | 1 +
136 files changed, 6253 insertions(+), 8104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2bd4ac1/core/Makefile
----------------------------------------------------------------------
diff --cc core/Makefile
index 6ef3e9a,f6eda1d..20fff11
--- a/core/Makefile
+++ b/core/Makefile
@@@ -129,12 -128,11 +129,12 @@@ cleanall: sqroot eclipseclean cleantest
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
cd sql/lib_mgmt && $(MAKE) cleanall
+ cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
-package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
+package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
- pkg-product: all
+ pkg-product: all dcs rest
cd sqf && $(MAKE) package 2>&1 | sed -e "s/$$/ ##(Package)/";exit $${PIPESTATUS[0]}
pkg-client: ci ndcs odb
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2bd4ac1/core/conn/jdbcT4/src/main/java/T4Messages.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2bd4ac1/core/sqf/Makefile
----------------------------------------------------------------------
diff --cc core/sqf/Makefile
index e24f658,f67ad46..acba403
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@@ -281,9 -281,9 +281,10 @@@ PKG_DCS_TEST_TAR ?= "../../${DISTRIBUTI
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 hbase_utilities/backup_and_restore
PKG_BIN_OBJS += trafci
+PKG_BIN_OBJS += samples
PKG_BIN_OBJS += export/limited-support-tools
PKG_BIN_OBJS += LICENSE NOTICE
+ PKG_BIN_OBJS += rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
PKG_BIN_DIRS ?= sql export
PKG_BIN_DIRS += trafci
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2bd4ac1/core/sqf/sql/scripts/install_traf_components
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2bd4ac1/install/installer/traf_cloudera_mods
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2bd4ac1/install/installer/traf_package_setup
----------------------------------------------------------------------
[08/15] incubator-trafodion git commit: Merge branch 'master' into
wrkbrnch-2.1
Posted by db...@apache.org.
Merge branch 'master' into wrkbrnch-2.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9fb1bdde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9fb1bdde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9fb1bdde
Branch: refs/heads/master
Commit: 9fb1bdde5007b2e38198cc1139742798af78936b
Parents: 9623bf1 d02fe47
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 15:45:29 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 15:45:29 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SrvrCommon.cpp | 4 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 4 +-
.../hbase/client/transactional/RMInterface.java | 43 +-
.../RetryTransactionException.java | 54 ++
.../RollbackUnsuccessfulException.java | 62 ++
.../transactional/SsccTransactionalTable.java | 34 +-
.../hbase/client/transactional/TmDDL.java | 24 +-
.../transactional/TransactionManager.java | 626 ++++++++-----------
.../TransactionalScanner.java.tmpl | 97 ++-
.../transactional/TransactionalTable.java | 46 +-
.../transactional/IdTmException.java | 14 +
.../java/org/trafodion/dtm/HBaseTxClient.java | 7 +-
core/sql/cli/Context.cpp | 26 +-
core/sql/cli/Context.h | 1 +
core/sql/cli/ExSqlComp.cpp | 5 +-
core/sql/cli/ExSqlComp.h | 2 +
core/sql/cli/SessionDefaults.cpp | 9 +
core/sql/cli/SessionDefaults.h | 12 +-
core/sql/cli/Statement.cpp | 2 +-
core/sql/executor/ex_control.cpp | 12 +
core/sql/optimizer/BindRelExpr.cpp | 44 +-
core/sql/optimizer/RelFastTransport.cpp | 4 +-
core/sql/optimizer/RelFastTransport.h | 14 +-
core/sql/regress/executor/EXPECTED020 | 1 +
core/sql/regress/hive/EXPECTED003 | 26 +
core/sql/regress/hive/TEST003 | 11 +
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/nadefaults.cpp | 2 +
.../java/org/trafodion/sql/ByteArrayList.java | 54 --
.../java/org/trafodion/sql/HBaseClient.java | 76 +--
.../java/org/trafodion/sql/HBulkLoadClient.java | 42 +-
.../java/org/trafodion/sql/HTableClient.java | 18 +-
.../main/java/org/trafodion/sql/HiveClient.java | 59 +-
.../java/org/trafodion/sql/ResultIterator.java | 133 ----
.../org/trafodion/sql/ResultKeyValueList.java | 100 ---
.../java/org/trafodion/sql/RowToInsert.java | 44 --
.../java/org/trafodion/sql/RowsToInsert.java | 57 --
.../org/trafodion/sql/SequenceFileWriter.java | 129 +---
.../java/org/trafodion/sql/StringArrayList.java | 47 --
39 files changed, 673 insertions(+), 1273 deletions(-)
----------------------------------------------------------------------
[05/15] incubator-trafodion git commit: Added copyright header
Posted by db...@apache.org.
Added copyright header
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ccb6a7ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ccb6a7ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ccb6a7ef
Branch: refs/heads/master
Commit: ccb6a7ef8a324e7efca2025cf2824adbd78af7c9
Parents: 908e242
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Fri May 20 05:09:03 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Fri May 20 05:09:03 2016 +0000
----------------------------------------------------------------------
.../unixcli/package/runconnect_test.sh | 21 ++++++++++++++++++++
core/sqf/Makefile | 1 +
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ccb6a7ef/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
index d2e7f92..0d6f27c 100755
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
@@ -1,4 +1,25 @@
#!/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 @@@
+
g++ -g connect_test.cpp -L${MY_SQROOT}/export/lib64 -I/usr/include/odbc -ltrafodbc64 -o connect_test
./connect_test -d Default_DataSource -u ss -p ss
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ccb6a7ef/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 551f649..e24f658 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -281,6 +281,7 @@ 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 hbase_utilities/backup_and_restore
PKG_BIN_OBJS += trafci
+PKG_BIN_OBJS += samples
PKG_BIN_OBJS += export/limited-support-tools
PKG_BIN_OBJS += LICENSE NOTICE