You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2016/07/19 16:09:14 UTC
[01/13] incubator-trafodion git commit: jira1743
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 44660e413 -> b7dd48c1f
jira1743
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b1ff89f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b1ff89f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b1ff89f1
Branch: refs/heads/master
Commit: b1ff89f145063ef633c8852495db875668c2fbd2
Parents: 7ad34b1
Author: traf <tr...@aven01.novalocal>
Authored: Mon Jun 27 05:21:01 2016 +0000
Committer: traf <tr...@aven01.novalocal>
Committed: Mon Jun 27 05:21:01 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/CoreCommon.h | 2 ++
core/conn/jdbc_type2/native/SQLMXConnection.cpp | 14 ++++++++++++++
core/conn/jdbc_type2/native/SrvrOthers.cpp | 9 +++++++++
3 files changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1ff89f1/core/conn/jdbc_type2/native/CoreCommon.h
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/CoreCommon.h b/core/conn/jdbc_type2/native/CoreCommon.h
index 92fc1c8..c131173 100644
--- a/core/conn/jdbc_type2/native/CoreCommon.h
+++ b/core/conn/jdbc_type2/native/CoreCommon.h
@@ -440,6 +440,8 @@ typedef struct _SRVR_GLOBAL_Def
#define CLEAR_SCHEMA 1013
#define CQD_DOOM_USER_TXN 1014
#define CQD_PCODE_OFF 1015
+#define BEGIN_SESSION 1016
+#define END_SESSION 1017
typedef struct tagDATE_TYPE
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1ff89f1/core/conn/jdbc_type2/native/SQLMXConnection.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SQLMXConnection.cpp b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
index b25d940..e8fd2d1 100644
--- a/core/conn/jdbc_type2/native/SQLMXConnection.cpp
+++ b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
@@ -590,6 +590,20 @@ JNIEXPORT void JNICALL Java_org_trafodion_jdbc_t2_SQLMXConnection_connectInit
strcpy(srvrGlobal->CurrentSchema, "SEABASE");
}
+
+ odbc_SQLSvc_SetConnectionOption_sme_(NULL, NULL,
+ &setConnectException,
+ dialogueId,
+ BEGIN_SESSION,
+ 0,
+ NULL,
+ &sqlWarning);
+ if (setConnectException.exception_nr != CEE_SUCCESS)
+ {
+ throwSetConnectionException(jenv, &setConnectException);
+ FUNCTION_RETURN_VOID(("BEGIN_SESSION - setConnectException.exception_nr(%s) is not CEE_SUCCESS",
+ CliDebugSqlError(setConnectException.exception_nr)));
+ }
if(blnDoomUsrTxn)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1ff89f1/core/conn/jdbc_type2/native/SrvrOthers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SrvrOthers.cpp b/core/conn/jdbc_type2/native/SrvrOthers.cpp
index 16fa01e..08d8a7c 100644
--- a/core/conn/jdbc_type2/native/SrvrOthers.cpp
+++ b/core/conn/jdbc_type2/native/SrvrOthers.cpp
@@ -1125,6 +1125,15 @@ odbc_SQLSvc_SetConnectionOption_sme_(
}
strcat(sqlString, schemaValueStr);
break;
+ case BEGIN_SESSION:
+ if(optionValueStr != NULL && strlen(optionValueStr) > 0)
+ sprintf(sqlString,"SET SESSION DEFAULT SQL_SESSION 'BEGIN:%0.200s';",optionValueStr);
+ else
+ strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'BEGIN';");
+ break;
+ case END_SESSION:
+ strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'END'");
+ break;
case RESET_DEFAULTS:
strcpy(sqlString, "CONTROL QUERY DEFAULT * RESET");
break;
[05/13] incubator-trafodion git commit: remove other jira changes
Posted by sa...@apache.org.
remove other jira changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/443b0c4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/443b0c4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/443b0c4a
Branch: refs/heads/master
Commit: 443b0c4abfcb8a4493deecb805b76568d8d1ed74
Parents: 6d08029
Author: traf <tr...@aven01.novalocal>
Authored: Thu Jun 30 10:08:32 2016 +0000
Committer: traf <tr...@aven01.novalocal>
Committed: Thu Jun 30 10:08:32 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/CoreCommon.h | 2 --
core/conn/jdbc_type2/native/SQLMXConnection.cpp | 14 --------------
core/conn/jdbc_type2/native/SrvrOthers.cpp | 9 ---------
3 files changed, 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/443b0c4a/core/conn/jdbc_type2/native/CoreCommon.h
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/CoreCommon.h b/core/conn/jdbc_type2/native/CoreCommon.h
index c131173..92fc1c8 100644
--- a/core/conn/jdbc_type2/native/CoreCommon.h
+++ b/core/conn/jdbc_type2/native/CoreCommon.h
@@ -440,8 +440,6 @@ typedef struct _SRVR_GLOBAL_Def
#define CLEAR_SCHEMA 1013
#define CQD_DOOM_USER_TXN 1014
#define CQD_PCODE_OFF 1015
-#define BEGIN_SESSION 1016
-#define END_SESSION 1017
typedef struct tagDATE_TYPE
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/443b0c4a/core/conn/jdbc_type2/native/SQLMXConnection.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SQLMXConnection.cpp b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
index e8fd2d1..b2d5ae4 100644
--- a/core/conn/jdbc_type2/native/SQLMXConnection.cpp
+++ b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
@@ -591,20 +591,6 @@ JNIEXPORT void JNICALL Java_org_trafodion_jdbc_t2_SQLMXConnection_connectInit
}
- odbc_SQLSvc_SetConnectionOption_sme_(NULL, NULL,
- &setConnectException,
- dialogueId,
- BEGIN_SESSION,
- 0,
- NULL,
- &sqlWarning);
- if (setConnectException.exception_nr != CEE_SUCCESS)
- {
- throwSetConnectionException(jenv, &setConnectException);
- FUNCTION_RETURN_VOID(("BEGIN_SESSION - setConnectException.exception_nr(%s) is not CEE_SUCCESS",
- CliDebugSqlError(setConnectException.exception_nr)));
- }
-
if(blnDoomUsrTxn)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/443b0c4a/core/conn/jdbc_type2/native/SrvrOthers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SrvrOthers.cpp b/core/conn/jdbc_type2/native/SrvrOthers.cpp
index 08d8a7c..16fa01e 100644
--- a/core/conn/jdbc_type2/native/SrvrOthers.cpp
+++ b/core/conn/jdbc_type2/native/SrvrOthers.cpp
@@ -1125,15 +1125,6 @@ odbc_SQLSvc_SetConnectionOption_sme_(
}
strcat(sqlString, schemaValueStr);
break;
- case BEGIN_SESSION:
- if(optionValueStr != NULL && strlen(optionValueStr) > 0)
- sprintf(sqlString,"SET SESSION DEFAULT SQL_SESSION 'BEGIN:%0.200s';",optionValueStr);
- else
- strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'BEGIN';");
- break;
- case END_SESSION:
- strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'END'");
- break;
case RESET_DEFAULTS:
strcpy(sqlString, "CONTROL QUERY DEFAULT * RESET");
break;
[10/13] incubator-trafodion git commit: Merge pull request #3 from
apache/master
Posted by sa...@apache.org.
Merge pull request #3 from apache/master
update head
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1f0e8a36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1f0e8a36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1f0e8a36
Branch: refs/heads/master
Commit: 1f0e8a3651bffdd74289a10ac901c04c315a407e
Parents: eba153a 9305332
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jul 15 17:42:42 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Jul 15 17:42:42 2016 +0800
----------------------------------------------------------------------
core/conn/jdbcT4/pom.xml | 6 +
.../trafodion/jdbc/t4/InterfaceResultSet.java | 20 +-
.../trafodion/jdbc/t4/InterfaceUtilities.java | 11 +-
.../trafodion/jdbc/t4/T4DatabaseMetaData.java | 8 +-
core/conn/jdbc_type2/Makefile | 2 +-
core/conn/odb/Makefile | 2 +-
core/conn/odb/src/odb.c | 7 +-
.../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 41 +
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 277 ++-
core/conn/trafci/.gitignore | 1 +
.../sql/scripts/install_hadoop_regr_test_env | 372 +++-
core/sqf/sql/scripts/install_local_hadoop | 33 +-
.../hbase/client/transactional/TmDDL.java | 65 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 4 +-
.../trafodion/dtm/HBaseAuditControlPoint.java | 150 +-
.../main/java/org/trafodion/dtm/HBaseTmZK.java | 22 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 535 +++---
.../java/org/trafodion/dtm/TmAuditTlog.java | 332 +---
.../main/java/org/trafodion/dtm/TrafInfo.java | 12 +-
core/sql/bin/SqlciErrors.txt | 8 +-
core/sql/cli/Cli.cpp | 18 +-
core/sql/cli/Cli.h | 3 +-
core/sql/cli/CliExtern.cpp | 3 +-
core/sql/cli/Context.cpp | 61 +-
core/sql/cli/Context.h | 17 +-
core/sql/cli/Descriptor.cpp | 8 +
core/sql/cli/Statement.cpp | 4 +
core/sql/cli/sqlcli.h | 5 +
core/sql/common/BaseTypes.cpp | 37 +
core/sql/common/BigNumHelper.cpp | 27 +-
core/sql/common/BigNumHelper.h | 6 +-
core/sql/common/ComSmallDefs.h | 12 +-
core/sql/common/ComSysUtils.h | 21 +
core/sql/common/Int64.cpp | 20 +
core/sql/common/Int64.h | 12 +
core/sql/common/MiscType.cpp | 150 +-
core/sql/common/MiscType.h | 112 +-
core/sql/common/NAType.cpp | 12 +
core/sql/common/NAType.h | 5 +
core/sql/common/NumericType.cpp | 148 +-
core/sql/common/NumericType.h | 54 +-
core/sql/common/SQLTypeDefs.h | 3 +
core/sql/common/dfs2rec.h | 16 +-
core/sql/common/str.cpp | 40 +-
core/sql/common/str.h | 12 +-
core/sql/executor/ExExeUtil.h | 3 +-
core/sql/executor/ExExeUtilCli.cpp | 4 +-
core/sql/executor/ExExeUtilGet.cpp | 8 +-
core/sql/executor/ExExeUtilLoad.cpp | 49 +-
core/sql/executor/ExExeUtilMisc.cpp | 5 +-
core/sql/executor/ExFastTransport.cpp | 6 +-
core/sql/executor/ExHbaseIUD.cpp | 13 +-
core/sql/executor/ExHdfsScan.cpp | 84 +-
core/sql/executor/ExHdfsScan.h | 1 -
core/sql/executor/JavaObjectInterface.cpp | 4 +-
core/sql/executor/ex_globals.cpp | 14 +-
core/sql/executor/ex_globals.h | 4 +-
core/sql/executor/ex_root.cpp | 13 +-
core/sql/executor/ex_split_bottom.cpp | 2 +-
core/sql/exp/ExpError.cpp | 25 +
core/sql/exp/ExpError.h | 5 +
core/sql/exp/ExpErrorEnums.h | 1 +
core/sql/exp/ExpLOB.cpp | 107 +-
core/sql/exp/ExpLOB.h | 18 +-
core/sql/exp/ExpLOBaccess.cpp | 232 ++-
core/sql/exp/ExpLOBaccess.h | 17 +-
core/sql/exp/ExpLOBinterface.cpp | 165 +-
core/sql/exp/ExpLOBinterface.h | 7 +-
core/sql/exp/ExpPCode.cpp | 68 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 398 +++--
core/sql/exp/ExpPCodeExpGen.cpp | 5 +-
core/sql/exp/ExpPCodeInstruction.h | 41 +-
core/sql/exp/ExpPCodeOptimizations.cpp | 103 +-
core/sql/exp/ExpPCodeOptsConstProp.cpp | 8 +-
core/sql/exp/exp_arith.cpp | 6 +-
core/sql/exp/exp_attrs.cpp | 3 +
core/sql/exp/exp_bignum.cpp | 12 +-
core/sql/exp/exp_clause.cpp | 3 +-
core/sql/exp/exp_clause_derived.h | 86 +-
core/sql/exp/exp_comp.cpp | 151 +-
core/sql/exp/exp_conv.cpp | 1033 +++++++++---
core/sql/exp/exp_datetime.cpp | 178 +-
core/sql/exp/exp_eval.cpp | 222 ++-
core/sql/exp/exp_expr.cpp | 2 -
core/sql/exp/exp_expr.h | 23 +-
core/sql/exp/exp_fixup.cpp | 131 +-
core/sql/exp/exp_function.cpp | 95 +-
core/sql/exp/exp_math_func.cpp | 18 +-
core/sql/generator/GenExpGenerator.cpp | 97 +-
core/sql/generator/GenExpGenerator.h | 3 +
core/sql/generator/GenItemExpr.cpp | 19 +
core/sql/generator/GenPreCode.cpp | 152 +-
core/sql/generator/GenRelJoin.cpp | 7 +-
core/sql/generator/GenRelMisc.cpp | 3 -
core/sql/generator/Generator.cpp | 17 +-
core/sql/generator/Generator.h | 21 -
core/sql/optimizer/BindItemExpr.cpp | 25 +
core/sql/optimizer/BindRelExpr.cpp | 108 +-
core/sql/optimizer/ControlDB.cpp | 10 +-
core/sql/optimizer/EncodedValue.cpp | 7 +
core/sql/optimizer/HDFSHook.cpp | 31 +-
core/sql/optimizer/ItemArith.h | 32 +
core/sql/optimizer/ItemExpr.cpp | 52 +-
core/sql/optimizer/NAColumn.cpp | 21 +
core/sql/optimizer/NATable.cpp | 26 +
core/sql/optimizer/NormItemExpr.cpp | 2 +-
core/sql/optimizer/OptRange.cpp | 24 +-
core/sql/optimizer/RelExeUtil.cpp | 6 +
core/sql/optimizer/SynthType.cpp | 70 +-
core/sql/optimizer/UdfDllInteraction.cpp | 23 +
core/sql/optimizer/ValueDesc.cpp | 34 +-
core/sql/parser/ParKeyWords.cpp | 2 +-
core/sql/parser/SqlParserAux.cpp | 28 +-
core/sql/parser/StmtDDLCreate.cpp | 1 +
core/sql/parser/sqlparser.y | 67 +-
core/sql/parser/ulexer.cpp | 3 +-
core/sql/regress/compGeneral/EXPECTED042 | 32 +-
core/sql/regress/compGeneral/EXPECTED071 | 4 +-
core/sql/regress/core/EXPECTED037.SB | 4 +-
core/sql/regress/core/EXPECTED038.LINUX | 24 +-
core/sql/regress/core/TEST037 | 2 +-
core/sql/regress/executor/EXPECTED002.SB | 68 +-
core/sql/regress/executor/EXPECTED012 | 36 +-
core/sql/regress/executor/EXPECTED022.SB | 168 +-
core/sql/regress/executor/EXPECTED050 | 4 +-
core/sql/regress/executor/EXPECTED063 | 166 +-
core/sql/regress/executor/EXPECTED140 | 60 +-
core/sql/regress/executor/TEST012 | 15 +-
core/sql/regress/hive/EXPECTED005 | 26 +-
core/sql/regress/hive/EXPECTED009 | 16 +-
core/sql/regress/hive/EXPECTED015 | 60 +-
core/sql/regress/hive/EXPECTED018 | 204 +--
core/sql/regress/hive/TEST005 | 2 +-
core/sql/regress/hive/TEST009 | 2 +-
core/sql/regress/hive/TEST018 | 22 +-
core/sql/regress/qat/eqatdml12 | 98 +-
core/sql/regress/qat/eqatdml13 | 98 +-
core/sql/regress/seabase/EXPECTED003 | 1583 +++++++++++++++++-
core/sql/regress/seabase/EXPECTED010 | 378 ++---
core/sql/regress/seabase/EXPECTED020 | 8 +-
core/sql/regress/seabase/EXPECTED030 | 20 +-
core/sql/regress/seabase/EXPECTED031 | 76 +
core/sql/regress/seabase/TEST003 | 251 ++-
core/sql/regress/seabase/TEST030 | 2 +
core/sql/regress/seabase/TEST031 | 13 +
core/sql/regress/tools/regrhive.ksh | 2 +-
core/sql/regress/udr/EXPECTED001 | 30 +-
core/sql/regress/udr/TEST001 | 7 +
core/sql/sqlci/Formatter.cpp | 10 +
core/sql/sqlci/Param.cpp | 2 +
core/sql/sqlci/SqlciEnv.cpp | 11 +-
core/sql/sqlci/SqlciEnv.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 15 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLutil.cpp | 2 +
core/sql/sqlcomp/DefaultConstants.h | 17 +
core/sql/sqlcomp/nadefaults.cpp | 9 +
.../java/org/trafodion/sql/HBaseClient.java | 14 +-
.../java/org/trafodion/sql/HBulkLoadClient.java | 31 +-
.../java/org/trafodion/sql/HTableClient.java | 21 +-
.../java/org/trafodion/sql/OrcFileReader.java | 52 +-
.../org/trafodion/sql/SequenceFileWriter.java | 75 +-
core/sql/ustat/hs_cli.cpp | 9 +
core/sql/ustat/hs_faststats.cpp | 9 +-
core/sql/ustat/hs_globals.cpp | 34 +
docs/client_install/pom.xml | 1 +
docs/command_interface/pom.xml | 1 +
docs/cqd_reference/pom.xml | 1 +
docs/jdbct4ref_guide/pom.xml | 1 +
docs/load_transform/pom.xml | 1 +
docs/messages_guide/pom.xml | 1 +
docs/odb_user/pom.xml | 1 +
docs/provisioning_guide/pom.xml | 1 +
.../src/asciidoc/_chapters/prepare.adoc | 43 +-
.../src/asciidoc/_chapters/quickstart.adoc | 597 +++++++
.../src/asciidoc/_chapters/requirements.adoc | 8 +-
.../src/asciidoc/_chapters/script_install.adoc | 371 ++--
.../src/asciidoc/_chapters/script_upgrade.adoc | 260 ++-
docs/provisioning_guide/src/asciidoc/index.adoc | 1 +
docs/shared/license.txt | 5 +
docs/shared/revisions.txt | 4 +-
docs/spj_guide/pom.xml | 1 +
docs/sql_reference/pom.xml | 1 +
docs/src/site/markdown/download.md | 24 +-
docs/src/site/markdown/index.md | 8 +-
docs/src/site/markdown/release-notes-2-0-1.md | 10 +-
docs/src/site/resources/css/site.css | 1 +
docs/src/site/site.xml | 12 +-
install/Makefile | 2 +-
install/installer/traf_apache_mods | 7 +
install/installer/traf_cloudera_mods | 32 +-
install/installer/traf_hortonworks_mods | 8 +
192 files changed, 8739 insertions(+), 3438 deletions(-)
----------------------------------------------------------------------
[12/13] incubator-trafodion git commit: Merge pull request #4 from
mashengchen/master
Posted by sa...@apache.org.
Merge pull request #4 from mashengchen/master
update head
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/42be08ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/42be08ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/42be08ac
Branch: refs/heads/master
Commit: 42be08ac4554893d68743321cfbeedd4cc0278a5
Parents: 0a5a0b8 1f0e8a3
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jul 18 19:01:10 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Jul 18 19:01:10 2016 +0800
----------------------------------------------------------------------
core/conn/jdbcT4/pom.xml | 6 +
.../trafodion/jdbc/t4/InterfaceResultSet.java | 20 +-
.../trafodion/jdbc/t4/InterfaceUtilities.java | 11 +-
.../trafodion/jdbc/t4/T4DatabaseMetaData.java | 8 +-
core/conn/jdbc_type2/Makefile | 2 +-
core/conn/odb/Makefile | 2 +-
core/conn/odb/src/odb.c | 7 +-
.../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 41 +
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 277 ++-
core/conn/trafci/.gitignore | 1 +
.../sql/scripts/install_hadoop_regr_test_env | 372 +++-
core/sqf/sql/scripts/install_local_hadoop | 33 +-
.../hbase/client/transactional/TmDDL.java | 65 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 4 +-
.../trafodion/dtm/HBaseAuditControlPoint.java | 150 +-
.../main/java/org/trafodion/dtm/HBaseTmZK.java | 22 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 535 +++---
.../java/org/trafodion/dtm/TmAuditTlog.java | 332 +---
.../main/java/org/trafodion/dtm/TrafInfo.java | 12 +-
core/sql/bin/SqlciErrors.txt | 8 +-
core/sql/cli/Cli.cpp | 18 +-
core/sql/cli/Cli.h | 3 +-
core/sql/cli/CliExtern.cpp | 3 +-
core/sql/cli/Context.cpp | 61 +-
core/sql/cli/Context.h | 17 +-
core/sql/cli/Descriptor.cpp | 8 +
core/sql/cli/Statement.cpp | 4 +
core/sql/cli/sqlcli.h | 5 +
core/sql/common/BaseTypes.cpp | 37 +
core/sql/common/BigNumHelper.cpp | 27 +-
core/sql/common/BigNumHelper.h | 6 +-
core/sql/common/ComSmallDefs.h | 12 +-
core/sql/common/ComSysUtils.h | 21 +
core/sql/common/Int64.cpp | 20 +
core/sql/common/Int64.h | 12 +
core/sql/common/MiscType.cpp | 150 +-
core/sql/common/MiscType.h | 112 +-
core/sql/common/NAType.cpp | 12 +
core/sql/common/NAType.h | 5 +
core/sql/common/NumericType.cpp | 148 +-
core/sql/common/NumericType.h | 54 +-
core/sql/common/SQLTypeDefs.h | 3 +
core/sql/common/dfs2rec.h | 16 +-
core/sql/common/str.cpp | 40 +-
core/sql/common/str.h | 12 +-
core/sql/executor/ExExeUtil.h | 3 +-
core/sql/executor/ExExeUtilCli.cpp | 4 +-
core/sql/executor/ExExeUtilGet.cpp | 8 +-
core/sql/executor/ExExeUtilLoad.cpp | 49 +-
core/sql/executor/ExExeUtilMisc.cpp | 5 +-
core/sql/executor/ExFastTransport.cpp | 6 +-
core/sql/executor/ExHbaseIUD.cpp | 13 +-
core/sql/executor/ExHdfsScan.cpp | 84 +-
core/sql/executor/ExHdfsScan.h | 1 -
core/sql/executor/JavaObjectInterface.cpp | 4 +-
core/sql/executor/ex_globals.cpp | 14 +-
core/sql/executor/ex_globals.h | 4 +-
core/sql/executor/ex_root.cpp | 13 +-
core/sql/executor/ex_split_bottom.cpp | 2 +-
core/sql/exp/ExpError.cpp | 25 +
core/sql/exp/ExpError.h | 5 +
core/sql/exp/ExpErrorEnums.h | 1 +
core/sql/exp/ExpLOB.cpp | 107 +-
core/sql/exp/ExpLOB.h | 18 +-
core/sql/exp/ExpLOBaccess.cpp | 232 ++-
core/sql/exp/ExpLOBaccess.h | 17 +-
core/sql/exp/ExpLOBinterface.cpp | 165 +-
core/sql/exp/ExpLOBinterface.h | 7 +-
core/sql/exp/ExpPCode.cpp | 68 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 398 +++--
core/sql/exp/ExpPCodeExpGen.cpp | 5 +-
core/sql/exp/ExpPCodeInstruction.h | 41 +-
core/sql/exp/ExpPCodeOptimizations.cpp | 103 +-
core/sql/exp/ExpPCodeOptsConstProp.cpp | 8 +-
core/sql/exp/exp_arith.cpp | 6 +-
core/sql/exp/exp_attrs.cpp | 3 +
core/sql/exp/exp_bignum.cpp | 12 +-
core/sql/exp/exp_clause.cpp | 3 +-
core/sql/exp/exp_clause_derived.h | 86 +-
core/sql/exp/exp_comp.cpp | 151 +-
core/sql/exp/exp_conv.cpp | 1033 +++++++++---
core/sql/exp/exp_datetime.cpp | 178 +-
core/sql/exp/exp_eval.cpp | 222 ++-
core/sql/exp/exp_expr.cpp | 2 -
core/sql/exp/exp_expr.h | 23 +-
core/sql/exp/exp_fixup.cpp | 131 +-
core/sql/exp/exp_function.cpp | 95 +-
core/sql/exp/exp_math_func.cpp | 18 +-
core/sql/generator/GenExpGenerator.cpp | 97 +-
core/sql/generator/GenExpGenerator.h | 3 +
core/sql/generator/GenItemExpr.cpp | 19 +
core/sql/generator/GenPreCode.cpp | 152 +-
core/sql/generator/GenRelJoin.cpp | 7 +-
core/sql/generator/GenRelMisc.cpp | 3 -
core/sql/generator/Generator.cpp | 17 +-
core/sql/generator/Generator.h | 21 -
core/sql/optimizer/BindItemExpr.cpp | 25 +
core/sql/optimizer/BindRelExpr.cpp | 108 +-
core/sql/optimizer/ControlDB.cpp | 10 +-
core/sql/optimizer/EncodedValue.cpp | 7 +
core/sql/optimizer/HDFSHook.cpp | 31 +-
core/sql/optimizer/ItemArith.h | 32 +
core/sql/optimizer/ItemExpr.cpp | 52 +-
core/sql/optimizer/NAColumn.cpp | 21 +
core/sql/optimizer/NATable.cpp | 26 +
core/sql/optimizer/NormItemExpr.cpp | 2 +-
core/sql/optimizer/OptRange.cpp | 24 +-
core/sql/optimizer/RelExeUtil.cpp | 6 +
core/sql/optimizer/SynthType.cpp | 70 +-
core/sql/optimizer/UdfDllInteraction.cpp | 23 +
core/sql/optimizer/ValueDesc.cpp | 34 +-
core/sql/parser/ParKeyWords.cpp | 2 +-
core/sql/parser/SqlParserAux.cpp | 28 +-
core/sql/parser/StmtDDLCreate.cpp | 1 +
core/sql/parser/sqlparser.y | 67 +-
core/sql/parser/ulexer.cpp | 3 +-
core/sql/regress/compGeneral/EXPECTED042 | 32 +-
core/sql/regress/compGeneral/EXPECTED071 | 4 +-
core/sql/regress/core/EXPECTED037.SB | 4 +-
core/sql/regress/core/EXPECTED038.LINUX | 24 +-
core/sql/regress/core/TEST037 | 2 +-
core/sql/regress/executor/EXPECTED002.SB | 68 +-
core/sql/regress/executor/EXPECTED012 | 36 +-
core/sql/regress/executor/EXPECTED022.SB | 168 +-
core/sql/regress/executor/EXPECTED050 | 4 +-
core/sql/regress/executor/EXPECTED063 | 166 +-
core/sql/regress/executor/EXPECTED140 | 60 +-
core/sql/regress/executor/TEST012 | 15 +-
core/sql/regress/hive/EXPECTED005 | 26 +-
core/sql/regress/hive/EXPECTED009 | 16 +-
core/sql/regress/hive/EXPECTED015 | 60 +-
core/sql/regress/hive/EXPECTED018 | 204 +--
core/sql/regress/hive/TEST005 | 2 +-
core/sql/regress/hive/TEST009 | 2 +-
core/sql/regress/hive/TEST018 | 22 +-
core/sql/regress/qat/eqatdml12 | 98 +-
core/sql/regress/qat/eqatdml13 | 98 +-
core/sql/regress/seabase/EXPECTED003 | 1583 +++++++++++++++++-
core/sql/regress/seabase/EXPECTED010 | 378 ++---
core/sql/regress/seabase/EXPECTED020 | 8 +-
core/sql/regress/seabase/EXPECTED030 | 20 +-
core/sql/regress/seabase/EXPECTED031 | 76 +
core/sql/regress/seabase/TEST003 | 251 ++-
core/sql/regress/seabase/TEST030 | 2 +
core/sql/regress/seabase/TEST031 | 13 +
core/sql/regress/tools/regrhive.ksh | 2 +-
core/sql/regress/udr/EXPECTED001 | 30 +-
core/sql/regress/udr/TEST001 | 7 +
core/sql/sqlci/Formatter.cpp | 10 +
core/sql/sqlci/Param.cpp | 2 +
core/sql/sqlci/SqlciEnv.cpp | 11 +-
core/sql/sqlci/SqlciEnv.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 15 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLutil.cpp | 2 +
core/sql/sqlcomp/DefaultConstants.h | 17 +
core/sql/sqlcomp/nadefaults.cpp | 9 +
.../java/org/trafodion/sql/HBaseClient.java | 14 +-
.../java/org/trafodion/sql/HBulkLoadClient.java | 31 +-
.../java/org/trafodion/sql/HTableClient.java | 21 +-
.../java/org/trafodion/sql/OrcFileReader.java | 52 +-
.../org/trafodion/sql/SequenceFileWriter.java | 75 +-
core/sql/ustat/hs_cli.cpp | 9 +
core/sql/ustat/hs_faststats.cpp | 9 +-
core/sql/ustat/hs_globals.cpp | 34 +
docs/client_install/pom.xml | 1 +
docs/command_interface/pom.xml | 1 +
docs/cqd_reference/pom.xml | 1 +
docs/jdbct4ref_guide/pom.xml | 1 +
docs/load_transform/pom.xml | 1 +
docs/messages_guide/pom.xml | 1 +
docs/odb_user/pom.xml | 1 +
docs/provisioning_guide/pom.xml | 1 +
.../src/asciidoc/_chapters/about.adoc | 6 +-
.../src/asciidoc/_chapters/activate.adoc | 1 +
.../src/asciidoc/_chapters/enable_security.adoc | 251 +--
.../src/asciidoc/_chapters/introduction.adoc | 142 +-
.../src/asciidoc/_chapters/prepare.adoc | 84 +-
.../src/asciidoc/_chapters/quickstart.adoc | 597 +++++++
.../src/asciidoc/_chapters/requirements.adoc | 38 +-
.../src/asciidoc/_chapters/script_install.adoc | 376 ++---
.../src/asciidoc/_chapters/script_upgrade.adoc | 266 ++-
docs/provisioning_guide/src/asciidoc/index.adoc | 1 +
docs/shared/license.txt | 5 +
docs/shared/revisions.txt | 3 +-
docs/spj_guide/pom.xml | 1 +
docs/sql_reference/pom.xml | 1 +
.../src/asciidoc/_chapters/sql_statements.adoc | 14 +-
docs/src/site/markdown/download.md | 24 +-
docs/src/site/markdown/index.md | 8 +-
docs/src/site/markdown/release-notes-2-0-1.md | 10 +-
docs/src/site/resources/css/site.css | 1 +
docs/src/site/site.xml | 12 +-
install/Makefile | 2 +-
install/installer/traf_apache_mods | 7 +
install/installer/traf_cloudera_mods | 32 +-
install/installer/traf_hortonworks_mods | 8 +
197 files changed, 9053 insertions(+), 3619 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/42be08ac/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/42be08ac/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/42be08ac/install/installer/traf_apache_mods
----------------------------------------------------------------------
[09/13] incubator-trafodion git commit: Update sqenvcom.sh
Posted by sa...@apache.org.
Update sqenvcom.sh
sorry,it's a long time from my first commit, and i mistake the value for hbase_distro when in apache situation, now returne back,
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a0fd11ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a0fd11ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a0fd11ec
Branch: refs/heads/master
Commit: a0fd11ec72c32ab7a3817ebd71dd21aafb996410
Parents: a694230
Author: mashengchen <ma...@gmail.com>
Authored: Tue Jul 12 10:24:48 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Tue Jul 12 10:24:48 2016 +0800
----------------------------------------------------------------------
core/sqf/sqenvcom.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0fd11ec/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index e0b3762..ea1cd97 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -475,8 +475,8 @@ else
cat <<EOF
If you haven't set HBASE_DISTRO, please set it before source current file
- export HBASE_DISTRO=HBASE1.0 (APACHE HBASE1.0)
- export HBASE_DISTRO=HBASE1.1 (APACHE HBASE1.1)
+ export HBASE_DISTRO=APACHE1.0 (APACHE HBASE1.0)
+ export HBASE_DISTRO=APACHE1.1 (APACHE HBASE1.1)
export HBASE_DISTRO=CDH5.4 (cloudera 1.0.0-cdh5.4.4)
export HBASE_DISTRO=CDH5.5 (cloudera 1.0.0-cdh5.5.1)
export HBASE_DISTRO=HDP (hortonworks 2.3)
[02/13] incubator-trafodion git commit: Merge pull request #1 from
apache/master
Posted by sa...@apache.org.
Merge pull request #1 from apache/master
update head
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/324a981c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/324a981c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/324a981c
Branch: refs/heads/master
Commit: 324a981c69e9c150bd7730d63ad5049483749918
Parents: b1ff89f 85ba233
Author: mashengchen <ma...@gmail.com>
Authored: Wed Jun 29 15:42:59 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Jun 29 15:42:59 2016 +0800
----------------------------------------------------------------------
core/sqf/sql/scripts/sqcheck | 68 ++++++++++++++++++++++++++++++---------
1 file changed, 53 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[08/13] incubator-trafodion git commit: Update sqenvcom.sh
Posted by sa...@apache.org.
Update sqenvcom.sh
correct HBASE_DISTRO value for apache situation
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a6942309
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a6942309
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a6942309
Branch: refs/heads/master
Commit: a6942309b0efba4f548a8e065e729826c0f8cca4
Parents: bacd8bf
Author: mashengchen <ma...@gmail.com>
Authored: Tue Jul 12 10:19:32 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Tue Jul 12 10:19:32 2016 +0800
----------------------------------------------------------------------
core/sqf/sqenvcom.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a6942309/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index ea1cd97..e0b3762 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -475,8 +475,8 @@ else
cat <<EOF
If you haven't set HBASE_DISTRO, please set it before source current file
- export HBASE_DISTRO=APACHE1.0 (APACHE HBASE1.0)
- export HBASE_DISTRO=APACHE1.1 (APACHE HBASE1.1)
+ export HBASE_DISTRO=HBASE1.0 (APACHE HBASE1.0)
+ export HBASE_DISTRO=HBASE1.1 (APACHE HBASE1.1)
export HBASE_DISTRO=CDH5.4 (cloudera 1.0.0-cdh5.4.4)
export HBASE_DISTRO=CDH5.5 (cloudera 1.0.0-cdh5.5.1)
export HBASE_DISTRO=HDP (hortonworks 2.3)
[11/13] incubator-trafodion git commit: Update traf_config_check
Posted by sa...@apache.org.
Update traf_config_check
add hbase_distro to trafodion_config
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0a5a0b87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0a5a0b87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0a5a0b87
Branch: refs/heads/master
Commit: 0a5a0b8778a3d468345dac57a805f319cc9249b1
Parents: a0fd11e
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jul 18 19:00:03 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Jul 18 19:00:03 2016 +0800
----------------------------------------------------------------------
install/installer/traf_config_check | 35 ++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a5a0b87/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 3cadaca..c7da156 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -623,7 +623,15 @@ source $TRAF_CONFIG
function setHBaseDistro {
-export HBASE_DISTRO="APACHE"
+if [[ $HADOOP_TYPE == "apache" ]]; then
+ HBASE_DISTRO="APACHE"$APACHE_VERSION
+elif [[ $HADOOP_TYPE == "hortonworks" ]]; then
+ HBASE_DISTRO="HDP"$HDP_VERSION
+elif [[ $HADOOP_TYPE == "cloudera" ]]; then
+ HBASE_DISTRO="CDH"$CDH_VERSION
+fi
+
+export HBASE_DISTRO
sudo chmod 777 $TRAF_CONFIG
sed -i '/HBASE_DISTRO\=/d' $TRAF_CONFIG
@@ -703,7 +711,9 @@ function checkRoleGroups {
function checkClouderaVersion {
-
+cdhVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | grep -o "cdh[0-9]\.[0-9]")
+#get cdh version,eg:5.5 or 5.7
+CDH_VERSION=${cdhVersion:3:5}
if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then
#Check that Cloudera 5.2 or 5.3 are not installed.
if [[ "$CDH_5_4_SUPPORT" == "Y" ]] || [[ "$CDH_5_5_SUPPORT" == "Y" ]]; then
@@ -745,18 +755,22 @@ else
fi
fi
-baseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
+hbaseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
echo "***INFO: nameOfVersion=$nameOfVersion"
sudo chmod 777 $TRAF_CONFIG
sed -i '/hbaseVersion\=/d' $TRAF_CONFIG
echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG
+sed -i '/CDH_VERSION\=/d' $TRAF_CONFIG
+echo "export CDH_VERSION=\"$CDH_VERSION\"" >> $TRAF_CONFIG
source $TRAF_CONFIG
}
function checkHDPVersion {
-
+version=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
+#get hdp version,eg:2.1 or 2.3
+HDP_VERSION=${version:6:3}
if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then
if [[ $HDP_2_3_SUPPORT == "N" ]]; then
#Check that Hortonworks 2.2 is not installed
@@ -809,7 +823,7 @@ if [[ -z $nameOfVersion ]]; then
fi
fi
-baseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
+hbaseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
echo "***INFO: nameOfVersion=$nameOfVersion"
echo "***INFO: HADOOP_PATH=$HADOOP_PATH"
@@ -817,12 +831,15 @@ echo "***INFO: HADOOP_PATH=$HADOOP_PATH"
sudo chmod 777 $TRAF_CONFIG
sed -i '/hbaseVersion\=/d' $TRAF_CONFIG
echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG
+sed -i '/HDP_VERSION\=/d' $TRAF_CONFIG
+echo "export HDP_VERSION=\"$HDP_VERSION\"" >> $TRAF_CONFIG
source $TRAF_CONFIG
}
function checkApacheVersion {
-
+version=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | awk {'print $2'})
+APACHE_VERSION=${version:0:3}
if [[ $APACHE_1_0_X_SUPPORT=="Y" || $APACHE_1_1_X_SUPPORT=="Y" ]]; then
nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | awk {'print $2'})
#Check that hbase 1.x.x is not installed.
@@ -838,12 +855,14 @@ if [[ $APACHE_1_0_X_SUPPORT=="Y" || $APACHE_1_1_X_SUPPORT=="Y" ]]; then
fi
fi
-baseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'}|sed s/,//g)
+hbaseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'}|sed s/,//g)
echo "***INFO: nameOfVersion=$nameOfVersion"
sudo chmod 777 $TRAF_CONFIG
sed -i '/hbaseVersion\=/d' $TRAF_CONFIG
echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG
+sed -i '/APACHE_VERSION\=/d' $TRAF_CONFIG
+echo "export APACHE_VERSION=\"$APACHE_VERSION\"" >> $TRAF_CONFIG
source $TRAF_CONFIG
}
@@ -1088,8 +1107,8 @@ fi
if [[ "$HADOOP_TYPE" == "apache" ]]; then
setPath
- setHBaseDistro
fi
+setHBaseDistro
getHadoopNodes
[13/13] incubator-trafodion git commit: Merge remote branch
'origin/pr/568/head' into merge_568
Posted by sa...@apache.org.
Merge remote branch 'origin/pr/568/head' into merge_568
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b7dd48c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b7dd48c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b7dd48c1
Branch: refs/heads/master
Commit: b7dd48c1f4ae4260ed7d609c3404bac4938f769e
Parents: 44660e4 42be08a
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue Jul 19 16:06:08 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue Jul 19 16:06:08 2016 +0000
----------------------------------------------------------------------
core/sqf/conf/install_features | 2 +
core/sqf/sqenvcom.sh | 49 ++-
core/sqf/sql/scripts/install_local_hadoop | 11 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 87 +++--
core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 336 -------------------
.../sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 336 +++++++++++++++++++
.../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 336 +++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh | 332 ------------------
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 332 ++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 332 ++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pp.awk | 40 ++-
.../hbase/client/ClientScanner98.java.tmpl | 2 +-
.../hbase/client/PatchClientScanner.java.tmpl | 2 +-
.../client/TrafParallelClientScanner.java.tmpl | 2 +-
.../transactional/SsccRegionEndpoint.java.tmpl | 4 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 4 +-
.../transactional/TrxRegionObserver.java.tmpl | 16 +-
.../CleanOldTransactionsChore.java.tmpl | 6 +-
.../transactional/KeyValueListScanner.java.tmpl | 2 +-
.../transactional/MemoryUsageChore.java.tmpl | 6 +-
.../transactional/TrxTransactionState.java.tmpl | 10 +-
install/installer/traf_apache_mods | 6 +-
install/installer/traf_config_check | 72 +++-
23 files changed, 1562 insertions(+), 763 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7dd48c1/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7dd48c1/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
----------------------------------------------------------------------
[03/13] incubator-trafodion git commit: TRAFODION-2016 support apache
hbase1.1 & cdh5.5
Posted by sa...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55
new file mode 100755
index 0000000..cf60e55
--- /dev/null
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55
@@ -0,0 +1,332 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+/**
+ * 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.
+ */
+-->
+ <repositories>
+ <repository>
+ <id>cloudera</id>
+ <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+ </repository>
+ </repositories>
+
+ <properties>
+ <hadoop.version>2.6.0</hadoop.version>
+ <hbase.version>1.0.0-cdh5.5.1</hbase.version>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.version>1.7</java.version>
+ <trx-suffix>cdh5_5</trx-suffix>
+ </properties>
+
+
+ <groupId>org.apache</groupId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>hbase-trx-cdh5_5</artifactId>
+ <version>${env.TRAFODION_VER}</version>
+ <name>HBase - Trx</name>
+ <description>Trx of HBase usage</description>
+
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <!-- allow for different build targets with separate classes directories and
+ output jars, used for Java 6 compile for now -->
+ <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
+ These plugins inherit their options from the <reporting> section below. These settings
+ can be overwritten here. -->
+ <plugins>
+ <plugin>
+ <!--Make it so assembly:single does nothing in here-->
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <!-- Have to set the groups here because we only do
+ split tests in this package, so groups on live in this module -->
+ <groups>${surefire.firstPartGroups}</groups>
+ </configuration>
+ </plugin>
+ <!-- Make a jar and put the sources in the jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>hbase-trx.jar.versions</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-protocol</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-thrift</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <scope>test</scope>
+ <version>${hbase.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <!-- Skip the tests in this module -->
+ <profile>
+ <id>skipTrxTests</id>
+ <activation>
+ <property>
+ <name>skipTrxTests</name>
+ </property>
+ </activation>
+ <properties>
+ <surefire.skipFirstPart>true</surefire.skipFirstPart>
+ <surefire.skipSecondPart>true</surefire.skipSecondPart>
+ </properties>
+ </profile>
+
+ <!-- Profiles for building against different hadoop versions -->
+ <!-- There are a lot of common dependencies used here, should investigate
+if we can combine these profiles somehow -->
+ <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
+ activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
+ the same time. -->
+ <profile>
+ <id>hadoop-1.1</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!--
+ profile for building against Hadoop 2.0.0-alpha. Activate using:
+ mvn -Dhadoop.profile=2.0
+ -->
+ <profile>
+ <id>hadoop-2.0</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h2--><name>!hadoop.profile</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate
+ the required classpath that is required in the env
+ of the launch container in the mini mr/yarn cluster
+ -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!--
+ profile for building against Hadoop 3.0.x. Activate using:
+ mvn -Dhadoop.profile=3.0
+ -->
+ <profile>
+ <id>hadoop-3.0</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>3.0</value>
+ </property>
+ </activation>
+ <properties>
+ <hadoop.version>3.0-SNAPSHOT</hadoop.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate
+ the required classpath that is required in the env
+ of the launch container in the mini mr/yarn cluster
+ -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>compile-protobuf</id>
+ <activation>
+ <property>
+ <name>compile-protobuf</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-maven-plugins</artifactId>
+ <executions>
+ <execution>
+ <id>compile-protoc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>protoc</goal>
+ </goals>
+ <configuration>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
+ <imports>
+ <param>${basedir}/src/main/protobuf</param>
+ <param>${basedir}/hbase-protocol/src/main/protobuf</param>
+ </imports>
+ <source>
+ <directory>${basedir}/src/main/protobuf</directory>
+ <includes>
+ <include>TrxRegion.proto</include>
+ <include>SsccRegion.proto</include>
+ </includes>
+ </source>
+ <output>${basedir}/src/main/java/</output>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/pp.awk
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pp.awk b/core/sqf/src/seatrans/hbase-trx/pp.awk
index 44d8b66..50fd32f 100644
--- a/core/sqf/src/seatrans/hbase-trx/pp.awk
+++ b/core/sqf/src/seatrans/hbase-trx/pp.awk
@@ -19,29 +19,35 @@
# under the License.
#
# @@@ END COPYRIGHT @@@
-## The following example has been tested to work.
+# The following example has been tested to work.
# If the file f1 contains the following, run this script
# as follows:
# awk -f pp.awk -v distro=HDP2.3 f1 > f2
+#
# contents of file f1:
-# #ifdef HDP2.3
-# this is HDP2.3 specific code
-# #else
-# this is other than HDP2.3 code
-# #endif
+# #ifdef HDP2.3
+# this is HDP2.3 specific code
+# #else
+# this is anything other than HDP2.3 code
+# #endif
#
-# #ifndef HDP2.3
-# this is other than HDP2.3 code partof ifndef
-# #else
-# this is HDP2.3 code part of ifndef else
+# #ifndef HDP2.3
+# this is anything other than HDP2.3 code partof ifndef construct
+# #else
+# this is HDP2.3 code part of ifndef else construct
# #endif
#
-# this is common code
-# this is common code 2
+# this is common code for all cases
#
-# #ifdef CDH1.0
-# this is CDH specific code
-# #endif
+# #ifdef CDH5.4
+# this is CDH5.4 specific code
+# #endif
+#
+# #ifdef CDH5.5 HDP2.3 HBASE1.1
+# this is common CDH5.5 or HDP2.3 or HBASE1.1
+# #else
+# this is anything other than CDH5.5 or HDP2.3 or HBASE1.1 code
+# #endif
BEGIN{
printline=1 #print current line or not.
@@ -99,7 +105,7 @@ ifndefpattern = "#ifndef"
if($0 ~ ifdefpattern)
{
- if( $2 ~ distro)
+ if( $2 ~ distro || $3 ~ distro || $4 ~ distro)
{
printline = 0
matchBegun = 1
@@ -112,7 +118,7 @@ ifndefpattern = "#ifndef"
}
if($0 ~ ifndefpattern)
{
- if($2 ~ distro)
+ if($2 ~ distro || $3 ~ distro || $4 ~ distro)
{
printline = 0
unmatchBegun = 1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/ClientScanner98.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/ClientScanner98.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/ClientScanner98.java.tmpl
index 81cec3f..4d9fad9 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/ClientScanner98.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/ClientScanner98.java.tmpl
@@ -468,7 +468,7 @@ public class ClientScanner98 extends AbstractClientScanner {
}
closed = true;
}
-#ifndef CDH1.0
+#ifndef CDH5.4 CDH5.5
@Override
public boolean renewLease() {
if (callable != null) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/PatchClientScanner.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/PatchClientScanner.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/PatchClientScanner.java.tmpl
index 9e1f597..42c9c5e 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/PatchClientScanner.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/PatchClientScanner.java.tmpl
@@ -69,7 +69,7 @@ public class PatchClientScanner extends ClientScanner {
super(conf, scan, tableName, connection, rpcFactory, controllerFactory, pool, primaryOperationTimeout);
}
-#ifndef HDP2.3
+#ifdef CDH5.4 HBASE1.0
@Override
protected void loadCache() throws IOException {
Result[] values = null;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/TrafParallelClientScanner.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/TrafParallelClientScanner.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/TrafParallelClientScanner.java.tmpl
index c8c75ae..3ff9a81 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/TrafParallelClientScanner.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/TrafParallelClientScanner.java.tmpl
@@ -190,7 +190,7 @@ public class TrafParallelClientScanner extends AbstractClientScanner implements
// interrupt all running threads, don't wait for completion
pool.shutdownNow();
}
-#ifndef CDH1.0
+#ifndef CDH5.4 CDH5.5
@Override
public boolean renewLease() {return false;}//fake, never needed.
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
index 2a9a748..dbeee79 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
@@ -3420,7 +3420,7 @@ CoprocessorService, Coprocessor {
if (LOG.isTraceEnabled()) LOG.trace("SsccRegionEndpoint coprocessor: start");
RegionCoprocessorEnvironment tmp_env =
(RegionCoprocessorEnvironment)env;
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1
this.m_Region = (HRegion)
tmp_env.getRegion();
#else
@@ -3582,7 +3582,7 @@ CoprocessorService, Coprocessor {
try {
if (LOG.isTraceEnabled()) LOG.trace("SsccRegionEndpoint coprocessor: Trafodion Recovery: Flushing cache in startRegionAfterRecovery " + m_Region.getRegionInfo().getRegionNameAsString());
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1
m_Region.flush(true);
#else
m_Region.flushcache();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
index 4f7b43c..a450db7 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
@@ -3490,7 +3490,7 @@ CoprocessorService, Coprocessor {
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: start");
RegionCoprocessorEnvironment tmp_env =
(RegionCoprocessorEnvironment)env;
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1
this.m_Region = (HRegion)
tmp_env.getRegion();
#else
@@ -4011,7 +4011,7 @@ CoprocessorService, Coprocessor {
try {
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: Trafodion Recovery: Flushing cache in startRegionAfterRecovery " + m_Region.getRegionInfo().getRegionNameAsString());
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1
m_Region.flush(true);
#else
m_Region.flushcache();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
index 5c087af..55c91e9 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
@@ -85,8 +85,10 @@ import org.apache.hadoop.hbase.client.Mutation;
import java.util.ListIterator;
import org.apache.hadoop.hbase.Cell;
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
import org.apache.hadoop.hbase.regionserver.ScannerContext;
+#endif
+#ifdef HDP2.3 HBASE1.1
import org.apache.hadoop.hbase.regionserver.Region;
#endif
@@ -184,7 +186,7 @@ public void start(CoprocessorEnvironment e) throws IOException {
RegionCoprocessorEnvironment regionCoprEnv = (RegionCoprocessorEnvironment)e;
RegionCoprocessorEnvironment re = (RegionCoprocessorEnvironment) e;
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1
my_Region = (HRegion) re.getRegion();
#else
my_Region = re.getRegion();
@@ -696,7 +698,7 @@ public void createRecoveryzNode(int node, String encodedName, byte [] data) thro
}
@Override
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1
public void postSplit(ObserverContext<RegionCoprocessorEnvironment> e, Region l, Region r) {
#else
public void postSplit(ObserverContext<RegionCoprocessorEnvironment> e, HRegion l, HRegion r) {
@@ -757,7 +759,7 @@ public void createRecoveryzNode(int node, String encodedName, byte [] data) thro
blockNonPhase2.set(true);
if(LOG.isInfoEnabled()) {
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1
HRegion region = (HRegion) c.getEnvironment().getRegion();
#else
HRegion region = c.getEnvironment().getRegion();
@@ -765,7 +767,7 @@ public void createRecoveryzNode(int node, String encodedName, byte [] data) thro
LOG.debug("preClose -- setting close var to true on: " + region.getRegionInfo().getRegionNameAsString());
}
try {
- sbHelper.pendingAndScannersWait(commitPendingTransactions, scanners, transactionsById, pendingDelayLen);
+ sbHelper.pendingAndScannersWait(commitPendingTransactions, scanners, transactionsById, pendingDelayLen);
} catch(IOException ioe) {
LOG.error("Encountered exception when calling pendingAndScannersWait(): " + ioe);
}
@@ -867,7 +869,7 @@ public void createRecoveryzNode(int node, String encodedName, byte [] data) thro
}
@Override
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOException {
if (LOG.isTraceEnabled()) LOG.trace("preCompact: call next with scannerContext limit " + scannerContext);
#else
@@ -878,7 +880,7 @@ public void createRecoveryzNode(int node, String encodedName, byte [] data) thro
boolean skip=false;
ConcurrentHashMap<String, Integer> verCountByCol = new ConcurrentHashMap<String,Integer>();
try {
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
ret = s.next(result,scannerContext);
#else
ret = s.next(result,limit);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl
index 6e81a8a..9f1f316 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl
@@ -27,7 +27,7 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
import org.apache.hadoop.hbase.ScheduledChore;
#else
import org.apache.hadoop.hbase.Chore;
@@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint;
* Cleans up committed transactions when they are no longer needed to verify
* pending transactions.
*/
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
public class CleanOldTransactionsChore extends ScheduledChore {
#else
public class CleanOldTransactionsChore extends Chore {
@@ -57,7 +57,7 @@ public class CleanOldTransactionsChore extends Chore {
public CleanOldTransactionsChore(final TrxRegionEndpoint trx_Region,
final int timer,
final Stoppable stoppable) {
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
super("CleanOldTransactionsChore", stoppable, timer);
#else
super("CleanOldTransactionsChore", timer, stoppable);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java.tmpl
index 6ba4f99..ae04542 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java.tmpl
@@ -158,7 +158,7 @@ public class KeyValueListScanner implements KeyValueScanner {
public boolean backwardSeek(Cell seekKey) throws IOException {
throw new NotImplementedException("Not implemented");
}
-#ifndef CDH1.0
+#ifndef CDH5.4
@Override
#endif
public Cell getNextIndexedKey() {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl
index 07c66ef..656868a 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl
@@ -28,7 +28,7 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
import org.apache.hadoop.hbase.ScheduledChore;
#else
import org.apache.hadoop.hbase.Chore;
@@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint;
/**
* Manages the MemoryMXBean to determine a regionserver's memory usage.
*/
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
public class MemoryUsageChore extends ScheduledChore {
#else
public class MemoryUsageChore extends Chore {
@@ -57,7 +57,7 @@ public class MemoryUsageChore extends Chore {
public MemoryUsageChore(final TrxRegionEndpoint trx_Region,
final int timer,
final Stoppable stoppable) {
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
super("MemoryUsageChore", stoppable, timer);
#else
super("MemoryUsageChore", timer, stoppable);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl
index 0eac088..7d301b3 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl
@@ -71,7 +71,7 @@ import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;
import org.apache.hadoop.hbase.regionserver.ScanQueryMatcher;
import org.apache.hadoop.hbase.regionserver.ScanType;
import org.apache.hadoop.hbase.regionserver.ScanInfo;
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
import org.apache.hadoop.hbase.regionserver.ScannerContext;
#endif
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
@@ -677,7 +677,7 @@ public class TrxTransactionState extends TransactionState {
//Store.ScanInfo scaninfo = new Store.ScanInfo(null, 0, 1, HConstants.FOREVER, false, 0, Cell.COMPARATOR);
ScanInfo scaninfo = new ScanInfo(null, 0, 1, HConstants.FOREVER,KeepDeletedCells.FALSE, 0, KeyValue.COMPARATOR);
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1
//Hbase 1.1.2 and beyond has optimization in TimeRange.compare(cell) to return true for all time ranges if TimeRange.isAllTime() is true.
//scan.setTimeRange(min, max) instantiates TimeRange with a different constructor (isAllTime is false in this case). This is set
//in scan object by the client if specific time range is needed. In all other cases, a default TimeRange() (isAllTime is true)
@@ -730,7 +730,7 @@ public class TrxTransactionState extends TransactionState {
* @param limit
* @return true if there are more rows, false if scanner is done
*/
-#ifndef HDP2.3
+#ifdef HBASE1.0 CDH5.4
@Override
#endif
public synchronized boolean next(final List<Cell> outResult, final int limit) throws IOException {
@@ -796,13 +796,13 @@ public class TrxTransactionState extends TransactionState {
return false;
}
-#ifndef HDP2.3
+#ifndef HDP2.3 HBASE1.1
@Override
#endif
public synchronized boolean next(final List<Cell> results) throws IOException {
return next(results, -1);
}
-#ifdef HDP2.3
+#ifdef HDP2.3 HBASE1.1 CDH5.5
@Override
public boolean next(List<Cell> results, ScannerContext scannerContext) throws IOException {
return next(results, -1);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/install/installer/traf_apache_mods
----------------------------------------------------------------------
diff --git a/install/installer/traf_apache_mods b/install/installer/traf_apache_mods
index cf16918..7acebf5 100755
--- a/install/installer/traf_apache_mods
+++ b/install/installer/traf_apache_mods
@@ -48,7 +48,11 @@ sudo chmod 777 $TRAF_CONFIG
source $TRAF_CONFIG
-hbase_trx_jar="hbase-trx-apache*.jar"
+hbase_trx_jar="hbase-trx-apache1_1_2*.jar"
+
+if [[ $hbaseVersion =~1.0]]; then
+ hbase_trx_jar="hbase-trx-apache1_0_2*.jar"
+fi
traf_util_jar="trafodion-utility-*.jar"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index a8d8e49..3cadaca 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -678,6 +678,11 @@ do
checkClouderaVersion
checkRoleGroups
fi
+
+ if [[ $HADOOP_TYPE == "apache" ]]; then
+ checkApacheVersion
+ fi
+
break;
fi
done
@@ -701,8 +706,8 @@ function checkClouderaVersion {
if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then
#Check that Cloudera 5.2 or 5.3 are not installed.
- if [[ "$CDH_5_4_SUPPORT" == "Y" ]]; then
- nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.4.*)
+ if [[ "$CDH_5_4_SUPPORT" == "Y" ]] || [[ "$CDH_5_5_SUPPORT" == "Y" ]]; then
+ nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.[4-6].*)
#Check that Cloudera 5.[n>4].* is not installed.
if [[ -z $nameOfVersion ]]; then
versionInstalled=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh[5-9].[7-9].* | wc -l)
@@ -740,8 +745,12 @@ else
fi
fi
+baseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
+
echo "***INFO: nameOfVersion=$nameOfVersion"
sudo chmod 777 $TRAF_CONFIG
+sed -i '/hbaseVersion\=/d' $TRAF_CONFIG
+echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG
source $TRAF_CONFIG
}
@@ -800,13 +809,44 @@ if [[ -z $nameOfVersion ]]; then
fi
fi
+baseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
+
echo "***INFO: nameOfVersion=$nameOfVersion"
echo "***INFO: HADOOP_PATH=$HADOOP_PATH"
+
+sudo chmod 777 $TRAF_CONFIG
+sed -i '/hbaseVersion\=/d' $TRAF_CONFIG
+echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG
source $TRAF_CONFIG
}
+function checkApacheVersion {
+if [[ $APACHE_1_0_X_SUPPORT=="Y" || $APACHE_1_1_X_SUPPORT=="Y" ]]; then
+ nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | awk {'print $2'})
+ #Check that hbase 1.x.x is not installed.
+ if [[ -z $nameOfVersion ]]; then
+ versionInstalled=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | awk {'print $2'} | grep [1].[0-1].* | wc -l)
+ if [[ $versionInstalled -gt "0" ]]; then
+ errorFound=1
+ echo "HADOOP VERSION" >> $ERROR_LOG
+ echo "***ERROR: Trafodion and apache hbase versions may not be compatible" >> $ERROR_LOG
+ echo "***ERROR: Detected apache hbase version:" >> $ERROR_LOG
+ ssh -q -n $node cat $HOME/hbaseVersion.txt >> $ERROR_LOG
+ fi
+ fi
+fi
+
+baseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'}|sed s/,//g)
+
+echo "***INFO: nameOfVersion=$nameOfVersion"
+sudo chmod 777 $TRAF_CONFIG
+sed -i '/hbaseVersion\=/d' $TRAF_CONFIG
+echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG
+source $TRAF_CONFIG
+
+}
function checkHadoopNames {
if [[ -z "$HDFS_USER" ]]; then
errorFound=1
@@ -928,6 +968,7 @@ else
fi
+install_features_path=$(tar -tf $TRAF_BUILD_PATH | grep "install_features")
if [[ ! -z $install_features_path ]]; then
if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
[06/13] incubator-trafodion git commit: remove other jira changes
Posted by sa...@apache.org.
remove other jira changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/bacd8bff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bacd8bff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bacd8bff
Branch: refs/heads/master
Commit: bacd8bff71ca271d1f8be92c03940bb2fbd4e575
Parents: 443b0c4
Author: traf <tr...@aven01.novalocal>
Authored: Thu Jun 30 10:10:34 2016 +0000
Committer: traf <tr...@aven01.novalocal>
Committed: Thu Jun 30 10:10:34 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SQLMXConnection.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bacd8bff/core/conn/jdbc_type2/native/SQLMXConnection.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SQLMXConnection.cpp b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
index b2d5ae4..b25d940 100644
--- a/core/conn/jdbc_type2/native/SQLMXConnection.cpp
+++ b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
@@ -590,7 +590,7 @@ JNIEXPORT void JNICALL Java_org_trafodion_jdbc_t2_SQLMXConnection_connectInit
strcpy(srvrGlobal->CurrentSchema, "SEABASE");
}
-
+
if(blnDoomUsrTxn)
{
[07/13] incubator-trafodion git commit: Merge pull request #2 from
apache/master
Posted by sa...@apache.org.
Merge pull request #2 from apache/master
update
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/eba153af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/eba153af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/eba153af
Branch: refs/heads/master
Commit: eba153afbf16583745996efd050d19319662fd29
Parents: 324a981 f4d9910
Author: mashengchen <ma...@gmail.com>
Authored: Thu Jun 30 18:26:14 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Jun 30 18:26:14 2016 +0800
----------------------------------------------------------------------
.../src/asciidoc/_chapters/about.adoc | 6 +-
.../src/asciidoc/_chapters/activate.adoc | 1 +
.../src/asciidoc/_chapters/enable_security.adoc | 251 +++++++++++--------
.../src/asciidoc/_chapters/introduction.adoc | 142 ++++++++---
.../src/asciidoc/_chapters/prepare.adoc | 41 ++-
.../src/asciidoc/_chapters/requirements.adoc | 34 ++-
.../src/asciidoc/_chapters/script_install.adoc | 13 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 14 +-
docs/shared/revisions.txt | 3 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 14 +-
10 files changed, 326 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
[04/13] incubator-trafodion git commit: TRAFODION-2016 support apache
hbase1.1 & cdh5.5
Posted by sa...@apache.org.
TRAFODION-2016 support apache hbase1.1 & cdh5.5
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6d08029a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6d08029a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6d08029a
Branch: refs/heads/master
Commit: 6d08029a1cbd162b5573e3055ecfee6b45f8371a
Parents: 324a981
Author: traf <tr...@aven01.novalocal>
Authored: Thu Jun 30 09:48:59 2016 +0000
Committer: traf <tr...@aven01.novalocal>
Committed: Thu Jun 30 09:48:59 2016 +0000
----------------------------------------------------------------------
core/sqf/conf/install_features | 2 +
core/sqf/sqenvcom.sh | 49 ++-
core/sqf/sql/scripts/install_local_hadoop | 11 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 87 +++--
core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 336 -------------------
.../sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 336 +++++++++++++++++++
.../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 336 +++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh | 332 ------------------
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 332 ++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 332 ++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pp.awk | 40 ++-
.../hbase/client/ClientScanner98.java.tmpl | 2 +-
.../hbase/client/PatchClientScanner.java.tmpl | 2 +-
.../client/TrafParallelClientScanner.java.tmpl | 2 +-
.../transactional/SsccRegionEndpoint.java.tmpl | 4 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 4 +-
.../transactional/TrxRegionObserver.java.tmpl | 16 +-
.../CleanOldTransactionsChore.java.tmpl | 6 +-
.../transactional/KeyValueListScanner.java.tmpl | 2 +-
.../transactional/MemoryUsageChore.java.tmpl | 6 +-
.../transactional/TrxTransactionState.java.tmpl | 10 +-
install/installer/traf_apache_mods | 6 +-
install/installer/traf_config_check | 45 ++-
23 files changed, 1539 insertions(+), 759 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/conf/install_features
----------------------------------------------------------------------
diff --git a/core/sqf/conf/install_features b/core/sqf/conf/install_features
index f65cdc7..9b1c85d 100644
--- a/core/sqf/conf/install_features
+++ b/core/sqf/conf/install_features
@@ -64,4 +64,6 @@
export CDH_5_3_HDP_2_2_SUPPORT="N"
export HDP_2_3_SUPPORT="Y"
export CDH_5_4_SUPPORT="Y"
+export CDH_5_5_SUPPORT="Y"
export APACHE_1_0_X_SUPPORT="Y"
+export APACHE_1_1_X_SUPPORT="Y"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 48c516f..ea1cd97 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -139,19 +139,30 @@ 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_CDH=1.0.0-cdh5.5.1
+export HIVE_DEP_VER_CDH=1.1.0-cdh5.5.1
+export HBASE_TRX_ID_CDH=hbase-trx-cdh5_5
+if [[ "$HBASE_DISTRO" = "CDH5.4" ]]; then
+ export HBASE_DEP_VER_CDH=1.0.0-cdh5.4.4
+ export HIVE_DEP_VER_CDH=1.1.0-cdh5.4.4
+ export HBASE_TRX_ID_CDH=hbase-trx-cdh5_4
+fi
+
+export HBASE_DEP_VER_APACHE=1.1.2
+export HIVE_DEP_VER_APACHE=1.1.0
+export HBVER=apache1_1_2
+if [[ "$HBASE_DISTRO" = "APACHE1.0" ]]; then
+ export HBASE_DEP_VER_APACHE=1.0.2
+ export HBVER=apache1_0_2
+fi
+export HBASE_TRX_ID_APACHE=hbase-trx-${HBVER}
+
export HBASE_DEP_VER_HDP=1.1.2
export HIVE_DEP_VER_HDP=1.2.1
-export HBASE_DEP_VER_APACHE=1.0.2
-export HIVE_DEP_VER_APACHE=1.1.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
export THRIFT_DEP_VER=0.9.0
export HIVE_DEP_VER=0.13.1
export HADOOP_DEP_VER=2.6.0
-
# staged build-time dependencies
export HADOOP_BLD_LIB=${TOOLSDIR}/hadoop-${HADOOP_DEP_VER}/lib/native
export HADOOP_BLD_INC=${TOOLSDIR}/hadoop-${HADOOP_DEP_VER}/include
@@ -164,16 +175,15 @@ export SQL_JAR=trafodion-sql-${TRAFODION_VER}.jar
export UTIL_JAR=trafodion-utility-${TRAFODION_VER}.jar
export JDBCT4_JAR=jdbcT4-${TRAFODION_VER}.jar
-HBVER=""
+
if [[ "$HBASE_DISTRO" = "HDP" ]]; then
export HBASE_TRX_JAR=${HBASE_TRX_ID_HDP}-${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
+if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
export HBASE_TRX_JAR=${HBASE_TRX_ID_APACHE}-${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
@@ -464,6 +474,12 @@ else
function vanilla_apache_usage {
cat <<EOF
+ If you haven't set HBASE_DISTRO, please set it before source current file
+ export HBASE_DISTRO=APACHE1.0 (APACHE HBASE1.0)
+ export HBASE_DISTRO=APACHE1.1 (APACHE HBASE1.1)
+ export HBASE_DISTRO=CDH5.4 (cloudera 1.0.0-cdh5.4.4)
+ export HBASE_DISTRO=CDH5.5 (cloudera 1.0.0-cdh5.5.1)
+ export HBASE_DISTRO=HDP (hortonworks 2.3)
If you are ready to build Trafodion, perform one of the following options:
@@ -556,7 +572,6 @@ EOF
# end of code for Apache Hadoop/HBase installation w/o distro
export HBASE_TRX_JAR=${HBASE_TRX_ID_APACHE}-${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
else
@@ -833,8 +848,18 @@ if [[ -n "$HADOOP_CNF_DIR" ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:$HADOOP_CNF_DIR"
if [[ -n "$HBASE_CNF_DIR" ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:$HBASE_CNF_DIR"; fi
if [[ -n "$HIVE_CNF_DIR" ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:$HIVE_CNF_DIR"; fi
if [[ -n "$SQ_CLASSPATH" ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:"; fi
+
+# set Trx in classpath only incase of workstation env.
+# In case of cluster, correct version of trx is already installed by
+# installer and hbase classpath already contains the correct trx jar.
+# In future, installer can put additional hints in bashrc to cleanup
+# and fine tune these adjustments for many other jars.
+if [[ -e $MY_SQROOT/sql/scripts/sw_env.sh ]]; then
+ SQ_CLASSPATH=${SQ_CLASSPATH}:${HBASE_TRXDIR}/${HBASE_TRX_JAR}
+fi
+
+
SQ_CLASSPATH=${SQ_CLASSPATH}:\
-${HBASE_TRXDIR}/${HBASE_TRX_JAR}:\
$MY_SQROOT/export/lib/${DTM_COMMON_JAR}:\
$MY_SQROOT/export/lib/${SQL_JAR}:\
$MY_SQROOT/export/lib/${UTIL_JAR}:\
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/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 a5c8c54..4b9e502 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -582,12 +582,15 @@ fi
# See JIRA TRAFODION-1512 that will eliminate this check
HADOOP_MIRROR_URL=http://archive.cloudera.com/cdh5/cdh/5
-HADOOP_TAR=hadoop-2.6.0-cdh5.4.4.tar.gz
+HADOOP_TAR=hadoop-2.6.0-cdh5.5.1.tar.gz
+if [[ "$HBASE_DISTRO" = "CDH5.4" ]]; then
+ HADOOP_TAR=hadoop-2.6.0-cdh5.4.4.tar.gz
+fi
if [[ "$HBASE_DISTRO" = "HDP" ]]; then
HADOOP_TAR=hadoop-2.7.1.2.3.2.0-2950.tar.gz
fi
-if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
HADOOP_TAR=hadoop-2.5.2.tar.gz
fi
@@ -603,7 +606,7 @@ MYSQL_JDBC_TAR=mysql-connector-java-5.1.23.tar.gz
HIVE_MIRROR_URL=http://archive.cloudera.com/cdh5/cdh/5
HIVE_PREFIX=hive-${HIVE_DEP_VER_CDH}
-if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
HIVE_MIRROR_URL=https://archive.apache.org/dist/hive/hive-${HIVE_DEP_VER_APACHE}
HIVE_PREFIX=apache-hive-${HIVE_DEP_VER_APACHE}-bin
fi
@@ -617,7 +620,7 @@ HBASE_TAR=hbase-${HBASE_DEP_VER_CDH}.tar.gz
if [[ "$HBASE_DISTRO" = "HDP" ]]; then
HBASE_TAR=hbase-${HBASE_DEP_VER_HDP}.tar.gz
fi
-if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
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
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/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 65a4c6c..b6eb9b0 100644
--- a/core/sqf/src/seatrans/hbase-trx/Makefile
+++ b/core/sqf/src/seatrans/hbase-trx/Makefile
@@ -21,11 +21,13 @@
# This Makefile is just a thin shell to Maven, which is used to do the real build
-BLD_HBASE_APACHE_TRX_JARNAME =hbase-trx-apache1_0_2-$(TRAFODION_VER).jar
-BLD_HBASE_CDH_TRX_JARNAME =hbase-trx-cdh5_4-$(TRAFODION_VER).jar
-BLD_HBASE_MAPR_TRX_JARNAME =hbase-trx-mapr4_0-$(TRAFODION_VER).jar
-BLD_HBASE_HDP_TRX_JARNAME =hbase-trx-hdp2_3-$(TRAFODION_VER).jar
-BLD_HBASE_SSCC_TRX_JARNAME =hbase-trx-sscc-$(TRAFODION_VER).jar
+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_CDH54_TRX_JARNAME =hbase-trx-cdh5_4-$(TRAFODION_VER).jar
+BLD_HBASE_CDH55_TRX_JARNAME =hbase-trx-cdh5_5-$-$(TRAFODION_VER).jar
+BLD_HBASE_MAPR_TRX_JARNAME =hbase-trx-mapr4_0-$(TRAFODION_VER).jar
+BLD_HBASE_HDP_TRX_JARNAME =hbase-trx-hdp2_3-$(TRAFODION_VER).jar
+BLD_HBASE_SSCC_TRX_JARNAME =hbase-trx-sscc-$(TRAFODION_VER).jar
VFILE =hbase-trx.jar.versions
GENVERS =./genvers
@@ -36,13 +38,22 @@ REINSTATE_ORIG =./reinstate_orig
all: build_all
-jdk_1_7_cdh: build_chk_cdh
+jdk_1_7_cdh54: build_chk_cdh54
$(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) CDH1.0
- $(MAKE) build_chk_cdh
- set -o pipefail && $(MAVEN) -f pom.xml.cdh package install -DskipTests | tee -a build_trx.log
+ $(UNCOMMENT_STRING) CDH5.4
+ echo "$(MAVEN) package -DskipTests"
+ echo "### For full Maven output, see file build_trx.log"
+ set -o pipefail && $(MAVEN) -f pom.xml.cdh54 package install -DskipTests | tee -a build_trx.log
+ mkdir -p $(MY_SQROOT)/export/lib
+ cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ $(RM) $(VFILE)
+
+jdk_1_7_cdh55: build_chk_cdh55
+ $(REINSTATE_ORIG)
+ $(UNCOMMENT_STRING) CDH5.5
+ set -o pipefail && $(MAVEN) -f pom.xml.cdh55 package install -DskipTests | tee -a build_trx.log
mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_CDH_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(MY_SQROOT)/export/lib
$(RM) $(VFILE)
jdk_1_7_mapr: build_chk_mapr
@@ -54,35 +65,49 @@ jdk_1_7_mapr: build_chk_mapr
jdk_1_7_hdp: build_chk_hdp
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) HDP2.3
- $(MAKE) build_chk_hdp
set -o pipefail && $(MAVEN) -f pom.xml.hdp package -DskipTests | tee -a build_trx.log
mkdir -p $(MY_SQROOT)/export/lib
cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(MY_SQROOT)/export/lib
$(RM) $(VFILE)
-jdk_1_7_apache: build_chk_apache
+jdk_1_7_apache10: build_chk_apache10
$(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) APACHE
- $(MAKE) build_chk_apache
- echo "$(MAVEN) package -DskipTests"
- echo "### For full Maven output, see file build_trx.log"
- set -o pipefail && $(MAVEN) -f pom.xml.apache package -DskipTests | tee build_trx.log
+ $(UNCOMMENT_STRING) HBASE1.0
+ set -o pipefail && $(MAVEN) -f pom.xml.apache10 package -DskipTests | tee build_trx.log
mkdir -p $(MY_SQROOT)/export/lib
- cp -pf target/$(BLD_HBASE_APACHE_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(MY_SQROOT)/export/lib
$(RM) $(VFILE)
+
+jdk_1_7_apache11: build_chk_apache11
$(REINSTATE_ORIG)
+ $(UNCOMMENT_STRING) HBASE1.1
+ set -o pipefail && $(MAVEN) -f pom.xml.apache11 package -DskipTests | tee build_trx.log
+ mkdir -p $(MY_SQROOT)/export/lib
+ cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(MY_SQROOT)/export/lib
+ $(RM) $(VFILE)
+
+build_all: jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_hdp jdk_1_7_apache10 jdk_1_7_apache11
+#jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_hdp jdk_1_7_apache10 jdk_1_7_apache11
-build_all: jdk_1_7_apache jdk_1_7_hdp jdk_1_7_cdh
+build_chk_apache10:
+ $(GENVERS) > $(VFILE)
+ @if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
+ @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
+
+build_chk_apache11:
+ $(GENVERS) > $(VFILE)
+ @if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
+ @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
-build_chk_apache:
+build_chk_cdh54:
$(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE_TRX_JARNAME); fi
+ @if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
+ @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
-build_chk_cdh:
+build_chk_cdh55:
$(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH_TRX_JARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH_TRX_JARNAME); fi
+ @if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
+ @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
build_chk_mapr:
$(GENVERS) > $(VFILE)
@@ -95,13 +120,17 @@ build_chk_hdp:
@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
clean:
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE_TRX_JARNAME)
- $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH_TRX_JARNAME)
+ $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
+ $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
+ $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
+ $(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
$(REINSTATE_ORIG)
- -$(MAVEN) -f pom.xml.apache clean | grep ERROR
- -$(MAVEN) -f pom.xml.cdh clean | grep ERROR
+ -$(MAVEN) -f pom.xml.apache10 clean | grep ERROR
+ -$(MAVEN) -f pom.xml.apache11 clean | grep ERROR
+ -$(MAVEN) -f pom.xml.cdh54 clean | grep ERROR
+ -$(MAVEN) -f pom.xml.cdh55 clean | grep ERROR
-$(MAVEN) -f pom.xml.mapr clean | grep ERROR
-$(MAVEN) -f pom.xml.hdp clean | grep ERROR
$(RM) build_trx.log
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/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
deleted file mode 100755
index 250b7ae..0000000
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
-/**
- * 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.
- */
--->
- <repositories>
- <repository>
- <id>Apache</id>
- <url>http://mvnrepository.com/artifact/</url>
- <layout>default</layout>
- </repository>
- </repositories>
-
- <properties>
- <hadoop.version>2.4.0</hadoop.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>
- <java.version>1.7</java.version>
- <trx-suffix>apache</trx-suffix>
- </properties>
-
- <groupId>org.apache</groupId>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>hbase-trx-apache1_0_2</artifactId>
- <version>${env.TRAFODION_VER}</version>
- <name>HBase - Trx</name>
- <description>Trx of HBase usage</description>
-
- <build>
- <defaultGoal>package</defaultGoal>
- <!-- allow for different build targets with separate classes directories and
- output jars, used for Java 6 compile for now -->
- <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
- These plugins inherit their options from the <reporting> section below. These settings
- can be overwritten here. -->
- <plugins>
- <plugin>
- <!--Make it so assembly:single does nothing in here-->
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <!-- Have to set the groups here because we only do
- split tests in this package, so groups on live in this module -->
- <groups>${surefire.firstPartGroups}</groups>
- </configuration>
- </plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>hbase-trx.jar.versions</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-protocol</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-thrift</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-annotations</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-testing-util</artifactId>
- <scope>test</scope>
- <version>${hbase.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.4.5</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
- </dependency>
- </dependencies>
- <profiles>
- <!-- Skip the tests in this module -->
- <profile>
- <id>skipTrxTests</id>
- <activation>
- <property>
- <name>skipTrxTests</name>
- </property>
- </activation>
- <properties>
- <surefire.skipFirstPart>true</surefire.skipFirstPart>
- <surefire.skipSecondPart>true</surefire.skipSecondPart>
- </properties>
- </profile>
-
- <!-- Profiles for building against different hadoop versions -->
- <!-- There are a lot of common dependencies used here, should investigate
-if we can combine these profiles somehow -->
- <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
- activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
- the same time. -->
- <profile>
- <id>hadoop-1.1</id>
- <activation>
- <property>
- <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <!--
- profile for building against Hadoop 2.0.0-alpha. Activate using:
- mvn -Dhadoop.profile=2.0
- -->
- <profile>
- <id>hadoop-2.0</id>
- <activation>
- <property>
- <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>create-mrapp-generated-classpath</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <!-- needed to run the unit test for DS to generate
- the required classpath that is required in the env
- of the launch container in the mini mr/yarn cluster
- -->
- <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <!--
- profile for building against Hadoop 3.0.x. Activate using:
- mvn -Dhadoop.profile=3.0
- -->
- <profile>
- <id>hadoop-3.0</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3.0</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>3.0-SNAPSHOT</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>create-mrapp-generated-classpath</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <!-- needed to run the unit test for DS to generate
- the required classpath that is required in the env
- of the launch container in the mini mr/yarn cluster
- -->
- <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>compile-protobuf</id>
- <activation>
- <property>
- <name>compile-protobuf</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-maven-plugins</artifactId>
- <executions>
- <execution>
- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>protoc</goal>
- </goals>
- <configuration>
- <protobuf.version>2.5.0</protobuf.version>
- <protocVersion>2.5.0</protocVersion>
- <imports>
- <param>${basedir}/src/main/protobuf</param>
- <param>${basedir}/hbase-protocol/src/main/protobuf</param>
- </imports>
- <source>
- <directory>${basedir}/src/main/protobuf</directory>
- <includes>
- <include>TrxRegion.proto</include>
- <include>SsccRegion.proto</include>
- </includes>
- </source>
- <output>${basedir}/src/main/java/</output>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/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
new file mode 100755
index 0000000..fc55593
--- /dev/null
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10
@@ -0,0 +1,336 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+/**
+ * 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.
+ */
+-->
+ <repositories>
+ <repository>
+ <id>Apache</id>
+ <url>http://mvnrepository.com/artifact/</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+
+ <properties>
+ <hadoop.version>2.4.0</hadoop.version>
+ <hbase.version>1.0.2</hbase.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
+ <java.version>1.7</java.version>
+ <trx-suffix>apache</trx-suffix>
+ </properties>
+
+ <groupId>org.apache</groupId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>hbase-trx-apache1_0_2</artifactId>
+ <version>${env.TRAFODION_VER}</version>
+ <name>HBase - Trx</name>
+ <description>Trx of HBase usage</description>
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <!-- allow for different build targets with separate classes directories and
+ output jars, used for Java 6 compile for now -->
+ <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
+ These plugins inherit their options from the <reporting> section below. These settings
+ can be overwritten here. -->
+ <plugins>
+ <plugin>
+ <!--Make it so assembly:single does nothing in here-->
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <!-- Have to set the groups here because we only do
+ split tests in this package, so groups on live in this module -->
+ <groups>${surefire.firstPartGroups}</groups>
+ </configuration>
+ </plugin>
+ <!-- Make a jar and put the sources in the jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>hbase-trx.jar.versions</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-protocol</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-thrift</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-annotations</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <scope>test</scope>
+ <version>${hbase.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <!-- Skip the tests in this module -->
+ <profile>
+ <id>skipTrxTests</id>
+ <activation>
+ <property>
+ <name>skipTrxTests</name>
+ </property>
+ </activation>
+ <properties>
+ <surefire.skipFirstPart>true</surefire.skipFirstPart>
+ <surefire.skipSecondPart>true</surefire.skipSecondPart>
+ </properties>
+ </profile>
+
+ <!-- Profiles for building against different hadoop versions -->
+ <!-- There are a lot of common dependencies used here, should investigate
+if we can combine these profiles somehow -->
+ <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
+ activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
+ the same time. -->
+ <profile>
+ <id>hadoop-1.1</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!--
+ profile for building against Hadoop 2.0.0-alpha. Activate using:
+ mvn -Dhadoop.profile=2.0
+ -->
+ <profile>
+ <id>hadoop-2.0</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h2--><name>!hadoop.profile</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate
+ the required classpath that is required in the env
+ of the launch container in the mini mr/yarn cluster
+ -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!--
+ profile for building against Hadoop 3.0.x. Activate using:
+ mvn -Dhadoop.profile=3.0
+ -->
+ <profile>
+ <id>hadoop-3.0</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>3.0</value>
+ </property>
+ </activation>
+ <properties>
+ <hadoop.version>3.0-SNAPSHOT</hadoop.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate
+ the required classpath that is required in the env
+ of the launch container in the mini mr/yarn cluster
+ -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>compile-protobuf</id>
+ <activation>
+ <property>
+ <name>compile-protobuf</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-maven-plugins</artifactId>
+ <executions>
+ <execution>
+ <id>compile-protoc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>protoc</goal>
+ </goals>
+ <configuration>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
+ <imports>
+ <param>${basedir}/src/main/protobuf</param>
+ <param>${basedir}/hbase-protocol/src/main/protobuf</param>
+ </imports>
+ <source>
+ <directory>${basedir}/src/main/protobuf</directory>
+ <includes>
+ <include>TrxRegion.proto</include>
+ <include>SsccRegion.proto</include>
+ </includes>
+ </source>
+ <output>${basedir}/src/main/java/</output>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/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
new file mode 100755
index 0000000..de74565
--- /dev/null
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11
@@ -0,0 +1,336 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+/**
+ * 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.
+ */
+-->
+ <repositories>
+ <repository>
+ <id>Apache</id>
+ <url>http://mvnrepository.com/artifact/</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+
+ <properties>
+ <hadoop.version>2.4.0</hadoop.version>
+ <hbase.version>1.1.2</hbase.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
+ <java.version>1.7</java.version>
+ <trx-suffix>apache</trx-suffix>
+ </properties>
+
+ <groupId>org.apache</groupId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>hbase-trx-apache1_1_2</artifactId>
+ <version>${env.TRAFODION_VER}</version>
+ <name>HBase - Trx</name>
+ <description>Trx of HBase usage</description>
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <!-- allow for different build targets with separate classes directories and
+ output jars, used for Java 6 compile for now -->
+ <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
+ These plugins inherit their options from the <reporting> section below. These settings
+ can be overwritten here. -->
+ <plugins>
+ <plugin>
+ <!--Make it so assembly:single does nothing in here-->
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <!-- Have to set the groups here because we only do
+ split tests in this package, so groups on live in this module -->
+ <groups>${surefire.firstPartGroups}</groups>
+ </configuration>
+ </plugin>
+ <!-- Make a jar and put the sources in the jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>hbase-trx.jar.versions</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-protocol</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-thrift</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-annotations</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <scope>test</scope>
+ <version>${hbase.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <!-- Skip the tests in this module -->
+ <profile>
+ <id>skipTrxTests</id>
+ <activation>
+ <property>
+ <name>skipTrxTests</name>
+ </property>
+ </activation>
+ <properties>
+ <surefire.skipFirstPart>true</surefire.skipFirstPart>
+ <surefire.skipSecondPart>true</surefire.skipSecondPart>
+ </properties>
+ </profile>
+
+ <!-- Profiles for building against different hadoop versions -->
+ <!-- There are a lot of common dependencies used here, should investigate
+if we can combine these profiles somehow -->
+ <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
+ activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
+ the same time. -->
+ <profile>
+ <id>hadoop-1.1</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!--
+ profile for building against Hadoop 2.0.0-alpha. Activate using:
+ mvn -Dhadoop.profile=2.0
+ -->
+ <profile>
+ <id>hadoop-2.0</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h2--><name>!hadoop.profile</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate
+ the required classpath that is required in the env
+ of the launch container in the mini mr/yarn cluster
+ -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!--
+ profile for building against Hadoop 3.0.x. Activate using:
+ mvn -Dhadoop.profile=3.0
+ -->
+ <profile>
+ <id>hadoop-3.0</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>3.0</value>
+ </property>
+ </activation>
+ <properties>
+ <hadoop.version>3.0-SNAPSHOT</hadoop.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate
+ the required classpath that is required in the env
+ of the launch container in the mini mr/yarn cluster
+ -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>compile-protobuf</id>
+ <activation>
+ <property>
+ <name>compile-protobuf</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-maven-plugins</artifactId>
+ <executions>
+ <execution>
+ <id>compile-protoc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>protoc</goal>
+ </goals>
+ <configuration>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
+ <imports>
+ <param>${basedir}/src/main/protobuf</param>
+ <param>${basedir}/hbase-protocol/src/main/protobuf</param>
+ </imports>
+ <source>
+ <directory>${basedir}/src/main/protobuf</directory>
+ <includes>
+ <include>TrxRegion.proto</include>
+ <include>SsccRegion.proto</include>
+ </includes>
+ </source>
+ <output>${basedir}/src/main/java/</output>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/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
deleted file mode 100755
index 57f458b..0000000
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
-/**
- * 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.
- */
--->
- <repositories>
- <repository>
- <id>cloudera</id>
- <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
- </repository>
- </repositories>
-
- <properties>
- <hadoop.version>2.6.0</hadoop.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>
- <java.version>1.7</java.version>
- <trx-suffix>cdh5_4</trx-suffix>
- </properties>
-
-
- <groupId>org.apache</groupId>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>hbase-trx-cdh5_4</artifactId>
- <version>${env.TRAFODION_VER}</version>
- <name>HBase - Trx</name>
- <description>Trx of HBase usage</description>
-
-
- <build>
- <defaultGoal>package</defaultGoal>
- <!-- allow for different build targets with separate classes directories and
- output jars, used for Java 6 compile for now -->
- <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
- These plugins inherit their options from the <reporting> section below. These settings
- can be overwritten here. -->
- <plugins>
- <plugin>
- <!--Make it so assembly:single does nothing in here-->
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <configuration>
- <skipAssembly>true</skipAssembly>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <!-- Have to set the groups here because we only do
- split tests in this package, so groups on live in this module -->
- <groups>${surefire.firstPartGroups}</groups>
- </configuration>
- </plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>hbase-trx.jar.versions</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-protocol</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-thrift</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-testing-util</artifactId>
- <scope>test</scope>
- <version>${hbase.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.4.5</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
- </dependency>
- </dependencies>
- <profiles>
- <!-- Skip the tests in this module -->
- <profile>
- <id>skipTrxTests</id>
- <activation>
- <property>
- <name>skipTrxTests</name>
- </property>
- </activation>
- <properties>
- <surefire.skipFirstPart>true</surefire.skipFirstPart>
- <surefire.skipSecondPart>true</surefire.skipSecondPart>
- </properties>
- </profile>
-
- <!-- Profiles for building against different hadoop versions -->
- <!-- There are a lot of common dependencies used here, should investigate
-if we can combine these profiles somehow -->
- <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
- activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
- the same time. -->
- <profile>
- <id>hadoop-1.1</id>
- <activation>
- <property>
- <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <!--
- profile for building against Hadoop 2.0.0-alpha. Activate using:
- mvn -Dhadoop.profile=2.0
- -->
- <profile>
- <id>hadoop-2.0</id>
- <activation>
- <property>
- <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>create-mrapp-generated-classpath</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <!-- needed to run the unit test for DS to generate
- the required classpath that is required in the env
- of the launch container in the mini mr/yarn cluster
- -->
- <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <!--
- profile for building against Hadoop 3.0.x. Activate using:
- mvn -Dhadoop.profile=3.0
- -->
- <profile>
- <id>hadoop-3.0</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3.0</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>3.0-SNAPSHOT</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>create-mrapp-generated-classpath</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
- <!-- needed to run the unit test for DS to generate
- the required classpath that is required in the env
- of the launch container in the mini mr/yarn cluster
- -->
- <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>compile-protobuf</id>
- <activation>
- <property>
- <name>compile-protobuf</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-maven-plugins</artifactId>
- <executions>
- <execution>
- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>protoc</goal>
- </goals>
- <configuration>
- <protobuf.version>2.5.0</protobuf.version>
- <protocVersion>2.5.0</protocVersion>
- <imports>
- <param>${basedir}/src/main/protobuf</param>
- <param>${basedir}/hbase-protocol/src/main/protobuf</param>
- </imports>
- <source>
- <directory>${basedir}/src/main/protobuf</directory>
- <includes>
- <include>TrxRegion.proto</include>
- <include>SsccRegion.proto</include>
- </includes>
- </source>
- <output>${basedir}/src/main/java/</output>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54
new file mode 100755
index 0000000..5b453de
--- /dev/null
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54
@@ -0,0 +1,332 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!--
+/**
+ * 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.
+ */
+-->
+ <repositories>
+ <repository>
+ <id>cloudera</id>
+ <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+ </repository>
+ </repositories>
+
+ <properties>
+ <hadoop.version>2.6.0</hadoop.version>
+ <hbase.version>1.0.0-cdh5.4.4</hbase.version>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.version>1.7</java.version>
+ <trx-suffix>cdh5_4</trx-suffix>
+ </properties>
+
+
+ <groupId>org.apache</groupId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>hbase-trx-cdh5_4</artifactId>
+ <version>${env.TRAFODION_VER}</version>
+ <name>HBase - Trx</name>
+ <description>Trx of HBase usage</description>
+
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <!-- allow for different build targets with separate classes directories and
+ output jars, used for Java 6 compile for now -->
+ <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
+ These plugins inherit their options from the <reporting> section below. These settings
+ can be overwritten here. -->
+ <plugins>
+ <plugin>
+ <!--Make it so assembly:single does nothing in here-->
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <!-- Have to set the groups here because we only do
+ split tests in this package, so groups on live in this module -->
+ <groups>${surefire.firstPartGroups}</groups>
+ </configuration>
+ </plugin>
+ <!-- Make a jar and put the sources in the jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>hbase-trx.jar.versions</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-protocol</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-thrift</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <scope>test</scope>
+ <version>${hbase.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <!-- Skip the tests in this module -->
+ <profile>
+ <id>skipTrxTests</id>
+ <activation>
+ <property>
+ <name>skipTrxTests</name>
+ </property>
+ </activation>
+ <properties>
+ <surefire.skipFirstPart>true</surefire.skipFirstPart>
+ <surefire.skipSecondPart>true</surefire.skipSecondPart>
+ </properties>
+ </profile>
+
+ <!-- Profiles for building against different hadoop versions -->
+ <!-- There are a lot of common dependencies used here, should investigate
+if we can combine these profiles somehow -->
+ <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
+ activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
+ the same time. -->
+ <profile>
+ <id>hadoop-1.1</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!--
+ profile for building against Hadoop 2.0.0-alpha. Activate using:
+ mvn -Dhadoop.profile=2.0
+ -->
+ <profile>
+ <id>hadoop-2.0</id>
+ <activation>
+ <property>
+ <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+ <!--h2--><name>!hadoop.profile</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate
+ the required classpath that is required in the env
+ of the launch container in the mini mr/yarn cluster
+ -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!--
+ profile for building against Hadoop 3.0.x. Activate using:
+ mvn -Dhadoop.profile=3.0
+ -->
+ <profile>
+ <id>hadoop-3.0</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>3.0</value>
+ </property>
+ </activation>
+ <properties>
+ <hadoop.version>3.0-SNAPSHOT</hadoop.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate
+ the required classpath that is required in the env
+ of the launch container in the mini mr/yarn cluster
+ -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>compile-protobuf</id>
+ <activation>
+ <property>
+ <name>compile-protobuf</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-maven-plugins</artifactId>
+ <executions>
+ <execution>
+ <id>compile-protoc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>protoc</goal>
+ </goals>
+ <configuration>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
+ <imports>
+ <param>${basedir}/src/main/protobuf</param>
+ <param>${basedir}/hbase-protocol/src/main/protobuf</param>
+ </imports>
+ <source>
+ <directory>${basedir}/src/main/protobuf</directory>
+ <includes>
+ <include>TrxRegion.proto</include>
+ <include>SsccRegion.proto</include>
+ </includes>
+ </source>
+ <output>${basedir}/src/main/java/</output>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>