You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2017/05/31 18:47:14 UTC
[13/50] [abbrv] incubator-trafodion git commit: Merge remote branch
'origin/master' into TRAFODION-2001
Merge remote branch 'origin/master' into TRAFODION-2001
Conflicts:
install/installer/trafodion_install
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ccd0b90e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ccd0b90e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ccd0b90e
Branch: refs/heads/master
Commit: ccd0b90e1ab5a5f6f9d4926474c1f1d474f26411
Parents: 83acf13 0b0665b
Author: Zalo Correa <za...@esgyn.com>
Authored: Tue Aug 23 10:40:01 2016 -0700
Committer: Zalo Correa <za...@esgyn.com>
Committed: Tue Aug 23 10:40:01 2016 -0700
----------------------------------------------------------------------
core/conn/jdbc_type2/native/CoreCommon.h | 2 +
core/conn/jdbc_type2/native/SQLMXConnection.cpp | 32 +-
core/conn/jdbc_type2/native/SrvrOthers.cpp | 9 +
core/sqf/conf/install_features | 2 +
core/sqf/sqenvcom.sh | 49 +--
core/sqf/sql/scripts/install_local_hadoop | 5 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 39 ++-
.../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 2 +-
.../sqf/src/seatrans/hbase-trx/pom.xml.apache12 | 336 +++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 2 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 | 332 ++++++++++++++++++
core/sqf/src/seatrans/hbase-trx/pp.awk | 10 +-
.../hbase/client/PatchClientScanner.java.tmpl | 2 +-
.../transactional/SsccRegionEndpoint.java.tmpl | 25 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 49 ++-
.../transactional/TrxRegionObserver.java.tmpl | 16 +-
.../CleanOldTransactionsChore.java.tmpl | 9 +-
.../transactional/KeyValueListScanner.java.tmpl | 14 +-
.../transactional/MemoryUsageChore.java.tmpl | 6 +-
.../transactional/TrxTransactionState.java.tmpl | 27 +-
core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 2 +-
.../src/seatrans/tm/hbasetmlib2/pom.xml.apache | 4 +-
.../sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 4 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 6 -
core/sql/comexe/ComTdb.h | 28 ++
core/sql/common/ComSecurityKey.cpp | 54 +++
core/sql/common/ComSecurityKey.h | 8 +
core/sql/executor/ExExeUtilGet.cpp | 6 +-
core/sql/generator/Generator.cpp | 94 +++++-
core/sql/generator/Generator.h | 7 +-
core/sql/nskgmake/Makerules.mk | 2 +-
core/sql/optimizer/NARoutine.cpp | 66 ++--
core/sql/optimizer/NARoutine.h | 2 +-
core/sql/optimizer/NATable.cpp | 93 +++--
core/sql/optimizer/NATable.h | 5 +-
core/sql/optimizer/NormRelExpr.cpp | 222 +++++++++---
core/sql/optimizer/OptLogRelExpr.cpp | 19 ++
core/sql/optimizer/RelExpr.h | 5 +
core/sql/pom.xml | 2 +-
core/sql/pom.xml.apache | 6 +-
core/sql/pom.xml.hdp | 2 +-
core/sql/regress/compGeneral/EXPECTED011.SB | 293 ++++++++++++++--
core/sql/regress/compGeneral/TEST011 | 29 ++
core/sql/regress/privs2/EXPECTED143 | Bin 59506 -> 60014 bytes
core/sql/regress/privs2/TEST129 | 2 +
core/sql/regress/privs2/TEST143 | 6 +
core/sql/sqlcat/TrafDDLdesc.cpp | 50 +++
core/sql/sqlcat/TrafDDLdesc.h | 142 +++++++-
core/sql/sqlcomp/CmpSeabaseDDL.h | 4 +
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 71 +++-
core/sql/sqlcomp/PrivMgrCommands.cpp | 127 +++++++
core/sql/sqlcomp/PrivMgrCommands.h | 14 +-
core/sql/sqlcomp/PrivMgrDesc.h | 52 ++-
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 207 +++++++++++-
core/sql/sqlcomp/PrivMgrPrivileges.h | 15 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 59 ++++
core/sql/sqlcomp/PrivMgrRoles.h | 4 +
core/sql/sqlcomp/nadefaults.cpp | 5 +
install/installer/traf_add_user | 2 -
install/installer/traf_apache_mods | 15 +-
install/installer/traf_cloudera_mods | 14 +-
install/installer/traf_config_check | 127 ++++---
install/installer/traf_getHadoopNodes | 45 ++-
install/installer/trafodion_install | 20 +-
65 files changed, 2534 insertions(+), 376 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ccd0b90e/install/installer/traf_add_user
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ccd0b90e/install/installer/traf_cloudera_mods
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ccd0b90e/install/installer/traf_config_check
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ccd0b90e/install/installer/trafodion_install
----------------------------------------------------------------------