trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject [4/5] trafodion git commit: Review fixes
Date Thu, 08 Feb 2018 19:29:39 GMT
Review fixes


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/efaebe17
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/efaebe17
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/efaebe17

Branch: refs/heads/master
Commit: efaebe17c964c8c4674ea1d1fa1110ac0daac344
Parents: 5ff1169
Author: Sandhya Sundaresan <sandhya@apache.org>
Authored: Wed Feb 7 22:08:58 2018 +0000
Committer: Sandhya Sundaresan <sandhya@apache.org>
Committed: Wed Feb 7 22:08:58 2018 +0000

----------------------------------------------------------------------
 core/sql/cli/Cli.cpp          | 2 ++
 core/sql/exp/ExpLOBaccess.cpp | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/efaebe17/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index d3892c6..41e9bf7 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9160,6 +9160,7 @@ Lng32 SQLCLI_LOBcliInterface
 
 	Int64 outlen = 0;Lng32 len = 0;
 	cliRC = cliInterface->executeImmediate(query,(char *)dataLen, &len, FALSE);
+        currContext.resetSqlParserFlags(0x1);
         if (inoutDescPartnKey)
           *inoutDescPartnKey = descPartnKey;
 
@@ -9194,6 +9195,7 @@ Lng32 SQLCLI_LOBcliInterface
 
 	Lng32 len = 0;
 	cliRC = cliInterface->executeImmediate(query,(char *)dataOffset, &len, FALSE);
+        currContext.resetSqlParserFlags(0x1);
         if (inoutDescPartnKey)
           *inoutDescPartnKey = descPartnKey;
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/efaebe17/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index df6b4ea..b5a427b 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -875,8 +875,7 @@ Ex_Lob_Error ExLob::getOffset(char *handleIn, Int32 handleInLen,Int64
&outLobOff
   char logBuf[4096];
   Int32 cliErr = 0;
   Ex_Lob_Error err=LOB_OPER_OK; 
-  char *blackBox = new(getLobGlobalHeap()) char[MAX_LOB_FILE_NAME_LEN+6];
-  Int32 blackBoxLen = 0;
+
   Int64 dummy = 0;
   Int32 dummy2 = 0;
   if (so != Lob_External_File)


Mime
View raw message