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

MCOL-769 Make sure system catalog is versioned

Browse Source 
Otherwise bad things can happen
This commit is contained in:
Andrew Hutchings
2017-06-21 10:05:14 +01:00
parent 4cca5fa7fa
commit 736826cbdf
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
writeengine/wrapper/writeengine.cpp
View File

@ -1288,7 +1288,7 @@ timer.stop("tokenize");
if (insertSelect && isAutoCommitOn) if (insertSelect && isAutoCommitOn)
BRMWrapper::setUseVb( false ); BRMWrapper::setUseVb( false );
else else
BRMWrapper::setUseVb( true ); BRMWrapper::setUseVb( true );
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// Update column info structure @Bug 1862 set hwm, and // Update column info structure @Bug 1862 set hwm, and
@ -2083,7 +2083,8 @@ timer.start("writeColumnRec");
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Write row(s) to database file(s) // Write row(s) to database file(s)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
rc = writeColumnRecBinary(txnid, colStructList, colValueList, rowIdArray, newColStructList, tableOid, useTmpSuffix); // @bug 5572 HDFS tmp file bool versioning = !(isAutoCommitOn && insertSelect);
rc = writeColumnRecBinary(txnid, colStructList, colValueList, rowIdArray, newColStructList, tableOid, useTmpSuffix, versioning); // @bug 5572 HDFS tmp file
} }
return rc; return rc;
} }
@ -2304,6 +2305,7 @@ timer.start("allocRowId");
} }
} }
BRMWrapper::setUseVb(true);
//Tokenize data if needed //Tokenize data if needed
dictStr::iterator dctStr_iter; dictStr::iterator dctStr_iter;
ColTupleList::iterator col_iter; ColTupleList::iterator col_iter;
@ -4550,7 +4552,6 @@ int WriteEngineWrapper::writeColumnRecBinary(const TxnID& txnid,
bool useTmpSuffix, bool useTmpSuffix,
bool versioning) bool versioning)
{ {
bool bExcp;
int rc = 0; int rc = 0;
void* valArray; void* valArray;
string segFile; string segFile;
@ -4575,7 +4576,6 @@ StopWatch timer;
TableMetaData* aTbaleMetaData = TableMetaData::makeTableMetaData(tableOid); TableMetaData* aTbaleMetaData = TableMetaData::makeTableMetaData(tableOid);
for (i = 0; i < totalColumn; i++) for (i = 0; i < totalColumn; i++)
{ {
RID * secondPart = rowIdArray + totalRow;
//@Bug 2205 Check if all rows go to the new extent //@Bug 2205 Check if all rows go to the new extent
//Write the first batch //Write the first batch
RID * firstPart = rowIdArray; RID * firstPart = rowIdArray;
@ -4636,8 +4636,6 @@ StopWatch timer;
uint8_t tmp8; uint8_t tmp8;
uint16_t tmp16; uint16_t tmp16;
uint32_t tmp32; uint32_t tmp32;
float tmpF;
double tmpD;
for (size_t j = 0; j < totalRow; j++) for (size_t j = 0; j < totalRow; j++)
{ {
uint64_t curValue = colValueList[(totalRow*i) + j]; uint64_t curValue = colValueList[(totalRow*i) + j];