You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2016/11/29 17:07:17 UTC
[2/5] incubator-trafodion git commit: Merge branch 'master' into
traf-2357
Merge branch 'master' into traf-2357
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2ff86e80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2ff86e80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2ff86e80
Branch: refs/heads/master
Commit: 2ff86e80bf6b705016338e72e8084cb937ebb9dd
Parents: e93d518 4e7e478
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Mon Nov 28 17:01:42 2016 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Mon Nov 28 17:01:42 2016 +0000
----------------------------------------------------------------------
core/conn/jdbcT4/pom.xml | 79 +-
core/sqf/.gitignore | 1 +
core/sqf/Makefile | 4 +-
core/sqf/build-scripts/genverhdr.ksh | 15 +-
core/sql/bin/SqlciErrors.txt | 2 +
core/sql/comexe/ComTdbExeUtil.cpp | 26 +-
core/sql/comexe/ComTdbExeUtil.h | 112 ++-
core/sql/common/ComSmallDefs.h | 8 +
core/sql/common/NAType.cpp | 201 +++++
core/sql/common/NAType.h | 2 +
core/sql/common/OperTypeEnum.h | 8 +-
core/sql/executor/ExExeUtil.h | 8 +-
core/sql/executor/ExExeUtilGet.cpp | 365 ++++-----
core/sql/executor/ExExeUtilLoad.cpp | 46 +-
core/sql/executor/ExHbaseAccess.cpp | 30 +
core/sql/executor/ExHbaseAccess.h | 1 +
core/sql/executor/HBaseClient_JNI.cpp | 795 +++++++------------
core/sql/executor/HBaseClient_JNI.h | 12 +
core/sql/executor/JavaObjectInterface.cpp | 14 +
core/sql/executor/JavaObjectInterface.h | 4 +-
core/sql/executor/SequenceFileReader.cpp | 127 ---
core/sql/executor/SequenceFileReader.h | 12 -
core/sql/executor/hiveHook.cpp | 168 +++-
core/sql/exp/ExpHbaseDefs.h | 6 +
core/sql/exp/ExpHbaseInterface.cpp | 45 ++
core/sql/exp/ExpHbaseInterface.h | 12 +-
core/sql/exp/ExpLOBaccess.cpp | 2 -
core/sql/exp/ExpPackDefs.cpp | 10 +
core/sql/exp/exp_clause.cpp | 35 +-
core/sql/exp/exp_clause.h | 4 +-
core/sql/exp/exp_clause_derived.h | 169 ++++
core/sql/exp/exp_function.cpp | 204 ++++-
core/sql/exp/exp_function.h | 35 +-
core/sql/exp/exp_like.cpp | 80 ++
core/sql/generator/GenItemFunc.cpp | 42 +-
core/sql/generator/GenRelExeUtil.cpp | 77 +-
core/sql/optimizer/BindItemExpr.cpp | 21 +-
core/sql/optimizer/BindRelExpr.cpp | 8 +
core/sql/optimizer/ImplRule.cpp | 2 +-
core/sql/optimizer/ItemCache.cpp | 4 +-
core/sql/optimizer/ItemExpr.cpp | 41 +-
core/sql/optimizer/ItemFunc.h | 104 ++-
core/sql/optimizer/NATable.cpp | 186 +----
core/sql/optimizer/NormItemExpr.cpp | 2 +-
core/sql/optimizer/RelRoutine.cpp | 9 +-
core/sql/optimizer/RelRoutine.h | 14 +-
core/sql/optimizer/SynthType.cpp | 67 +-
core/sql/optimizer/hiveHook.h | 116 +--
core/sql/parser/ParKeyWords.cpp | 2 +
core/sql/parser/sqlparser.y | 72 +-
core/sql/regress/compGeneral/EXPECTED006.SB | 150 ++++
core/sql/regress/compGeneral/TEST006 | 40 +
core/sql/regress/executor/EXPECTED002.SB | 99 ++-
core/sql/regress/executor/TEST002 | 29 +-
core/sql/regress/seabase/EXPECTED002 | 266 +++++--
core/sql/regress/seabase/EXPECTED012 | 52 +-
core/sql/regress/seabase/TEST002 | 28 +
core/sql/regress/seabase/TEST012 | 11 +
core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp | 19 +-
.../java/org/trafodion/sql/HBaseClient.java | 40 +
.../java/org/trafodion/sql/HBulkLoadClient.java | 2 -
.../org/trafodion/sql/SequenceFileWriter.java | 70 +-
core/sql/ustat/hs_globals.cpp | 14 +
core/sql/ustat/hs_util.h | 3 +-
64 files changed, 2798 insertions(+), 1434 deletions(-)
----------------------------------------------------------------------