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/04/01 00:16:19 UTC
[08/50] [abbrv] incubator-trafodion git commit: remove support hdp2_3
remove support hdp2_3
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/71f80f6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/71f80f6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/71f80f6e
Branch: refs/heads/master
Commit: 71f80f6e7e6f4c8364cabaa0817e983ba695156e
Parents: f1c7f3a
Author: mashengchen <ma...@gmail.com>
Authored: Mon Mar 7 09:52:34 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Mar 7 09:52:34 2016 +0000
----------------------------------------------------------------------
core/sqf/conf/install_features | 1 -
core/sqf/hbase_utilities/pom.xml | 2 +-
core/sqf/sqenvcom.sh | 42 +++++++++++++-------
core/sqf/sql/scripts/install_local_hadoop | 32 +++++++--------
core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.hdp | 4 +-
core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 4 +-
.../src/seatrans/tm/hbasetmlib2/pom.xml.apache | 4 +-
.../sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 4 +-
core/sql/pom.xml | 6 +--
core/sql/pom.xml.apache | 8 ++--
core/sql/pom.xml.hdp | 9 +++--
13 files changed, 63 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/conf/install_features
----------------------------------------------------------------------
diff --git a/core/sqf/conf/install_features b/core/sqf/conf/install_features
index b5d3470..15a1789 100644
--- a/core/sqf/conf/install_features
+++ b/core/sqf/conf/install_features
@@ -63,4 +63,3 @@
# perform some additional support for this.
export CDH_5_3_HDP_2_2_SUPPORT="N"
export CDH_5_4_SUPPORT="Y"
-export HDP_2_3_SUPPORT="Y"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/hbase_utilities/pom.xml
----------------------------------------------------------------------
diff --git a/core/sqf/hbase_utilities/pom.xml b/core/sqf/hbase_utilities/pom.xml
index c7081e4..e0c7a74 100644
--- a/core/sqf/hbase_utilities/pom.xml
+++ b/core/sqf/hbase_utilities/pom.xml
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.6.0</hadoop.version>
- <hbase.version>${env.HBASE_DEP_VER}</hbase.version>
+ <hbase.version>${env.HBASE_DEP_VER_CDH}</hbase.version>
<java.version>1.7</java.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 34d4f7a..6c96ef4 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -139,29 +139,41 @@ fi
export MY_SQROOT=$PWD
export SQ_HOME=$PWD
+# set common version to be consistent between shared lib and maven dependencies
+export HBASE_DEP_VER_CDH=1.0.0-cdh5.4.4
+export HIVE_DEP_VER_CDH=1.1.0-cdh5.4.4
+export HBASE_DEP_VER_HDP=1.1.2.2.3.2.0-2950
+export HIVE_DEP_VER_HDP=1.2.1.2.3.2.0-2950
+export HBASE_DEP_VER_APACHE=1.0.2
+export HIVE_DEP_VER_APACHE=1.1.0
+export THRIFT_DEP_VER=0.9.0
+export HBASE_TRX_ID_CDH=hbase-trx-cdh5_4
+export HBASE_TRX_ID_APACHE=hbase-trx-apache1_0_2
+export HBASE_TRX_ID_HDP=hbase-trx-hdp2_3
+
# general Hadoop & TRX dependencies - not distro specific, choose one to build against
export HBASE_TRXDIR=$MY_SQROOT/export/lib
-export HBASE_TRX_ID=hbase-trx-cdh5_4
-export HBASE_DEP_VER=hbase-1.0.0-cdh5.4.4.tar.gz
-export HBASE_TRX_JAR=${HBASE_TRX_ID}-${TRAFODION_VER}.jar
+export HBASE_TRX_JAR=${HBASE_TRX_ID_CDH}-${TRAFODION_VER}.jar
+if [[ "$HBASE_DISTRO" = "HDP" ]]; then
+ export HBASE_TRX_JAR=${HBASE_TRX_ID_HDP}-${TRAFODION_VER}.jar
+fi
+if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+ export HBASE_TRX_JAR=${HBASE_TRX_ID_APACHE}-${TRAFODION_VER}.jar
+fi
export DTM_COMMON_JAR=trafodion-dtm-${TRAFODION_VER}.jar
export SQL_JAR=trafodion-sql-${TRAFODION_VER}.jar
-export UTIL_JAR=trafodion-utility-${TRAFODION_VER}.jar
+HBVER=""
if [[ "$HBASE_DISTRO" = "HDP" ]]; then
- export HBASE_VERSION_ID=hdp2_3
- export HBASE_TRX_JAR=hbase-trx-${HBASE_VERSION_ID}-${TRAFODION_VER}.jar
- export DTM_COMMON_JAR=trafodion-dtm-${HBASE_VERSION_ID}-${TRAFODION_VER}.jar
- export SQL_JAR=trafodion-sql-${HBASE_VERSION_ID}-${TRAFODION_VER}.jar
+ HBVER="hdp2_3"
+ export DTM_COMMON_JAR=trafodion-dtm-${HBVER}-${TRAFODION_VER}.jar
+ export SQL_JAR=trafodion-sql-${HBVER}-${TRAFODION_VER}.jar
fi
if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
- export HBASE_VERSION_ID=apache1_0_2
- export HBASE_TRX_JAR=hbase-trx-${HBASE_VERSION_ID}-${TRAFODION_VER}.jar
- export DTM_COMMON_JAR=trafodion-dtm-${HBASE_VERSION_ID}-${TRAFODION_VER}.jar
- export SQL_JAR=trafodion-sql-${HBASE_VERSION_ID}-${TRAFODION_VER}.jar
+ HBVER="apache1_0_2"
+ export DTM_COMMON_JAR=trafodion-dtm-${HBVER}-${TRAFODION_VER}.jar
+ export SQL_JAR=trafodion-sql-${HBVER}-${TRAFODION_VER}.jar
fi
-# set common version to be consistent between shared lib and maven dependencies
-export THRIFT_DEP_VER=0.9.0
-export HIVE_DEP_VER=0.13.1
+export UTIL_JAR=trafodion-utility-${TRAFODION_VER}.jar
# check for workstation env
# want to make sure SQ_VIRTUAL_NODES is set in the shell running sqstart
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/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 e0081c2..4cc74c4 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -601,28 +601,24 @@ MYSQL_JDBC_URL=http://cdn.mysql.com/archives/mysql-connector-java-5.1
MYSQL_JDBC_TAR=mysql-connector-java-5.1.23.tar.gz
HIVE_MIRROR_URL=http://archive.cloudera.com/cdh5/cdh/5
-HIVE_PREFIX=hive-1.1.0-cdh5.4.4
-HIVE_TAR=${HIVE_PREFIX}.tar.gz
-
+HIVE_PREFIX=hive-${HIVE_DEP_VER_CDH}
if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
- HIVE_MIRROR_URL=https://archive.apache.org/dist/hive/hive-${HIVE_DEP_VER}
- HIVE_PREFIX=apache-hive-${HIVE_DEP_VER}-bin
- HIVE_TAR=${HIVE_PREFIX}.tar.gz
+ HIVE_MIRROR_URL=https://archive.apache.org/dist/hive/hive-${HIVE_DEP_VER_APACHE}
+ HIVE_PREFIX=apache-hive-${HIVE_DEP_VER_APACHE}-bin
fi
-
if [[ "$HBASE_DISTRO" = "HDP" ]]; then
- HIVE_PREFIX=apache-hive-1.2.1.2.3.2.0-2950-bin
- HIVE_TAR=${HIVE_PREFIX}.tar.gz
+ HIVE_PREFIX=apache-hive-${HIVE_DEP_VER_HDP}-bin
fi
+HIVE_TAR=${HIVE_PREFIX}.tar.gz
HBASE_MIRROR_URL=http://archive.cloudera.com/cdh5/cdh/5
-HBASE_TARR=hbase-${HBASE_DEP_VER}.tar.gz
-
+HBASE_TAR=hbase-${HBASE_DEP_VER_CDH}.tar.gz
if [[ "$HBASE_DISTRO" = "HDP" ]]; then
- HBASE_TAR=hbase-1.1.2.2.3.2.0-2950.tar.gz
+ HBASE_TAR=hbase-${HBASE_DEP_VER_HDP}.tar.gz
fi
if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
- HBASE_TAR=hbase-1.0.2-bin.tar.gz
+ HBASE_MIRROR_URL=https://archive.apache.org/dist/hbase/hbase-${HBASE_DEP_VER_APACHE}
+ HBASE_TAR=hbase-${HBASE_DEP_VER_APACHE}-bin.tar.gz
fi
echo "Checking for existing Hadoop processes..."
@@ -1019,7 +1015,7 @@ if [ -d hadoop/bin ]; then
else
echo "Setting up Hadoop..."
#####################################################
-
+echo "$MY_LOCAL_SW_DIST/${HADOOP_TAR}"
if [ -f $MY_LOCAL_SW_DIST/${HADOOP_TAR} ]; then
cp $MY_LOCAL_SW_DIST/${HADOOP_TAR} .
echo "Copied Hadoop tar file from: $MY_LOCAL_SW_DIST/${HADOOP_TAR}"
@@ -1239,7 +1235,7 @@ if [ -d mysql/bin ]; then
else
#####################################################
echo "Setting up MySQL..."
-
+echo "$MY_LOCAL_SW_DIST/${MYSQL_TAR}"
if [ -f $MY_LOCAL_SW_DIST/${MYSQL_TAR} ]; then
cp $MY_LOCAL_SW_DIST/${MYSQL_TAR} .
echo "Copied MySql tar file from: $MY_LOCAL_SW_DIST/${MYSQL_TAR}"
@@ -1318,7 +1314,7 @@ if [ -f mysql-connector-java-*/mysql-connector-java-*.jar ]; then
else
#####################################################
echo "Setting up MySQL JDBC driver..."
-
+echo "$MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR}"
if [ -f $MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR} ]; then
cp $MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR} .
echo "Copied MySql JDBC tar file from: $MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR}"
@@ -1344,7 +1340,7 @@ if [ -d hive/bin ]; then
else
#####################################################
echo "Setting up Hive..."
-
+echo "$MY_LOCAL_SW_DIST/${HIVE_TAR}"
if [ -f $MY_LOCAL_SW_DIST/${HIVE_TAR} ]; then
cp $MY_LOCAL_SW_DIST/${HIVE_TAR} .
echo "Copied Hive tar file from: $MY_LOCAL_SW_DIST/${HIVE_TAR}"
@@ -1472,7 +1468,7 @@ if [ -d hbase/bin ]; then
else
#####################################################
echo "Setting up HBase..."
-
+echo "$MY_LOCAL_SW_DIST/${HBASE_TAR}"
if [ -f $MY_LOCAL_SW_DIST/${HBASE_TAR} ]; then
cp $MY_LOCAL_SW_DIST/${HBASE_TAR} .
echo "Copied HBase tar file from: $MY_LOCAL_SW_DIST/${HBASE_TAR}"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
index fc55593..250b7ae 100755
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
@@ -29,7 +29,7 @@
<properties>
<hadoop.version>2.4.0</hadoop.version>
- <hbase.version>1.0.2</hbase.version>
+ <hbase.version>${env.HBASE_DEP_VER_APACHE}</hbase.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<protobuf.version>2.5.0</protobuf.version>
<protocVersion>2.5.0</protocVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh
index 5b453de..57f458b 100755
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh
@@ -28,7 +28,7 @@
<properties>
<hadoop.version>2.6.0</hadoop.version>
- <hbase.version>1.0.0-cdh5.4.4</hbase.version>
+ <hbase.version>${env.HBASE_DEP_VER_CDH}</hbase.version>
<protobuf.version>2.5.0</protobuf.version>
<protocVersion>2.5.0</protocVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp
index 1885931..045772c 100755
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp
@@ -50,9 +50,7 @@
<properties>
<hadoop.version>2.7.1.2.3.2.0-2950</hadoop.version>
- <hbase.version>1.1.2.2.3.2.0-2950</hbase.version>
- <!--<hbase.version>0.98.3-hadoop2</hbase.version>-->
- <!--<hbase.version>0.98.3-hadoop1</hbase.version>-->
+ <hbase.version>${env.HBASE_DEP_VER_HDP}</hbase.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.7</java.version>
<trx-suffix>hdp2_3</trx-suffix>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
index af93afd..928229a 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
@@ -28,8 +28,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <hbase.version>${env.HBASE_DEP_VER}</hbase.version>
- <hbase-trx.id>${env.HBASE_TRX_ID}</hbase-trx.id>
+ <hbase.version>${env.HBASE_DEP_VER_CDH}</hbase.version>
+ <hbase-trx.id>${env.HBASE_TRX_ID_CDH}</hbase-trx.id>
<java.version>1.7</java.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
index 7b0a48b..ef305a9 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
@@ -29,9 +29,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.6.0</hadoop.version>
- <hbase.version>1.0.2</hbase.version>
+ <hbase.version>${env.HBASE_DEP_VER_APACHE}</hbase.version>
<hbase-flavor-id>apache1_0_2</hbase-flavor-id>
- <hbase-trx.id>hbase-trx-${hbase-flavor-id}</hbase-trx.id>
+ <hbase-trx.id>${env.HBASE_TRX_ID_APACHE}</hbase-trx.id>
<java.version>1.7</java.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
index 5142636..31f4a5a 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
@@ -29,9 +29,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.7.1.2.3.2.0-2950</hadoop.version>
- <hbase.version>1.1.2.2.3.2.0-2950</hbase.version>
+ <hbase.version>${env.HBASE_DEP_VER_HDP}</hbase.version>
<hbase-flavor-id>hdp2_3</hbase-flavor-id>
- <hbase-trx.id>hbase-trx-${hbase-flavor-id}</hbase-trx.id>
+ <hbase-trx.id>${env.HBASE_TRX_ID_HDP}</hbase-trx.id>
<java.version>1.7</java.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sql/pom.xml
----------------------------------------------------------------------
diff --git a/core/sql/pom.xml b/core/sql/pom.xml
index f96c38f..5c6b5c5 100644
--- a/core/sql/pom.xml
+++ b/core/sql/pom.xml
@@ -29,9 +29,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.6.0-cdh5.4.4</hadoop.version>
- <hbase.version>${env.HBASE_DEP_VER}</hbase.version>
- <hbase-trx.id>${env.HBASE_TRX_ID}</hbase-trx.id>
- <hive.version>${env.HIVE_DEP_VER}</hive.version>
+ <hbase.version>${env.HBASE_DEP_VER_CDH}</hbase.version>
+ <hbase-trx.id>${env.HBASE_TRX_ID_CDH}</hbase-trx.id>
+ <hive.version>${env.HIVE_DEP_VER_CDH}</hive.version>
<thrift.version>${env.THRIFT_DEP_VER}</thrift.version>
<java.version>1.7</java.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sql/pom.xml.apache
----------------------------------------------------------------------
diff --git a/core/sql/pom.xml.apache b/core/sql/pom.xml.apache
index 6500b66..bc8e86f 100644
--- a/core/sql/pom.xml.apache
+++ b/core/sql/pom.xml.apache
@@ -29,11 +29,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.6.0</hadoop.version>
- <hbase.version>1.0.2</hbase.version>
<hbase-flavor-id>apache1_0_2</hbase-flavor-id>
- <hbase-trx.id>hbase-trx-${hbase-flavor-id}</hbase-trx.id>
- <hive.version>1.1.0</hive.version>
- <thrift.version>0.9.0</thrift.version>
+ <hbase.version>${env.HBASE_DEP_VER_APACHE}</hbase.version>
+ <hbase-trx.id>${env.HBASE_TRX_ID_APACHE}</hbase-trx.id>
+ <hive.version>${env.HIVE_DEP_VER_APACHE}</hive.version>
+ <thrift.version>${THRIFT_DEP_VER}</thrift.version>
<java.version>1.7</java.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71f80f6e/core/sql/pom.xml.hdp
----------------------------------------------------------------------
diff --git a/core/sql/pom.xml.hdp b/core/sql/pom.xml.hdp
index 8a28586..fee21e4 100644
--- a/core/sql/pom.xml.hdp
+++ b/core/sql/pom.xml.hdp
@@ -29,10 +29,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.7.1.2.3.2.0-2950</hadoop.version>
- <hbase.version>1.1.2.2.3.2.0-2950</hbase.version>
+ <hbase.version>${env.HBASE_DEP_VER_HDP}</hbase.version>
+ <hbase-trx.id>${env.HBASE_TRX_ID_HDP}</hbase-trx.id>
+ <hive.version>${env.HIVE_DEP_VER_HDP}</hive.version>
<hbase-flavor-id>hdp2_3</hbase-flavor-id>
- <hbase-trx.id>hbase-trx-${hbase-flavor-id}</hbase-trx.id>
- <hive.version>1.2.1</hive.version>
<thrift.version>0.9.0</thrift.version>
<java.version>1.7</java.version>
</properties>
@@ -54,7 +54,8 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>