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

Remove #define SKIP_AUTOI. This is no longer used

Browse Source
This commit is contained in:
David Hall
2016-09-06 12:04:28 -05:00
parent ecb41be0a8
commit 23cf2e3edc
2 changed files with 4 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
dbcon/mysql/ha_calpont_ddl.cpp
View File

@@ -99,9 +99,7 @@ typedef CalpontSelectExecutionPlan::ColumnMap::value_type CMVT_;
ResourceManager rm; ResourceManager rm;
bool useHdfs = rm.useHdfs(); bool useHdfs = rm.useHdfs();
#ifndef SKIP_AUTOI
#include "ha_autoi.cpp" #include "ha_autoi.cpp"
#endif
//convenience fcn //convenience fcn
inline uint32_t tid2sid(const uint32_t tid) inline uint32_t tid2sid(const uint32_t tid)
@@ -805,21 +803,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
} }
try { try {
#ifndef SKIP_AUTOI
autoIncre = parseAutoincrementColumnComment(comment, startValue); autoIncre = parseAutoincrementColumnComment(comment, startValue);
#else
algorithm::to_upper(comment);
if ( comment.find("AUTOINCREMENT") != string::npos )
{
int rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, (IDBErrorInfo::instance()->errorMsg(ERR_CREATE_AUTOINCREMENT_NOT_SUPPORT)).c_str());
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
return rc;
}
#endif
if (autoIncre) if (autoIncre)
{ {
//Check whether there is a column with autoincrement already //Check whether there is a column with autoincrement already
@@ -1155,21 +1139,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
} }
try { try {
#ifndef SKIP_AUTOI
autoIncre = parseAutoincrementColumnComment(comment, startValue); autoIncre = parseAutoincrementColumnComment(comment, startValue);
#else
algorithm::to_upper(comment);
if ( comment.find("AUTOINCREMENT") != string::npos )
{
int rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, (IDBErrorInfo::instance()->errorMsg(ERR_CREATE_AUTOINCREMENT_NOT_SUPPORT)).c_str());
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
return rc;
}
#endif
} }
catch (runtime_error& ex) catch (runtime_error& ex)
{ {
@@ -1473,21 +1443,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
try { try {
#ifndef SKIP_AUTOI
autoIncre = parseAutoincrementColumnComment(comment, startValue); autoIncre = parseAutoincrementColumnComment(comment, startValue);
#else
algorithm::to_upper(comment);
if ( comment.find("AUTOINCREMENT") != string::npos )
{
int rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, (IDBErrorInfo::instance()->errorMsg(ERR_CREATE_AUTOINCREMENT_NOT_SUPPORT)).c_str());
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
return rc;
}
#endif
} }
catch (runtime_error& ex) catch (runtime_error& ex)
{ {
@@ -1611,21 +1567,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
if ( comment.length() > 0 ) if ( comment.length() > 0 )
{ {
try { try {
#ifndef SKIP_AUTOI
autoIncre = parseAutoincrementColumnComment(comment, startValue); autoIncre = parseAutoincrementColumnComment(comment, startValue);
#else
algorithm::to_upper(comment);
if ( comment.find("AUTOINCREMENT") != string::npos )
{
int rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, (IDBErrorInfo::instance()->errorMsg(ERR_CREATE_AUTOINCREMENT_NOT_SUPPORT)).c_str());
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
return rc;
}
#endif
} }
catch (runtime_error& ex) catch (runtime_error& ex)
{ {

2
writeengine/xml/we_xmlgenproc.cpp
View File

@@ -312,14 +312,12 @@ bool XMLGenProc::makeColumnData(const CalpontSystemCatalog::TableName& table)
xmlTextWriterWriteFormatAttribute(fWriter, xmlTextWriterWriteFormatAttribute(fWriter,
BAD_CAST xmlTagTable[TAG_WIDTH], "%d", col->colType.colWidth); BAD_CAST xmlTagTable[TAG_WIDTH], "%d", col->colType.colWidth);
#ifndef SKIP_AUTOI
if (col->colType.autoincrement) if (col->colType.autoincrement)
{ {
int autoInc = 1; int autoInc = 1;
xmlTextWriterWriteFormatAttribute(fWriter, xmlTextWriterWriteFormatAttribute(fWriter,
BAD_CAST xmlTagTable[TAG_AUTOINCREMENT_FLAG], "%d",autoInc); BAD_CAST xmlTagTable[TAG_AUTOINCREMENT_FLAG], "%d",autoInc);
} }
#endif
//need dictionary and decimal stuff //need dictionary and decimal stuff
if (col->colType.ddn.dictOID > 0) if (col->colType.ddn.dictOID > 0)