[TRAFODION-2853] memory leak of ComDiagsArea in CmpContext heap of mxosrvr Fix for the regression failures seen with commit 07f41ddb3042ac039252bd09955fb59bb80c8f9a
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/a101b2f2 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/a101b2f2 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/a101b2f2 Branch: refs/heads/master Commit: a101b2f26ea098265f9d89e89e766f24bed9d25c Parents: 07f41dd Author: selvaganesang <selva.govindara...@esgyn.com> Authored: Tue Mar 13 15:38:34 2018 +0000 Committer: selvaganesang <selva.govindara...@esgyn.com> Committed: Tue Mar 13 15:38:34 2018 +0000 ---------------------------------------------------------------------- core/sql/optimizer/BindRelExpr.cpp | 2 +- core/sql/regress/privs1/EXPECTED141 | 3 ++- core/sql/regress/privs2/EXPECTED135 | 15 ++++++++++----- core/sql/regress/privs2/EXPECTED138 | 6 ++++-- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 1 - 5 files changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/a101b2f2/core/sql/optimizer/BindRelExpr.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/BindRelExpr.cpp b/core/sql/optimizer/BindRelExpr.cpp index 046989c..0faae6f 100644 --- a/core/sql/optimizer/BindRelExpr.cpp +++ b/core/sql/optimizer/BindRelExpr.cpp @@ -14715,7 +14715,7 @@ RelExpr *Describe::bindNode(BindWA *bindWA) (getLabelAnsiNameSpace() == COM_TABLE_NAME) && (NOT getIsSchema())) { - bindWA->getNATable(describedTableName_); + bindWA->getNATableInternal(describedTableName_); if (bindWA->errStatus()) { return this; http://git-wip-us.apache.org/repos/asf/trafodion/blob/a101b2f2/core/sql/regress/privs1/EXPECTED141 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs1/EXPECTED141 b/core/sql/regress/privs1/EXPECTED141 index 3f291f0..07da30d 100644 --- a/core/sql/regress/privs1/EXPECTED141 +++ b/core/sql/regress/privs1/EXPECTED141 @@ -703,7 +703,8 @@ CREATE VIEW TRAFODION.T141_USER1.U2V1 AS *** ERROR[4082] Object TRAFODION.T141_USER1.U2V2 does not exist or is inaccessible. ---- SQL operation failed with errors. +*** ERROR[8822] The statement was not prepared. + >> >>-- these creates should fail >>-- user2 has no privs on u1t1 http://git-wip-us.apache.org/repos/asf/trafodion/blob/a101b2f2/core/sql/regress/privs2/EXPECTED135 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs2/EXPECTED135 b/core/sql/regress/privs2/EXPECTED135 index dc7a2c2..5bf3c18 100644 --- a/core/sql/regress/privs2/EXPECTED135 +++ b/core/sql/regress/privs2/EXPECTED135 @@ -266,7 +266,8 @@ CREATE VIEW TRAFODION.T135SCH.T135_V2_T1 AS *** ERROR[4082] Object TRAFODION.T135SCH.USER1_V1 does not exist or is inaccessible. ---- SQL operation failed with errors. +*** ERROR[8822] The statement was not prepared. + >>drop view user1_v1; *** ERROR[1389] Object TRAFODION.T135SCH.USER1_V1 does not exist in Trafodion. @@ -347,7 +348,8 @@ End of MXCI Session *** ERROR[4082] Object TRAFODION.T135SCH.USER2_V1 does not exist or is inaccessible. ---- SQL operation failed with errors. +*** ERROR[8822] The statement was not prepared. + >>drop view user2_v1; *** ERROR[1389] Object TRAFODION.T135SCH.USER2_V1 does not exist in Trafodion. @@ -518,7 +520,8 @@ End of MXCI Session *** ERROR[4082] Object TRAFODION.T135SCH_USER3.T135_V1_USER3 does not exist or is inaccessible. ---- SQL operation failed with errors. +*** ERROR[8822] The statement was not prepared. + >> >>exit; @@ -691,7 +694,8 @@ CREATE TABLE TRAFODION.T135SCH.T135_T3 *** ERROR[4082] Object TRAFODION.T135SCH_USER5.T135_V1_USER5 does not exist or is inaccessible. ---- SQL operation failed with errors. +*** ERROR[8822] The statement was not prepared. + >>select * from t135_v1_user5; *** ERROR[4082] Object TRAFODION.T135SCH_USER5.T135_V1_USER5 does not exist or is inaccessible. @@ -710,7 +714,8 @@ CREATE TABLE TRAFODION.T135SCH.T135_T3 *** ERROR[4082] Object TRAFODION.T135SCH.T135_V1_USER5 does not exist or is inaccessible. ---- SQL operation failed with errors. +*** ERROR[8822] The statement was not prepared. + >>select * from t135_v1_user5; *** ERROR[4082] Object TRAFODION.T135SCH.T135_V1_USER5 does not exist or is inaccessible. http://git-wip-us.apache.org/repos/asf/trafodion/blob/a101b2f2/core/sql/regress/privs2/EXPECTED138 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs2/EXPECTED138 b/core/sql/regress/privs2/EXPECTED138 index 9643889..f8dad07 100644 --- a/core/sql/regress/privs2/EXPECTED138 +++ b/core/sql/regress/privs2/EXPECTED138 @@ -67,7 +67,8 @@ SB_PERSISTENT_SAMPLES *** ERROR[4082] Object TRAFODION.T138SCH.USER1_T1 does not exist or is inaccessible. ---- SQL operation failed with errors. +*** ERROR[8822] The statement was not prepared. + >> >>create table user1_t2 (c1 int, c2 int); @@ -90,7 +91,8 @@ SB_PERSISTENT_SAMPLES *** ERROR[4082] Object TRAFODION.T138SCH.USER1_T2 does not exist or is inaccessible. ---- SQL operation failed with errors. +*** ERROR[8822] The statement was not prepared. + >> >>exit; http://git-wip-us.apache.org/repos/asf/trafodion/blob/a101b2f2/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp index c9229af..4cf654d 100644 --- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp +++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp @@ -179,7 +179,6 @@ short CmpSeabaseDDL::switchCompiler(Int32 cntxtType) short CmpSeabaseDDL::switchBackCompiler() { - Lng32 diagsMark = 0; if (cmpSwitched_) { GetCliGlobals()->currContext()->copyDiagsAreaToPrevCmpContext();
