Repository: incubator-trafodion Updated Branches: refs/heads/master 66bc82632 -> 0fbf499d9
Merge remote branch 'origin/master' into TRAFODION-2235 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6dc469df Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6dc469df Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6dc469df Branch: refs/heads/master Commit: 6dc469df784583ac3bd8df28d61386d73517cf10 Parents: 587cbf1 708f58f Author: Zalo Correa <zalo.cor...@esgyn.com> Authored: Tue Sep 27 09:14:24 2016 -0700 Committer: Zalo Correa <zalo.cor...@esgyn.com> Committed: Tue Sep 27 09:14:24 2016 -0700 ---------------------------------------------------------------------- core/sqf/sql/scripts/cleanZKNodes | 33 + core/sqf/sql/scripts/install_local_hadoop | 8 + core/sqf/sql/scripts/sqstart | 2 + .../hbase/client/transactional/RMInterface.java | 13 +- .../transactional/SsccTransactionalTable.java | 117 +- .../transactional/TransactionalTable.java | 176 +- .../transactional/TransactionalTableClient.java | 14 +- .../transactional/SsccRegionEndpoint.java.tmpl | 625 +++- .../transactional/TrxRegionEndpoint.java.tmpl | 629 +++- .../transactional/TrxRegionObserver.java.tmpl | 54 +- .../generated/SsccRegionProtos.java | 2789 +++++++++++--- .../generated/TrxRegionProtos.java | 3434 +++++++++++++----- .../transactional/TransactionState.java | 14 +- .../transactional/TrxTransactionState.java.tmpl | 4 +- .../src/main/protobuf/SsccRegion.proto | 23 +- .../hbase-trx/src/main/protobuf/TrxRegion.proto | 21 +- .../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 74 +- .../tm/hbasetmlib2/javaobjectinterfacetm.h | 2 + core/sqf/src/tm/tm.cpp | 2 +- core/sqf/src/tm/tminfo.cpp | 2 - core/sqf/src/tm/tmlogging.cpp | 15 +- core/sql/common/ExprNode.cpp | 5 + core/sql/executor/JavaObjectInterface.cpp | 32 +- core/sql/executor/JavaObjectInterface.h | 2 + core/sql/optimizer/RelExpr.cpp | 37 + core/sql/optimizer/RelSet.h | 4 + core/sql/regress/core/EXPECTED116 | 40 +- .../java/org/trafodion/sql/HTableClient.java | 28 +- 28 files changed, 6506 insertions(+), 1693 deletions(-) ----------------------------------------------------------------------
