Merge remote branch 'origin/pr/1586/head' into merge_1586
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/4fdc7424 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/4fdc7424 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/4fdc7424 Branch: refs/heads/master Commit: 4fdc742418579e9e187a9896928b77b74d427cd9 Parents: dc1a619 bf8d8d6 Author: Sandhya Sundaresan <[email protected]> Authored: Thu Jun 7 22:16:55 2018 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Thu Jun 7 22:16:55 2018 +0000 ---------------------------------------------------------------------- core/sql/bin/SqlciErrors.txt | 1 + core/sql/cli/Cli.cpp | 15 ++++ core/sql/cli/Cli.h | 8 +- core/sql/cli/CliExtern.cpp | 122 ++++++++++++++++++++++++++++ core/sql/cli/Context.cpp | 86 ++++++++++++++++++++ core/sql/cli/Context.h | 6 +- core/sql/cli/SessionDefaults.cpp | 1 + core/sql/comexe/ComTdbExeUtil.h | 9 +- core/sql/executor/ExExeUtil.h | 1 + core/sql/executor/ExExeUtilLoad.cpp | 70 ++++++++++++++-- core/sql/exp/ExpErrorEnums.h | 1 + core/sql/exp/ExpLOB.cpp | 131 ++++++++++++++++++++++++++---- core/sql/exp/ExpLOB.h | 15 +++- core/sql/exp/ExpLOBenums.h | 2 +- core/sql/exp/ExpLOBexternal.h | 4 +- core/sql/generator/GenItemFunc.cpp | 10 ++- core/sql/generator/GenPreCode.cpp | 4 +- core/sql/generator/GenRelExeUtil.cpp | 6 ++ core/sql/parser/sqlparser.y | 4 +- core/sql/runtimestats/SqlStats.cpp | 22 ++++- core/sql/runtimestats/SqlStats.h | 3 + core/sql/runtimestats/rts_msg.cpp | 39 +++++++++ core/sql/runtimestats/rts_msg.h | 40 ++++++++- core/sql/runtimestats/sscpipc.cpp | 53 ++++++++++++ core/sql/runtimestats/sscpipc.h | 1 + core/sql/runtimestats/ssmpipc.cpp | 85 +++++++++++++++++++ core/sql/runtimestats/ssmpipc.h | 5 +- core/sql/sqlcomp/DefaultConstants.h | 1 + core/sql/sqlcomp/nadefaults.cpp | 5 ++ 29 files changed, 712 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/4fdc7424/core/sql/bin/SqlciErrors.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/4fdc7424/core/sql/comexe/ComTdbExeUtil.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/4fdc7424/core/sql/generator/GenRelExeUtil.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/4fdc7424/core/sql/parser/sqlparser.y ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/4fdc7424/core/sql/sqlcomp/DefaultConstants.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/4fdc7424/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------
