Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ad27625f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ad27625f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ad27625f Branch: refs/heads/master Commit: ad27625f2bfc4b0892802fce0e8dcc46424c193c Parents: 5357a65 bc009d5 Author: Amanda Moran <[email protected]> Authored: Mon Apr 18 16:30:11 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Mon Apr 18 16:30:11 2016 +0000 ---------------------------------------------------------------------- .../java/org/trafodion/rest/ServerResource.java | 2 +- core/sqf/sql/scripts/ilh_cleanhb | 4 +- core/sqf/sql/scripts/install_local_hadoop | 8 +- core/sqf/src/seatrans/.gitignore | 3 + .../hbase/client/ClientScanner98.java.tmpl | 490 +++++++++++++++++++ .../client/TrafParallelClientScanner.java.tmpl | 325 ++++++++++++ .../hbase/client/transactional/RMInterface.java | 4 +- .../transactional/SsccTransactionalTable.java | 8 +- .../transactional/TransactionalTable.java | 8 +- .../transactional/TransactionalTableClient.java | 3 +- core/sql/comexe/ComTdbHbaseAccess.h | 4 + core/sql/executor/ExHbaseIUD.cpp | 6 +- core/sql/executor/ExHbaseSelect.cpp | 3 + core/sql/executor/HBaseClient_JNI.cpp | 5 +- core/sql/executor/HBaseClient_JNI.h | 1 + core/sql/exp/ExpHbaseInterface.cpp | 4 +- core/sql/exp/ExpHbaseInterface.h | 2 + core/sql/generator/GenExplain.cpp | 7 + core/sql/generator/GenRelScan.cpp | 1 + core/sql/generator/Generator.cpp | 3 + core/sql/generator/Generator.h | 2 +- core/sql/regress/executor/EXPECTED140 | 435 +++++++++++++++- core/sql/regress/executor/TEST140 | 28 +- core/sql/sqlcomp/DefaultConstants.h | 5 + core/sql/sqlcomp/nadefaults.cpp | 2 +- .../java/org/trafodion/sql/HTableClient.java | 7 +- 26 files changed, 1333 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
