Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

comments

This commit is contained in:
Jan Steemann 2014-06-06 13:11:10 +02:00
parent 362838ae69
commit 4b568e6069
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/VocBase/compactor.cpp
View File

@ -172,14 +172,14 @@ static TRI_datafile_t* CreateCompactor (TRI_document_collection_t* document,
// reserve room for one additional entry
if (TRI_ReserveVectorPointer(&collection->_compactors, 1) != TRI_ERROR_NO_ERROR) {
// could not get memory, exit early
return NULL;
return nullptr;
}
TRI_LOCK_JOURNAL_ENTRIES_DOC_COLLECTION(document);
compactor = TRI_CreateCompactorPrimaryCollection(document, fid, maximalSize);
if (compactor != NULL) {
if (compactor != nullptr) {
int res TRI_UNUSED = TRI_PushBackVectorPointer(&collection->_compactors, compactor);
// we have reserved space before, so we can be sure the push succeeds

3
arangod/Wal/CollectorThread.cpp
View File

@ -1070,7 +1070,8 @@ void CollectorThread::finishMarker (char* mem,
TRI_voc_tick_t tick,
CollectorCache* cache) {
TRI_df_marker_t* marker = reinterpret_cast<TRI_df_marker_t*>(mem);
// re-use the original WAL marker's tick
marker->_tick = tick;
// calculate the CRC