Merge remote branch 'origin/master' into ddlxns_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ba6a1f2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ba6a1f2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ba6a1f2f Branch: refs/heads/master Commit: ba6a1f2fdc233534cef0b2dd07d2db33b6722c93 Parents: 44f28db 90b5c8f Author: Cloud User <[email protected]> Authored: Wed Apr 6 14:55:12 2016 +0000 Committer: Cloud User <[email protected]> Committed: Wed Apr 6 14:55:12 2016 +0000 ---------------------------------------------------------------------- core/rest/Makefile | 5 +- core/sqf/sqenvcom.sh | 4 +- core/sqf/src/seatrans/hbase-trx/pom.xml.hdp | 2 +- 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 + 19 files changed, 1455 insertions(+), 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ba6a1f2f/core/sql/generator/GenRelUpdate.cpp ----------------------------------------------------------------------
