You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/05 23:39:51 UTC
[20/22] incubator-trafodion git commit: Merge remote-tracking branch
'origin/master' into TRAFODION-1949
Merge remote-tracking branch 'origin/master' into TRAFODION-1949
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4392a832
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4392a832
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4392a832
Branch: refs/heads/master
Commit: 4392a8322157a485a4a520a9413e96a2ab3606da
Parents: d7d75f6 ed93ea9
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Wed May 4 22:25:53 2016 -0600
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Wed May 4 22:25:53 2016 -0600
----------------------------------------------------------------------
core/sql/executor/ExExeUtil.h | 7 +-
core/sql/executor/ExExeUtilGet.cpp | 55 +++--
core/sql/executor/HBaseClient_JNI.cpp | 227 +++++++++++--------
core/sql/executor/HBaseClient_JNI.h | 66 +++---
core/sql/exp/ExpHbaseInterface.cpp | 39 +---
core/sql/exp/ExpHbaseInterface.h | 18 +-
core/sql/generator/GenRelScan.cpp | 2 +-
core/sql/lib_mgmt/Makefile | 2 +-
core/sql/optimizer/NATable.cpp | 15 +-
core/sql/optimizer/NATable.h | 4 +-
core/sql/optimizer/RelScan.h | 4 +-
core/sql/regress/hive/DIFF018.KNOWN.SB | 10 +
core/sql/regress/udr/EXPECTED001 | 18 +-
core/sql/regress/udr/TEST001 | 4 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 18 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 32 +--
.../java/org/trafodion/sql/HBaseClient.java | 35 ++-
.../java/org/trafodion/sql/HTableClient.java | 49 +---
19 files changed, 312 insertions(+), 297 deletions(-)
----------------------------------------------------------------------