Merge branch 'master' of git://git.apache.org/incubator-trafodion
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d9e5c545 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d9e5c545 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d9e5c545 Branch: refs/heads/master Commit: d9e5c545eddbb8735e5685fc4ee4c28dc26b754f Parents: ed4a3d4 ff2b62c Author: selvaganesang <[email protected]> Authored: Wed Apr 6 23:01:26 2016 +0000 Committer: selvaganesang <[email protected]> Committed: Wed Apr 6 23:01:26 2016 +0000 ---------------------------------------------------------------------- .../src/org/trafodion/jdbc/t4/HPT4Desc.java | 8 +- .../trafodion/jdbc/t4/InterfaceResultSet.java | 10 + .../trafodion/jdbc/t4/InterfaceStatement.java | 8 +- .../jdbc/t4/TrafT4PreparedStatement.java | 32 +- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 19 +- core/conn/odbc/src/odbc/Common/DrvrSrvr.cpp | 2 + core/conn/odbc/src/odbc/Common/nskieee.cpp | 18 + .../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 86 +- core/conn/odbc/src/odbc/nsksrvrcore/srvrkds.cpp | 2 + core/rest/Makefile | 5 +- core/sql/comexe/ComTdbHbaseAccess.h | 12 +- core/sql/executor/ExHbaseAccess.h | 2 - core/sql/executor/ExHbaseIUD.cpp | 28 +- core/sql/executor/HBaseClient_JNI.cpp | 85 +- core/sql/executor/HBaseClient_JNI.h | 10 +- core/sql/executor/ex_control.cpp | 6 - core/sql/exp/ExpHbaseInterface.cpp | 25 +- core/sql/exp/ExpHbaseInterface.h | 10 +- core/sql/generator/GenRelUpdate.cpp | 4 - core/sql/regress/tools/runregr_executor.ksh | 2 +- core/sql/sqlcomp/DefaultConstants.h | 1 - core/sql/sqlcomp/nadefaults.cpp | 1 - .../java/org/trafodion/sql/HBaseClient.java | 15 +- .../java/org/trafodion/sql/HTableClient.java | 15 +- licenses/lic-rest-bin | 1415 +++++++++++++++++- licenses/not-rest-bin | 20 + 26 files changed, 1591 insertions(+), 250 deletions(-) ----------------------------------------------------------------------
