Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 10:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Disable robust iteration for ordered dictionaries

Browse source 
This also includes some minor commenting cleanup in that class
This commit is contained in:
Tim Wojtulewicz 2022-09-08 15:37:34 -07:00
parent 57ae03dd7d
commit 20292b0210
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Dict.h
View file

@ -1544,6 +1544,10 @@ private:
RobustDictIterator<T> MakeRobustIterator()
{
if ( IsOrdered() )
reporter->InternalError(
"RobustIterators are not currently supported for ordered dictionaries");
if ( ! iterators )
iterators = new std::vector<RobustDictIterator<T>*>;
@ -1552,15 +1556,17 @@ private:
detail::DictEntry<T> GetNextRobustIteration(RobustDictIterator<T>* iter)
{
// If there are any inserted entries, return them first.
// That keeps the list small and helps avoiding searching
// a large list when deleting an entry.
// If there's no table in the dictionary, then the iterator needs to be
// cleaned up because it's not pointing at anything.
if ( ! table )
{
iter->Complete();
return detail::DictEntry<T>(nullptr); // end of iteration
}
// If there are any inserted entries, return them first.
// That keeps the list small and helps avoiding searching
// a large list when deleting an entry.
if ( iter->inserted && ! iter->inserted->empty() )
{
// Return the last one. Order doesn't matter,
@ -1570,6 +1576,7 @@ private:
return e;
}
// First iteration.
if ( iter->next < 0 )
iter->next = Next(-1);