Repository: incubator-trafodion Updated Branches: refs/heads/master e9d7ba448 -> 08be5c164
Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/973bdcec Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/973bdcec Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/973bdcec Branch: refs/heads/master Commit: 973bdcec14c35ad473bebee46caa302bbb5a49d2 Parents: 2e6e354 dcfc8e6 Author: Anuradha Hegde <[email protected]> Authored: Thu May 12 17:44:19 2016 +0000 Committer: Anuradha Hegde <[email protected]> Committed: Thu May 12 17:44:19 2016 +0000 ---------------------------------------------------------------------- core/sqf/monitor/linux/shell.cxx | 30 +-- core/sqf/sql/scripts/makemsg.ksh | 5 - core/sql/bin/SqlciErrors.txt | 2 + core/sql/common/Ipc.cpp | 12 + core/sql/common/Ipc.h | 1 + core/sql/executor/HBaseClient_JNI.cpp | 223 +------------------ core/sql/executor/HBaseClient_JNI.h | 70 +----- core/sql/generator/GenPreCode.cpp | 13 -- core/sql/nskgmake/udr_predef/Makefile | 2 - core/sql/optimizer/ValueDesc.cpp | 5 + core/sql/regress/executor/EXPECTED130 | 117 ++++++---- core/sql/regress/executor/TEST130 | 51 ++--- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 +- core/sql/sqludr/sqludr.cpp | 107 ++++++++- .../java/org/trafodion/sql/udr/TupleInfo.java | 86 ++++++- .../java/org/trafodion/sql/udr/TypeInfo.java | 6 + core/sql/ustat/hs_const.h | 1 + core/sql/ustat/hs_la.cpp | 13 ++ core/sql/ustat/hs_parser.cpp | 5 +- 19 files changed, 328 insertions(+), 424 deletions(-) ----------------------------------------------------------------------
