You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2016/07/07 20:36:50 UTC
[7/7] incubator-trafodion git commit: Merge remote branch
'origin/pr/574/head' into merge_574
Merge remote branch 'origin/pr/574/head' into merge_574
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2dd9d3a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2dd9d3a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2dd9d3a6
Branch: refs/heads/master
Commit: 2dd9d3a6edbc5651a090a4e45ec682b08d58be51
Parents: 6a1de93 9a851e2
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jul 7 20:36:13 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jul 7 20:36:13 2016 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 17 +-
core/sql/cli/Cli.h | 3 +-
core/sql/cli/CliExtern.cpp | 3 +-
core/sql/cli/Context.cpp | 61 +++++-
core/sql/cli/Context.h | 17 +-
core/sql/executor/ExExeUtil.h | 3 +-
core/sql/executor/ExExeUtilCli.cpp | 4 +-
core/sql/executor/ExExeUtilGet.cpp | 8 +-
core/sql/executor/ExExeUtilLoad.cpp | 49 ++---
core/sql/executor/ExExeUtilMisc.cpp | 5 +-
core/sql/executor/ExFastTransport.cpp | 6 +-
core/sql/executor/ExHbaseIUD.cpp | 13 +-
core/sql/executor/ExHdfsScan.cpp | 56 ++++--
core/sql/executor/ExHdfsScan.h | 1 -
core/sql/executor/JavaObjectInterface.cpp | 4 +-
core/sql/executor/ex_globals.cpp | 14 +-
core/sql/executor/ex_globals.h | 4 +-
core/sql/executor/ex_root.cpp | 13 +-
core/sql/executor/ex_split_bottom.cpp | 2 +-
core/sql/exp/ExpLOB.cpp | 107 +++++-----
core/sql/exp/ExpLOB.h | 18 +-
core/sql/exp/ExpLOBaccess.cpp | 115 ++++-------
core/sql/exp/ExpLOBaccess.h | 15 +-
core/sql/exp/ExpLOBinterface.cpp | 160 ++++++++-------
core/sql/exp/ExpLOBinterface.h | 4 +-
core/sql/generator/GenPreCode.cpp | 3 +
core/sql/optimizer/HDFSHook.cpp | 31 ++-
core/sql/regress/hive/EXPECTED005 | 16 +-
core/sql/regress/hive/EXPECTED018 | 198 ++++++++++---------
core/sql/regress/hive/TEST005 | 2 +-
core/sql/regress/hive/TEST018 | 22 ++-
core/sql/regress/tools/regrhive.ksh | 2 +-
.../java/org/trafodion/sql/HBulkLoadClient.java | 8 +-
33 files changed, 529 insertions(+), 455 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2dd9d3a6/core/sql/regress/hive/EXPECTED005
----------------------------------------------------------------------