You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/23 20:03:34 UTC
[1/4] incubator-trafodion git commit: Trafodion-1551 -- Change
version of Trafodion from 1.2.0 to 1.3.0
Repository: incubator-trafodion
Updated Branches:
refs/heads/master a2668078a -> 393eae3c1
Trafodion-1551 -- Change version of Trafodion from 1.2.0 to 1.3.0
Changed Trafodion version from 1.2.0 to 1.3.0 as requested by the release
team.
Reworded text in sqenvcom.sh to better reflect the operation
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/288a3378
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/288a3378
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/288a3378
Branch: refs/heads/master
Commit: 288a33781c8bbcaa58c9e49975ec77bba5a29797
Parents: bc0ad16
Author: Roberta Marton <ro...@esgyn.com>
Authored: Wed Oct 21 23:06:37 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Wed Oct 21 23:06:37 2015 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 4 ++--
core/sqf/sqenvcom.sh | 28 +++++++++++++-------------
core/sqf/sql/scripts/install_local_hadoop | 2 +-
dcs/pom.xml | 6 +++---
4 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/288a3378/core/rest/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index 8396584..d167b89 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.trafodion</groupId>
<artifactId>rest</artifactId>
<packaging>jar</packaging>
- <version>1.2.0</version>
+ <version>1.3.0</version>
<name>rest</name>
<url>http://wiki.trafodion.org</url>
@@ -401,7 +401,7 @@
<jython-standalone.version>2.5.3</jython-standalone.version>
<jettison.version>1.3.5</jettison.version>
<displaytag.version>1.1.1</displaytag.version>
- <jdbct4.version>1.2.0</jdbct4.version>
+ <jdbct4.version>1.3.0</jdbct4.version>
<!-- Plugin Dependencies -->
<maven.antrun.plugin.version>1.6</maven.antrun.plugin.version>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/288a3378/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index b33f647..82792e8 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -33,7 +33,7 @@
export TRAFODION_VER_PROD="Apache Trafodion"
# Trafodion version (also update file ../sql/common/copyright.h)
export TRAFODION_VER_MAJOR=1
-export TRAFODION_VER_MINOR=2
+export TRAFODION_VER_MINOR=3
export TRAFODION_VER_UPDATE=0
export TRAFODION_VER="${TRAFODION_VER_MAJOR}.${TRAFODION_VER_MINOR}.${TRAFODION_VER_UPDATE}"
@@ -469,24 +469,24 @@ else
cat <<EOF
- If you have Apache Hadoop and HBase installed, without a distro,
- please do the following to ensure Trafodion can find the installation
+ If you are ready to build Trafodion, perform one of the following options:
- Method 1: Ensure that hadoop-site.xml, hbase-site.xml and hive-site.xml
- are in the CLASSPATH.
+ make all (Build Trafodion, DCS, and REST) OR
+ make package (Build Trafodion, DCS, REST, and Client drivers) OR
+ make package-all (Build Trafodion, DCS, REST, Client drivers, and Tests)
- Method 2: Set the following environment variables:
- - HADOOP_PREFIX for Hadoop (example: /opt/hadoop-1.2.3)
- - HBASE_HOME for HBase (example: /opt/hbase-1.2.3)
- - HIVE_HOME for Hive (example: /opt/hive-1.2.3)
+ If Trafodion has been built and you want test:
- See http://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/ClusterSetup.html
+ Execute the install_local_hadoop script which performs a single node
+ install using a popular Hadoop distribution
- Yet another option is to use the install_local_hadoop script on a
- single node for evaluation or development.
+ cd $MY_SQROOT/sql/scripts
+ install_local_hadoop [-p <port option]
+ source ./install_traf_components
+ configure Trafodion and start the processes
+ HAVE FUN!
- If you just checked out or copied a Trafodion source tree and want to build,
- then you can ignore the above and continue with your build.
+ You can also choose to install_local_hadoop before building Trafodion
EOF
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/288a3378/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index 755a307..8e9e053 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -1534,7 +1534,7 @@ fi
cd $MY_SW_ROOT
-if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
+if [ -d $MY_LOCAL_SW_DIST && ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
echo "------------------------------------------------------------"
echo "-- WARNING: libhdfs.so is not present on this system. Please"
echo "-- build it, otherwise Trafodion will not compile."
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/288a3378/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index 7baeb9e..a15638a 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -34,7 +34,7 @@
<groupId>org.trafodion</groupId>
<artifactId>dcs</artifactId>
<packaging>jar</packaging>
- <version>1.2.0</version>
+ <version>1.3.0</version>
<name>dcs</name>
<url>http://wiki.trafodion.org</url>
@@ -484,8 +484,8 @@
<jython-standalone.version>2.5.3</jython-standalone.version>
<jettison.version>1.3.5</jettison.version>
<displaytag.version>1.1.1</displaytag.version>
- <jdbct4.version>1.2.0</jdbct4.version>
- <jdbct2.version>1.2.0</jdbct2.version>
+ <jdbct4.version>1.3.0</jdbct4.version>
+ <jdbct2.version>1.3.0</jdbct2.version>
<!-- Plugin Dependencies -->
<maven.antrun.plugin.version>1.6</maven.antrun.plugin.version>
[3/4] incubator-trafodion git commit: Trafodion-1551 -- Change
version of Trafodion from 1.2.0 to 1.3.0
Posted by su...@apache.org.
Trafodion-1551 -- Change version of Trafodion from 1.2.0 to 1.3.0
Updated a jdbc test to use new versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a4a83652
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a4a83652
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a4a83652
Branch: refs/heads/master
Commit: a4a83652f7a7ee2f7400e8c6f5cba2a8a80ec1b1
Parents: 6ca31ce
Author: Roberta Marton <ro...@esgyn.com>
Authored: Fri Oct 23 15:30:27 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Fri Oct 23 15:30:27 2015 +0000
----------------------------------------------------------------------
.../jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a4a83652/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
index 2b7b33c..4e4fed5 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
@@ -606,7 +606,7 @@ public class TestCat
Connection connection = Utils.getUserConnection();
String s = connection.getMetaData().getDatabaseProductVersion();
System.out.println((new StringBuilder()).append("DB product version : ").append(s).toString());
- assertEquals("DB Product Version", "1.2", s);
+ assertEquals("DB Product Version", "1.3", s);
connection.close();
System.out.println("JDBC Get DB product version : Passed");
}
[2/4] incubator-trafodion git commit: Trafodion-1551 - Change version
of Tradion from 1.2.0 to 1.3.0
Posted by su...@apache.org.
Trafodion-1551 - Change version of Tradion from 1.2.0 to 1.3.0
Missed changing a test, fixed review comments from previous commits.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6ca31cef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6ca31cef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6ca31cef
Branch: refs/heads/master
Commit: 6ca31cef396887228ca7c8ea1965f2fe8c01a964
Parents: 288a337
Author: Roberta Marton <ro...@esgyn.com>
Authored: Thu Oct 22 21:32:53 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Thu Oct 22 21:32:53 2015 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_local_hadoop | 13 ++++++++-----
.../src/test/java/org/trafodion/jdbc_test/TestCat.java | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ca31cef/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index 8e9e053..77db26f 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -1534,11 +1534,14 @@ fi
cd $MY_SW_ROOT
-if [ -d $MY_LOCAL_SW_DIST && ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
- echo "------------------------------------------------------------"
- echo "-- WARNING: libhdfs.so is not present on this system. Please"
- echo "-- build it, otherwise Trafodion will not compile."
- echo "------------------------------------------------------------"
+if [[ -n "$VERBOSE" ]]; then
+
+ if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
+ echo "------------------------------------------------------------"
+ echo "-- WARNING: libhdfs.so is not present on this system. Please"
+ echo "-- build it, otherwise Trafodion will not compile."
+ echo "------------------------------------------------------------"
+ fi
fi
#For clients
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ca31cef/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
index 934b097..2b7b33c 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
@@ -648,7 +648,7 @@ public class TestCat
{
Connection connection = Utils.getUserConnection();
int i = connection.getMetaData().getDatabaseMinorVersion();
- assertEquals("DB Minor Version", 2L, i);
+ assertEquals("DB Minor Version", 3L, i);
connection.close();
System.out.println("JDBC Get DB minor version : Passed");
}
[4/4] incubator-trafodion git commit: Merge remote branch
'origin/pr/141/head' into mrg_71
Posted by su...@apache.org.
Merge remote branch 'origin/pr/141/head' into mrg_71
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/393eae3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/393eae3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/393eae3c
Branch: refs/heads/master
Commit: 393eae3c1cacc9f4b4ad1ccaa70c6cdb8b11865b
Parents: a266807 a4a8365
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Oct 23 18:02:45 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Oct 23 18:02:45 2015 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 4 +--
core/sqf/sqenvcom.sh | 28 ++++++++++----------
core/sqf/sql/scripts/install_local_hadoop | 13 +++++----
dcs/pom.xml | 6 ++---
.../java/org/trafodion/jdbc_test/TestCat.java | 4 +--
5 files changed, 29 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/393eae3c/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/install_local_hadoop
index 7067107,77db26f..66e5494
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@@ -1544,13 -1534,21 +1544,16 @@@ f
cd $MY_SW_ROOT
- if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
- echo "------------------------------------------------------------"
- echo "-- WARNING: libhdfs.so is not present on this system. Please"
- echo "-- build it, otherwise Trafodion will not compile."
- echo "------------------------------------------------------------"
+ if [[ -n "$VERBOSE" ]]; then
+
+ if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
+ echo "------------------------------------------------------------"
+ echo "-- WARNING: libhdfs.so is not present on this system. Please"
+ echo "-- build it, otherwise Trafodion will not compile."
+ echo "------------------------------------------------------------"
+ fi
fi
-#For clients
-cat >$HOME/.traf-clports-$USER <<EOF
-HADOOP_START_PORT=$MY_START_PORT
-EOF
-
echo
echo "Installed directory size and name = $(du -sh $MY_SW_ROOT)" | tee -a ${MY_LOG_FILE}
echo