You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/11/12 02:09:18 UTC
[1/9] incubator-trafodion git commit: Cleanup the scripts to remove
HP names
Repository: incubator-trafodion
Updated Branches:
refs/heads/master d5ca21fb3 -> b9fb0d492
Cleanup the scripts to remove HP names
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0ce8b15c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0ce8b15c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0ce8b15c
Branch: refs/heads/master
Commit: 0ce8b15c094a1e43e13eec67e6d4f35c898533f8
Parents: 397e06b
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Tue Nov 3 17:53:50 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Tue Nov 3 17:53:50 2015 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_traf_components | 2 ++
dcs/src/test/pytests/.env.sh.tmpl | 2 +-
dcs/src/test/pytests/.odbc.ini.tmpl | 2 --
tests/phx/phoenix_test.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0ce8b15c/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 5c293c6..c089fb4 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -453,6 +453,8 @@ fi
# End setup of PyODBC test
+source $HOME/.trafodion
+
cds
echo | tee -a ${MY_LOG_FILE}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0ce8b15c/dcs/src/test/pytests/.env.sh.tmpl
----------------------------------------------------------------------
diff --git a/dcs/src/test/pytests/.env.sh.tmpl b/dcs/src/test/pytests/.env.sh.tmpl
index 6e7ca18..5c5f2dd 100644
--- a/dcs/src/test/pytests/.env.sh.tmpl
+++ b/dcs/src/test/pytests/.env.sh.tmpl
@@ -27,7 +27,7 @@
export LANG=en_US.utf8
#--------------------------------------------------------------------
-# HPODBC enviroment variables
+# ODBC enviroment variables
#--------------------------------------------------------------------
export LD_LIBRARY_PATH=TEMPLATE_ODBC_LIB
export LIBRARY_PATH=$LD_LIBRARY_PATH
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0ce8b15c/dcs/src/test/pytests/.odbc.ini.tmpl
----------------------------------------------------------------------
diff --git a/dcs/src/test/pytests/.odbc.ini.tmpl b/dcs/src/test/pytests/.odbc.ini.tmpl
index 2783af0..559ac74 100644
--- a/dcs/src/test/pytests/.odbc.ini.tmpl
+++ b/dcs/src/test/pytests/.odbc.ini.tmpl
@@ -34,7 +34,6 @@ Server = TCP:TEMPLATE_DSN
SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
SQL_LOGIN_TIMEOUT = SYSTEM_DEFAULT
SQL_QUERY_TIMEOUT = NO_TIMEOUT
-ServiceName = HP_DEFAULT_SERVICE
[TDM_Default_DataSource]
Description = Trafodion test system
@@ -47,5 +46,4 @@ Server = TCP:TEMPLATE_DSN
SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
SQL_LOGIN_TIMEOUT = SYSTEM_DEFAULT
SQL_QUERY_TIMEOUT = NO_TIMEOUT
-ServiceName = HP_DEFAULT_SERVICE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0ce8b15c/tests/phx/phoenix_test.py
----------------------------------------------------------------------
diff --git a/tests/phx/phoenix_test.py b/tests/phx/phoenix_test.py
index 13a891c..54fea68 100755
--- a/tests/phx/phoenix_test.py
+++ b/tests/phx/phoenix_test.py
@@ -821,7 +821,7 @@ else:
gvars.my_RUN_CMD = (os.path.join(ArgList._javahome, 'bin/java') + ' -cp ' + myclasspath +
' ' + myoptions + ' -Duser.timezone=GMT -Dtrafjdbc.properties=' +
ArgList._prop_file + ' org.junit.runner.JUnitCore ' +
- 'test.java.com.hp.phoenix.end2end.')
+ 'test.java.org.trafodion.phoenix.end2end.')
# Generate list of tests if needed
if ArgList._tests is None:
[3/9] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrk-brnch
Posted by ar...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into wrk-brnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dafab4b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dafab4b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dafab4b1
Branch: refs/heads/master
Commit: dafab4b1b2612140f8eb56a1512d7124a124c1bd
Parents: 3bc1a7f 514479f
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Wed Nov 4 17:13:48 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Wed Nov 4 17:13:48 2015 +0000
----------------------------------------------------------------------
install/installer/traf_config | 297 +++++++++++++++++++
install/installer/traf_config_setup | 22 +-
install/installer/traf_start | 290 +-----------------
.../installer/trafodion_apache_hadoop_install | 6 +-
install/installer/trafodion_install | 33 ++-
5 files changed, 349 insertions(+), 299 deletions(-)
----------------------------------------------------------------------
[5/9] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrk-brnch
Posted by ar...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into wrk-brnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7c95bc48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7c95bc48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7c95bc48
Branch: refs/heads/master
Commit: 7c95bc4859232dea531bf4a35eddb9656826c4c7
Parents: 9b85014 392b99b
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Sat Nov 7 03:40:47 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Sat Nov 7 03:40:47 2015 +0000
----------------------------------------------------------------------
core/sqf/.gitignore | 5 +
core/sqf/Makefile | 7 +-
core/sqf/hbase_utilities/Makefile | 46 +
.../backup_restore_functions.sh | 34 +-
.../run_full_trafodion_backup.sh | 31 +-
.../run_full_trafodion_restore.sh | 17 +-
core/sqf/hbase_utilities/pom.xml | 71 ++
.../backuprestore/TrafExportSnapshot.java | 1076 ++++++++++++++++++
core/sqf/sqenvcom.sh | 2 +
core/sqf/sql/scripts/install_apache_hadoop | 2 +-
core/sqf/sql/scripts/install_local_hadoop | 4 +-
core/sql/optimizer/BindRelExpr.cpp | 43 +-
core/sql/regress/executor/EXPECTED015.SB | 27 +
core/sql/regress/executor/TEST015 | 7 +
core/sql/regress/tools/runregr_executor.ksh | 12 +-
install/installer/traf_cloudera_mods98 | 10 +
install/installer/traf_getHadoopNodes | 25 +-
install/installer/traf_hortonworks_mods98 | 9 +
18 files changed, 1364 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
[9/9] incubator-trafodion git commit: Merge [TRAFODION-1607] PR-164
Missing version for jdbcT2 and jdbcT4 jar files
Posted by ar...@apache.org.
Merge [TRAFODION-1607] PR-164 Missing version for jdbcT2 and jdbcT4 jar files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b9fb0d49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b9fb0d49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b9fb0d49
Branch: refs/heads/master
Commit: b9fb0d492fec35de951c15a76ef8381acf8dcdd7
Parents: d5ca21f 192744f
Author: Arvind Narain <ar...@apache.org>
Authored: Thu Nov 12 01:06:57 2015 +0000
Committer: Arvind Narain <ar...@apache.org>
Committed: Thu Nov 12 01:06:57 2015 +0000
----------------------------------------------------------------------
core/conn/Makefile | 1 +
core/conn/jdbc_type2/build.xml | 24 +-------------------
core/conn/jdbc_type2/native/type2version.h | 2 +-
.../org/trafodion/jdbc/t2/DriverInfo.java-tmpl | 4 ++--
core/conn/jdbc_type4/build.xml | 5 ++--
.../trafodion/jdbc/t4/T4DatabaseMetaData.java | 11 ++++-----
.../src/org/trafodion/jdbc/t4/Vproc.java | 2 ++
core/conn/trafci/build.xml | 8 +++----
core/sqf/sql/scripts/install_traf_components | 1 +
9 files changed, 19 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
[6/9] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrk-brnch
Posted by ar...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into wrk-brnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/861dc631
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/861dc631
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/861dc631
Branch: refs/heads/master
Commit: 861dc6310cd11a270a75fd742a477765c510ae54
Parents: 7c95bc4 cce8b85
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Tue Nov 10 19:32:46 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Tue Nov 10 19:32:46 2015 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/findPort.py | 106 ++++++++++++++++++++++++++++++++++
1 file changed, 106 insertions(+)
----------------------------------------------------------------------
[4/9] incubator-trafodion git commit: [TRAFODION-1607] - Missing
version for jdbcT2 and jdbcT4 jar files
Posted by ar...@apache.org.
[TRAFODION-1607] - Missing version for jdbcT2 and jdbcT4 jar files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9b85014c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9b85014c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9b85014c
Branch: refs/heads/master
Commit: 9b85014c27abaca1de1ae3ae50a775d5a446e1b4
Parents: dafab4b
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Sat Nov 7 00:31:16 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Sat Nov 7 00:31:16 2015 +0000
----------------------------------------------------------------------
core/Makefile | 9 ++++++---
core/conn/.gitignore | 1 +
core/conn/Makefile | 1 +
core/conn/jdbc_type2/build.xml | 24 +-----------------------
core/conn/jdbc_type2/native/type2version.h | 2 +-
core/conn/jdbc_type4/build.xml | 3 +--
6 files changed, 11 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index ab62c49..98a1888 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -58,7 +58,7 @@ smstub: mpistub
echo "Building SM stub"
cd smstub/src; $(MAKE) all 2>&1 | sed -e "s/$$/ ##(SMSTUB)/" ; exit $${PIPESTATUS[0]}
-verhdr:
+verhdr:
cd sqf && $(MAKE) genverhdr
dbsecurity: $(MPI_TARGET)
@@ -67,7 +67,10 @@ dbsecurity: $(MPI_TARGET)
foundation: sqroot dbsecurity $(MPI_TARGET) $(SEAMONSTER_TARGET)
cd sqf && $(MAKE) all
-jdbc_jar: verhdr
+conn-mf: verhdr
+ $(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.0 > $(MY_SQROOT)/../conn/trafodion-conn.jar.mf
+
+jdbc_jar: verhdr conn-mf
cd conn/jdbc_type4 && $(ANT) deploy 2>&1 | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type4/lib/jdbcT4.jar \
-DgroupId=org.trafodion.jdbc.t4.T4Driver -DartifactId=t4driver -Dversion="$$TRAFODION_VER" \
@@ -84,7 +87,7 @@ ci: trafci
trafci: jdbc_jar
cd conn/trafci && $(ANT) dist 2>&1 | sed -e "s/$$/ ##(TRAFCI)/" ; exit $${PIPESTATUS[0]}
-jdbc_type2_jar: verhdr foundation
+jdbc_type2_jar: verhdr foundation conn-mf
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]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type2/dist/jdbcT2.jar \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/.gitignore
----------------------------------------------------------------------
diff --git a/core/conn/.gitignore b/core/conn/.gitignore
index b4bbe8b..305c61f 100644
--- a/core/conn/.gitignore
+++ b/core/conn/.gitignore
@@ -1,2 +1,3 @@
clients/
odb/bin/
+trafodion-conn.jar.mf
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index 468f0b7..fea299f 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -38,4 +38,5 @@ pkg-clients:
tar -zcvf $(CLIENT_TAR) clients
clean:
$(RM) -rf $(MY_SQROOT)/../conn/clients
+ $(RM) -f $(MY_SQROOT)/../conn/*.mf
$(RM) -f $(CLIENT_TAR)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/jdbc_type2/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/build.xml b/core/conn/jdbc_type2/build.xml
index 47da51f..8a16ead 100644
--- a/core/conn/jdbc_type2/build.xml
+++ b/core/conn/jdbc_type2/build.xml
@@ -41,8 +41,7 @@
<target name="dist" depends="native">
<mkdir dir="dist"/>
- <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
- <property file="jdbct2.jar.version"/>
+ <property file="${my_sqroot}/../conn/trafodion-conn.jar.mf"/>
<jar destfile="dist/jdbcT2.jar" compress="true">
<fileset dir="classes"/>
<manifest id="mf">
@@ -78,13 +77,7 @@
</target>
<target name="compile" depends="init">
-<!--
- <copy file="${package.src}/DriverInfo.java-tmpl" tofile="${package.src}/DriverInfo.java" overwrite="yes"/>
--->
<copy todir="${dest.classes}" overwrite="yes" file="${dest.src}/SQLMXT2Messages_en.properties"/>
-<!--
- <replace file="${package.src}/DriverInfo.java" token="@@@" value="${vproc.str}" />
--->
<exec executable="/bin/sh">
<arg line="../doDrvInfo ${package.src}/DriverInfo.java ${package.src}/DriverInfo.java-tmpl ${vproc.str}"/>
</exec>
@@ -105,21 +98,6 @@
</target>
<target name="native" depends="jni" >
-<!--
- <copy file="${native.src}/Vproc.cpp-tmpl" tofile="${native.src}/Vproc.cpp" overwrite="yes"/>
- <copy file="${native.src}/Vproc.h-tmpl" tofile="${native.src}/Vproc.h" overwrite="yes"/>
-
- <replace file="${native.src}/Vproc.cpp" token="@@@" value="${vproc.str}" />
- <replace file="${native.src}/Vproc.h" token="@@@" value="${vproc.str}" />
--->
-<!--
- <exec dir="." executable="/usr/bin/make">
- <arg line="clean"/>
- </exec>
- <exec dir="." executable="/usr/bin/make">
- <arg line=""/>
- </exec>
--->
</target>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/jdbc_type2/native/type2version.h
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/type2version.h b/core/conn/jdbc_type2/native/type2version.h
index 6bcddd6..afc1f1f 100644
--- a/core/conn/jdbc_type2/native/type2version.h
+++ b/core/conn/jdbc_type2/native/type2version.h
@@ -32,7 +32,7 @@
// component version for binaries
#define VERS_CV_MAJ 1
-#define VERS_CV_MIN 4
+#define VERS_CV_MIN 0
#define VERS_CV_UPD 0
DEFINE_EXTERN_COMP_DOVERS(type2)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9b85014c/core/conn/jdbc_type4/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/build.xml b/core/conn/jdbc_type4/build.xml
index 32b2c75..1c53dfd 100755
--- a/core/conn/jdbc_type4/build.xml
+++ b/core/conn/jdbc_type4/build.xml
@@ -96,8 +96,7 @@
<!-- LIB -->
<target name="lib" depends="compile">
- <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
- <property file="jdbct4.jar.version"/>
+ <property file="${my_sqroot}/../conn/trafodion-conn.jar.mf"/>
<jar destfile="${jdbcT4.jar}" basedir="${temp.classes}">
<include name="**/*.class" />
<include name="**/*.properties" />
[8/9] incubator-trafodion git commit: removed the obsolete file from
gitignore
Posted by ar...@apache.org.
removed the obsolete file from gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/192744ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/192744ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/192744ff
Branch: refs/heads/master
Commit: 192744ff96a9b4154b88b6b49b3d510b038667ab
Parents: 549d597
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Wed Nov 11 19:04:33 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Wed Nov 11 19:04:33 2015 +0000
----------------------------------------------------------------------
core/Makefile | 6 +++---
core/conn/.gitignore | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/192744ff/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 50af249..ab62c49 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -58,7 +58,7 @@ smstub: mpistub
echo "Building SM stub"
cd smstub/src; $(MAKE) all 2>&1 | sed -e "s/$$/ ##(SMSTUB)/" ; exit $${PIPESTATUS[0]}
-verhdr:
+verhdr:
cd sqf && $(MAKE) genverhdr
dbsecurity: $(MPI_TARGET)
@@ -67,7 +67,7 @@ dbsecurity: $(MPI_TARGET)
foundation: sqroot dbsecurity $(MPI_TARGET) $(SEAMONSTER_TARGET)
cd sqf && $(MAKE) all
-jdbc_jar: verhdr
+jdbc_jar: verhdr
cd conn/jdbc_type4 && $(ANT) deploy 2>&1 | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type4/lib/jdbcT4.jar \
-DgroupId=org.trafodion.jdbc.t4.T4Driver -DartifactId=t4driver -Dversion="$$TRAFODION_VER" \
@@ -84,7 +84,7 @@ ci: trafci
trafci: jdbc_jar
cd conn/trafci && $(ANT) dist 2>&1 | sed -e "s/$$/ ##(TRAFCI)/" ; exit $${PIPESTATUS[0]}
-jdbc_type2_jar: verhdr foundation
+jdbc_type2_jar: verhdr foundation
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]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type2/dist/jdbcT2.jar \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/192744ff/core/conn/.gitignore
----------------------------------------------------------------------
diff --git a/core/conn/.gitignore b/core/conn/.gitignore
index 305c61f..b4bbe8b 100644
--- a/core/conn/.gitignore
+++ b/core/conn/.gitignore
@@ -1,3 +1,2 @@
clients/
odb/bin/
-trafodion-conn.jar.mf
[2/9] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrk-brnch
Posted by ar...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into wrk-brnch
Conflicts:
core/sqf/sql/scripts/install_traf_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/3bc1a7f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3bc1a7f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3bc1a7f1
Branch: refs/heads/master
Commit: 3bc1a7f1c43096c27c0317a26847ecc6b6be8bbe
Parents: 0ce8b15 9ce518c
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Tue Nov 3 17:58:22 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Tue Nov 3 17:58:22 2015 +0000
----------------------------------------------------------------------
.rat-excludes | 1 -
DISCLAIMER.txt | 12 +
LICENSE.txt | 271 +
NOTICE.txt | 2 +-
RAT_README.txt | 158 +-
README.txt | 35 +
core/rest/pom.xml | 6 +-
core/sqf/sqenvcom.sh | 4 +-
.../transactional/SplitBalanceHelper.java | 2 +-
core/sql/optimizer/NAColumn.cpp | 24 +
core/sql/optimizer/NAColumn.h | 3 +
core/sql/optimizer/NAFileSet.cpp | 14 +
core/sql/optimizer/NAFileSet.h | 2 +
core/sql/optimizer/OptPhysRelExpr.cpp | 123 +-
core/sql/optimizer/ScmCostMethod.cpp | 13 +-
core/sql/regress/hive/EXPECTED018 | 176 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 7 -
core/sql/sqlcomp/nadefaults.cpp | 6 +-
core/sql/ustat/hs_cli.cpp | 204 +-
dcs/pom.xml | 8 +-
.../dcs/tmpl/server/ServerStatusTmpl.jamon | 7 +-
.../dcs/tmpl/servermt/ServerStatusTmpl.jamon | 7 +-
.../org/trafodion/dcs/master/ServerManager.java | 3 +-
.../master/datatables/license-gpl2.txt | 339 -
.../resources/dcs-webapps/master/servers.jsp | 34 +-
.../main/resources/dcs-webapps/static/dcs.css | 16 +-
.../java/org/trafodion/jdbc_test/TestCat.java | 6 +-
install/installer/traf_cloudera_mods98 | 86 +-
install/installer/trafodion_install | 4 +-
install/installer/trafodion_license | 27 +-
readme.md | 5 -
.../SetCertificateDirReg.rc | 222 +-
.../SetCertificateDirReg_os.vcxproj | 390 +-
.../SetCertificateDirReg_os.vcxproj.filters | 104 +-
.../SetCertificateDirReg_os.vcxproj.user | 4 +-
.../SetCertificateDirReg/odbccp32.props | 34 +-
.../SetCertificateDirReg/resource.h | 40 +-
.../SetCertificateDirReg_os.sln | 52 +-
.../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp | 200 -
.../UpdateDSN/UpdateDSN/UpdateDSN.vcxproj | 170 -
.../UpdateDSN/UpdateDSN.vcxproj.filters | 33 -
.../UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj | 104 -
.../UpdateDSN/UpdateDSN_os.vcxproj.filters | 33 -
.../UpdateDSN/UpdateDSN_os.vcxproj.user | 3 -
.../Install/UpdateDSN/UpdateDSN/stdafx.cpp | 28 -
win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h | 37 -
win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln | 26 -
.../Install/win64_installer/installer.iss | 200 +
.../win64_installer/win64_installer_os.ism | 6029 ------------------
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 12 +-
.../odbcclient/Drvr35Res/Drvr35Res_os.vcxproj | 4 +-
.../odbcclient/Drvr35Res/res/Drvr35Res.rc2 | 26 +-
win-odbc64/odbcclient/README.txt | 111 +-
.../odbcclient/TranslationDll/TranslationDll.rc | 12 +-
.../TranslationDll/TranslationDll_os.vcxproj | 4 +-
win-odbc64/odbcclient/build_os.bat | 333 +-
win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 12 +-
.../drvr35/TCPIPV4/TCPIPV4_os.vcxproj | 8 +-
win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 12 +-
.../drvr35/TCPIPV6/TCPIPV6_os.vcxproj | 8 +-
win-odbc64/odbcclient/drvr35/drvr35.rc | 12 +-
win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 16 +-
.../odbcclient/drvr35adm/Drvr35Adm_os.vcxproj | 5 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 12 +-
win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp | 2 +-
.../odbcclient/drvr35adm/tabpagenetwork.cpp | 2 +-
win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 12 +-
.../odbcclient/drvr35msg/Drvr35Msg_os.vcxproj | 4 +-
win-odbc64/odbcclient/odbcclient_os.sln | 17 +-
win-odbc64/odbcclient/pkg.bat | 38 -
70 files changed, 1834 insertions(+), 8142 deletions(-)
----------------------------------------------------------------------
[7/9] incubator-trafodion git commit: Took care of versions and
rebuilds
Posted by ar...@apache.org.
Took care of versions and rebuilds
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/549d597c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/549d597c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/549d597c
Branch: refs/heads/master
Commit: 549d597cbd47a287f0e6914cdb1b988eddeba98b
Parents: 861dc63
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Wed Nov 11 14:01:32 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Wed Nov 11 14:01:32 2015 +0000
----------------------------------------------------------------------
core/Makefile | 7 ++-----
core/conn/jdbc_type2/build.xml | 4 ++--
.../main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl | 4 ++--
core/conn/jdbc_type4/build.xml | 6 +++---
.../src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java | 11 +++++------
.../conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java | 2 ++
core/conn/trafci/build.xml | 8 ++++----
7 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 98a1888..50af249 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -67,10 +67,7 @@ dbsecurity: $(MPI_TARGET)
foundation: sqroot dbsecurity $(MPI_TARGET) $(SEAMONSTER_TARGET)
cd sqf && $(MAKE) all
-conn-mf: verhdr
- $(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.0 > $(MY_SQROOT)/../conn/trafodion-conn.jar.mf
-
-jdbc_jar: verhdr conn-mf
+jdbc_jar: verhdr
cd conn/jdbc_type4 && $(ANT) deploy 2>&1 | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type4/lib/jdbcT4.jar \
-DgroupId=org.trafodion.jdbc.t4.T4Driver -DartifactId=t4driver -Dversion="$$TRAFODION_VER" \
@@ -87,7 +84,7 @@ ci: trafci
trafci: jdbc_jar
cd conn/trafci && $(ANT) dist 2>&1 | sed -e "s/$$/ ##(TRAFCI)/" ; exit $${PIPESTATUS[0]}
-jdbc_type2_jar: verhdr foundation conn-mf
+jdbc_type2_jar: verhdr foundation
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]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type2/dist/jdbcT2.jar \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type2/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/build.xml b/core/conn/jdbc_type2/build.xml
index 8a16ead..4827799 100644
--- a/core/conn/jdbc_type2/build.xml
+++ b/core/conn/jdbc_type2/build.xml
@@ -41,13 +41,13 @@
<target name="dist" depends="native">
<mkdir dir="dist"/>
- <property file="${my_sqroot}/../conn/trafodion-conn.jar.mf"/>
+ <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
<jar destfile="dist/jdbcT2.jar" compress="true">
<fileset dir="classes"/>
<manifest id="mf">
<attribute name="Main-Class" value="JdbcT2"/>
<attribute name="VPROC" value="${vproc.str}"/>
- <attribute name="Implementation-Version-1" value="${Implementation-Version-1}"/>
+ <attribute name="Implementation-Version-1" value="Version 1.0.0"/>
<attribute name="Implementation-Version-2" value="${Implementation-Version-2}"/>
<attribute name="Implementation-Version-3" value="${Implementation-Version-3}"/>
<attribute name="Implementation-Version-4" value="${Implementation-Version-4}"/>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
index b144631..1ea153b 100644
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
+++ b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/DriverInfo.java-tmpl
@@ -25,8 +25,8 @@ class DriverInfo {
static final String driverVproc = "@@@@";
static final String driverProductVersion = "###";
- static final int JdbcMajorVersion = 3;
- static final int JdbcMinorVersion = 2;
+ static final int JdbcMajorVersion = 1;
+ static final int JdbcMinorVersion = 0;
DriverInfo() {
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type4/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/build.xml b/core/conn/jdbc_type4/build.xml
index 1c53dfd..7a0a570 100755
--- a/core/conn/jdbc_type4/build.xml
+++ b/core/conn/jdbc_type4/build.xml
@@ -78,7 +78,7 @@
</target>
<!-- COMPILE -->
- <target name="compile" depends="clean,init">
+ <target name="compile" depends="init">
<copy todir="${temp.src}">
<fileset dir="${src.src}">
<include name="**/*.java" />
@@ -96,7 +96,7 @@
<!-- LIB -->
<target name="lib" depends="compile">
- <property file="${my_sqroot}/../conn/trafodion-conn.jar.mf"/>
+ <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
<jar destfile="${jdbcT4.jar}" basedir="${temp.classes}">
<include name="**/*.class" />
<include name="**/*.properties" />
@@ -104,7 +104,7 @@
<manifest>
<attribute name="Main-Class" value="${vproc.class}" />
<attribute name="Vproc" value="${vproc.str}" />
- <attribute name="Implementation-Version-1" value="${Implementation-Version-1}"/>
+ <attribute name="Implementation-Version-1" value="Version 1.0.0"/>
<attribute name="Implementation-Version-2" value="${Implementation-Version-2}"/>
<attribute name="Implementation-Version-3" value="${Implementation-Version-3}"/>
<attribute name="Implementation-Version-4" value="${Implementation-Version-4}"/>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
index 9522e5d..f700c4b 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
@@ -404,8 +404,7 @@ public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseM
} catch (SQLException se) {
// ignore
}
-
- return 1;
+ return Vproc.jdbcMajorVersion;
}
/*
@@ -432,7 +431,7 @@ public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseM
} catch (SQLException se) {
// ignore
}
- return 0;
+ return Vproc.jdbcMinorVersion;
}
/*
@@ -5440,7 +5439,7 @@ public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseM
String temp = lf.format(lr);
connection_.props_.getLogWriter().println(temp);
}
- return 3;
+ return Vproc.jdbcMajorVersion;
}
public int getJDBCMinorVersion() throws SQLException {
@@ -5457,8 +5456,8 @@ public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseM
T4LogFormatter lf = new T4LogFormatter();
String temp = lf.format(lr);
connection_.props_.getLogWriter().println(temp);
- }
- return 1;
+ }
+ return Vproc.jdbcMinorVersion;
}
public int getSQLStateType() throws SQLException {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java
index afa0779..9ab6727 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/Vproc.java
@@ -23,6 +23,8 @@ package org.trafodion.jdbc.t4;
public class Vproc {
private static final String vprocStr = "@@@@";
+ static final int jdbcMajorVersion = 1;
+ static final int jdbcMinorVersion = 0;
public static void main(String[] args) {
System.out.println(vprocStr);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/549d597c/core/conn/trafci/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/build.xml b/core/conn/trafci/build.xml
index 3556818..00ae9c4 100644
--- a/core/conn/trafci/build.xml
+++ b/core/conn/trafci/build.xml
@@ -79,7 +79,7 @@
<delete file="${utils.dir}/trafci.cmd"/>
</target>
- <target name="init" depends="clean">
+ <target name="init">
<mkdir dir="${temp.dir}"/>
<mkdir dir="${tempsrc.dir}"/>
<mkdir dir="${tempinstall.dir}"/>
@@ -161,9 +161,9 @@
<fileset dir="${samples.dir}" excludes="**/*.contrib*, *.db"/>
</copy>
- <jar destfile="${deploy.dir}/${installer.file}">
+ <jar destfile="${deploy.dir}/${installer.file}" update="true">
<fileset dir="${installclasses.dir}" />
- <fileset dir="${deploy.dir}" excludes="ciencr.sh, onplatform.sh" />
+ <fileset dir="${deploy.dir}" excludes="ciencr.sh, onplatform.sh ${installer.file}" />
<manifest>
<attribute name="Main-Class" value="Installer" />
</manifest>
@@ -173,7 +173,7 @@
<tar destfile="${deploy.dir}/${tar.file}" basedir="${deploy.dir}" includes="*.jar,README">
</tar>
- <zip destfile="${client.dir}/${installer.zipfile}" basedir="${deploy.dir}" includes="*.jar,README"/>
+ <zip destfile="${client.dir}/${installer.zipfile}" basedir="${deploy.dir}" includes="*.jar,README" update="yes"/>
</target>
<target name="dist" depends="deploy">
<exec dir="${utils.dir}" executable="sh">