1
0
Fork 0

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
a-brandt 2013-02-18 10:55:38 +01:00
commit 20d66e53b6
1 changed files with 3 additions and 2 deletions

View File

@ -1484,15 +1484,17 @@ static bool OpenIterator (TRI_df_marker_t const* marker, void* data, TRI_datafil
// update the header info
UpdateHeader(datafile, marker, found, &update);
update._validTo = 0;
// update the datafile info
dfi = TRI_FindDatafileInfoPrimaryCollection(primary, found->_fid);
if (dfi != NULL) {
size_t length = LengthDataMasterPointer(found);
/*
issue #411: if we decrease here, the counts might get negative!
dfi->_numberAlive -= 1;
dfi->_sizeAlive -= length;
*/
dfi->_numberDead += 1;
dfi->_sizeDead += length;
@ -1504,7 +1506,6 @@ static bool OpenIterator (TRI_df_marker_t const* marker, void* data, TRI_datafil
dfi->_numberAlive += 1;
dfi->_sizeAlive += LengthDataMasterPointer(&update);
}
// update immediate indexes
UpdateImmediateIndexes(collection, found, &update);
}