Merge remote branch 'origin/pr/1216/head' into merge_1216
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/615b8dd2 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/615b8dd2 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/615b8dd2 Branch: refs/heads/master Commit: 615b8dd26d38e19ba17cf9451453bc38e8879dcc Parents: 2048d25 f186448 Author: Sandhya Sundaresan <sand...@apache.org> Authored: Mon Sep 4 06:58:05 2017 +0000 Committer: Sandhya Sundaresan <sand...@apache.org> Committed: Mon Sep 4 06:58:05 2017 +0000 ---------------------------------------------------------------------- core/sql/cli/Cli.cpp | 5 +- core/sql/clitest/blobtest.cpp | 12 +- core/sql/executor/ExExeUtil.h | 7 +- core/sql/executor/ExExeUtilLoad.cpp | 255 ++++++++----- core/sql/exp/ExpLOBaccess.cpp | 135 +++++-- core/sql/exp/ExpLOBaccess.h | 4 +- core/sql/exp/ExpLOBenums.h | 4 +- core/sql/exp/ExpLOBinterface.cpp | 57 ++- core/sql/exp/ExpLOBinterface.h | 13 + core/sql/generator/GenRelExeUtil.cpp | 2 +- core/sql/regress/executor/EXPECTED130 | 78 ++-- core/sql/regress/hive/EXPECTED018 | 585 +++++++++++++++-------------- 12 files changed, 688 insertions(+), 469 deletions(-) ----------------------------------------------------------------------