From commits-return-7699-archive-asf-public=cust-asf.ponee.io@trafodion.apache.org Fri Jun 8 00:17:36 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AD9DB180674 for ; Fri, 8 Jun 2018 00:17:35 +0200 (CEST) Received: (qmail 19419 invoked by uid 500); 7 Jun 2018 22:17:34 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 19401 invoked by uid 99); 7 Jun 2018 22:17:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2018 22:17:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6BCD3E109F; Thu, 7 Jun 2018 22:17:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sandhya@apache.org To: commits@trafodion.apache.org Date: Thu, 07 Jun 2018 22:17:36 -0000 Message-Id: <981f8a451efe4309aefe5cfaa806e452@git.apache.org> In-Reply-To: <7e6a43c92fe94cd9b2703ce1a592dbcf@git.apache.org> References: <7e6a43c92fe94cd9b2703ce1a592dbcf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] trafodion git commit: Merge remote branch 'origin/pr/1586/head' into merge_1586 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 Authored: Thu Jun 7 22:16:55 2018 +0000 Committer: Sandhya Sundaresan 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 ----------------------------------------------------------------------