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 SKIP_AUTOI. Not used

Browse Source
This commit is contained in:
David Hall
2016-09-06 15:42:48 -05:00
parent 23cf2e3edc
commit 33a6102116
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
writeengine/xml/we_xmljob.cpp
View File

@@ -195,10 +195,7 @@ void XMLJob::printJobInfo( Log& logger ) const
oss3 << "\t\tColumn WithDefault: " << jobCol.fWithDefault << endl; oss3 << "\t\tColumn WithDefault: " << jobCol.fWithDefault << endl;
oss3 << "\t\tColumn type : " << jobCol.colType << endl; oss3 << "\t\tColumn type : " << jobCol.colType << endl;
oss3 << "\t\tColumn comp type : " << jobCol.compressionType <<endl; oss3 << "\t\tColumn comp type : " << jobCol.compressionType <<endl;
#ifndef SKIP_AUTOI
oss3 << "\t\tColumn autoInc : " << jobCol.autoIncFlag << endl; oss3 << "\t\tColumn autoInc : " << jobCol.autoIncFlag << endl;
#endif
if( jobCol.typeName == ColDataTypeStr[CalpontSystemCatalog::DECIMAL] ) { if( jobCol.typeName == ColDataTypeStr[CalpontSystemCatalog::DECIMAL] ) {
oss3 << "\t\tColumn Precision : " << jobCol.precision << endl; oss3 << "\t\tColumn Precision : " << jobCol.precision << endl;
@@ -268,10 +265,8 @@ void XMLJob::printJobInfoBrief( Log& logger ) const
if( jobCol.colType == 'D' ) if( jobCol.colType == 'D' )
oss3 << "); DctnryOid(" << jobCol.dctnry.dctnryOid; oss3 << "); DctnryOid(" << jobCol.dctnry.dctnryOid;
oss3 << ')'; oss3 << ')';
#ifndef SKIP_AUTOI
if (jobCol.autoIncFlag) if (jobCol.autoIncFlag)
oss3 << "; autoInc"; oss3 << "; autoInc";
#endif
if (jobCol.fNotNull) if (jobCol.fNotNull)
oss3 << "; NotNull"; oss3 << "; NotNull";
if (jobCol.fWithDefault) if (jobCol.fWithDefault)
@@ -561,10 +556,6 @@ void XMLJob::setJobDataColumn( xmlNode* pNode, bool bDefaultCol )
curColumn.autoIncFlag = false; curColumn.autoIncFlag = false;
} }
#ifdef SKIP_AUTOI
curColumn.autoIncFlag = false;
#endif
if( getNodeAttributeStr( pNode, xmlTagTable[TAG_COL_TYPE], bufString ) ) { if( getNodeAttributeStr( pNode, xmlTagTable[TAG_COL_TYPE], bufString ) ) {
const char* buf = bufString.c_str(); const char* buf = bufString.c_str();
if( !strcmp( buf, "D" ) ) { if( !strcmp( buf, "D" ) ) {
@@ -896,10 +887,6 @@ void XMLJob::fillInXMLDataAsLoaded(
col.autoIncFlag = true; col.autoIncFlag = true;
else else
col.autoIncFlag = false; col.autoIncFlag = false;
#ifdef SKIP_AUTOI
col.autoIncFlag = false;
#endif
// Initialize NotNull and Default Value (based on data type) // Initialize NotNull and Default Value (based on data type)
fillInXMLDataNotNullDefault( tbl.tblName, colType, col ); fillInXMLDataNotNullDefault( tbl.tblName, colType, col );