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/01/08 20:11:38 UTC
[13/13] incubator-trafodion git commit: Merge remote branch
'origin/pr/248/head' into merge_248
Merge remote branch 'origin/pr/248/head' into merge_248
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/60ffbd9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/60ffbd9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/60ffbd9a
Branch: refs/heads/master
Commit: 60ffbd9aade42401011ebfffddd681dca96e0d4d
Parents: 9f8afad f365667
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Jan 8 18:01:04 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Jan 8 18:01:04 2016 +0000
----------------------------------------------------------------------
core/sql/bin/clitest.cpp | 267 ++++++++++++++++++++++++
core/sql/bin/vprocclitestdriver.cpp | 51 +++++
core/sql/cli/Cli.cpp | 31 ++-
core/sql/cli/sqlcli.h | 9 +-
core/sql/clitest/blobtest.cpp | 269 ++++++++++++++++++++++++
core/sql/clitest/blobtest.h | 76 +++++++
core/sql/clitest/vers_libclitest.cpp | 28 +++
core/sql/comexe/ComTdbExeUtil.cpp | 22 +-
core/sql/comexe/ComTdbExeUtil.h | 27 ++-
core/sql/comexe/ComTdbRoot.h | 14 +-
core/sql/common/BaseTypes.cpp | 27 ++-
core/sql/executor/ExExeUtil.h | 2 +-
core/sql/executor/ExExeUtilCli.cpp | 8 +-
core/sql/executor/ExExeUtilCli.h | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 167 +++++++++------
core/sql/executor/ExHdfsScan.cpp | 8 +-
core/sql/exp/ExpLOB.cpp | 70 ++++---
core/sql/exp/ExpLOB.h | 13 +-
core/sql/exp/ExpLOBaccess.cpp | 26 ++-
core/sql/exp/ExpLOBenums.h | 1 +
core/sql/exp/ExpLOBinterface.cpp | 24 ++-
core/sql/exp/ExpLOBinterface.h | 1 +
core/sql/generator/GenItemFunc.cpp | 7 +
core/sql/generator/GenRelExeUtil.cpp | 11 +-
core/sql/generator/GenRelMisc.cpp | 4 +
core/sql/nskgmake/Makerules.linux | 4 +-
core/sql/nskgmake/clitest/Makefile | 36 ++++
core/sql/nskgmake/clitestdriver/Makefile | 35 ++++
core/sql/optimizer/ItemExpr.cpp | 4 +-
core/sql/optimizer/ItemFunc.h | 17 +-
core/sql/optimizer/RelExeUtil.cpp | 4 +-
core/sql/optimizer/RelExeUtil.h | 12 +-
core/sql/optimizer/SynthType.cpp | 33 ++-
core/sql/parser/sqlparser.y | 88 ++++----
core/sql/regress/executor/EXPECTED130 | 275 +++++++++++++++++++++++--
core/sql/regress/executor/TEST130 | 8 +-
core/sql/regress/executor/TEST130_argfile | 3 +
37 files changed, 1456 insertions(+), 228 deletions(-)
----------------------------------------------------------------------