database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-5021 Disallow the following ALTER TABLE ADD COLUMN statement:

Browse Source 
ALTER TABLE calpontsys.systable ADD COLUMN (auxcolumnoid INT NOT NULL DEFAULT 0);
This commit is contained in:
Gagan Goel
2022-07-21 14:13:03 -04:00
parent 1355237ca3
commit 11b7ee2f11
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dbcon/ddlpackageproc/altertableprocessor.cpp
View File

@ -682,7 +682,7 @@ void AlterTableProcessor::addColumn(uint32_t sessionID, execplan::CalpontSystemC
throw std::runtime_error(err); throw std::runtime_error(err);
} }
if ((columnOid > 0) && (columnOid != OID_SYSTABLE_AUXCOLUMNOID)) // Column exists already if (columnOid > 0) // Column exists already
{ {
err = err + "Internal add column error for " + tableColName.schema + "." + tableColName.table + "." + err = err + "Internal add column error for " + tableColName.schema + "." + tableColName.table + "." +
tableColName.column + ". Column exists already. Your table is probably out-of-sync"; tableColName.column + ". Column exists already. Your table is probably out-of-sync";
@ -747,22 +747,6 @@ void AlterTableProcessor::addColumn(uint32_t sessionID, execplan::CalpontSystemC
{ {
fStartingColOID = OID_SYSTABLE_AUTOINCREMENT; fStartingColOID = OID_SYSTABLE_AUTOINCREMENT;
} }
else if ((inTableName.fName == SYSTABLE_TABLE) && (columnDefPtr->fName == AUXCOLUMNOID_COL))
{
fStartingColOID = OID_SYSTABLE_AUXCOLUMNOID;
if (!columnDefPtr->fDefaultValue || columnDefPtr->fDefaultValue->fValue != "0" ||
columnDefPtr->fConstraints.size() != 1 || !columnDefPtr->fConstraints[0] ||
columnDefPtr->fConstraints[0]->fConstraintType != ddlpackage::DDL_NOT_NULL ||
columnDefPtr->fType->fType != CalpontSystemCatalog::INT ||
columnDefPtr->fType->fLength != 4)
{
std::ostringstream oss;
oss << "Error adding " << AUXCOLUMNOID_COL << " column to calpontsys table.";
oss << " Column should be of type integer, added with NOT NULL constraint and default value of 0";
throw std::runtime_error(oss.str());
}
}
else if ((inTableName.fName == SYSCOLUMN_TABLE) && (columnDefPtr->fName == COMPRESSIONTYPE_COL)) else if ((inTableName.fName == SYSCOLUMN_TABLE) && (columnDefPtr->fName == COMPRESSIONTYPE_COL))
{ {
fStartingColOID = OID_SYSCOLUMN_COMPRESSIONTYPE; fStartingColOID = OID_SYSCOLUMN_COMPRESSIONTYPE;
@ -1019,19 +1003,18 @@ void AlterTableProcessor::addColumn(uint32_t sessionID, execplan::CalpontSystemC
else else
bs << (uint32_t)0; bs << (uint32_t)0;
std::string tmpStr("");
if (columnDefPtr->fDefaultValue)
{
tmpStr = columnDefPtr->fDefaultValue->fValue;
}
// new column info // new column info
bs << (ByteStream::byte)dataType; bs << (ByteStream::byte)dataType;
bs << (ByteStream::byte)autoincrement; bs << (ByteStream::byte)autoincrement;
bs << (uint32_t)columnDefPtr->fType->fLength; bs << (uint32_t)columnDefPtr->fType->fLength;
bs << (uint32_t)columnDefPtr->fType->fScale; bs << (uint32_t)columnDefPtr->fType->fScale;
bs << (uint32_t)columnDefPtr->fType->fPrecision; bs << (uint32_t)columnDefPtr->fType->fPrecision;
std::string tmpStr("");
if (columnDefPtr->fDefaultValue)
{
tmpStr = columnDefPtr->fDefaultValue->fValue;
}
bs << tmpStr; bs << tmpStr;
bs << (ByteStream::byte)columnDefPtr->fType->fCompressiontype; bs << (ByteStream::byte)columnDefPtr->fType->fCompressiontype;

1
primitives/primproc/primitiveserver.cpp
View File

@ -1162,7 +1162,6 @@ int DictScanJob::operator()()
loadBlock(cmd->LBID, verInfo, cmd->Hdr.TransactionID, cmd->CompType, data, &wasBlockInCache, loadBlock(cmd->LBID, verInfo, cmd->Hdr.TransactionID, cmd->CompType, data, &wasBlockInCache,
&blocksRead, fLBIDTraceOn, session); &blocksRead, fLBIDTraceOn, session);
// TODO MCOL-5021
pproc.setBlockPtr((int*)data); pproc.setBlockPtr((int*)data);
pproc.p_TokenByScan(cmd, output, output_buf_size, eqFilter); pproc.p_TokenByScan(cmd, output, output_buf_size, eqFilter);