You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/10/15 22:07:21 UTC
[2/9] incubator-trafodion git commit: [TRAFODION-2768] Make Trafodion
code base to compile in RH7
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sort/SortUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/SortUtil.cpp b/core/sql/sort/SortUtil.cpp
index cd75706..7b892d2 100644
--- a/core/sql/sort/SortUtil.cpp
+++ b/core/sql/sort/SortUtil.cpp
@@ -126,8 +126,8 @@ NABoolean SortUtil::scratchInitialize(void)
if (scratch_ == NULL)
{
sortError_.setErrorInfo( EScrNoMemory //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SortUtil::scratchInitialize" //methodname
);
return SORT_FAILURE;
@@ -214,8 +214,8 @@ NABoolean SortUtil::sortInitialize(SortUtilConfig& config, ULng32 topNSize)
if (sortAlgo_ == NULL)
{
sortError_.setErrorInfo(EScrNoMemory //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SortUtil::sortInitialize" //methodname
);
return SORT_FAILURE;
@@ -465,8 +465,8 @@ Lng32 SortUtil::sortReceivePrepare(void)
//Also return error if merge order is least value of 2.
//This is a really tight situation where memory is scarce.
sortError_.setErrorInfo( EScrNoMemory //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SortUtil::sortSendEndProcessing1" //methodname
);
return SORT_FAILURE;
@@ -490,8 +490,8 @@ Lng32 SortUtil::sortReceivePrepare(void)
if(result != SCRATCH_SUCCESS)
{
sortError_.setErrorInfo( EScrNoMemory //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SortUtil::sortSendEndProcessing2" //methodname
);
return SORT_FAILURE;
@@ -578,8 +578,8 @@ Lng32 SortUtil::sortReceivePrepare(void)
if(tempScratch->cleanupScratchFiles(runnum-1) != SCRATCH_SUCCESS)
{
sortError_.setErrorInfo( EInterRuns //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SortUtil::sortSendEndprocessing4" //methodname
);
return SORT_FAILURE;
@@ -610,8 +610,8 @@ Lng32 SortUtil::sortReceivePrepare(void)
if (sortAlgo_ == NULL)
{
sortError_.setErrorInfo( EScrNoMemory //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SortUtil::sortSendEndProcessing5" //methodname
);
return SORT_FAILURE;
@@ -646,8 +646,8 @@ Lng32 SortUtil::sortReceivePrepare(void)
if(tempScratch->cleanupScratchFiles(runnum-1) != SCRATCH_SUCCESS)
{
sortError_.setErrorInfo( EInterRuns //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SortUtil::sortSendEndprocessing7" //methodname
);
return SORT_FAILURE;
@@ -709,8 +709,8 @@ Lng32 SortUtil::sortReceivePrepare(void)
if (sortAlgo_ == NULL)
{
sortError_.setErrorInfo( EScrNoMemory //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SortUtil::sortSendEndprocessing8" //methodname
);
return SORT_FAILURE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sort/SortUtilCfg.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/SortUtilCfg.cpp b/core/sql/sort/SortUtilCfg.cpp
index ba818f5..729a743 100644
--- a/core/sql/sort/SortUtilCfg.cpp
+++ b/core/sql/sort/SortUtilCfg.cpp
@@ -56,7 +56,7 @@ SortUtilConfig::SortUtilConfig(CollHeap* heap)
recSize_ = 132L;
keySize_ = 10L;
runSize_ = 200;
- mergeOrder_ = NULL;
+ mergeOrder_ = 0;
heapAddr_ = heap;
minMem_ = 150000L;
maxMem_ = 10000000L; //arbitrarily chosen 10MB max memory
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sort/TreeNode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/TreeNode.cpp b/core/sql/sort/TreeNode.cpp
index 1d9fd6b..20b27bd 100644
--- a/core/sql/sort/TreeNode.cpp
+++ b/core/sql/sort/TreeNode.cpp
@@ -108,8 +108,8 @@ void TreeNode::initialize(ULng32 nodenum,
if (sortMergeNode_ == NULL)
{
sortError_->setErrorInfo( EScrNoMemory //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"Treenode::initialize" //methodname
);
return;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sort/diskpool_sq.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/diskpool_sq.cpp b/core/sql/sort/diskpool_sq.cpp
index db1ab4a..e26780c 100644
--- a/core/sql/sort/diskpool_sq.cpp
+++ b/core/sql/sort/diskpool_sq.cpp
@@ -96,8 +96,8 @@ NABoolean SQDisk::returnBestDisk(char** diskname,
{
*diskname = NULL;
sortError_->setErrorInfo( EScrNoDisks //sort error
- ,NULL //syserr: the actual FS error
- ,NULL //syserrdetail
+ ,0 //syserr: the actual FS error
+ ,0 //syserrdetail
,"SQDisk::returnBestDisk" //methodname
);
return SORT_FAILURE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sort/scratchfile_base.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/scratchfile_base.cpp b/core/sql/sort/scratchfile_base.cpp
index 778e96a..19b05bc 100644
--- a/core/sql/sort/scratchfile_base.cpp
+++ b/core/sql/sort/scratchfile_base.cpp
@@ -239,8 +239,8 @@ RESULT ScratchFile::processAsynchronousReadCompletion(Int32 index)
char msg[100];
str_sprintf(msg, "ScratchFile::processAReadCompn, volume %s",fileName_);
sortError_->setErrorInfo(EWrongLengthRead, // sort error
- NULL, // syserr: the actual FS error
- NULL, // syserrdetail
+ 0, // syserr: the actual FS error
+ 0, // syserrdetail
msg);
completedAB->retval_ = OTHER_ERROR;
rc = OTHER_ERROR;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpDescribe.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDescribe.cpp b/core/sql/sqlcomp/CmpDescribe.cpp
index efb30d2..d731faf 100644
--- a/core/sql/sqlcomp/CmpDescribe.cpp
+++ b/core/sql/sqlcomp/CmpDescribe.cpp
@@ -3166,7 +3166,7 @@ short CmpDescribeSeabaseTable (
NABoolean forceStoreBy = FALSE;
NABoolean isSalted = FALSE;
NABoolean isDivisioned = FALSE;
- ItemExpr *saltExpr;
+ ItemExpr *saltExpr = NULL;
LIST(NAString) divisioningExprs(heap);
LIST(NABoolean) divisioningExprAscOrders(heap);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLauth.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLauth.cpp b/core/sql/sqlcomp/CmpSeabaseDDLauth.cpp
index b3750e9..8cf1cf5 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLauth.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLauth.cpp
@@ -529,7 +529,7 @@ void CmpSeabaseDDLauth::insertRow()
}
// update a row in AUTHS table based on the passed in setClause
-void CmpSeabaseDDLauth::updateRow(const NAString &setClause)
+void CmpSeabaseDDLauth::updateRow(NAString &setClause)
{
char buf[1000];
ExeCliInterface cliInterface(STMTHEAP);
@@ -667,7 +667,7 @@ Int64 CmpSeabaseDDLauth::selectCount(const NAString & whereClause)
Lng32 len = 0;
Int64 rowCount = 0;
ExeCliInterface cliInterface(STMTHEAP);
- Lng32 cliRC = cliInterface.executeImmediate(buf, (char*)&rowCount, &len, NULL);
+ Lng32 cliRC = cliInterface.executeImmediate(buf, (char*)&rowCount, &len, FALSE);
// If unexpected error occurred, return an exception
if (cliRC < 0)
@@ -1040,7 +1040,7 @@ void CmpSeabaseDDLuser::unregisterUser(StmtDDLRegisterUser * pNode)
Int32 len = 0;
Int64 rowCount = 0;
ExeCliInterface cliInterface(STMTHEAP);
- Lng32 cliRC = cliInterface.executeImmediate(buf, (char*)&rowCount, &len, NULL);
+ Lng32 cliRC = cliInterface.executeImmediate(buf, (char*)&rowCount, &len, FALSE);
if (cliRC != 0)
{
cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
@@ -1738,8 +1738,6 @@ bool CmpSeabaseDDLrole::describe(
}
//------------------------------ End of describe -------------------------------
-
-
// ----------------------------------------------------------------------------
// Public method: dropRole
//
@@ -2016,5 +2014,6 @@ void CmpSeabaseDDLrole::verifyAuthority()
UserException excp (NULL, 0);
throw excp;
+ Int32 rc;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLauth.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLauth.h b/core/sql/sqlcomp/CmpSeabaseDDLauth.h
index 7ecf96d..b95e8be 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLauth.h
+++ b/core/sql/sqlcomp/CmpSeabaseDDLauth.h
@@ -123,7 +123,7 @@ class CmpSeabaseDDLauth
// metadata access methods
void deleteRow (const NAString &authName);
void insertRow (void);
- void updateRow (const NAString & setClause);
+ void updateRow (NAString & setClause);
AuthStatus selectExactRow (const NAString &cmd);
Int64 selectCount (const NAString & whereClause);
Int32 selectMaxAuthID(const NAString &whereClause);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp
index 3d98d66..49105c2 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp
@@ -989,9 +989,10 @@ void CmpSeabaseMDcleanup::cleanupSchemaObjects(ExeCliInterface *cliInterface)
if (NOT cannotDropSchema)
{
// delete schema object row from objects table
- str_sprintf(query, "delete from %s.\"%s\".%s where catalog_name = '%s' and schema_name = '%s' and object_name = '"SEABASE_SCHEMA_OBJECTNAME" ' ",
+ str_sprintf(query, "delete from %s.\"%s\".%s where catalog_name = '%s' and schema_name = '%s' and object_name = '%s' ",
getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_OBJECTS,
- (char*)catName_.data(),(char*)schName_.data());
+ (char*)catName_.data(),(char*)schName_.data(),
+ SEABASE_SCHEMA_OBJECTNAME);
cliRC = cliInterface->executeImmediate(query);
if (cliRC < 0)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index c0a74b7..70d37d1 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -3413,7 +3413,7 @@ short CmpSeabaseDDL::existsInSeabaseMDTable(
Lng32 len = 0;
Int64 rowCount = 0;
- cliRC = cliInterface->executeImmediate(buf, (char*)&rowCount, &len, NULL);
+ cliRC = cliInterface->executeImmediate(buf, (char*)&rowCount, &len, FALSE);
if (cliRC < 0)
{
cliInterface->retrieveSQLDiagnostics(CmpCommon::diags());
@@ -4747,7 +4747,7 @@ short CmpSeabaseDDL::updateSeabaseMDTable(
Lng32 entry = 0;
Int64 rowsAffected = 0;
- ExeCliInterface rwrsCliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface rwrsCliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
if (useRWRS)
{
@@ -6937,7 +6937,7 @@ short CmpSeabaseDDL::dropSeabaseObject(ExpHbaseInterface * ehi,
NAString extTableName = tableName.getExternalName(TRUE);
const NAString extNameForHbase = catalogNamePart + "." + schemaNamePart + "." + objectNamePart;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid() );
if (dropFromMD)
@@ -7087,7 +7087,7 @@ short CmpSeabaseDDL::dropSeabaseStats(ExeCliInterface *cliInterface,
Lng32 len = 0;
char sampleTableName[1000];
- cliRC = cliInterface->executeImmediate(buf, (char*)&sampleTableName, &len, NULL);
+ cliRC = cliInterface->executeImmediate(buf, (char*)&sampleTableName, &len, FALSE);
if (cliRC == -4082) // if persistent_samples table does not exist
cliRC = 0; // then there isn't a persistent sample table
else if (cliRC < 0)
@@ -7206,7 +7206,7 @@ void CmpSeabaseDDL::initSeabaseMD(NABoolean ddlXns, NABoolean minimal)
if (ehi == NULL)
return;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
const char* sysCat = ActiveSchemaDB()->getDefaults().getValue(SEABASE_CATALOG);
@@ -7482,7 +7482,7 @@ void CmpSeabaseDDL::createSeabaseMDviews()
Lng32 retcode = 0;
Lng32 cliRC = 0;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
if ((CmpCommon::context()->isUninitializedSeabase()) &&
@@ -7511,7 +7511,7 @@ void CmpSeabaseDDL::dropSeabaseMDviews()
Lng32 retcode = 0;
Lng32 cliRC = 0;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
if ((CmpCommon::context()->isUninitializedSeabase()) &&
@@ -7539,7 +7539,7 @@ void CmpSeabaseDDL::createSeabaseSchemaObjects()
Lng32 retcode = 0;
Lng32 cliRC = 0;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
if ((CmpCommon::context()->isUninitializedSeabase()) &&
@@ -7725,7 +7725,7 @@ void CmpSeabaseDDL::createSeabaseSequence(StmtDDLCreateSequence * createSequen
ElemDDLSGOptions * sgo = createSequenceNode->getSGoptions();
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
@@ -7870,7 +7870,7 @@ void CmpSeabaseDDL::alterSeabaseSequence(StmtDDLCreateSequence * alterSequence
ElemDDLSGOptions * sgo = alterSequenceNode->getSGoptions();
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
retcode = existsInSeabaseMDTable(&cliInterface,
@@ -8018,7 +8018,7 @@ void CmpSeabaseDDL::dropSeabaseSequence(StmtDDLDropSequence * dropSequenceNode
NAString objectNamePart = seqName.getObjectNamePartAsAnsiString(TRUE);
const NAString extSeqName = seqName.getExternalName(TRUE);
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
retcode = existsInSeabaseMDTable(&cliInterface,
@@ -8562,7 +8562,7 @@ void CmpSeabaseDDL::updateVersion()
Lng32 retcode = 0;
Lng32 cliRC = 0;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
if ((CmpCommon::context()->isUninitializedSeabase()) &&
@@ -8659,7 +8659,7 @@ void CmpSeabaseDDL::purgedataHbaseTable(DDLExpr * ddlExpr,
const NAString extTableName = tableName.getExternalName(TRUE);
const NAString extNameForHbase = catalogNamePart + "." + schemaNamePart + "." + objectNamePart;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
ExpHbaseInterface * ehi = allocEHI();
if (ehi == NULL)
@@ -8862,7 +8862,7 @@ short CmpSeabaseDDL::executeSeabaseDDL(DDLExpr * ddlExpr, ExprNode * ddlNode,
CmpDDLwithStatusInfo *dws)
{
Lng32 cliRC = 0;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
// error accessing hbase. Return.
@@ -9622,7 +9622,7 @@ int32_t toOwnerID = -1;
return;
char buf[4000];
-ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
Lng32 cliRC = 0;
@@ -9649,7 +9649,7 @@ Lng32 cliRC = 0;
int32_t length = 0;
Int64 rowCount = 0;
- cliRC = cliInterface.executeImmediate(buf,(char*)&rowCount,&length,NULL);
+ cliRC = cliInterface.executeImmediate(buf,(char*)&rowCount,&length,FALSE);
if (cliRC < 0)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp b/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
index 7aa1213..29844c2 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
@@ -435,7 +435,7 @@ void CmpSeabaseDDL::createSeabaseIndex( StmtDDLCreateIndex * createIndexNode,
return;
}
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
NABoolean isVolatileTable = FALSE;
ComObjectName volTabName ;
@@ -1236,7 +1236,7 @@ void CmpSeabaseDDL::populateSeabaseIndex(
return;
}
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
// If an index was created with NO POPULATE option, then
@@ -1437,7 +1437,7 @@ void CmpSeabaseDDL::dropSeabaseIndex(
NAString objectNamePart = indexName.getObjectNamePartAsAnsiString(TRUE);
const NAString extIndexName = indexName.getExternalName(TRUE);
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
ExpHbaseInterface * ehi = allocEHI();
@@ -1773,7 +1773,7 @@ void CmpSeabaseDDL::alterSeabaseTableDisableOrEnableIndex(
const NAString objectNamePart = indexName.getObjectNamePartAsAnsiString(TRUE);
const NAString extIndexName = indexName.getExternalName(TRUE);
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
retcode = existsInSeabaseMDTable(&cliInterface,
@@ -1817,7 +1817,7 @@ void CmpSeabaseDDL::alterSeabaseTableDisableOrEnableIndex(
return;
}
- Int64 btUID;
+ Int64 btUID = 0;
Int32 btObjOwner = 0;
Int32 btSchemaOwner = 0;
Int64 btObjectFlags = 0;
@@ -1890,7 +1890,7 @@ short CmpSeabaseDDL::alterSeabaseTableDisableOrEnableIndex(
Lng32 cliRC = 0;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
sprintf (buf, " ALTER TABLE \"%s\".\"%s\".\"%s\" %s INDEX \"%s\" ;", catName, schName, tabName,
@@ -1925,7 +1925,7 @@ void CmpSeabaseDDL::alterSeabaseTableDisableOrEnableAllIndexes(
const NAString schemaNamePart = tableName.getSchemaNamePartAsAnsiString(TRUE);
const NAString objectNamePart = tableName.getObjectNamePartAsAnsiString(TRUE);
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
// Fix for launchpad bug 1381621
@@ -2018,7 +2018,7 @@ void CmpSeabaseDDL::alterSeabaseIndexHBaseOptions(
const NAString extIndexName = indexName.getExternalName(TRUE);
NAString extNameForHbase = catalogNamePart + "." + schemaNamePart + "." + objectNamePart;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
ExpHbaseInterface * ehi = allocEHI();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLmd.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLmd.h b/core/sql/sqlcomp/CmpSeabaseDDLmd.h
index 54ef42c..76383b6 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLmd.h
+++ b/core/sql/sqlcomp/CmpSeabaseDDLmd.h
@@ -42,6 +42,7 @@
#ifndef _CMP_SEABASE_MD_H_
#define _CMP_SEABASE_MD_H_
+
#define COL_MAX_CATALOG_LEN 256
#define COL_MAX_SCHEMA_LEN 256
#define COL_MAX_TABLE_LEN 256
@@ -71,7 +72,7 @@ public:
static const QString seabaseAuthsDDL[] =
{
- {" create table "SEABASE_AUTHS" "},
+ {" create table " SEABASE_AUTHS " "},
{" ( "},
{" auth_id int unsigned not null not serialized, "},
{" auth_db_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -90,7 +91,7 @@ static const QString seabaseAuthsDDL[] =
static const QString seabaseColumnsDDL[] =
{
- {" create table "SEABASE_COLUMNS" "},
+ {" create table " SEABASE_COLUMNS" "},
{" ( "},
{" object_uid largeint not null not serialized, "},
{" column_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -130,7 +131,7 @@ enum SeabaseColumnsFlags {
static const QString seabaseDefaultsDDL[] =
{
- {" create table "SEABASE_DEFAULTS" "},
+ {" create table " SEABASE_DEFAULTS" "},
{" ( "},
{" attribute varchar(100 bytes) character set utf8 not null not serialized, "},
{" attr_value varchar(1000 bytes) character set utf8 not null not serialized, "},
@@ -144,7 +145,7 @@ static const QString seabaseDefaultsDDL[] =
static const QString seabaseKeysDDL[] =
{
- {" create table "SEABASE_KEYS" "},
+ {" create table " SEABASE_KEYS" "},
{" ( "},
{" object_uid largeint not null not serialized, "},
{" column_name varchar( 256 bytes ) character set utf8 not null not serialized, "},
@@ -161,7 +162,7 @@ static const QString seabaseKeysDDL[] =
static const QString seabaseIndexesDDL[] =
{
- {" create table "SEABASE_INDEXES" "},
+ {" create table " SEABASE_INDEXES" "},
{" ( "},
{" base_table_uid largeint not null not serialized, "},
{" keytag int not null not serialized, "},
@@ -179,7 +180,7 @@ static const QString seabaseIndexesDDL[] =
static const QString seabaseLibrariesDDL[] =
{
- {" create table "SEABASE_LIBRARIES" "},
+ {" create table " SEABASE_LIBRARIES" "},
{" ( "},
{" library_uid largeint not null not serialized, "},
{" library_filename varchar(512) character set iso88591 not null not serialized, "},
@@ -193,7 +194,7 @@ static const QString seabaseLibrariesDDL[] =
static const QString seabaseLibrariesUsageDDL[] =
{
- {" create table "SEABASE_LIBRARIES_USAGE" "},
+ {" create table " SEABASE_LIBRARIES_USAGE" "},
{" ( "},
{" using_library_uid largeint not null not serialized, "},
{" used_udr_uid largeint not null not serialized, "},
@@ -206,7 +207,7 @@ static const QString seabaseLibrariesUsageDDL[] =
static const QString seabaseObjectsDDL[] =
{
- {" create table "SEABASE_OBJECTS" "},
+ {" create table " SEABASE_OBJECTS" "},
{" ( "},
{" catalog_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
{" schema_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
@@ -228,7 +229,7 @@ static const QString seabaseObjectsDDL[] =
static const QString seabaseObjectsUniqIdxIndexDDL[] =
{
- {" create unique index "SEABASE_OBJECTS_UNIQ_IDX" on "TRAFODION_SYSCAT_LIT".\""SEABASE_MD_SCHEMA"\"."SEABASE_OBJECTS" "},
+ {" create unique index " SEABASE_OBJECTS_UNIQ_IDX" on " TRAFODION_SYSCAT_LIT".\"" SEABASE_MD_SCHEMA"\"." SEABASE_OBJECTS" "},
{" ( "},
{" object_uid "},
{" ) "},
@@ -238,7 +239,7 @@ static const QString seabaseObjectsUniqIdxIndexDDL[] =
static const QString seabaseObjectsUniqIdxDDL[] =
{
- {" create table "SEABASE_OBJECTS_UNIQ_IDX" "},
+ {" create table " SEABASE_OBJECTS_UNIQ_IDX" "},
{" ( "},
{" \"OBJECT_UID@\" largeint not null not serialized, "},
{" catalog_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -278,7 +279,7 @@ enum SeabaseObjectsFlags {
static const QString seabaseRefConstraintsDDL[] =
{
- {" create table "SEABASE_REF_CONSTRAINTS" "},
+ {" create table " SEABASE_REF_CONSTRAINTS" "},
{" ( "},
{" ref_constraint_uid largeint not null not serialized, "},
{" unique_constraint_uid largeint not null not serialized, "},
@@ -294,7 +295,7 @@ static const QString seabaseRefConstraintsDDL[] =
static const QString seabaseRoutinesDDL[] =
{
- {" create table "SEABASE_ROUTINES" "},
+ {" create table " SEABASE_ROUTINES" "},
{" ( "},
{" udr_uid largeint not null not serialized, "},
{" udr_type char(2) not null, "},
@@ -323,7 +324,7 @@ static const QString seabaseRoutinesDDL[] =
static const QString seabaseSeqGenDDL[] =
{
- {" create table "SEABASE_SEQ_GEN" "},
+ {" create table " SEABASE_SEQ_GEN" "},
{" ( "},
{" seq_type char(2) character set iso88591 not null not serialized, "},
{" seq_uid largeint not null not serialized, "},
@@ -353,7 +354,7 @@ static const QString seabaseSeqGenDDL[] =
static const QString seabaseTablesDDL[] =
{
- {" create table "SEABASE_TABLES" "},
+ {" create table " SEABASE_TABLES" "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" row_format char(2) character set iso88591 not null not serialized, "},
@@ -379,7 +380,7 @@ enum SeabaseTablesFlags
static const QString seabaseTableConstraintsDDL[] =
{
- {" create table "SEABASE_TABLE_CONSTRAINTS" "},
+ {" create table " SEABASE_TABLE_CONSTRAINTS" "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" constraint_uid largeint not null not serialized, "},
@@ -401,7 +402,7 @@ static const QString seabaseTableConstraintsDDL[] =
static const QString seabaseTableConstraintsIdxIndexDDL[] =
{
- {" create index "SEABASE_TABLE_CONSTRAINTS_IDX" on "TRAFODION_SYSCAT_LIT".\""SEABASE_MD_SCHEMA"\"."SEABASE_TABLE_CONSTRAINTS" "},
+ {" create index " SEABASE_TABLE_CONSTRAINTS_IDX" on " TRAFODION_SYSCAT_LIT".\"" SEABASE_MD_SCHEMA"\"." SEABASE_TABLE_CONSTRAINTS" "},
{" ( "},
{" constraint_uid "},
{" ) "},
@@ -410,7 +411,7 @@ static const QString seabaseTableConstraintsIdxIndexDDL[] =
static const QString seabaseTableConstraintsIdxDDL[] =
{
- {" create table "SEABASE_TABLE_CONSTRAINTS_IDX" "},
+ {" create table " SEABASE_TABLE_CONSTRAINTS_IDX" "},
{" ( "},
{" \"CONSTRAINT_UID@\" largeint not null not serialized, "},
{" table_uid largeint not null not serialized, "},
@@ -423,7 +424,7 @@ static const QString seabaseTableConstraintsIdxDDL[] =
static const QString seabaseTextDDL[] =
{
- {" create table "SEABASE_TEXT" "},
+ {" create table " SEABASE_TEXT" "},
{" ( "},
{" text_uid largeint not null not serialized, "},
{" text_type int not null not serialized, "},
@@ -439,7 +440,7 @@ static const QString seabaseTextDDL[] =
static const QString seabaseUniqueRefConstrUsageDDL[] =
{
- {" create table "SEABASE_UNIQUE_REF_CONSTR_USAGE" "},
+ {" create table " SEABASE_UNIQUE_REF_CONSTR_USAGE" "},
{" ( "},
{" unique_constraint_uid largeint not null not serialized, "},
{" foreign_constraint_uid largeint not null not serialized, "},
@@ -452,7 +453,7 @@ static const QString seabaseUniqueRefConstrUsageDDL[] =
static const QString seabaseVersionsDDL[] =
{
- {" create table "SEABASE_VERSIONS" "},
+ {" create table " SEABASE_VERSIONS" "},
{" ( "},
{" version_type char(50 bytes) character set utf8 not null not serialized, "},
{" major_version largeint not null not serialized, "},
@@ -467,7 +468,7 @@ static const QString seabaseVersionsDDL[] =
static const QString seabaseViewsDDL[] =
{
- {" create table "SEABASE_VIEWS" "},
+ {" create table " SEABASE_VIEWS" "},
{" ( "},
{" view_uid largeint not null not serialized, "},
{" check_option char(2) character set iso88591 not null not serialized, "},
@@ -482,7 +483,7 @@ static const QString seabaseViewsDDL[] =
static const QString seabaseViewsUsageDDL[] =
{
- {" create table "SEABASE_VIEWS_USAGE" "},
+ {" create table " SEABASE_VIEWS_USAGE" "},
{" ( "},
{" using_view_uid largeint not null not serialized, "},
{" used_object_uid largeint not null not serialized, "},
@@ -515,7 +516,7 @@ static const ComTdbVirtTableColumnInfo seabaseMDValidateRoutineColInfo[] =
static const QString seabaseHistogramsDDL[] =
{
- {" create table "HBASE_HIST_NAME" "},
+ {" create table " HBASE_HIST_NAME" "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" histogram_id int unsigned not null not serialized, "},
@@ -541,7 +542,7 @@ static const QString seabaseHistogramsDDL[] =
{" v4 largeint not null not serialized, "},
{" v5 varchar(250) character set ucs2 not null not serialized, "},
{" v6 varchar(250) character set ucs2 not null not serialized "},
- {" , constraint "HBASE_HIST_PK" primary key "},
+ {" , constraint " HBASE_HIST_PK" primary key "},
{" (table_uid, histogram_id, col_position) "},
{" ) "},
{" attribute hbase format "},
@@ -550,7 +551,7 @@ static const QString seabaseHistogramsDDL[] =
static const QString seabaseHistogramIntervalsDDL[] =
{
- {" create table "HBASE_HISTINT_NAME" "},
+ {" create table " HBASE_HISTINT_NAME" "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" histogram_id int unsigned not null not serialized, "},
@@ -565,7 +566,7 @@ static const QString seabaseHistogramIntervalsDDL[] =
{" v4 largeint not null not serialized, "},
{" v5 varchar(250) character set ucs2 not null not serialized, "},
{" v6 varchar(250) character set ucs2 not null not serialized"},
- {" , constraint "HBASE_HISTINT_PK" primary key "},
+ {" , constraint " HBASE_HISTINT_PK" primary key "},
{" (table_uid, histogram_id, interval_number) "},
{" ) "},
{" attribute hbase format "},
@@ -574,7 +575,7 @@ static const QString seabaseHistogramIntervalsDDL[] =
static const QString seabasePersistentSamplesDDL[] =
{
- {" create table "HBASE_PERS_SAMP_NAME" "},
+ {" create table " HBASE_PERS_SAMP_NAME" "},
{" ( "},
{" TABLE_UID LARGEINT NOT NULL NOT SERIALIZED, "},
{" REQUESTED_SAMPLE_ROWS LARGEINT NOT NULL NOT SERIALIZED, "},
@@ -588,7 +589,7 @@ static const QString seabasePersistentSamplesDDL[] =
{" UPDATER_INFO VARCHAR(128) CHARACTER SET ISO88591 NOT NULL NOT SERIALIZED, "},
{" V1 VARCHAR(250) CHARACTER SET UCS2 NOT NULL NOT SERIALIZED, "},
{" V2 VARCHAR(250) CHARACTER SET UCS2 NOT NULL NOT SERIALIZED, "},
- {" constraint "HBASE_PERS_SAMP_PK" primary key (TABLE_UID) "},
+ {" constraint " HBASE_PERS_SAMP_PK" primary key (TABLE_UID) "},
{" ) "},
{" attribute hbase format "},
{" ; "}
@@ -760,7 +761,7 @@ static const MDTableInfo allMDHistInfo[] = {
static const QString seabaseOldTrafMDv11AuthsDDL[] =
{
- {" create table "SEABASE_AUTHS_OLD_MD" "},
+ {" create table " SEABASE_AUTHS_OLD_MD " "},
{" ( "},
{" auth_id int unsigned not null not serialized, "},
{" auth_db_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -778,7 +779,7 @@ static const QString seabaseOldTrafMDv11AuthsDDL[] =
static const QString seabaseOldTrafMDv11ColumnsDDL[] =
{
- {" create table "SEABASE_COLUMNS_OLD_MD" "},
+ {" create table " SEABASE_COLUMNS_OLD_MD " "},
{" ( "},
{" object_uid largeint not null not serialized, "},
{" column_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -817,7 +818,7 @@ enum SeabaseOldTrafMDv11ColumnsFlags {
static const QString seabaseOldTrafMDv11DefaultsDDL[] =
{
- {" create table "SEABASE_DEFAULTS_OLD_MD" "},
+ {" create table " SEABASE_DEFAULTS_OLD_MD " "},
{" ( "},
{" attribute varchar(100 bytes) character set utf8 not null not serialized, "},
{" attr_value varchar(1000 bytes) character set utf8 not null not serialized, "},
@@ -829,7 +830,7 @@ static const QString seabaseOldTrafMDv11DefaultsDDL[] =
static const QString seabaseOldTrafMDv11KeysDDL[] =
{
- {" create table "SEABASE_KEYS_OLD_MD" "},
+ {" create table " SEABASE_KEYS_OLD_MD " "},
{" ( "},
{" object_uid largeint not null not serialized, "},
{" column_name varchar( 256 bytes ) character set utf8 not null not serialized, "},
@@ -845,7 +846,7 @@ static const QString seabaseOldTrafMDv11KeysDDL[] =
static const QString seabaseOldTrafMDv11IndexesDDL[] =
{
- {" create table "SEABASE_INDEXES_OLD_MD" "},
+ {" create table " SEABASE_INDEXES_OLD_MD " "},
{" ( "},
{" base_table_uid largeint not null not serialized, "},
{" keytag int not null not serialized, "},
@@ -862,7 +863,7 @@ static const QString seabaseOldTrafMDv11IndexesDDL[] =
static const QString seabaseOldTrafMDv11LibrariesDDL[] =
{
- {" create table "SEABASE_LIBRARIES_OLD_MD" "},
+ {" create table " SEABASE_LIBRARIES_OLD_MD " "},
{" ( "},
{" library_uid largeint not null not serialized, "},
{" library_filename varchar(512) character set iso88591 not null not serialized, "},
@@ -874,7 +875,7 @@ static const QString seabaseOldTrafMDv11LibrariesDDL[] =
static const QString seabaseOldTrafMDv11LibrariesUsageDDL[] =
{
- {" create table "SEABASE_LIBRARIES_USAGE_OLD_MD" "},
+ {" create table " SEABASE_LIBRARIES_USAGE_OLD_MD " "},
{" ( "},
{" using_library_uid largeint not null not serialized, "},
{" used_udr_uid largeint not null not serialized "},
@@ -885,7 +886,7 @@ static const QString seabaseOldTrafMDv11LibrariesUsageDDL[] =
static const QString seabaseOldTrafMDv11ObjectsDDL[] =
{
- {" create table "SEABASE_OBJECTS_OLD_MD" "},
+ {" create table " SEABASE_OBJECTS_OLD_MD " "},
{" ( "},
{" catalog_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
{" schema_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
@@ -906,7 +907,7 @@ static const QString seabaseOldTrafMDv11ObjectsDDL[] =
static const QString seabaseOldTrafMDv11ObjectsUniqIdxIndexDDL[] =
{
- {" create unique index "SEABASE_OBJECTS_UNIQ_IDX_OLD_MD" on "TRAFODION_SYSCAT_LIT".\""SEABASE_MD_SCHEMA"\"."SEABASE_OBJECTS_OLD_MD" "},
+ {" create unique index " SEABASE_OBJECTS_UNIQ_IDX_OLD_MD " on " TRAFODION_SYSCAT_LIT".\"" SEABASE_MD_SCHEMA"\"." SEABASE_OBJECTS_OLD_MD" "},
{" ( "},
{" object_uid "},
{" ) "},
@@ -915,7 +916,7 @@ static const QString seabaseOldTrafMDv11ObjectsUniqIdxIndexDDL[] =
static const QString seabaseOldTrafMDv11ObjectsUniqIdxDDL[] =
{
- {" create table "SEABASE_OBJECTS_UNIQ_IDX_OLD_MD" "},
+ {" create table " SEABASE_OBJECTS_UNIQ_IDX_OLD_MD " "},
{" ( "},
{" \"OBJECT_UID@\" largeint not null not serialized, "},
{" catalog_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -939,7 +940,7 @@ enum SeabaseOldTrafMDv11ObjectsFlags {
static const QString seabaseOldTrafMDv11RefConstraintsDDL[] =
{
- {" create table "SEABASE_REF_CONSTRAINTS_OLD_MD" "},
+ {" create table " SEABASE_REF_CONSTRAINTS_OLD_MD " "},
{" ( "},
{" ref_constraint_uid largeint not null not serialized, "},
{" unique_constraint_uid largeint not null not serialized, "},
@@ -954,7 +955,7 @@ static const QString seabaseOldTrafMDv11RefConstraintsDDL[] =
static const QString seabaseOldTrafMDv11RoutinesDDL[] =
{
- {" create table "SEABASE_ROUTINES_OLD_MD" "},
+ {" create table " SEABASE_ROUTINES_OLD_MD " "},
{" ( "},
{" udr_uid largeint not null not serialized, "},
{" udr_type char(2) not null, "},
@@ -981,7 +982,7 @@ static const QString seabaseOldTrafMDv11RoutinesDDL[] =
static const QString seabaseOldTrafMDv11SeqGenDDL[] =
{
- {" create table "SEABASE_SEQ_GEN_OLD_MD" "},
+ {" create table " SEABASE_SEQ_GEN_OLD_MD " "},
{" ( "},
{" seq_type char(2) character set iso88591 not null not serialized, "},
{" seq_uid largeint not null not serialized, "},
@@ -1010,7 +1011,7 @@ static const QString seabaseOldTrafMDv11SeqGenDDL[] =
static const QString seabaseOldTrafMDv11TablesDDL[] =
{
- {" create table "SEABASE_TABLES_OLD_MD" "},
+ {" create table " SEABASE_TABLES_OLD_MD " "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" row_format char(2) character set iso88591 not null not serialized, "},
@@ -1027,7 +1028,7 @@ static const QString seabaseOldTrafMDv11TablesDDL[] =
static const QString seabaseOldTrafMDv11TableConstraintsDDL[] =
{
- {" create table "SEABASE_TABLE_CONSTRAINTS_OLD_MD" "},
+ {" create table " SEABASE_TABLE_CONSTRAINTS_OLD_MD " "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" constraint_uid largeint not null not serialized, "},
@@ -1048,7 +1049,7 @@ static const QString seabaseOldTrafMDv11TableConstraintsDDL[] =
static const QString seabaseOldTrafMDv11TextDDL[] =
{
- {" create table "SEABASE_TEXT_OLD_MD" "},
+ {" create table " SEABASE_TEXT_OLD_MD " "},
{" ( "},
{" text_uid largeint not null not serialized, "},
{" text_type int not null not serialized, "},
@@ -1063,7 +1064,7 @@ static const QString seabaseOldTrafMDv11TextDDL[] =
static const QString seabaseOldTrafMDv11UniqueRefConstrUsageDDL[] =
{
- {" create table "SEABASE_UNIQUE_REF_CONSTR_USAGE_OLD_MD" "},
+ {" create table " SEABASE_UNIQUE_REF_CONSTR_USAGE_OLD_MD " "},
{" ( "},
{" unique_constraint_uid largeint not null not serialized, "},
{" foreign_constraint_uid largeint not null not serialized, "},
@@ -1075,7 +1076,7 @@ static const QString seabaseOldTrafMDv11UniqueRefConstrUsageDDL[] =
static const QString seabaseOldTrafMDv11VersionsDDL[] =
{
- {" create table "SEABASE_VERSIONS_OLD_MD" "},
+ {" create table " SEABASE_VERSIONS_OLD_MD " "},
{" ( "},
{" version_type char(50 bytes) character set utf8 not null not serialized, "},
{" major_version largeint not null not serialized, "},
@@ -1089,7 +1090,7 @@ static const QString seabaseOldTrafMDv11VersionsDDL[] =
static const QString seabaseOldTrafMDv11ViewsDDL[] =
{
- {" create table "SEABASE_VIEWS_OLD_MD" "},
+ {" create table " SEABASE_VIEWS_OLD_MD " "},
{" ( "},
{" view_uid largeint not null not serialized, "},
{" check_option char(2) character set iso88591 not null not serialized, "},
@@ -1103,7 +1104,7 @@ static const QString seabaseOldTrafMDv11ViewsDDL[] =
static const QString seabaseOldTrafMDv11ViewsUsageDDL[] =
{
- {" create table "SEABASE_VIEWS_USAGE_OLD_MD" "},
+ {" create table " SEABASE_VIEWS_USAGE_OLD_MD " "},
{" ( "},
{" using_view_uid largeint not null not serialized, "},
{" used_object_uid largeint not null not serialized, "},
@@ -1135,7 +1136,7 @@ static const ComTdbVirtTableColumnInfo seabaseOldTrafMDv11MDValidateRoutineColIn
static const QString seabaseOldTrafMDv11HistogramsDDL[] =
{
- {" create table "HBASE_HIST_NAME"_OLD_MD "},
+ {" create table " HBASE_HIST_NAME" _OLD_MD "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" histogram_id int unsigned not null not serialized, "},
@@ -1161,7 +1162,7 @@ static const QString seabaseOldTrafMDv11HistogramsDDL[] =
{" v4 largeint not null not serialized, "},
{" v5 varchar(250) character set ucs2 not null not serialized, "},
{" v6 varchar(250) character set ucs2 not null not serialized "},
- {" , constraint "HBASE_HIST_PK" primary key "},
+ {" , constraint " HBASE_HIST_PK" primary key "},
{" (table_uid, histogram_id, col_position) "},
{" ) "},
{" ; "}
@@ -1169,7 +1170,7 @@ static const QString seabaseOldTrafMDv11HistogramsDDL[] =
static const QString seabaseOldTrafMDv11HistogramIntervalsDDL[] =
{
- {" create table "HBASE_HISTINT_NAME"_OLD_MD "},
+ {" create table " HBASE_HISTINT_NAME" _OLD_MD "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" histogram_id int unsigned not null not serialized, "},
@@ -1184,7 +1185,7 @@ static const QString seabaseOldTrafMDv11HistogramIntervalsDDL[] =
{" v4 largeint not null not serialized, "},
{" v5 varchar(250) character set ucs2 not null not serialized, "},
{" v6 varchar(250) character set ucs2 not null not serialized"},
- {" , constraint "HBASE_HISTINT_PK" primary key "},
+ {" , constraint " HBASE_HISTINT_PK" primary key "},
{" (table_uid, histogram_id, interval_number) "},
{" ) "},
{" ; "}
@@ -1206,7 +1207,7 @@ static const QString seabaseOldTrafMDv11HistogramIntervalsDDL[] =
static const QString seabaseOldMDv23AuthsDDL[] =
{
- {" create table "SEABASE_AUTHS_OLD_MD" "},
+ {" create table " SEABASE_AUTHS_OLD_MD " "},
{" ( "},
{" auth_id int unsigned not null not serialized, "},
{" auth_db_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -1223,7 +1224,7 @@ static const QString seabaseOldMDv23AuthsDDL[] =
static const QString seabaseOldMDv23ColumnsDDL[] =
{
- {" create table "SEABASE_COLUMNS_OLD_MD" "},
+ {" create table " SEABASE_COLUMNS_OLD_MD " "},
{" ( "},
{" object_uid largeint not null not serialized, "},
{" column_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -1253,7 +1254,7 @@ static const QString seabaseOldMDv23ColumnsDDL[] =
static const QString seabaseOldMDv23IndexesDDL[] =
{
- {" create table "SEABASE_INDEXES_OLD_MD" "},
+ {" create table " SEABASE_INDEXES_OLD_MD " "},
{" ( "},
{" base_table_uid largeint not null not serialized, "},
{" keytag int not null not serialized, "},
@@ -1269,7 +1270,7 @@ static const QString seabaseOldMDv23IndexesDDL[] =
static const QString seabaseOldMDv23KeysDDL[] =
{
- {" create table "SEABASE_KEYS_OLD_MD" "},
+ {" create table " SEABASE_KEYS_OLD_MD " "},
{" ( "},
{" object_uid largeint not null not serialized, "},
{" column_name varchar( 256 bytes ) character set utf8 not null not serialized, "},
@@ -1284,7 +1285,7 @@ static const QString seabaseOldMDv23KeysDDL[] =
static const QString seabaseOldMDv23ObjectsDDL[] =
{
- {" create table "SEABASE_OBJECTS_OLD_MD" "},
+ {" create table " SEABASE_OBJECTS_OLD_MD " "},
{" ( "},
{" catalog_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
{" schema_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
@@ -1302,7 +1303,7 @@ static const QString seabaseOldMDv23ObjectsDDL[] =
static const QString seabaseOldMDv23RefConstraintsDDL[] =
{
- {" create table "SEABASE_REF_CONSTRAINTS_OLD_MD" "},
+ {" create table " SEABASE_REF_CONSTRAINTS_OLD_MD " "},
{" ( "},
{" ref_constraint_uid largeint not null not serialized, "},
{" unique_constraint_uid largeint not null not serialized, "},
@@ -1316,7 +1317,7 @@ static const QString seabaseOldMDv23RefConstraintsDDL[] =
static const QString seabaseOldMDv23SeqGenDDL[] =
{
- {" create table "SEABASE_SEQ_GEN_OLD_MD" "},
+ {" create table " SEABASE_SEQ_GEN_OLD_MD " "},
{" ( "},
{" seq_type char(2) character set iso88591 not null not serialized, "},
{" seq_uid largeint not null not serialized, "},
@@ -1341,7 +1342,7 @@ static const QString seabaseOldMDv23SeqGenDDL[] =
static const QString seabaseOldMDv23TablesDDL[] =
{
- {" create table "SEABASE_TABLES_OLD_MD" "},
+ {" create table " SEABASE_TABLES_OLD_MD " "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" is_audited char(2) character set iso88591 not null not serialized, "},
@@ -1353,7 +1354,7 @@ static const QString seabaseOldMDv23TablesDDL[] =
static const QString seabaseOldMDv23TableConstraintsDDL[] =
{
- {" create table "SEABASE_TABLE_CONSTRAINTS_OLD_MD" "},
+ {" create table " SEABASE_TABLE_CONSTRAINTS_OLD_MD " "},
{" ( "},
{" table_uid largeint not null not serialized, "},
{" constraint_uid largeint not null not serialized, "},
@@ -1367,7 +1368,7 @@ static const QString seabaseOldMDv23TableConstraintsDDL[] =
static const QString seabaseOldMDv23TextDDL[] =
{
- {" create table "SEABASE_TEXT_OLD_MD" "},
+ {" create table " SEABASE_TEXT_OLD_MD " "},
{" ( "},
{" object_uid largeint not null not serialized, "},
{" seq_num int not null not serialized, "},
@@ -1379,7 +1380,7 @@ static const QString seabaseOldMDv23TextDDL[] =
static const QString seabaseOldMDv23UniqueRefConstrUsageDDL[] =
{
- {" create table "SEABASE_UNIQUE_REF_CONSTR_USAGE_OLD_MD" "},
+ {" create table " SEABASE_UNIQUE_REF_CONSTR_USAGE_OLD_MD " "},
{" ( "},
{" unique_constraint_uid largeint not null not serialized, "},
{" foreign_constraint_uid largeint not null not serialized "},
@@ -1390,7 +1391,7 @@ static const QString seabaseOldMDv23UniqueRefConstrUsageDDL[] =
static const QString seabaseOldMDv23ViewsDDL[] =
{
- {" create table "SEABASE_VIEWS_OLD_MD" "},
+ {" create table " SEABASE_VIEWS_OLD_MD " "},
{" ( "},
{" view_uid largeint not null not serialized, "},
{" check_option char(2) character set iso88591 not null not serialized, "},
@@ -1403,7 +1404,7 @@ static const QString seabaseOldMDv23ViewsDDL[] =
static const QString seabaseOldMDv23ViewsUsageDDL[] =
{
- {" create table "SEABASE_VIEWS_USAGE_OLD_MD" "},
+ {" create table " SEABASE_VIEWS_USAGE_OLD_MD " "},
{" ( "},
{" using_view_uid largeint not null not serialized, "},
{" used_object_uid largeint not null not serialized, "},
@@ -1425,7 +1426,7 @@ static const QString seabaseOldMDv23ViewsUsageDDL[] =
static const QString seabaseOldMDv21ObjectsDDL[] =
{
- {" create table "SEABASE_OBJECTS_OLD_MD" "},
+ {" create table " SEABASE_OBJECTS_OLD_MD " "},
{" ( "},
{" catalog_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
{" schema_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
@@ -1453,7 +1454,7 @@ static const QString seabaseOldMDv21ObjectsDDL[] =
static const QString seabaseOldMDv11ColumnsDDL[] =
{
- {" create table "SEABASE_COLUMNS_OLD_MD" "},
+ {" create table " SEABASE_COLUMNS_OLD_MD " "},
{" ( "},
{" object_uid largeint not null not serialized, "},
{" column_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -1481,7 +1482,7 @@ static const QString seabaseOldMDv11ColumnsDDL[] =
static const QString seabaseOldMDv11IndexesDDL[] =
{
- {" create table "SEABASE_INDEXES_OLD_MD" "},
+ {" create table " SEABASE_INDEXES_OLD_MD " "},
{" ( "},
{" base_table_uid largeint not null not serialized, "},
{" catalog_name varchar(256 bytes) character set utf8 not null not serialized, "},
@@ -1498,7 +1499,7 @@ static const QString seabaseOldMDv11IndexesDDL[] =
static const QString seabaseOldMDv11ObjectsDDL[] =
{
- {" create table "SEABASE_OBJECTS_OLD_MD" "},
+ {" create table " SEABASE_OBJECTS_OLD_MD " "},
{" ( "},
{" catalog_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
{" schema_name varchar ( 256 bytes ) character set utf8 not null not serialized, "},
@@ -1515,7 +1516,7 @@ static const QString seabaseOldMDv11ObjectsDDL[] =
static const QString seabaseOldMDv11ViewsDDL[] =
{
- {" create table "SEABASE_VIEWS_OLD_MD" "},
+ {" create table " SEABASE_VIEWS_OLD_MD " "},
{" ( "},
{" view_uid largeint not null not serialized, "},
{" check_option char(2) character set iso88591 not null not serialized, "},
@@ -1546,7 +1547,7 @@ static const QString seabaseOldMDv11ViewsDDL[] =
static const QString createTrafColumnsViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_COLUMNS_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_COLUMNS_VIEW" as "},
{" select O.catalog_name, O.schema_name, O.object_name table_name, "},
{" C.column_name, C.column_number, "},
{" cast (case when char_length(trim(sql_data_type)) = 0 then 'UNKNOWN' else sql_data_type end as char(24)) sql_data_type, "},
@@ -1577,7 +1578,7 @@ static const QString createTrafColumnsViewQuery[] =
static const QString createTrafIndexesViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_INDEXES_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_INDEXES_VIEW" as "},
{" select O.catalog_name, O.schema_name, O.object_name index_name, "},
{" O2.object_name table_name, "},
{" I.is_unique, I.key_colcount, I.nonkey_colcount "},
@@ -1595,7 +1596,7 @@ static const QString createTrafIndexesViewQuery[] =
static const QString createTrafKeysViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_KEYS_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_KEYS_VIEW" as "},
{" select O.catalog_name, O.schema_name, O.object_name table_name, "},
{" O2.object_name constraint_name, "},
{" cast(case "},
@@ -1621,7 +1622,7 @@ static const QString createTrafKeysViewQuery[] =
static const QString createTrafRefConstraintsViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_REF_CONSTRAINTS_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_REF_CONSTRAINTS_VIEW" as "},
{" select O2.catalog_name, O2.schema_name, O2.object_name table_name, "},
{" O.object_name constraint_name, "},
{" O3.schema_name unique_constraint_schema_name, "},
@@ -1644,7 +1645,7 @@ static const QString createTrafRefConstraintsViewQuery[] =
static const QString createTrafSequencesViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_SEQUENCES_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_SEQUENCES_VIEW" as "},
{" select O.catalog_name, O.schema_name, O.object_name seq_name, "},
{" S.start_value, S.increment, S.max_value, S.min_value, "},
{" S.cycle_option, case when S.cache_size = 0 then 'N' else 'Y' end cache_option, "},
@@ -1662,7 +1663,7 @@ static const QString createTrafSequencesViewQuery[] =
static const QString createTrafTablesViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_TABLES_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_TABLES_VIEW" as "},
{" select catalog_name, schema_name, object_name table_name, "},
{" T.key_length, T.row_data_length, T.row_total_length, T.num_salt_partns "},
{" from %s.\"%s\".\"%s\" O, "},
@@ -1678,7 +1679,7 @@ static const QString createTrafTablesViewQuery[] =
static const QString createTrafViewsViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_VIEWS_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_VIEWS_VIEW" as "},
{" select O.catalog_name, O.schema_name, O.object_name view_name, "},
{" V.check_option, V.is_updatable, V.is_insertable "},
{" from %s.\"%s\".\"%s\" O, "},
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp b/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp
index 55ea7d2..957c063 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp
@@ -751,7 +751,7 @@ short CmpSeabaseDDL::upgradeReposUndo(ExeCliInterface * cliInterface,
void CmpSeabaseDDL::processRepository(
NABoolean createR, NABoolean dropR, NABoolean upgradeR)
{
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
if (createR)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLrepos.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLrepos.h b/core/sql/sqlcomp/CmpSeabaseDDLrepos.h
index 98c6c6f..7a672d4 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLrepos.h
+++ b/core/sql/sqlcomp/CmpSeabaseDDLrepos.h
@@ -45,7 +45,7 @@
//----------------------------------------------------------------
static const QString createMetricQueryTable[] =
{
-{" create table %s.\"%s\"."REPOS_METRIC_QUERY_TABLE" "},
+{" create table %s.\"%s\"." REPOS_METRIC_QUERY_TABLE" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable serialized, "},
{" tenant_id integer unsigned no default not null not droppable serialized, "},
@@ -59,8 +59,8 @@ static const QString createMetricQueryTable[] =
{" sequence_number integer unsigned default null serialized, "},
{" process_name char(32) character set iso88591 casespecific default null serialized, "},
{" exec_start_utc_ts timestamp(6) no default not null not droppable not serialized, "},
- {" query_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable serialized, "},
- {" query_signature_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
+ {" query_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable serialized, "},
+ {" query_signature_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
{" user_name char(256 bytes) character set utf8 casespecific default null serialized, "},
{" role_name char(256 bytes) character set utf8 casespecific default null serialized, "},
{" start_priority integer unsigned default null serialized, "},
@@ -68,7 +68,7 @@ static const QString createMetricQueryTable[] =
{" session_id char(108) character set iso88591 casespecific default null serialized, "},
{" client_name varchar(1024) character set iso88591 casespecific default null serialized, "},
{" application_name char(130) character set iso88591 casespecific default null serialized, "},
- {" statement_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
+ {" statement_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
{" statement_type char(36) character set iso88591 casespecific default null serialized, "},
{" statement_subtype char(36) character set iso88591 casespecific default null serialized, "},
{" submit_utc_ts timestamp(6) default null not serialized, "},
@@ -137,7 +137,7 @@ static const QString createMetricQueryTable[] =
{" num_reply_msg_bytes largeint default null serialized, "},
{" first_result_return_utc_ts timestamp(6) default null not serialized, "},
{" rows_returned_to_master largeint default null serialized, "},
- {" parent_query_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
+ {" parent_query_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
{" parent_system_name char(128) character set iso88591 casespecific default null serialized, "},
{" exec_end_utc_ts timestamp(6) default null not serialized, "},
{" master_execution_time largeint default null serialized, "},
@@ -148,7 +148,7 @@ static const QString createMetricQueryTable[] =
{" sql_error_code integer default null serialized, "},
{" error_text varchar(2000) character set utf8 casespecific default null serialized, "},
{" query_text varchar(50000) character set utf8 casespecific default null serialized, "},
- {" explain_plan varchar("REPOS_MAX_EXPLAIN_PLAN_LEN_STR") character set iso88591 casespecific default null serialized, "},
+ {" explain_plan varchar(" REPOS_MAX_EXPLAIN_PLAN_LEN_STR") character set iso88591 casespecific default null serialized, "},
{" last_error_before_aqr integer default null serialized, "},
{" delay_time_before_aqr_sec largeint default null serialized, "},
{" total_num_aqr_retries largeint default null serialized, "},
@@ -187,7 +187,7 @@ static const QString createMetricQueryTable[] =
// ----------------------------------------------------------------
static const QString createMetricSessionTable[] =
{
- {" create table %s.\"%s\"."REPOS_METRIC_SESSION_TABLE" "},
+ {" create table %s.\"%s\"." REPOS_METRIC_SESSION_TABLE" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable serialized, "},
{" tenant_id integer unsigned no default not null not droppable serialized, "},
@@ -245,7 +245,7 @@ static const QString createMetricSessionTable[] =
//----------------------------------------------------------------
static const QString createMetricQueryAggrTable[] =
{
- {" create table %s.\"%s\"."REPOS_METRIC_QUERY_AGGR_TABLE" "},
+ {" create table %s.\"%s\"." REPOS_METRIC_QUERY_AGGR_TABLE" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable serialized, "},
{" tenant_id integer unsigned no default not null not droppable serialized, "},
@@ -323,9 +323,9 @@ static const QString createMetricQueryAggrTable[] =
//----------------------------------------------------------------
static const QString createMetricTextTable[] =
{
- {" create table %s.\"%s\"."REPOS_METRIC_TEXT_TABLE" "},
+ {" create table %s.\"%s\"." REPOS_METRIC_TEXT_TABLE" "},
{" ( "},
- {" query_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable serialized, "},
+ {" query_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable serialized, "},
{" text_type int not null serialized, "},
{" sub_id int not null serialized, "},
{" seq_num int not null serialized, "},
@@ -367,7 +367,7 @@ static const QString createMetricTextTable[] =
//----------------------------------------------------------------
static const QString createOldTrafv11MetricQueryTable[] =
{
-{" create table %s.\"%s\"."TRAF_METRIC_QUERY_TABLE_OLD_REPOS" "},
+{" create table %s.\"%s\"." TRAF_METRIC_QUERY_TABLE_OLD_REPOS" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable serialized, "},
{" tenant_id integer unsigned no default not null not droppable serialized, "},
@@ -381,7 +381,7 @@ static const QString createOldTrafv11MetricQueryTable[] =
{" sequence_number integer unsigned default null serialized, "},
{" process_name char(32) character set iso88591 casespecific default null serialized, "},
{" exec_start_utc_ts timestamp(6) no default not null not droppable not serialized, "},
- {" query_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable serialized, "},
+ {" query_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable serialized, "},
{" user_name char(256 bytes) character set utf8 casespecific default null serialized, "},
{" role_name char(256 bytes) character set utf8 casespecific default null serialized, "},
{" start_priority integer unsigned default null serialized, "},
@@ -389,7 +389,7 @@ static const QString createOldTrafv11MetricQueryTable[] =
{" session_id char(108) character set iso88591 casespecific default null serialized, "},
{" client_name varchar(1024) character set iso88591 casespecific default null serialized, "},
{" application_name char(130) character set iso88591 casespecific default null serialized, "},
- {" statement_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
+ {" statement_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
{" statement_type char(36) character set iso88591 casespecific default null serialized, "},
{" statement_subtype char(36) character set iso88591 casespecific default null serialized, "},
{" submit_utc_ts timestamp(6) default null not serialized, "},
@@ -458,7 +458,7 @@ static const QString createOldTrafv11MetricQueryTable[] =
{" num_reply_msg_bytes largeint default null serialized, "},
{" first_result_return_utc_ts timestamp(6) default null not serialized, "},
{" rows_returned_to_master largeint default null serialized, "},
- {" parent_query_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
+ {" parent_query_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null serialized, "},
{" parent_system_name char(128) character set iso88591 casespecific default null serialized, "},
{" exec_end_utc_ts timestamp(6) default null not serialized, "},
{" master_execution_time largeint default null serialized, "},
@@ -506,7 +506,7 @@ static const QString createOldTrafv11MetricQueryTable[] =
// ----------------------------------------------------------------
static const QString createOldTrafv11MetricSessionTable[] =
{
- {" create table %s.\"%s\"."TRAF_METRIC_SESSION_TABLE_OLD_REPOS" "},
+ {" create table %s.\"%s\"." TRAF_METRIC_SESSION_TABLE_OLD_REPOS" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable serialized, "},
{" tenant_id integer unsigned no default not null not droppable serialized, "},
@@ -561,7 +561,7 @@ static const QString createOldTrafv11MetricSessionTable[] =
//----------------------------------------------------------------
static const QString createOldTrafv11MetricQueryAggrTable[] =
{
- {" create table %s.\"%s\"."TRAF_METRIC_QUERY_AGGR_TABLE_OLD_REPOS" "},
+ {" create table %s.\"%s\"." TRAF_METRIC_QUERY_AGGR_TABLE_OLD_REPOS" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable serialized, "},
{" tenant_id integer unsigned no default not null not droppable serialized, "},
@@ -645,9 +645,9 @@ static const QString createOldTrafv11MetricQueryAggrTable[] =
//----------------------------------------------------------------
static const QString createOldTrafv11MetricTextTable[] =
{
- {" create table %s.\"%s\"."REPOS_METRIC_TEXT_TABLE" "}, // table didn't change when moving from 1.1 to 2.1
+ {" create table %s.\"%s\"." REPOS_METRIC_TEXT_TABLE" "}, // table didn't change when moving from 1.1 to 2.1
{" ( "},
- {" query_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable serialized, "},
+ {" query_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable serialized, "},
{" text_type int not null serialized, "},
{" sub_id int not null serialized, "},
{" seq_num int not null serialized, "},
@@ -664,7 +664,7 @@ static const QString createOldTrafv11MetricTextTable[] =
static const QString createOldv23ReposMetricQueryTable[] =
{
- {" create table %s.\"%s\"."TRAF_METRIC_QUERY_TABLE_OLD_REPOS" "},
+ {" create table %s.\"%s\"." TRAF_METRIC_QUERY_TABLE_OLD_REPOS" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable not serialized, "},
{" tenant_id integer unsigned no default not null not droppable not serialized, "},
@@ -678,7 +678,7 @@ static const QString createOldv23ReposMetricQueryTable[] =
{" sequence_number integer unsigned default null not serialized, "},
{" process_name char(32) character set iso88591 casespecific default null not serialized, "},
{" exec_start_utc_ts timestamp(6) no default not null not droppable not serialized, "},
- {" query_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable not serialized, "},
+ {" query_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific no default not null not droppable not serialized, "},
{" user_name char(256 bytes) character set utf8 casespecific default null not serialized, "},
{" role_name char(256 bytes) character set utf8 casespecific default null not serialized, "},
{" start_priority integer unsigned default null not serialized, "},
@@ -686,7 +686,7 @@ static const QString createOldv23ReposMetricQueryTable[] =
{" session_id char(108) character set iso88591 casespecific default null not serialized, "},
{" client_name varchar(1024) character set iso88591 casespecific default null not serialized, "},
{" application_name char(130) character set iso88591 casespecific default null not serialized, "},
- {" statement_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null not serialized, "},
+ {" statement_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null not serialized, "},
{" statement_type char(36) character set iso88591 casespecific default null not serialized, "},
{" statement_subtype char(36) character set iso88591 casespecific default null not serialized, "},
{" submit_utc_ts timestamp(6) default null not serialized, "},
@@ -755,7 +755,7 @@ static const QString createOldv23ReposMetricQueryTable[] =
{" num_reply_msg_bytes largeint default null not serialized, "},
{" first_result_return_utc_ts timestamp(6) default null not serialized, "},
{" rows_returned_to_master largeint default null not serialized, "},
- {" parent_query_id char("MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null not serialized, "},
+ {" parent_query_id char(" MAX_QUERY_ID_LEN_STR") character set iso88591 casespecific default null not serialized, "},
{" parent_system_name char(128) character set iso88591 casespecific default null not serialized, "},
{" exec_end_utc_ts timestamp(6) default null not serialized, "},
{" master_execution_time largeint default null not serialized, "},
@@ -797,7 +797,7 @@ static const QString createOldv23ReposMetricQueryTable[] =
static const QString createOldv23ReposMetricSessionTable[] =
{
- {" create table %s.\"%s\"."TRAF_METRIC_SESSION_TABLE_OLD_REPOS" "},
+ {" create table %s.\"%s\"." TRAF_METRIC_SESSION_TABLE_OLD_REPOS" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable not serialized, "},
{" tenant_id integer unsigned no default not null not droppable not serialized, "},
@@ -851,7 +851,7 @@ static const QString createOldv23ReposMetricSessionTable[] =
//----------------------------------------------------------------
static const QString createOldv23ReposMetricQueryAggrTable[] =
{
- {" create table %s.\"%s\"."TRAF_METRIC_QUERY_AGGR_TABLE_OLD_REPOS" "},
+ {" create table %s.\"%s\"." TRAF_METRIC_QUERY_AGGR_TABLE_OLD_REPOS" "},
{" ( "},
{" instance_id integer unsigned no default not null not droppable not serialized, "},
{" tenant_id integer unsigned no default not null not droppable not serialized, "},
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
index f37a836..eed28cb 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
@@ -291,7 +291,7 @@ void CmpSeabaseDDL::createSeabaseLibrary(
}
// Check to see if user has the authority to create the library
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
Int32 objectOwnerID = SUPER_USER;
Int32 schemaOwnerID = SUPER_USER;
@@ -445,7 +445,7 @@ void CmpSeabaseDDL::dropSeabaseLibrary(StmtDDLDropLibrary * dropLibraryNode,
getObjectNamePartAsAnsiString(TRUE);
const NAString extLibraryName = libraryName.getExternalName(TRUE);
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
ExpHbaseInterface * ehi = allocEHI();
@@ -584,7 +584,7 @@ void CmpSeabaseDDL::alterSeabaseLibrary(StmtDDLAlterLibrary *alterLibraryNode,
NAString libNamePart = libName.getObjectNamePartAsAnsiString(TRUE);
const NAString extLibName = libName.getExternalName(TRUE);
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
retcode = existsInSeabaseMDTable(&cliInterface,
@@ -722,7 +722,7 @@ void CmpSeabaseDDL::createSeabaseRoutine(
NABoolean isJava = (language == COM_LANGUAGE_JAVA);
// Check to see if user has the authority to create the routine
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
Int32 objectOwnerID = SUPER_USER;
Int32 schemaOwnerID = SUPER_USER;
@@ -1322,7 +1322,7 @@ void CmpSeabaseDDL::dropSeabaseRoutine(StmtDDLDropRoutine * dropRoutineNode,
const NAString extRoutineName = routineName.getExternalName(TRUE);
ExpHbaseInterface * ehi = NULL;
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
ehi = allocEHI();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLroutine.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLroutine.h b/core/sql/sqlcomp/CmpSeabaseDDLroutine.h
index af47250..76f4b65 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLroutine.h
+++ b/core/sql/sqlcomp/CmpSeabaseDDLroutine.h
@@ -54,7 +54,7 @@
// Create procedure text for system procedures
static const QString seabaseProcAddlibDDL[] =
{
- {" CREATE PROCEDURE IF NOT EXISTS %s.\"%s\"."SYSTEM_PROC_ADDLIB" "},
+ {" CREATE PROCEDURE IF NOT EXISTS %s.\"%s\"." SYSTEM_PROC_ADDLIB" "},
{" ( "},
{" IN LIBNAME VARCHAR(1024) CHARACTER SET UTF8, "},
{" IN FILENAME VARCHAR(1024) CHARACTER SET UTF8, "},
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ec9ec171/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
index e295c7a..a39ad0b 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
@@ -243,7 +243,7 @@ void CmpSeabaseDDL::createSeabaseSchema(
ComAnsiNamePart schNameAsComAnsi = schemaName.getSchemaNamePart();
NAString schName = schNameAsComAnsi.getInternalName();
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
ComSchemaClass schemaClass;
Int32 objectOwner = NA_UserIdDefault;
@@ -486,7 +486,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
NAString schName = schNameAsComAnsi.getInternalName();
ComObjectName objName(catName,schName,NAString("dummy"),COM_TABLE_NAME,TRUE);
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
Int32 objectOwnerID = 0;
Int32 schemaOwnerID = 0;
@@ -561,7 +561,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
str_sprintf(query,"SELECT distinct TRIM(object_name), TRIM(object_type) "
"FROM %s.\"%s\".%s "
"WHERE catalog_name = '%s' AND schema_name = '%s' AND "
- "object_name <> '"SEABASE_SCHEMA_OBJECTNAME"' AND "
+ "object_name <> '" SEABASE_SCHEMA_OBJECTNAME"' AND "
"object_type <> 'PK' "
"FOR READ COMMITTED ACCESS",
getSystemCatalog(),SEABASE_MD_SCHEMA,SEABASE_OBJECTS,
@@ -918,12 +918,12 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
str_sprintf(query,"SELECT COUNT(*) "
"FROM %s.\"%s\".%s "
"WHERE catalog_name = '%s' AND schema_name = '%s' AND "
- "object_name <> '"SEABASE_SCHEMA_OBJECTNAME"'"
+ "object_name <> '" SEABASE_SCHEMA_OBJECTNAME"'"
"FOR READ COMMITTED ACCESS",
getSystemCatalog(),SEABASE_MD_SCHEMA,SEABASE_OBJECTS,
(char*)catName.data(),(char*)schName.data());
- cliRC = cliInterface.executeImmediate(query,(char*)&rowCount,&length,NULL);
+ cliRC = cliInterface.executeImmediate(query,(char*)&rowCount,&length,FALSE);
if (cliRC < 0)
{
@@ -938,7 +938,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
str_sprintf(query,"SELECT TRIM(object_name) "
"FROM %s.\"%s\".%s "
"WHERE catalog_name = '%s' AND schema_name = '%s' AND "
- "object_name <> '"SEABASE_SCHEMA_OBJECTNAME"' AND "
+ "object_name <> '" SEABASE_SCHEMA_OBJECTNAME"' AND "
"object_type <> 'PK' "
"FOR READ COMMITTED ACCESS",
getSystemCatalog(),SEABASE_MD_SCHEMA,SEABASE_OBJECTS,
@@ -976,7 +976,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
dirtiedMetadata = TRUE;
str_sprintf(buf,"DELETE FROM %s.\"%s\".%s "
"WHERE CATALOG_NAME = '%s' AND SCHEMA_NAME = '%s' AND "
- "OBJECT_NAME = '"SEABASE_SCHEMA_OBJECTNAME"'",
+ "OBJECT_NAME = '" SEABASE_SCHEMA_OBJECTNAME"'",
getSystemCatalog(),SEABASE_MD_SCHEMA,SEABASE_OBJECTS,
(char*)catName.data(),(char*)schName.data());
cliRC = cliInterface.executeImmediate(buf);
@@ -1035,7 +1035,7 @@ void CmpSeabaseDDL::alterSeabaseSchema(StmtDDLAlterSchema * alterSchemaNode)
NAString schName = schNameAsComAnsi.getInternalName();
ComObjectName objName(catName,schName,NAString("dummy"),COM_TABLE_NAME,TRUE);
- ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
Int32 objectOwnerID = 0;
Int32 schemaOwnerID = 0;
@@ -1130,7 +1130,7 @@ void CmpSeabaseDDL::alterSeabaseSchema(StmtDDLAlterSchema * alterSchemaNode)
str_sprintf(query,"SELECT distinct TRIM(object_name), TRIM(object_type), object_uid "
"FROM %s.\"%s\".%s "
"WHERE catalog_name = '%s' AND schema_name = '%s' AND "
- "object_name <> '"SEABASE_SCHEMA_OBJECTNAME"' AND "
+ "object_name <> '" SEABASE_SCHEMA_OBJECTNAME"' AND "
"(object_type = 'BT' OR "
" object_type = 'VI') "
"FOR READ COMMITTED ACCESS",
@@ -1285,7 +1285,7 @@ NAString schemaName = giveSchemaNode->getSchemaName();
if (catalogName.isNull())
catalogName = currentCatalogName;
-ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
+ExeCliInterface cliInterface(STMTHEAP, 0, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
Int32 objectOwnerID = 0;
Int32 schemaOwnerID = 0;
@@ -1427,7 +1427,7 @@ char buf[4000];
str_sprintf(buf,"SELECT COUNT(*) "
"FROM %s.\"%s\".%s "
"WHERE catalog_name = '%s' AND schema_name = '%s' AND "
- "object_name <> '"SEABASE_SCHEMA_OBJECTNAME"' AND "
+ "object_name <> '" SEABASE_SCHEMA_OBJECTNAME"' AND "
"object_owner <> %d "
"FOR READ COMMITTED ACCESS",
getSystemCatalog(),SEABASE_MD_SCHEMA,SEABASE_OBJECTS,
@@ -1436,7 +1436,7 @@ char buf[4000];
int32_t length = 0;
Int64 rowCount = 0;
- cliRC = cliInterface.executeImmediate(buf,(char*)&rowCount,&length,NULL);
+ cliRC = cliInterface.executeImmediate(buf,(char*)&rowCount,&length,FALSE);
if (cliRC < 0)
{