You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2018/01/19 06:58:02 UTC
[1/6] trafodion git commit: Removed usage of system new and moved
allocation of LOB globals to be derived from a heap. Moved xLObHdfsRequest
also to be derived from a heap
Repository: trafodion
Updated Branches:
refs/heads/master f06ea68bb -> 8bd408bdf
Removed usage of system new and moved allocation of LOB globals to be derived from a heap. Moved xLObHdfsRequest also to be derived from a heap
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0da83d52
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0da83d52
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0da83d52
Branch: refs/heads/master
Commit: 0da83d525d7e25b546181b0360cf3f3d9d422721
Parents: 2e30aad
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jan 18 16:17:41 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jan 18 16:17:41 2018 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 62 ++++++++++++++++++++++++++----
core/sql/cli/Statement.cpp | 4 +-
core/sql/executor/ExExeUtilLoad.cpp | 5 +--
core/sql/executor/ExExeUtilMisc.cpp | 2 +-
core/sql/executor/ExFastTransport.cpp | 2 +-
core/sql/executor/ExHdfsScan.cpp | 2 +-
core/sql/executor/ex_globals.cpp | 4 ++
core/sql/executor/ex_globals.h | 2 +-
core/sql/exp/ExpLOB.cpp | 43 +++++++--------------
core/sql/exp/ExpLOB.h | 4 +-
core/sql/exp/ExpLOBaccess.cpp | 62 ++++++++++++++++++++++--------
core/sql/exp/ExpLOBaccess.h | 4 +-
core/sql/exp/ExpLOBinterface.cpp | 17 ++++----
core/sql/exp/ExpLOBinterface.h | 2 +-
14 files changed, 139 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index be9181a..825d2a7 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9542,7 +9542,7 @@ Lng32 SQLCLI_LOBddlInterface
{
Lng32 cliRC = 0;
-
+ ExLobGlobals *exLobGlob = NULL;
ContextCli & currContext = *(cliGlobals->currContext());
ComDiagsArea & diags = currContext.diags();
@@ -9611,12 +9611,28 @@ Lng32 SQLCLI_LOBddlInterface
} // for
+ //Initialize LOB interface
+
+ Int32 rc= ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),&currContext,hdfsServer,hdfsPort);
+ if (rc)
+ {
+ {
+ cliRC = 0;
+ ComDiagsArea * da = &diags;
+ ExRaiseSqlError(currContext.exHeap(), &da,
+ (ExeErrorCode)(8442), NULL, &cliRC ,
+ &rc, NULL, (char*)"ExpLOBInterfaceCreate",
+ getLobErrStr(rc));
+ goto error_return;
+ }
+ }
+
for (Lng32 i = 0; i < numLOBs; i++)
{
// create lob data tables
- Lng32 rc = ExpLOBoper::createLOB
- (NULL, &currContext,currContext.exHeap(),
+ rc = ExpLOBoper::createLOB
+ (exLobGlob, &currContext,
lobLocList[i], hdfsPort,hdfsServer,
objectUID, lobNumList[i],lobMaxSize);
@@ -9726,10 +9742,26 @@ Lng32 SQLCLI_LOBddlInterface
//lob data files. Note that if there is an error in the drop of the
//descriptor tables above , the transaction will restore each of the
//above tables .
+ //Initialize LOB interface
+
+ Int32 rc= ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),&currContext,hdfsServer,hdfsPort);
+ if (rc)
+ {
+ {
+ cliRC = 0;
+ ComDiagsArea * da = &diags;
+ ExRaiseSqlError(currContext.exHeap(), &da,
+ (ExeErrorCode)(8442), NULL, &cliRC ,
+ &rc, NULL, (char*)"ExpLOBInterfaceCreate",
+
+ getLobErrStr(rc));
+ goto error_return;
+ }
+ }
for (Lng32 i = 0; i < numLOBs; i++)
{
- Lng32 rc = ExpLOBoper::dropLOB
- (NULL, currContext.exHeap(),&currContext,
+ rc = ExpLOBoper::dropLOB
+ (exLobGlob,&currContext,
lobLocList[i],hdfsPort,hdfsServer,
objectUID, lobNumList[i]);
// Ignore 'not found' error from hdfs file deletes until this is made transactional just like Hbase tables are.
@@ -9765,12 +9797,27 @@ Lng32 SQLCLI_LOBddlInterface
goto error_return;
}
-
+ //Initialize LOB interface
+
+ Int32 rc= ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),&currContext,hdfsServer,hdfsPort);
+ if (rc)
+ {
+ {
+ cliRC = 0;
+ ComDiagsArea * da = &diags;
+ ExRaiseSqlError(currContext.exHeap(), &da,
+ (ExeErrorCode)(8442), NULL, &cliRC ,
+ &rc, NULL, (char*)"ExpLOBInterfaceCreate",
+
+ getLobErrStr(rc));
+ goto error_return;
+ }
+ }
// drop descriptor table
for (Lng32 i = 0; i < numLOBs; i++)
{
Lng32 rc = ExpLOBoper::dropLOB
- (NULL, currContext.exHeap(),&currContext,
+ (exLobGlob,&currContext,
lobLocList[i],hdfsPort, hdfsServer,
objectUID, lobNumList[i]);
@@ -9919,6 +9966,7 @@ Lng32 SQLCLI_LOBddlInterface
} // switch
error_return:
+ ExpLOBinterfaceCleanup(exLobGlob);
NADELETEBASIC(query, currContext.exHeap());
NADELETEBASIC(hdfsServer,currContext.exHeap());
delete cliInterface;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index 6d847f0..8e15d71 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -2136,12 +2136,12 @@ RETCODE Statement::doQuerySimilarityCheck(TrafQuerySimilarityInfo * qsi,
} // for
if (lobGlob)
- ExpLOBinterfaceCleanup(lobGlob, &heap_);
+ ExpLOBinterfaceCleanup(lobGlob);
return SUCCESS;
error_return:
if (lobGlob)
- ExpLOBinterfaceCleanup(lobGlob, &heap_);
+ ExpLOBinterfaceCleanup(lobGlob);
return ERROR;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilLoad.cpp b/core/sql/executor/ExExeUtilLoad.cpp
index ab1580c..5d253cd 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -2782,8 +2782,7 @@ void ExExeUtilLobExtractTcb::freeResources()
0); // open type not applicable
- ExpLOBinterfaceCleanup
- (exLobGlobals_, currContext->exHeap());
+ ExpLOBinterfaceCleanup(exLobGlobals_);
exLobGlobals_ = NULL;
}
@@ -3505,7 +3504,7 @@ void ExExeUtilLobUpdateTcb::freeResources()
ContextCli *currContext =
getGlobals()->castToExExeStmtGlobals()->castToExMasterStmtGlobals()->
getStatement()->getContext();
- ExpLOBinterfaceCleanup(exLobGlobals_, currContext->exHeap());
+ ExpLOBinterfaceCleanup(exLobGlobals_);
exLobGlobals_ = NULL;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/executor/ExExeUtilMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilMisc.cpp b/core/sql/executor/ExExeUtilMisc.cpp
index 2ed95fb..ebf741a 100644
--- a/core/sql/executor/ExExeUtilMisc.cpp
+++ b/core/sql/executor/ExExeUtilMisc.cpp
@@ -2270,7 +2270,7 @@ void ExExeUtilHiveTruncateTcb::freeResources()
hiveClient->executeHiveSQL(hiveDropDDL);
}
if (lobGlob_) {
- ExpLOBinterfaceCleanup(lobGlob_, (NAHeap *)getGlobals()->getDefaultHeap());
+ ExpLOBinterfaceCleanup(lobGlob_);
lobGlob_ = NULL;
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/executor/ExFastTransport.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFastTransport.cpp b/core/sql/executor/ExFastTransport.cpp
index b1166bf..4d77319 100644
--- a/core/sql/executor/ExFastTransport.cpp
+++ b/core/sql/executor/ExFastTransport.cpp
@@ -465,7 +465,7 @@ ExHdfsFastExtractTcb::~ExHdfsFastExtractTcb()
{
if (lobGlob_) {
- ExpLOBinterfaceCleanup(lobGlob_, (NAHeap *)getGlobals()->getDefaultHeap());
+ ExpLOBinterfaceCleanup(lobGlob_);
lobGlob_ = NULL;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index f49ad06..7dd933b 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -280,7 +280,7 @@ void ExHdfsScanTcb::freeResources()
}
deallocateRuntimeRanges();
if (lobGlob_) {
- ExpLOBinterfaceCleanup(lobGlob_, (NAHeap *)getGlobals()->getDefaultHeap());
+ ExpLOBinterfaceCleanup(lobGlob_);
lobGlob_ = NULL;
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/executor/ex_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_globals.cpp b/core/sql/executor/ex_globals.cpp
index 0c81fdc..3d8bb62 100644
--- a/core/sql/executor/ex_globals.cpp
+++ b/core/sql/executor/ex_globals.cpp
@@ -45,6 +45,7 @@
#include "Globals.h"
#include "SqlStats.h"
#include "ExpLOB.h"
+#include "ExpLOBaccess.h"
ex_globals::ex_globals(short num_temps,
short create_gui_sched,
@@ -135,6 +136,9 @@ void ex_globals::deleteMe(NABoolean fatalError)
statsArea_ = NULL;
cleanupTcbs();
tcbList_.deallocate();
+ ExpLOBinterfaceCleanup(exLobGlobals_);
+ exLobGlobals_ = NULL;
+
}
void ex_globals::deleteMemory(void *mem)
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/executor/ex_globals.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_globals.h b/core/sql/executor/ex_globals.h
index eeed8df..9edc328 100644
--- a/core/sql/executor/ex_globals.h
+++ b/core/sql/executor/ex_globals.h
@@ -267,7 +267,7 @@ private:
// pool shared by among PAs under PAPA
sql_buffer_pool *sharedPool_;
- ExLobGlobals * exLobGlobals_;
+ ExLobGlobals *exLobGlobals_;
// pointer passed to interface methods that store and retrieve lob data
// from flatfile or hdfs filesystem.
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/exp/ExpLOB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.cpp b/core/sql/exp/ExpLOB.cpp
index c4336f4..5d3bf05 100644
--- a/core/sql/exp/ExpLOB.cpp
+++ b/core/sql/exp/ExpLOB.cpp
@@ -56,10 +56,10 @@
#include "ex_god.h"
-Lng32 ExpLOBoper::initLOBglobal(ExLobGlobals *& exLobGlobals, NAHeap *lobHeap, ContextCli *currContext, char *hdfsServer ,Int32 port)
+Lng32 ExpLOBoper::initLOBglobal(ExLobGlobals *& exLobGlobals, NAHeap *parentHeap, ContextCli *currContext, char *hdfsServer ,Int32 port)
{
// call ExeLOBinterface to initialize lob globals
- ExpLOBinterfaceInit(exLobGlobals, lobHeap,currContext,FALSE, hdfsServer, port);
+ ExpLOBinterfaceInit(exLobGlobals, parentHeap,currContext,FALSE, hdfsServer, port);
return 0;
}
@@ -151,7 +151,7 @@ char * ExpLOBoper::ExpGetLOBMDName(Lng32 schNameLen, char * schName,
return outBuf;
}
-Lng32 ExpLOBoper::createLOB(ExLobGlobals * exLobGlob, ContextCli *currContext, NAHeap * lobHeap,
+Lng32 ExpLOBoper::createLOB(ExLobGlobals * exLobGlob, ContextCli *currContext,
char * lobLoc,Int32 hdfsPort,char *hdfsServer,
Int64 uid, Lng32 num, Int64 lobMaxSize )
{
@@ -162,20 +162,11 @@ Lng32 ExpLOBoper::createLOB(ExLobGlobals * exLobGlob, ContextCli *currContext, N
return -1;
Lng32 rc = 0;
- void * exLobGlobL = NULL;
+
// Call ExeLOBinterface to create the LOB
- if (exLobGlob == NULL)
- {
- rc = initLOBglobal(exLobGlob, lobHeap,currContext,hdfsServer,hdfsPort);
- if (rc)
- return rc;
- }
- else
- exLobGlobL = exLobGlob;
rc = ExpLOBinterfaceCreate(exLobGlob, lobName, lobLoc, Lob_HDFS_File,hdfsServer,lobMaxSize, hdfsPort);
- if (exLobGlob == NULL)
- ExpLOBinterfaceCleanup(exLobGlob, lobHeap);
+
return rc;
}
void ExpLOBoper::calculateNewOffsets(ExLobInMemoryDescChunksEntry *dcArray, Lng32 numEntries)
@@ -233,7 +224,7 @@ Lng32 ExpLOBoper::compactLobDataFile(ExLobGlobals *exLobGlob,ExLobInMemoryDescCh
rc = ExpLOBinterfacePerformGC(exLobGlobL,tgtLobName, (void *)dcArray, numEntries,hdfsServer,hdfsPort,lobLoc,lobMaxChunkMemSize);
if (exLobGlob == NULL)
- ExpLOBinterfaceCleanup(exLobGlobL, lobHeap);
+ ExpLOBinterfaceCleanup(exLobGlobL);
return rc;
}
@@ -251,7 +242,7 @@ Int32 ExpLOBoper::restoreLobDataFile(ExLobGlobals *exLobGlob, char *lobName, NAH
exLobGlobL = exLobGlob;
rc = ExpLOBinterfaceRestoreLobDataFile(exLobGlobL,hdfsServer,hdfsPort,lobLoc,lobName);
if (exLobGlob == NULL)
- ExpLOBinterfaceCleanup(exLobGlobL, lobHeap);
+ ExpLOBinterfaceCleanup(exLobGlobL);
return rc;
}
@@ -270,12 +261,12 @@ Int32 ExpLOBoper::purgeBackupLobDataFile(ExLobGlobals *exLobGlob,char *lobName,
exLobGlobL = exLobGlob;
rc = ExpLOBinterfacePurgeBackupLobDataFile(exLobGlobL,(char *)hdfsServer,hdfsPort,lobLoc,lobName);
if (exLobGlob == NULL)
- ExpLOBinterfaceCleanup(exLobGlobL, lobHeap);
+ ExpLOBinterfaceCleanup(exLobGlobL);
return rc;
}
-Lng32 ExpLOBoper::dropLOB(ExLobGlobals * exLobGlob, NAHeap * lobHeap, ContextCli *currContext,
+Lng32 ExpLOBoper::dropLOB(ExLobGlobals * exLobGlob, ContextCli *currContext,
char * lobLoc,Int32 hdfsPort, char *hdfsServer,
Int64 uid, Lng32 num)
{
@@ -286,20 +277,12 @@ Lng32 ExpLOBoper::dropLOB(ExLobGlobals * exLobGlob, NAHeap * lobHeap, ContextCli
return -1;
Lng32 rc = 0;
- ExLobGlobals * exLobGlobL = NULL;
+
// Call ExeLOBinterface to create the LOB
- if (exLobGlob == NULL)
- {
- rc = initLOBglobal(exLobGlobL, lobHeap,currContext,hdfsServer,hdfsPort);
- if (rc)
- return rc;
- }
- else
- exLobGlobL = exLobGlob;
+
// Call ExeLOBinterface to drop the LOB
- rc = ExpLOBinterfaceDrop(exLobGlobL,hdfsServer, hdfsPort, lobName, lobLoc);
- if (exLobGlob == NULL)
- ExpLOBinterfaceCleanup(exLobGlobL, lobHeap);
+ rc = ExpLOBinterfaceDrop(exLobGlob,hdfsServer, hdfsPort, lobName, lobLoc);
+
return rc;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/exp/ExpLOB.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.h b/core/sql/exp/ExpLOB.h
index f8a40cd..9c39876 100644
--- a/core/sql/exp/ExpLOB.h
+++ b/core/sql/exp/ExpLOB.h
@@ -124,11 +124,11 @@ public:
static Int32 restoreLobDataFile(ExLobGlobals *lobGlob, char *lobName, NAHeap *lobHeap, ContextCli *currContext,char *hdfsServer, Int32 hdfsPort,char *lobLocation );
static Int32 purgeBackupLobDataFile(ExLobGlobals *lobGlob,char *lobName, NAHeap *lobHeap, ContextCli *currContext, char *hdfsServer, Int32 hdfsPort, char *lobLocation);
- static Lng32 createLOB(ExLobGlobals * lobGlob, ContextCli *currContext,NAHeap * lobHeap,
+ static Lng32 createLOB(ExLobGlobals * lobGlob, ContextCli *currContext,
char * lobLoc, Int32 hdfsPort, char *hdfsServer,
Int64 uid, Lng32 lobNum, Int64 lobMAxSize);
- static Lng32 dropLOB(ExLobGlobals * lobGlob, NAHeap *lobHeap, ContextCli *currContext,
+ static Lng32 dropLOB(ExLobGlobals * lobGlob, ContextCli *currContext,
char * lobLoc,Int32 hdfsPort, char *hdfsServer,
Int64 uid, Lng32 lobNum);
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 58febe9..6b13f86 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -2566,8 +2566,8 @@ Ex_Lob_Error ExLobsOper (
{
if ((operation == Lob_Init))
{
-
- globPtr = new ExLobGlobals();
+ NAHeap *lobHeap = (NAHeap *)blackBox;
+ globPtr = new (lobHeap) ExLobGlobals(lobHeap);
if (globPtr == NULL)
return LOB_INIT_ERROR;
@@ -2877,7 +2877,7 @@ Ex_Lob_Error ExLobsOper (
err = lobPtr->purgeLob();
it = lobMap->find(string(lobName));
lobMap->erase(it);
- delete lobPtr;
+ NADELETE(lobPtr, ExLob,lobGlobals->getHeap()) ;
lobPtr = NULL;
if (err != LOB_OPER_OK)
lobDebugInfo("purgeLob failed ",err,__LINE__,lobGlobals->lobTrace_);
@@ -2887,7 +2887,7 @@ Ex_Lob_Error ExLobsOper (
err = lobPtr->purgeLob();
it = lobMap->find(string(lobName));
lobMap->erase(it);
- delete lobPtr;
+ NADELETE(lobPtr, ExLob,lobGlobals->getHeap()) ;
lobPtr = NULL;
if (err != LOB_OPER_OK)
lobDebugInfo("purgeLob failed ",err,__LINE__,lobGlobals->lobTrace_);
@@ -2925,7 +2925,7 @@ Ex_Lob_Error ExLobsOper (
break;
case Lob_Cleanup:
- delete lobGlobals;
+ NADELETE(lobGlobals,ExLobGlobals, lobGlobals->getHeap());
break;
case Lob_PerformGC:
@@ -3393,14 +3393,14 @@ Ex_Lob_Error ExLob::sendReqToLobServer()
// ExLobGlobals definitions
///////////////////////////////////////////////////////////////////////////////
-ExLobGlobals::ExLobGlobals() :
+ExLobGlobals::ExLobGlobals(NAHeap *lobHeap) :
lobMap_(NULL),
fs_(NULL),
isCliInitialized_(FALSE),
threadTraceFile_(NULL),
lobTrace_(FALSE),
numWorkerThreads_(0),
- heap_(NULL)
+ heap_(lobHeap)
{
//initialize the log file
if (getenv("TRACE_HDFS_THREAD_ACTIONS"))
@@ -3418,9 +3418,7 @@ ExLobGlobals::~ExLobGlobals()
ExLobCursor::bufferList_t::iterator c_it;
ExLobCursorBuffer *buf = NULL;
- preOpenListLock_.lock();
- preOpenList_.clear();
- preOpenListLock_.unlock();
+
if (numWorkerThreads_ > 0) {
for (int i=0; numWorkerThreads_-i > 0 && i < NUM_WORKER_THREADS; i++) {
@@ -3442,9 +3440,37 @@ ExLobGlobals::~ExLobGlobals()
//Free the preOpenList AFTER the worker threads have left to avoid the
//case where a slow worker thread is still processing a preOpen and
//may access the preOpenList.
+
+
preOpenListLock_.lock();
- preOpenList_.clear();
+ ExLobPreOpen *po = NULL;
+ preOpenList_t::iterator p_it;
+ p_it = preOpenList_.begin();
+ while (p_it != preOpenList_.end())
+ {
+ po = *p_it;
+ NADELETE(po,ExLobPreOpen,heap_);
+ p_it = preOpenList_.erase(p_it);
+ }
+
+
preOpenListLock_.unlock();
+
+
+ //Free the request list
+ ExLobHdfsRequest *request;
+ reqList_t::iterator it;
+
+ reqQueueLock_.lock();
+ it = reqQueue_.begin();
+ while (it != reqQueue_.end())
+ {
+ request = *it;
+ NADELETE(request,ExLobHdfsRequest,heap_);
+ it = reqQueue_.erase(it);
+ }
+ reqQueueLock_.unlock();
+
// Free the post fetch bugf list AFTER the worker threads have left to
// avoid slow worker thread being stuck and master deallocating these
// buffers and not consuming the buffers which could cause a lock.
@@ -3463,7 +3489,10 @@ ExLobGlobals::~ExLobGlobals()
//delete the lobMap AFTER the worker threads have finished their pending
//work since they may still be using an objetc that was fetched off the lobMap_
if (lobMap_)
- delete lobMap_;
+ {
+ NADELETE(lobMap_,lobMap_t,heap_);
+ lobMap_ = NULL;
+ }
//msg_mon_close_process(&serverPhandle);
if (threadTraceFile_)
@@ -3617,8 +3646,8 @@ Ex_Lob_Error ExLobGlobals::enqueueRequest(ExLobHdfsRequest *request)
}
Ex_Lob_Error ExLobGlobals::enqueuePrefetchRequest(ExLob *lobPtr, ExLobCursor *cursor)
-{// Leaving this allocated from system heap. Since this class contains hdfsFS unable to derive from LOB heap
- ExLobHdfsRequest *request = new ExLobHdfsRequest(Lob_Hdfs_Cursor_Prefetch, lobPtr, cursor);
+{
+ ExLobHdfsRequest *request = new (heap_) ExLobHdfsRequest(Lob_Hdfs_Cursor_Prefetch, lobPtr, cursor);
if (!request) {
// return error
@@ -3631,8 +3660,7 @@ Ex_Lob_Error ExLobGlobals::enqueuePrefetchRequest(ExLob *lobPtr, ExLobCursor *cu
Ex_Lob_Error ExLobGlobals::enqueueShutdownRequest()
{
- // Leaving this allocated from system heap. Since this class contains hdfsFS unable to derive from LOB heap
- ExLobHdfsRequest *request = new ExLobHdfsRequest(Lob_Hdfs_Shutdown);
+ ExLobHdfsRequest *request = new (heap_) ExLobHdfsRequest(Lob_Hdfs_Shutdown);
if (!request) {
// return error
@@ -3704,7 +3732,7 @@ void ExLobGlobals::doWorkInThread()
}
else {
performRequest(request);
- delete request;
+ NADELETE(request, ExLobHdfsRequest, heap_);
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/exp/ExpLOBaccess.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.h b/core/sql/exp/ExpLOBaccess.h
index 9246d6e..200091a 100644
--- a/core/sql/exp/ExpLOBaccess.h
+++ b/core/sql/exp/ExpLOBaccess.h
@@ -589,7 +589,7 @@ class ExLobGlobals
{
public :
- ExLobGlobals();
+ ExLobGlobals(NAHeap *lobHeap=NULL);
~ExLobGlobals();
Ex_Lob_Error initialize();
@@ -602,7 +602,7 @@ class ExLobGlobals
void doWorkInThread();
ExLobHdfsRequest* getHdfsRequest();
Ex_Lob_Error enqueueRequest(ExLobHdfsRequest *request);
- Ex_Lob_Error enqueuePrefetchRequest(ExLob *lobPtr, ExLobCursor *cursor);
+ Ex_Lob_Error enqueuePrefetchRequest(ExLob *lobPtr, ExLobCursor *cursor);
Ex_Lob_Error enqueueShutdownRequest();
Ex_Lob_Error performRequest(ExLobHdfsRequest *request);
Ex_Lob_Error addToPreOpenList(ExLobPreOpen *preOpenObj);
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/exp/ExpLOBinterface.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBinterface.cpp b/core/sql/exp/ExpLOBinterface.cpp
index 79bf622..718538e 100644
--- a/core/sql/exp/ExpLOBinterface.cpp
+++ b/core/sql/exp/ExpLOBinterface.cpp
@@ -34,7 +34,7 @@ using std::ofstream;
#include "ExpLOBinterface.h"
#include "ex_globals.h"
-Lng32 ExpLOBinterfaceInit(ExLobGlobals *& exLobGlob, NAHeap * lobHeap,
+Lng32 ExpLOBinterfaceInit(ExLobGlobals *& exLobGlob, NAHeap * parentHeap,
ContextCli *currContext,NABoolean isHiveRead,
char *hdfsServer,
Int32 port)
@@ -45,7 +45,8 @@ Lng32 ExpLOBinterfaceInit(ExLobGlobals *& exLobGlob, NAHeap * lobHeap,
Int64 cliError = -1;
Ex_Lob_Error status;
Int32 dummyParam2 = 0;
-
+
+ NAHeap *lobHeap = new ((NAHeap *)parentHeap) NAHeap("LOB Heap", (NAHeap *)parentHeap);
err = ExLobsOper((char*)"dummy",
NULL, 0,
@@ -60,17 +61,17 @@ Lng32 ExpLOBinterfaceInit(ExLobGlobals *& exLobGlob, NAHeap * lobHeap,
1, // waited op
exLobGlob,
0,
- NULL, 0,
+ lobHeap, 0,
0);
if (exLobGlob)
{
- NAHeap *heap = new ((NAHeap *)lobHeap) NAHeap("LOB Heap", (NAHeap *)lobHeap);
+
if (isHiveRead)
{
((ExLobGlobals *)exLobGlob)->startWorkerThreads();
- heap->setThreadSafe();
+ lobHeap->setThreadSafe();
}
- ((ExLobGlobals *)exLobGlob)->setHeap(heap);
+
}
@@ -177,7 +178,7 @@ Lng32 ExpLOBinterfacePurgeBackupLobDataFile(ExLobGlobals *& exLobGlob, char *hdf
else
return 0;
}
-Lng32 ExpLOBinterfaceCleanup(ExLobGlobals *& exLobGlob, NAHeap * lobHeap)
+Lng32 ExpLOBinterfaceCleanup(ExLobGlobals *& exLobGlob)
{
Ex_Lob_Error err;
Ex_Lob_Error status;
@@ -197,7 +198,7 @@ Lng32 ExpLOBinterfaceCleanup(ExLobGlobals *& exLobGlob, NAHeap * lobHeap)
1, // waited op
exLobGlob,
0,
- lobHeap, 0
+ NULL, 0
);
if (err != LOB_OPER_OK)
return -err;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0da83d52/core/sql/exp/ExpLOBinterface.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBinterface.h b/core/sql/exp/ExpLOBinterface.h
index df6c142..fa4694d 100644
--- a/core/sql/exp/ExpLOBinterface.h
+++ b/core/sql/exp/ExpLOBinterface.h
@@ -82,7 +82,7 @@ enum ExpLOBinterfaceInputFlags
Lng32 ExpLOBinterfaceInit(ExLobGlobals *& lobGlob, NAHeap *lobHeap, ContextCli *currContext,NABoolean isHiveRead, char *hdfsServer=(char *)"default", Int32 port=0);
-Lng32 ExpLOBinterfaceCleanup(ExLobGlobals *& lobGlob, NAHeap *lobHeap);
+Lng32 ExpLOBinterfaceCleanup(ExLobGlobals *& lobGlob);
Lng32 ExpLOBinterfaceCreate(ExLobGlobals * lobGlob,
char * lobName,
[3/6] trafodion git commit: Remove default param for heap
Posted by sa...@apache.org.
Remove default param for heap
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/de7240e8
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/de7240e8
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/de7240e8
Branch: refs/heads/master
Commit: de7240e8c715c60a1c16f4ce01f405cfb0865d38
Parents: eeeabbc
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jan 18 23:00:14 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jan 18 23:00:14 2018 +0000
----------------------------------------------------------------------
core/sql/exp/ExpLOBaccess.h | 2 +-
core/sql/exp/ExpLOBprocess.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/de7240e8/core/sql/exp/ExpLOBaccess.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.h b/core/sql/exp/ExpLOBaccess.h
index 200091a..9604aab 100644
--- a/core/sql/exp/ExpLOBaccess.h
+++ b/core/sql/exp/ExpLOBaccess.h
@@ -589,7 +589,7 @@ class ExLobGlobals
{
public :
- ExLobGlobals(NAHeap *lobHeap=NULL);
+ ExLobGlobals(NAHeap *lobHeap);
~ExLobGlobals();
Ex_Lob_Error initialize();
http://git-wip-us.apache.org/repos/asf/trafodion/blob/de7240e8/core/sql/exp/ExpLOBprocess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBprocess.cpp b/core/sql/exp/ExpLOBprocess.cpp
index 9177902..e117160 100644
--- a/core/sql/exp/ExpLOBprocess.cpp
+++ b/core/sql/exp/ExpLOBprocess.cpp
@@ -575,7 +575,7 @@ Lng32 main(Lng32 argc, char *argv[])
// setup log4cxx
QRLogger::initLog4cxx(QRLogger::QRL_LOB);
// initialize lob globals
- lobGlobals = new ExLobGlobals();
+ lobGlobals = new ExLobGlobals(NULL);
if (lobGlobals == NULL)
return -1;
[4/6] trafodion git commit: Remove extra parens
Posted by sa...@apache.org.
Remove extra parens
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7c27c146
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7c27c146
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7c27c146
Branch: refs/heads/master
Commit: 7c27c146a5b0e22366a4f1e6a86d99b0ea250dbb
Parents: de7240e
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jan 18 23:02:36 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jan 18 23:02:36 2018 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/7c27c146/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 4b7d6b6..72d6731 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9798,16 +9798,13 @@ Lng32 SQLCLI_LOBddlInterface
Int32 rc= ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),&currContext,hdfsServer,hdfsPort);
if (rc)
{
- {
- cliRC = 0;
- ComDiagsArea * da = &diags;
- ExRaiseSqlError(currContext.exHeap(), &da,
+ cliRC = 0;
+ ComDiagsArea * da = &diags;
+ ExRaiseSqlError(currContext.exHeap(), &da,
(ExeErrorCode)(8442), NULL, &cliRC ,
- &rc, NULL, (char*)"ExpLOBInterfaceCreate",
-
- getLobErrStr(rc));
- goto error_return;
- }
+ &rc, NULL, (char*)"ExpLOBInterfaceCreate",
+ getLobErrStr(rc));
+ goto error_return;
}
// drop descriptor table
for (Lng32 i = 0; i < numLOBs; i++)
[6/6] trafodion git commit: Merge remote branch 'origin/pr/1405/head'
into merge_1405
Posted by sa...@apache.org.
Merge remote branch 'origin/pr/1405/head' into merge_1405
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/8bd408bd
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/8bd408bd
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/8bd408bd
Branch: refs/heads/master
Commit: 8bd408bdf42d8e8f4149ef534a46778830e79679
Parents: f06ea68 4904711
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Jan 19 06:57:31 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Jan 19 06:57:31 2018 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 55 ++++++++++++++++++++++----
core/sql/cli/Statement.cpp | 4 +-
core/sql/executor/ExExeUtilLoad.cpp | 5 +--
core/sql/executor/ExExeUtilMisc.cpp | 2 +-
core/sql/executor/ExFastTransport.cpp | 2 +-
core/sql/executor/ExHdfsScan.cpp | 2 +-
core/sql/executor/ex_globals.cpp | 4 ++
core/sql/executor/ex_globals.h | 2 +-
core/sql/exp/ExpLOB.cpp | 43 +++++++--------------
core/sql/exp/ExpLOB.h | 4 +-
core/sql/exp/ExpLOBaccess.cpp | 62 ++++++++++++++++++++++--------
core/sql/exp/ExpLOBaccess.h | 4 +-
core/sql/exp/ExpLOBinterface.cpp | 17 ++++----
core/sql/exp/ExpLOBinterface.h | 2 +-
core/sql/exp/ExpLOBprocess.cpp | 2 +-
15 files changed, 133 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
[5/6] trafodion git commit: remove extra parens
Posted by sa...@apache.org.
remove extra parens
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/49047116
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/49047116
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/49047116
Branch: refs/heads/master
Commit: 4904711603eaf50a2852bf4685187de2a14fca63
Parents: 7c27c14
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jan 18 23:05:40 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jan 18 23:05:40 2018 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/49047116/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 72d6731..a3ba081 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9612,16 +9612,14 @@ Lng32 SQLCLI_LOBddlInterface
Int32 rc= ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),&currContext,hdfsServer,hdfsPort);
if (rc)
{
- {
- cliRC = 0;
- ComDiagsArea * da = &diags;
- ExRaiseSqlError(currContext.exHeap(), &da,
+ cliRC = 0;
+ ComDiagsArea * da = &diags;
+ ExRaiseSqlError(currContext.exHeap(), &da,
(ExeErrorCode)(8442), NULL, &cliRC ,
&rc, NULL, (char*)"ExpLOBInterfaceCreate",
getLobErrStr(rc));
- goto error_return;
- }
+ goto error_return;
}
for (Lng32 i = 0; i < numLOBs; i++)
@@ -9743,16 +9741,14 @@ Lng32 SQLCLI_LOBddlInterface
Int32 rc= ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),&currContext,hdfsServer,hdfsPort);
if (rc)
{
- {
- cliRC = 0;
- ComDiagsArea * da = &diags;
- ExRaiseSqlError(currContext.exHeap(), &da,
+ cliRC = 0;
+ ComDiagsArea * da = &diags;
+ ExRaiseSqlError(currContext.exHeap(), &da,
(ExeErrorCode)(8442), NULL, &cliRC ,
&rc, NULL, (char*)"ExpLOBInterfaceCreate",
-
getLobErrStr(rc));
- goto error_return;
- }
+ goto error_return;
+
}
for (Lng32 i = 0; i < numLOBs; i++)
{
[2/6] trafodion git commit: Merge remote branch 'origin/master' into
traf_lob_global_fix
Posted by sa...@apache.org.
Merge remote branch 'origin/master' into traf_lob_global_fix
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/eeeabbca
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/eeeabbca
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/eeeabbca
Branch: refs/heads/master
Commit: eeeabbca7e5dee3ed3ed100fc27de8d08dbda39a
Parents: 0da83d5 03f705b
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jan 18 18:38:01 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jan 18 18:38:01 2018 +0000
----------------------------------------------------------------------
DISCLAIMER | 12 -
Makefile | 14 +-
README | 10 +-
README.md | 8 +-
core/Makefile | 2 +-
core/conn/Makefile | 7 +-
core/conn/jdbcT4/pom.xml | 6 +-
.../org/trafodion/jdbc/t4/TrafT4Connection.java | 9 +-
.../odbc/src/odbc/Common/ODBCMXTraceMsgs.cpp | 6 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 2 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 14 +-
core/conn/trafci/Makefile | 6 +-
.../java/org/trafodion/ci/DatabaseQuery.java | 1 +
.../unixcli/DrvrManager/drvrmanager.cpp | 2 +
.../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 6 +-
.../odbc/odbcclient/unixcli/cli/sqltocconv.cpp | 3 +
core/seamonster/src/Makefile | 1 -
core/sqf/.gitignore | 2 -
core/sqf/Makefile | 12 +-
core/sqf/build-scripts/build.branch | 2 +-
.../export/include/common/evl_sqlog_eventnum.h | 26 +
.../run_full_trafodion_backup.sh | 9 +
.../backuprestore/TrafExportSnapshot.java | 15 +-
core/sqf/monitor/linux/cluster.cxx | 967 +++++++-------
core/sqf/monitor/linux/cluster.h | 6 +-
core/sqf/monitor/linux/cmsh.cxx | 146 +-
core/sqf/monitor/linux/cmsh.h | 2 +
core/sqf/monitor/linux/commaccept.cxx | 37 +-
core/sqf/monitor/linux/commaccept.h | 3 +-
core/sqf/monitor/linux/internal.h | 2 +-
core/sqf/monitor/linux/macros.gmk | 4 +-
core/sqf/monitor/linux/montest_run.virtual | 10 +-
core/sqf/monitor/linux/pnode.cxx | 8 +-
core/sqf/monitor/linux/pnodeconfig.cxx | 33 +-
core/sqf/monitor/linux/pnodeconfig.h | 2 +
core/sqf/monitor/linux/process.cxx | 161 ++-
core/sqf/monitor/linux/redirector.cxx | 11 +-
core/sqf/monitor/linux/redirector.h | 2 +-
core/sqf/monitor/linux/reqexit.cxx | 7 +-
core/sqf/monitor/linux/reqnewproc.cxx | 30 +-
core/sqf/monitor/linux/reqopen.cxx | 8 +-
core/sqf/monitor/linux/reqqueue.cxx | 5 +
core/sqf/monitor/linux/shell.cxx | 101 +-
core/sqf/monitor/linux/tcdbsqlite.cxx | 8 -
core/sqf/monitor/linux/tmsync.cxx | 46 +-
core/sqf/monitor/linux/zclient.cxx | 6 +-
core/sqf/sql/scripts/analyzeMessageGuide.py | 12 +-
core/sqf/sql/scripts/install_apache_hadoop | 4 +-
core/sqf/sql/scripts/install_local_hadoop | 2 +-
core/sqf/sql/scripts/sqnodestatus | 23 +-
core/sqf/src/seabed/src/msmon.cpp | 2 +-
core/sqf/src/seabed/src/sqstatepi.cpp | 25 +-
core/sql/arkcmp/CmpContext.cpp | 10 +-
core/sql/arkcmp/CmpContext.h | 8 -
core/sql/arkcmp/CmpStatement.cpp | 27 +-
core/sql/arkcmp/CmpStatement.h | 6 +
core/sql/bin/SqlciErrors.txt | 287 ++--
core/sql/bin/ex_sscp_main.cpp | 4 -
core/sql/bin/ex_ssmp_main.cpp | 4 -
core/sql/cli/Cli.cpp | 4 -
core/sql/cli/Context.cpp | 1 -
core/sql/cli/Globals.cpp | 68 +-
core/sql/cli/Globals.h | 81 +-
core/sql/cli/NoWaitOp.cpp | 264 ----
core/sql/cli/NoWaitOp.h | 89 --
core/sql/cli/QuasiFileManager.cpp | 577 --------
core/sql/cli/QuasiFileManager.h | 159 ---
core/sql/cli/Statement.cpp | 3 -
core/sql/common/BaseTypes.cpp | 3 -
core/sql/common/CmpCommon.h | 2 +-
core/sql/common/NAAssert.h | 7 -
core/sql/common/NAMemory.cpp | 335 +----
core/sql/common/NAMemory.h | 146 +-
core/sql/executor/ExSimpleSqlBuffer.cpp | 3 -
core/sql/executor/ex_ex.cpp | 8 -
core/sql/executor/ex_ex.h | 7 -
core/sql/executor/ex_globals.cpp | 1 -
core/sql/executor/ex_globals.h | 10 -
core/sql/executor/ex_mj.cpp | 3 +-
core/sql/executor/ex_root.cpp | 122 --
core/sql/executor/ex_sort.cpp | 16 -
core/sql/exp/exp_conv.cpp | 2 +-
core/sql/generator/GenRelMisc.cpp | 11 +-
core/sql/generator/GenRelUpdate.cpp | 6 +-
core/sql/langman/Measure.cpp | 2 +-
core/sql/nskgmake/executor/Makefile | 3 -
core/sql/nskgmake/tdm_sqlmxevents/Makefile | 1 -
core/sql/optimizer/BindItemExpr.cpp | 9 +-
core/sql/optimizer/BindRelExpr.cpp | 1 -
core/sql/optimizer/MJVIndexBuilder.cpp | 4 +-
core/sql/optimizer/OptimizerSimulator.cpp | 36 +-
core/sql/optimizer/RelExpr.h | 1 +
core/sql/regress/charsets/DIFF312.KNOWN.SB.OS | 12 +-
.../sql/regress/compGeneral/DIFF005.KNOWN.SB.OS | 4 +-
core/sql/regress/core/DIFF024.KNOWN.SB.OS | 4 +-
core/sql/regress/hive/EXPECTED005 | 4 +
core/sql/regress/hive/EXPECTED007 | 10 +-
core/sql/regress/hive/EXPECTED009 | 12 +-
core/sql/regress/privs1/EXPECTED136 | 6 +-
core/sql/regress/seabase/EXPECTED025 | 14 +-
core/sql/regress/seabase/EXPECTED027 | 2 +-
core/sql/regress/seabase/EXPECTED031 | 6 +-
core/sql/regress/seabase/EXPECTED032 | 4 +-
core/sql/runtimestats/SqlStats.cpp | 5 +-
core/sql/runtimestats/SqlStats.h | 1 -
core/sql/sort/Qsort.cpp | 1 -
core/sql/sort/Record.cpp | 2 -
core/sql/sort/TourTree.cpp | 1 -
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 213 ++-
core/sql/sqlcomp/CmpDescribe.cpp | 10 +-
core/sql/sqlcomp/QCache.cpp | 1 -
core/sql/sqlcomp/parser.cpp | 1 -
.../org/trafodion/sql/udr/predef/JDBCUDR.java | 10 +-
core/sql/udrserv/UdrResultSet.cpp | 22 +-
core/sql/udrserv/spinfo.cpp | 14 +-
core/sql/udrserv/udrserv.cpp | 12 +-
core/trafodion.spec | 2 +-
.../org/trafodion/dcs/master/ServerManager.java | 82 +-
.../trafodion/jdbc_test/TestGetIndexInfo.java | 2 +-
doap.rdf | 14 +-
docs/client_install/pom.xml | 26 +-
.../src/asciidoc/_chapters/introduction.adoc | 2 +-
.../src/asciidoc/_chapters/jdbct4.adoc | 2 +-
.../src/asciidoc/_chapters/preparation.adoc | 11 +-
.../src/asciidoc/_chapters/sample_prog.adoc | 6 +-
docs/command_interface/pom.xml | 22 +-
docs/cqd_reference/pom.xml | 22 +-
docs/jdbct4ref_guide/pom.xml | 22 +-
docs/load_transform/pom.xml | 22 +-
docs/lob_guide/pom.xml | 22 +-
.../lob_guide/src/asciidoc/_chapters/about.adoc | 4 +-
.../asciidoc/_chapters/working_with_lob.adoc | 8 +-
docs/messages_guide/pom.xml | 22 +-
.../src/asciidoc/_chapters/compiler_msgs.adoc | 6 +-
.../src/asciidoc/_chapters/ddl_msgs.adoc | 1254 ++++++++++++++++--
.../src/asciidoc/_chapters/parser_msgs.adoc | 12 +-
docs/odb_user/pom.xml | 22 +-
docs/provisioning_guide/pom.xml | 26 +-
.../src/asciidoc/_chapters/about.adoc | 2 +-
.../src/asciidoc/_chapters/enable_security.adoc | 4 +-
.../src/asciidoc/_chapters/introduction.adoc | 4 +-
.../src/asciidoc/_chapters/quickstart.adoc | 22 +-
.../src/asciidoc/_chapters/requirements.adoc | 37 +-
.../src/asciidoc/_chapters/script_install.adoc | 6 +-
.../src/asciidoc/_chapters/script_remove.adoc | 2 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 6 +-
docs/shared/license.txt | 5 -
docs/spj_guide/pom.xml | 22 +-
.../src/asciidoc/_chapters/deploy_spjs.adoc | 2 +-
.../src/resources/source/Inventory.java | 6 +-
.../spj_guide/src/resources/source/Payroll.java | 8 +-
docs/spj_guide/src/resources/source/Sales.java | 12 +-
.../src/resources/source/adjustSalary.java | 2 +-
.../src/resources/source/employeeJob.java | 2 +-
.../src/resources/source/lowerPrice.java | 2 +-
.../src/resources/source/numDailyOrders.java | 2 +-
.../src/resources/source/numMonthlyOrders.java | 2 +-
.../src/resources/source/orderSummary.java | 2 +-
.../src/resources/source/partData.java | 2 +-
.../src/resources/source/partLocations.java | 2 +-
.../src/resources/source/projectTeam.java | 2 +-
.../src/resources/source/supplierInfo.java | 2 +-
.../src/resources/source/supplyQuantities.java | 2 +-
.../src/resources/source/topSalesReps.java | 2 +-
.../src/resources/source/totalPrice.java | 2 +-
docs/sql_reference/pom.xml | 22 +-
.../sql_functions_and_expressions.adoc | 12 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 120 +-
.../src/asciidoc/_chapters/sql_utilities.adoc | 524 ++++++++
docs/src/site/markdown/download.md | 2 +-
.../site/markdown/enable-secure-trafodion.md | 2 +-
docs/src/site/markdown/index.md | 10 +-
docs/src/site/markdown/ldapcheck.md | 2 +-
docs/src/site/markdown/ldapconfigcheck.md | 2 +-
docs/src/site/markdown/quickstart.md | 6 +-
docs/src/site/markdown/release-notes-1-0-1.md | 2 +-
docs/src/site/site.xml | 11 +-
install/.gitignore | 1 -
install/Makefile | 7 +-
install/ambari-installer/Makefile | 6 +-
install/ambari-installer/traf_ambari.spec | 2 +-
licenses/Makefile | 5 +-
licenses/lic-server-src | 32 +-
licenses/lic-test-src | 6 +-
pom.xml | 52 +-
tools/docker/Dockerfile | 4 +-
tools/docker/start-compile-docker.sh | 6 +-
win-odbc64/odbcclient/drvr35/cdesc.cpp | 3 +-
win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 6 +-
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 112 +-
190 files changed, 3763 insertions(+), 3519 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/eeeabbca/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/eeeabbca/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/eeeabbca/core/sql/executor/ex_globals.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/eeeabbca/core/sql/executor/ex_globals.h
----------------------------------------------------------------------