Merge remote branch 'origin/pr/1503/head' into merge_1503
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/052f7faa Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/052f7faa Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/052f7faa Branch: refs/heads/master Commit: 052f7faa4174560729ae1b263efb403127bfc6d7 Parents: 81640f9 528e9c6 Author: Sandhya Sundaresan <sand...@apache.org> Authored: Thu Apr 5 21:23:50 2018 +0000 Committer: Sandhya Sundaresan <sand...@apache.org> Committed: Thu Apr 5 21:23:50 2018 +0000 ---------------------------------------------------------------------- core/sql/common/CharType.cpp | 2 +- core/sql/common/CharType.h | 27 ++++++----- core/sql/exp/ExpLOBaccess.cpp | 27 ++++++----- core/sql/exp/exp_attrs.cpp | 12 ++--- core/sql/exp/exp_attrs.h | 6 ++- core/sql/generator/GenExpGenerator.cpp | 7 +-- core/sql/generator/GenRelExeUtil.cpp | 5 +- core/sql/generator/GenRelJoin.cpp | 8 ++-- core/sql/generator/GenRelPackedRows.cpp | 7 ++- core/sql/generator/Generator.h | 1 + core/sql/optimizer/BindItemExpr.cpp | 12 +++-- core/sql/optimizer/ItemFunc.h | 34 ++++++++------ core/sql/optimizer/ObjectNames.cpp | 2 +- core/sql/optimizer/SynthType.cpp | 8 ++-- core/sql/parser/sqlparser.y | 4 +- core/sql/qmscommon/QRLogger.cpp | 2 +- core/sql/sqlcomp/CmpMain.cpp | 8 +++- core/sql/sqlcomp/nadefaults.cpp | 68 ++++++++++++++++------------ 18 files changed, 139 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/exp/ExpLOBaccess.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/generator/GenExpGenerator.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/optimizer/BindItemExpr.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/optimizer/ItemFunc.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/optimizer/ObjectNames.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/optimizer/SynthType.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/parser/sqlparser.y ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/qmscommon/QRLogger.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/052f7faa/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------