Merge remote branch 'origin/pr/1428/head' into merge_1428
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/bd886c12 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/bd886c12 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/bd886c12 Branch: refs/heads/master Commit: bd886c121f809821517b8b4cb824ed0c4c92e5be Parents: fb3a5e4 efaebe1 Author: Sandhya Sundaresan <[email protected]> Authored: Thu Feb 8 19:29:04 2018 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Thu Feb 8 19:29:04 2018 +0000 ---------------------------------------------------------------------- core/sql/cli/Cli.cpp | 47 ++++++++++-- core/sql/comexe/ComTdbExeUtil.h | 15 +++- core/sql/executor/ExExeUtil.h | 2 + core/sql/executor/ExExeUtilLoad.cpp | 85 +++++++++++++++++++-- core/sql/exp/ExpLOBaccess.cpp | 70 ++++++++++++++++++ core/sql/exp/ExpLOBaccess.h | 2 + core/sql/exp/ExpLOBenums.h | 4 +- core/sql/exp/ExpLOBexternal.h | 5 +- core/sql/exp/ExpLOBinterface.cpp | 115 +++++++++++++++++++++++++++++ core/sql/exp/ExpLOBinterface.h | 21 ++++++ core/sql/generator/GenRelExeUtil.cpp | 12 ++- core/sql/optimizer/RelExeUtil.h | 3 +- core/sql/parser/sqlparser.y | 53 +++++++++++++ core/sql/regress/executor/EXPECTED130 | 96 ++++++++++++++---------- core/sql/regress/executor/TEST130 | 17 +++++ 15 files changed, 491 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/bd886c12/core/sql/parser/sqlparser.y ----------------------------------------------------------------------
