You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
chore(build): fixes to satisfy clang19 warnings
This commit is contained in:
Leonid Fedorov
committed by
Leonid Fedorov
Leonid Fedorov
parent
9fd7f342a7
commit
a0bee173f6
@ -75,7 +75,6 @@ using namespace rowgroup;
|
||||
#include <boost/thread/mutex.hpp>
|
||||
#include <boost/version.hpp>
|
||||
|
||||
|
||||
#undef BAIL_IF_0
|
||||
#if 1
|
||||
// We are unlikely to ever get anything more out of this connection, so bail out
|
||||
@ -341,14 +340,14 @@ bool CalpontSystemCatalog::TableAliasName::operator<(const TableAliasName& rhs)
|
||||
else if (view == rhs.view)
|
||||
{
|
||||
if (partitions < rhs.partitions)
|
||||
{
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (partitions == rhs.partitions)
|
||||
{
|
||||
}
|
||||
if (partitions == rhs.partitions)
|
||||
{
|
||||
if (fisColumnStore < rhs.fisColumnStore)
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -853,7 +852,7 @@ void CalpontSystemCatalog::getSysData(CalpontSelectExecutionPlan& csep, NJLSysDa
|
||||
}
|
||||
|
||||
void CalpontSystemCatalog::getSysData_EC(CalpontSelectExecutionPlan& csep, NJLSysDataList& sysDataList,
|
||||
const string& sysTableName)
|
||||
const string& /*sysTableName*/)
|
||||
{
|
||||
DEBUG << "Enter getSysData_EC " << fSessionID << endl;
|
||||
|
||||
@ -3236,7 +3235,8 @@ const CalpontSystemCatalog::RIDList CalpontSystemCatalog::columnRIDs(const Table
|
||||
|
||||
for (int i = 0; i < (*it)->dataCount(); i++)
|
||||
{
|
||||
TableColName tcn = make_tcn(aTableName.schema, aTableName.table, (*it)->GetStringData(i).safeString(""));
|
||||
TableColName tcn =
|
||||
make_tcn(aTableName.schema, aTableName.table, (*it)->GetStringData(i).safeString(""));
|
||||
fOIDmap[tcn] = rl[i].objnum;
|
||||
|
||||
if (fIdentity == EC)
|
||||
@ -3681,15 +3681,11 @@ CalpontSystemCatalog::OID CalpontSystemCatalog::tableAUXColumnOID(const TableNam
|
||||
CalpontSelectExecutionPlan::FilterTokenList filterTokenList;
|
||||
CalpontSelectExecutionPlan::ColumnMap colMap;
|
||||
|
||||
static const std::string sysCatSchemaTablePrefix =
|
||||
CALPONT_SCHEMA + "." + SYSTABLE_TABLE + ".";
|
||||
static const std::string sysCatSchemaTablePrefix = CALPONT_SCHEMA + "." + SYSTABLE_TABLE + ".";
|
||||
|
||||
SimpleColumn* c1 =
|
||||
new SimpleColumn(sysCatSchemaTablePrefix + AUXCOLUMNOID_COL, fSessionID);
|
||||
SimpleColumn* c2 =
|
||||
new SimpleColumn(sysCatSchemaTablePrefix + SCHEMA_COL, fSessionID);
|
||||
SimpleColumn* c3 =
|
||||
new SimpleColumn(sysCatSchemaTablePrefix + TABLENAME_COL, fSessionID);
|
||||
SimpleColumn* c1 = new SimpleColumn(sysCatSchemaTablePrefix + AUXCOLUMNOID_COL, fSessionID);
|
||||
SimpleColumn* c2 = new SimpleColumn(sysCatSchemaTablePrefix + SCHEMA_COL, fSessionID);
|
||||
SimpleColumn* c3 = new SimpleColumn(sysCatSchemaTablePrefix + TABLENAME_COL, fSessionID);
|
||||
|
||||
SRCP srcp;
|
||||
srcp.reset(c1);
|
||||
@ -3793,13 +3789,10 @@ CalpontSystemCatalog::OID CalpontSystemCatalog::isAUXColumnOID(const OID& oid)
|
||||
CalpontSelectExecutionPlan::FilterTokenList filterTokenList;
|
||||
CalpontSelectExecutionPlan::ColumnMap colMap;
|
||||
|
||||
static const std::string sysCatSchemaTablePrefix =
|
||||
CALPONT_SCHEMA + "." + SYSTABLE_TABLE + ".";
|
||||
static const std::string sysCatSchemaTablePrefix = CALPONT_SCHEMA + "." + SYSTABLE_TABLE + ".";
|
||||
|
||||
SimpleColumn* c1 =
|
||||
new SimpleColumn(sysCatSchemaTablePrefix + OBJECTID_COL, fSessionID);
|
||||
SimpleColumn* c2 =
|
||||
new SimpleColumn(sysCatSchemaTablePrefix + AUXCOLUMNOID_COL, fSessionID);
|
||||
SimpleColumn* c1 = new SimpleColumn(sysCatSchemaTablePrefix + OBJECTID_COL, fSessionID);
|
||||
SimpleColumn* c2 = new SimpleColumn(sysCatSchemaTablePrefix + AUXCOLUMNOID_COL, fSessionID);
|
||||
SRCP srcp;
|
||||
srcp.reset(c1);
|
||||
colMap.insert(CMVT_(sysCatSchemaTablePrefix + OBJECTID_COL, srcp));
|
||||
@ -3820,8 +3813,7 @@ CalpontSystemCatalog::OID CalpontSystemCatalog::isAUXColumnOID(const OID& oid)
|
||||
csep.filterTokenList(filterTokenList);
|
||||
|
||||
ostringstream oss;
|
||||
oss << "select objectid from systable where auxcolumnoid='" << oid
|
||||
<< "' --isAUXColumnOID/";
|
||||
oss << "select objectid from systable where auxcolumnoid='" << oid << "' --isAUXColumnOID/";
|
||||
|
||||
if (fIdentity == EC)
|
||||
oss << "EC";
|
||||
@ -5961,122 +5953,146 @@ void CalpontSystemCatalog::buildSysColinfomap()
|
||||
DictOID notDict;
|
||||
|
||||
// @bug 4433 - Increase object width from 64 to 128 for schema names, table names, and column names.
|
||||
fColinfomap[OID_SYSTABLE_TABLENAME] = ColType(129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSTABLE_TABLENAME, LISTOID_SYSTABLE_TABLENAME, TREEOID_SYSTABLE_TABLENAME, compressionType),
|
||||
colPosition++, compressionType, OID_SYSTABLE_TABLENAME, VARCHAR);
|
||||
fColinfomap[OID_SYSTABLE_TABLENAME] =
|
||||
ColType(129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSTABLE_TABLENAME, LISTOID_SYSTABLE_TABLENAME, TREEOID_SYSTABLE_TABLENAME,
|
||||
compressionType),
|
||||
colPosition++, compressionType, OID_SYSTABLE_TABLENAME, VARCHAR);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_SCHEMA] = ColType(129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSTABLE_SCHEMA, LISTOID_SYSTABLE_SCHEMA, TREEOID_SYSTABLE_SCHEMA, compressionType),
|
||||
colPosition++, compressionType, OID_SYSTABLE_SCHEMA, VARCHAR);
|
||||
fColinfomap[OID_SYSTABLE_SCHEMA] = ColType(
|
||||
129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSTABLE_SCHEMA, LISTOID_SYSTABLE_SCHEMA, TREEOID_SYSTABLE_SCHEMA, compressionType),
|
||||
colPosition++, compressionType, OID_SYSTABLE_SCHEMA, VARCHAR);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_OBJECTID] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_OBJECTID, INT);
|
||||
fColinfomap[OID_SYSTABLE_OBJECTID] = ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict,
|
||||
colPosition++, compressionType, OID_SYSTABLE_OBJECTID, INT);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_CREATEDATE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_CREATEDATE, DATE);
|
||||
fColinfomap[OID_SYSTABLE_CREATEDATE] =
|
||||
ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSTABLE_CREATEDATE, DATE);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_LASTUPDATE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_LASTUPDATE, DATE);
|
||||
fColinfomap[OID_SYSTABLE_LASTUPDATE] =
|
||||
ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSTABLE_LASTUPDATE, DATE);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_INIT] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_INIT, INT);
|
||||
fColinfomap[OID_SYSTABLE_INIT] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSTABLE_INIT, INT);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_NEXT] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_NEXT, INT);
|
||||
fColinfomap[OID_SYSTABLE_NEXT] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSTABLE_NEXT, INT);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_NUMOFROWS] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_NUMOFROWS, INT);
|
||||
fColinfomap[OID_SYSTABLE_NUMOFROWS] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSTABLE_NUMOFROWS, INT);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_AVGROWLEN] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_AVGROWLEN, INT);
|
||||
fColinfomap[OID_SYSTABLE_AVGROWLEN] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSTABLE_AVGROWLEN, INT);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_NUMOFBLOCKS] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_NUMOFBLOCKS, INT);
|
||||
fColinfomap[OID_SYSTABLE_NUMOFBLOCKS] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSTABLE_NUMOFBLOCKS, INT);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_AUTOINCREMENT] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_AUTOINCREMENT, INT);
|
||||
fColinfomap[OID_SYSTABLE_AUTOINCREMENT] =
|
||||
ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSTABLE_AUTOINCREMENT, INT);
|
||||
|
||||
fColinfomap[OID_SYSTABLE_AUXCOLUMNOID] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSTABLE_AUXCOLUMNOID, INT);
|
||||
fColinfomap[OID_SYSTABLE_AUXCOLUMNOID] =
|
||||
ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSTABLE_AUXCOLUMNOID, INT);
|
||||
|
||||
fTablemap[make_table(CALPONT_SCHEMA, SYSCOLUMN_TABLE)] = SYSCOLUMN_BASE;
|
||||
|
||||
colPosition = 0;
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_SCHEMA] = ColType(129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_SCHEMA, LISTOID_SYSCOLUMN_SCHEMA, TREEOID_SYSCOLUMN_SCHEMA, compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_SCHEMA, VARCHAR);
|
||||
fColinfomap[OID_SYSCOLUMN_SCHEMA] = ColType(
|
||||
129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_SCHEMA, LISTOID_SYSCOLUMN_SCHEMA, TREEOID_SYSCOLUMN_SCHEMA, compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_SCHEMA, VARCHAR);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_TABLENAME] = ColType(129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_TABLENAME, LISTOID_SYSCOLUMN_TABLENAME, TREEOID_SYSCOLUMN_TABLENAME, compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_TABLENAME, VARCHAR);
|
||||
fColinfomap[OID_SYSCOLUMN_TABLENAME] =
|
||||
ColType(129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_TABLENAME, LISTOID_SYSCOLUMN_TABLENAME, TREEOID_SYSCOLUMN_TABLENAME,
|
||||
compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_TABLENAME, VARCHAR);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_COLNAME] = ColType(129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_COLNAME, LISTOID_SYSCOLUMN_COLNAME, TREEOID_SYSCOLUMN_COLNAME, compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_COLNAME, VARCHAR);
|
||||
fColinfomap[OID_SYSCOLUMN_COLNAME] =
|
||||
ColType(129, scale, precision, NOTNULL_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_COLNAME, LISTOID_SYSCOLUMN_COLNAME, TREEOID_SYSCOLUMN_COLNAME,
|
||||
compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_COLNAME, VARCHAR);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_OBJECTID] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_OBJECTID, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_OBJECTID] = ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict,
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_OBJECTID, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_DICTOID] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_DICTOID, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_DICTOID] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSCOLUMN_DICTOID, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_LISTOBJID] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_LISTOBJID, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_LISTOBJID] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSCOLUMN_LISTOBJID, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_TREEOBJID] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_TREEOBJID, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_TREEOBJID] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSCOLUMN_TREEOBJID, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_DATATYPE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_DATATYPE, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_DATATYPE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict,
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_DATATYPE, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_COLUMNLEN] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_COLUMNLEN, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_COLUMNLEN] =
|
||||
ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSCOLUMN_COLUMNLEN, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_COLUMNPOS] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_COLUMNPOS, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_COLUMNPOS] =
|
||||
ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSCOLUMN_COLUMNPOS, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_LASTUPDATE] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_LASTUPDATE, DATE);
|
||||
fColinfomap[OID_SYSCOLUMN_LASTUPDATE] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSCOLUMN_LASTUPDATE, DATE);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_DEFAULTVAL] = ColType(64, scale, precision, NO_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_DEFAULTVAL, LISTOID_SYSCOLUMN_DEFAULTVAL, TREEOID_SYSCOLUMN_DEFAULTVAL, compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_DEFAULTVAL, VARCHAR);
|
||||
fColinfomap[OID_SYSCOLUMN_DEFAULTVAL] =
|
||||
ColType(64, scale, precision, NO_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_DEFAULTVAL, LISTOID_SYSCOLUMN_DEFAULTVAL,
|
||||
TREEOID_SYSCOLUMN_DEFAULTVAL, compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_DEFAULTVAL, VARCHAR);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_NULLABLE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_NULLABLE, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_NULLABLE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict,
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_NULLABLE, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_SCALE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_SCALE, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_SCALE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSCOLUMN_SCALE, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_PRECISION] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_PRECISION, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_PRECISION] =
|
||||
ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSCOLUMN_PRECISION, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_AUTOINC] = ColType(1, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_AUTOINC, CHAR);
|
||||
fColinfomap[OID_SYSCOLUMN_AUTOINC] = ColType(1, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSCOLUMN_AUTOINC, CHAR);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_DISTCOUNT] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_DISTCOUNT, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_DISTCOUNT] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSCOLUMN_DISTCOUNT, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_NULLCOUNT] = ColType(4, scale, precision, NO_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_NULLCOUNT, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_NULLCOUNT] = ColType(4, scale, precision, NO_CONSTRAINT, notDict, colPosition++,
|
||||
compressionType, OID_SYSCOLUMN_NULLCOUNT, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_MINVALUE] = ColType(65, scale, precision, NO_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_MINVALUE, LISTOID_SYSCOLUMN_MINVALUE, TREEOID_SYSCOLUMN_MINVALUE, compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_MINVALUE, VARCHAR);
|
||||
fColinfomap[OID_SYSCOLUMN_MINVALUE] =
|
||||
ColType(65, scale, precision, NO_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_MINVALUE, LISTOID_SYSCOLUMN_MINVALUE, TREEOID_SYSCOLUMN_MINVALUE,
|
||||
compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_MINVALUE, VARCHAR);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_MAXVALUE] = ColType(65, scale, precision, NO_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_MAXVALUE, LISTOID_SYSCOLUMN_MAXVALUE, TREEOID_SYSCOLUMN_MAXVALUE, compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_MAXVALUE, VARCHAR);
|
||||
fColinfomap[OID_SYSCOLUMN_MAXVALUE] =
|
||||
ColType(65, scale, precision, NO_CONSTRAINT,
|
||||
DictOID(DICTOID_SYSCOLUMN_MAXVALUE, LISTOID_SYSCOLUMN_MAXVALUE, TREEOID_SYSCOLUMN_MAXVALUE,
|
||||
compressionType),
|
||||
colPosition++, compressionType, OID_SYSCOLUMN_MAXVALUE, VARCHAR);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_COMPRESSIONTYPE] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_COMPRESSIONTYPE, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_COMPRESSIONTYPE] =
|
||||
ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSCOLUMN_COMPRESSIONTYPE, INT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_NEXTVALUE] = ColType(8, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_NEXTVALUE, UBIGINT);
|
||||
fColinfomap[OID_SYSCOLUMN_NEXTVALUE] =
|
||||
ColType(8, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSCOLUMN_NEXTVALUE, UBIGINT);
|
||||
|
||||
fColinfomap[OID_SYSCOLUMN_CHARSETNUM] = ColType(4, scale, precision, NOTNULL_CONSTRAINT,
|
||||
notDict, colPosition++, compressionType, OID_SYSCOLUMN_CHARSETNUM, INT);
|
||||
fColinfomap[OID_SYSCOLUMN_CHARSETNUM] =
|
||||
ColType(4, scale, precision, NOTNULL_CONSTRAINT, notDict, colPosition++, compressionType,
|
||||
OID_SYSCOLUMN_CHARSETNUM, INT);
|
||||
}
|
||||
|
||||
void CalpontSystemCatalog::buildSysOIDmap()
|
||||
@ -6170,13 +6186,14 @@ CalpontSystemCatalog::ColType::ColType(const ColType& rhs) : TypeHolderStd(rhs)
|
||||
}
|
||||
|
||||
CalpontSystemCatalog::ColType::ColType(int32_t colWidth_, int32_t scale_, int32_t precision_,
|
||||
const ConstraintType& constraintType_, const DictOID& ddn_, int32_t colPosition_,
|
||||
int32_t compressionType_, OID columnOID_, const ColDataType& colDataType_)
|
||||
: constraintType(constraintType_),
|
||||
ddn(ddn_),
|
||||
colPosition(colPosition_),
|
||||
compressionType(compressionType_),
|
||||
columnOID(columnOID_)
|
||||
const ConstraintType& constraintType_, const DictOID& ddn_,
|
||||
int32_t colPosition_, int32_t compressionType_, OID columnOID_,
|
||||
const ColDataType& colDataType_)
|
||||
: constraintType(constraintType_)
|
||||
, ddn(ddn_)
|
||||
, colPosition(colPosition_)
|
||||
, compressionType(compressionType_)
|
||||
, columnOID(columnOID_)
|
||||
{
|
||||
colWidth = colWidth_;
|
||||
scale = scale_;
|
||||
@ -6251,8 +6268,7 @@ boost::any CalpontSystemCatalog::ColType::convertColumnData(const NullString& da
|
||||
}
|
||||
|
||||
CalpontSystemCatalog::ColType CalpontSystemCatalog::ColType::convertUnionColType(
|
||||
vector<CalpontSystemCatalog::ColType>& types,
|
||||
unsigned int& rc)
|
||||
vector<CalpontSystemCatalog::ColType>& types, unsigned int& rc)
|
||||
{
|
||||
idbassert(types.size());
|
||||
CalpontSystemCatalog::ColType unionedType = types[0];
|
||||
@ -6328,7 +6344,7 @@ bool ctListSort(const CalpontSystemCatalog::ColType& a, const CalpontSystemCatal
|
||||
return a.colPosition < b.colPosition;
|
||||
}
|
||||
|
||||
bool operator <(const Partitions& a, const Partitions& b)
|
||||
bool operator<(const Partitions& a, const Partitions& b)
|
||||
{
|
||||
// lexicographic order.
|
||||
uint32_t l = std::min(a.fPartNames.size(), b.fPartNames.size());
|
||||
@ -6353,7 +6369,7 @@ bool operator <(const Partitions& a, const Partitions& b)
|
||||
}
|
||||
return false;
|
||||
}
|
||||
bool operator ==(const Partitions& a, const Partitions& b)
|
||||
bool operator==(const Partitions& a, const Partitions& b)
|
||||
{
|
||||
if (a.fPartNames.size() != b.fPartNames.size())
|
||||
{
|
||||
@ -6370,7 +6386,7 @@ bool operator ==(const Partitions& a, const Partitions& b)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool operator !=(const Partitions& a, const Partitions& b)
|
||||
bool operator!=(const Partitions& a, const Partitions& b)
|
||||
{
|
||||
return !(a == b);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user