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

fixed invariant

This commit is contained in:
Jan Steemann 2014-10-13 14:24:29 +02:00
parent ada372f123
commit d151088a94
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/HashIndex/hash-array-multi.cpp
View File

@ -564,10 +564,12 @@ int TRI_InsertElementHashArrayMulti (TRI_hash_array_multi_t* array,
TRI_ASSERT(arrayElement->_next == nullptr); TRI_ASSERT(arrayElement->_next == nullptr);
// not found in list, now insert insert // not found in list, now insert
element->_next = nullptr; element->_next = nullptr;
*arrayElement = *element; *arrayElement = *element;
array->_nrUsed++; array->_nrUsed++;
TRI_ASSERT(arrayElement->_next == nullptr);
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }
@ -618,6 +620,7 @@ int TRI_RemoveElementHashArrayMulti (TRI_hash_array_multi_t* array,
} }
// the element itself is the document to remove // the element itself is the document to remove
if (arrayElement->_next != nullptr) { if (arrayElement->_next != nullptr) {
auto next = arrayElement->_next; auto next = arrayElement->_next;
@ -648,7 +651,9 @@ int TRI_RemoveElementHashArrayMulti (TRI_hash_array_multi_t* array,
if ((i < k && ! (i < j && j <= k)) || (k < i && ! (i < j || j <= k))) { if ((i < k && ! (i < j && j <= k)) || (k < i && ! (i < j || j <= k))) {
array->_table[i] = array->_table[k]; array->_table[i] = array->_table[k];
array->_table[k]._document = nullptr; array->_table[k]._document = nullptr;
array->_table[k]._next = nullptr;
array->_table[k]._subObjects = nullptr;
i = k; i = k;
} }

3
arangod/HashIndex/hash-array.cpp
View File

@ -489,7 +489,8 @@ int TRI_RemoveElementHashArray (TRI_hash_array_t* array,
if ((i < k && ! (i < j && j <= k)) || (k < i && ! (i < j || j <= k))) { if ((i < k && ! (i < j && j <= k)) || (k < i && ! (i < j || j <= k))) {
array->_table[i] = array->_table[k]; array->_table[i] = array->_table[k];
array->_table[k]._document = nullptr; array->_table[k]._document = nullptr;
array->_table[k]._subObjects = nullptr;
i = k; i = k;
} }