Merge remote branch 'origin/master' into ddlxns2_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b7a6e54d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b7a6e54d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b7a6e54d Branch: refs/heads/master Commit: b7a6e54d8ea4043f0d736dcd43e8f45ef8a14b30 Parents: eded5a1 149649f Author: Cloud User <[email protected]> Authored: Thu Apr 21 15:19:00 2016 +0000 Committer: Cloud User <[email protected]> Committed: Thu Apr 21 15:19:00 2016 +0000 ---------------------------------------------------------------------- .../sqf/conf/log4cxx.trafodion.masterexe.config | 1 + core/sqf/sql/scripts/ilh_cleanhb | 31 +- core/sql/arkcmp/CmpContext.h | 1 + core/sql/arkcmp/NATableSt.cpp | 30 +- core/sql/cli/Cli.cpp | 130 ++-- core/sql/cli/Cli.h | 9 +- core/sql/cli/CliExtern.cpp | 16 +- core/sql/cli/SessionDefaults.cpp | 1 - core/sql/cli/Statement.cpp | 2 +- core/sql/comexe/ComTdb.cpp | 8 +- core/sql/comexe/ComTdb.h | 1 + core/sql/comexe/ComTdbExeUtil.cpp | 74 +++ core/sql/comexe/ComTdbExeUtil.h | 122 ++++ core/sql/common/ComResWords.cpp | 1 - core/sql/executor/ExComTdb.cpp | 8 + core/sql/executor/ExExeUtil.h | 176 ++++++ core/sql/executor/ExExeUtilGet.cpp | 586 ++++++++++++++++++- core/sql/executor/ExExeUtilLoad.cpp | 4 +- core/sql/exp/ExpLOBaccess.cpp | 441 ++++++++++---- core/sql/exp/ExpLOBaccess.h | 10 +- core/sql/exp/ExpLOBexternal.h | 9 +- core/sql/exp/ExpLOBprocess.cpp | 4 +- core/sql/export/ComDiags.cpp | 8 +- core/sql/generator/GenRelExeUtil.cpp | 161 ++++- core/sql/optimizer/NATable.cpp | 25 +- core/sql/optimizer/NATable.h | 4 + core/sql/optimizer/RelExeUtil.cpp | 119 ++++ core/sql/optimizer/RelExeUtil.h | 42 ++ core/sql/parser/ParKeyWords.cpp | 1 - core/sql/parser/sqlparser.y | 23 +- core/sql/regress/core/EXPECTED005.SB | 8 +- core/sql/regress/core/EXPECTED037.SB | 9 +- core/sql/regress/core/TEST005 | 2 +- core/sql/regress/executor/EXPECTED130 | 161 ++++- core/sql/regress/executor/FILTER130 | 4 + core/sql/regress/executor/TEST130 | 38 ++ core/sql/regress/hive/EXPECTED009 | 2 +- core/sql/regress/hive/TEST009 | 2 +- core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 6 +- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 16 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 12 +- core/sql/sqlmxevents/logmxevent_traf.cpp | 8 +- core/sql/sqlmxevents/logmxevent_traf.h | 2 +- 43 files changed, 2074 insertions(+), 244 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7a6e54d/core/sql/cli/Statement.cpp ----------------------------------------------------------------------
