Merge remote branch 'origin/pr/194/head' into merge_trafodion194
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/394d007a Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/394d007a Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/394d007a Branch: refs/heads/master Commit: 394d007a3ccd4c7defef5e5f8136f3e20c7b84c8 Parents: ebe876d 00b2832 Author: Sandhya Sundaresan <[email protected]> Authored: Thu Dec 3 19:51:01 2015 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Thu Dec 3 19:51:01 2015 +0000 ---------------------------------------------------------------------- core/sqf/tools/sqtools.sh | 4 +- core/sql/comexe/ComTdb.h | 2 +- core/sql/comexe/ComTdbExeUtil.cpp | 27 + core/sql/comexe/ComTdbExeUtil.h | 119 +++ core/sql/executor/ExComTdb.cpp | 7 + core/sql/executor/ExExeUtil.h | 167 ++++ core/sql/executor/ExExeUtilCommon.cpp | 7 +- core/sql/executor/ExExeUtilGet.cpp | 824 ++++++++++++++++++- core/sql/executor/HBaseClient_JNI.cpp | 58 ++ core/sql/executor/HBaseClient_JNI.h | 2 + core/sql/exp/ExpHbaseInterface.cpp | 16 + core/sql/exp/ExpHbaseInterface.h | 3 + core/sql/generator/GenRelExeUtil.cpp | 119 +++ core/sql/optimizer/BindRelExpr.cpp | 5 + core/sql/optimizer/RelExeUtil.cpp | 128 ++- core/sql/optimizer/RelExeUtil.h | 60 ++ core/sql/parser/ParKeyWords.cpp | 4 +- core/sql/parser/sqlparser.y | 112 ++- core/sql/regress/seabase/EXPECTED002 | 677 +++++++++++++++ core/sql/regress/seabase/FILTER002 | 31 + core/sql/regress/seabase/TEST002 | 144 ++++ core/sql/sqlcomp/CmpDescribe.cpp | 19 +- .../java/org/trafodion/sql/HBaseClient.java | 57 +- .../java/org/trafodion/sql/TrafRegionStats.java | 144 ++++ 24 files changed, 2699 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
