You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/10/26 02:25:21 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2293] remove minor
version for the hbase-trx-apache_*.jar
Repository: incubator-trafodion
Updated Branches:
refs/heads/master de82dfbb7 -> 087d91ec8
[TRAFODION-2293] remove minor version for the hbase-trx-apache_*.jar
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/802e6b5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/802e6b5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/802e6b5d
Branch: refs/heads/master
Commit: 802e6b5dac6db46fab4090c7e7e5a4e58eccc32b
Parents: e0f18ae
Author: mashengchen <ma...@gmail.com>
Authored: Sun Oct 23 19:43:53 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Sun Oct 23 19:43:53 2016 +0800
----------------------------------------------------------------------
core/sqf/sqenvcom.sh | 6 +++---
core/sqf/sql/scripts/install_local_hadoop | 14 +++++++++-----
core/sqf/src/seatrans/hbase-trx/Makefile | 6 +++---
core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 | 2 +-
6 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/802e6b5d/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 6409b35..81af05a 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -158,15 +158,15 @@ fi
export HBASE_DEP_VER_APACHE=1.2.0
export HIVE_DEP_VER_APACHE=1.1.0
-export HBVER=apache1_2_0
+export HBVER=apache1_2
if [[ "$HBASE_DISTRO" == "APACHE1.1" ]]; then
export HBASE_DEP_VER_APACHE=1.1.2
- export HBVER=apache1_1_2
+ export HBVER=apache1_1
fi
if [[ "$HBASE_DISTRO" == "APACHE1.0" ]]; then
export HBASE_DEP_VER_APACHE=1.0.2
- export HBVER=apache1_0_2
+ export HBVER=apache1_0
fi
export HBASE_TRX_ID_APACHE=hbase-trx-${HBVER}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/802e6b5d/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 153c97e..7932793 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -1543,7 +1543,7 @@ echo "$MY_LOCAL_SW_DIST/${HBASE_TAR}"
mv -f $HBASE_CONFIG_FILE $HBASE_CONFIG_FILE.orig
fi
- if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+ if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
MASTER_VISBILITY_COPROC="<property>
<name>hbase.coprocessor.master.classes</name>
<value>org.apache.hadoop.hbase.security.access.AccessController,
@@ -1554,6 +1554,13 @@ echo "$MY_LOCAL_SW_DIST/${HBASE_TAR}"
org.apache.hadoop.hbase.security.visibility.VisibilityController"
fi
+ if [[ "$HBASE_DISTRO" == "APACHE1.1" || "$HBASE_DISTRO" == "APACHE1.0" ]]; then
+ HREGION_IMPL="<property>
+ <name>hbase.hregion.impl</name>
+ <value>org.apache.hadoop.hbase.regionserver.transactional.TransactionalRegion</value>
+ </property>"
+ fi
+
cat <<EOF >$HBASE_CONFIG_FILE
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
@@ -1625,10 +1632,7 @@ echo "$MY_LOCAL_SW_DIST/${HBASE_TAR}"
<name>hbase.master.distributed.log.splitting</name>
<value>false</value>
</property>
- <property>
- <name>hbase.hregion.impl</name>
- <value>org.apache.hadoop.hbase.regionserver.transactional.TransactionalRegion</value>
- </property>
+ ${HREGION_IMPL}
${MASTER_VISBILITY_COPROC}
<property>
<name>hbase.coprocessor.region.classes</name>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/802e6b5d/core/sqf/src/seatrans/hbase-trx/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/Makefile b/core/sqf/src/seatrans/hbase-trx/Makefile
index 42895b6..63f1e51 100644
--- a/core/sqf/src/seatrans/hbase-trx/Makefile
+++ b/core/sqf/src/seatrans/hbase-trx/Makefile
@@ -21,9 +21,9 @@
# This Makefile is just a thin shell to Maven, which is used to do the real build
-BLD_HBASE_APACHE10_TRX_JARNAME =hbase-trx-apache1_0_2-$(TRAFODION_VER).jar
-BLD_HBASE_APACHE11_TRX_JARNAME =hbase-trx-apache1_1_2-$(TRAFODION_VER).jar
-BLD_HBASE_APACHE12_TRX_JARNAME =hbase-trx-apache1_2_0-$(TRAFODION_VER).jar
+BLD_HBASE_APACHE10_TRX_JARNAME =hbase-trx-apache1_0-$(TRAFODION_VER).jar
+BLD_HBASE_APACHE11_TRX_JARNAME =hbase-trx-apache1_1-$(TRAFODION_VER).jar
+BLD_HBASE_APACHE12_TRX_JARNAME =hbase-trx-apache1_2-$(TRAFODION_VER).jar
BLD_HBASE_CDH54_TRX_JARNAME =hbase-trx-cdh5_4-$(TRAFODION_VER).jar
BLD_HBASE_CDH55_TRX_JARNAME =hbase-trx-cdh5_5-$-$(TRAFODION_VER).jar
BLD_HBASE_CDH57_TRX_JARNAME =hbase-trx-cdh5_7-$-$(TRAFODION_VER).jar
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/802e6b5d/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10
index fc55593..6e088f1 100755
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10
@@ -39,7 +39,7 @@
<groupId>org.apache</groupId>
<modelVersion>4.0.0</modelVersion>
- <artifactId>hbase-trx-apache1_0_2</artifactId>
+ <artifactId>hbase-trx-apache1_0</artifactId>
<version>${env.TRAFODION_VER}</version>
<name>HBase - Trx</name>
<description>Trx of HBase usage</description>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/802e6b5d/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11
index c7500df..9ee8c1c 100755
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11
@@ -39,7 +39,7 @@
<groupId>org.apache</groupId>
<modelVersion>4.0.0</modelVersion>
- <artifactId>hbase-trx-apache1_1_2</artifactId>
+ <artifactId>hbase-trx-apache1_1</artifactId>
<version>${env.TRAFODION_VER}</version>
<name>HBase - Trx</name>
<description>Trx of HBase usage</description>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/802e6b5d/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12
index 5ce2c60..09c353d 100644
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12
@@ -39,7 +39,7 @@
<groupId>org.apache</groupId>
<modelVersion>4.0.0</modelVersion>
- <artifactId>hbase-trx-apache1_2_0</artifactId>
+ <artifactId>hbase-trx-apache1_2</artifactId>
<version>${env.TRAFODION_VER}</version>
<name>HBase - Trx</name>
<description>Trx of HBase usage</description>
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2293] remove
minor version for the hbase-trx-apache_*.jar
Posted by li...@apache.org.
Merge [TRAFODION-2293] remove minor version for the hbase-trx-apache_*.jar
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/087d91ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/087d91ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/087d91ec
Branch: refs/heads/master
Commit: 087d91ec87e93768e698ebb39fb4c24c9892d501
Parents: de82dfb 802e6b5
Author: Liu Ming <li...@apache.org>
Authored: Tue Oct 25 12:44:51 2016 +0000
Committer: Liu Ming <li...@apache.org>
Committed: Tue Oct 25 12:44:51 2016 +0000
----------------------------------------------------------------------
core/sqf/sqenvcom.sh | 6 +++---
core/sqf/sql/scripts/install_local_hadoop | 14 +++++++++-----
core/sqf/src/seatrans/hbase-trx/Makefile | 6 +++---
core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 | 2 +-
6 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------