You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/02/02 18:07:17 UTC
[4/5] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into sean_traf Additional changes for
JIRA [TRAFODION-1703]
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf
Additional changes for JIRA [TRAFODION-1703]
Conflicts:
core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/TrxRegionProtos.java
core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto
core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/TmAuditTlog.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/174b18ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/174b18ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/174b18ff
Branch: refs/heads/master
Commit: 174b18ff0cddf0583033e1a6e1ec813f085153cb
Parents: 7f54aa7 e62e22b
Author: Sean Broeder <sb...@edev03.esgyn.local>
Authored: Fri Jan 29 23:05:15 2016 +0000
Committer: Sean Broeder <sb...@edev03.esgyn.local>
Committed: Fri Jan 29 23:05:15 2016 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 63 +-
core/sqf/sql/scripts/install_local_hadoop | 2 +-
core/sql/comexe/ComTdbHbaseAccess.cpp | 16 +-
core/sql/comexe/ComTdbHbaseAccess.h | 10 +-
core/sql/executor/ExHbaseIUD.cpp | 2 +
core/sql/executor/ExHbaseSelect.cpp | 4 +
core/sql/executor/HBaseClient_JNI.cpp | 7 +-
core/sql/executor/HBaseClient_JNI.h | 2 +-
core/sql/exp/ExpHbaseInterface.cpp | 11 +-
core/sql/exp/ExpHbaseInterface.h | 6 +-
core/sql/generator/GenExplain.cpp | 5 +
core/sql/generator/GenRelScan.cpp | 11 +
core/sql/generator/Generator.cpp | 12 +
core/sql/generator/Generator.h | 4 +-
core/sql/optimizer/NATable.cpp | 7 +-
core/sql/optimizer/RelExeUtil.cpp | 2 +-
core/sql/optimizer/RelExeUtil.h | 15 +-
core/sql/parser/sqlparser.y | 16 +
core/sql/regress/core/EXPECTED005.SB | 2 +-
core/sql/regress/executor/DIFF013.KNOWN | 2 +-
core/sql/regress/executor/EXPECTED013.SB | 29 +-
core/sql/regress/executor/EXPECTED131 | 453 ++++++++++++
core/sql/regress/executor/EXPECTED140 | 48 +-
core/sql/regress/executor/FILTER131 | 31 +
core/sql/regress/executor/TEST131 | 96 +++
core/sql/regress/fullstack2/EXPECTED062 | 41 +-
core/sql/regress/fullstack2/EXPECTED062.RELEASE | 33 +-
core/sql/regress/privs1/EXPECTED141 | Bin 78469 -> 92809 bytes
core/sql/regress/privs1/TEST141 | 65 ++
core/sql/regress/privs2/EXPECTED135 | 84 ++-
core/sql/regress/privs2/EXPECTED140 | 66 +-
core/sql/regress/privs2/TEST135 | 54 +-
core/sql/regress/privs2/TEST140 | 13 +-
core/sql/regress/seabase/EXPECTED010 | 532 +++++++++-----
core/sql/regress/seabase/EXPECTED011 | 20 +-
core/sql/regress/seabase/EXPECTED016 | 35 +-
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/regress/tools/runregr_privs1.ksh | 3 -
core/sql/regress/tools/runregr_privs2.ksh | 5 -
core/sql/regress/tools/sbdefs | 1 +
core/sql/sqlcomp/CmpDescribe.cpp | 8 -
core/sql/sqlcomp/CmpSeabaseDDL.h | 3 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 49 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 11 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 43 --
core/sql/sqlcomp/DefaultConstants.h | 2 +
core/sql/sqlcomp/PrivMgr.h | 9 +-
core/sql/sqlcomp/PrivMgrCommands.cpp | 4 +-
core/sql/sqlcomp/PrivMgrCommands.h | 2 +-
core/sql/sqlcomp/PrivMgrDesc.h | 51 +-
core/sql/sqlcomp/PrivMgrMD.cpp | 174 ++++-
core/sql/sqlcomp/PrivMgrMD.h | 15 +-
core/sql/sqlcomp/PrivMgrObjects.cpp | 52 ++
core/sql/sqlcomp/PrivMgrObjects.h | 4 +
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 685 ++++++++++++++-----
core/sql/sqlcomp/PrivMgrPrivileges.h | 39 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 38 +-
core/sql/sqlcomp/nadefaults.cpp | 2 +
.../java/org/trafodion/sql/HTableClient.java | 3 +-
dcs/pom.xml | 74 +-
.../serverHandler/ServerApiSqlExecute.java | 1 +
.../dcs/servermt/serverSql/TrafConnection.java | 1 +
.../dcs/servermt/serverSql/TrafStatement.java | 5 +-
docs/.gitignore | 2 +
docs/client_install/pom.xml | 10 +-
docs/command_interface/pom.xml | 9 +-
docs/install_guide/pom.xml | 7 +
docs/odb_user/pom.xml | 9 +-
docs/sql_reference/pom.xml | 9 +-
docs/src/site/markdown/document.md | 86 +--
docs/src/site/markdown/website.md | 12 +-
pom.xml | 12 +
72 files changed, 2465 insertions(+), 776 deletions(-)
----------------------------------------------------------------------