make dict remain order after delete#2902

Merged

coolreader18 merged 6 commits into

RustPython:masterfrom

eldpswp99:dict-remain-order-after-delete

Aug 17, 2021

eldpswp99 commented Aug 17, 2021 •

edited by youknowone

Loading

Contributor

closes #2550

before:

dict is insertion order in CPython, but in RustPython the order was broken when deletion is occured

after:

it follows the CPython way. when it is deleted, make the entry to None, and remove this None only if resize occurs.
added nentries to optimize popitem. it is equal to the index for next insertion (= last valid entry index + 1)

fermian and others added 4 commits

August 14, 2021 17:27


          Update test_collections.py

b1207ab


          change Dict Entries type Vec<DictEntry> to Vec<Option<DictEntry>>

4e9f9ff


          make dict delete remains order

ce99057


          optimize popitem using nentries which implies next insertion index

fca7b41

eldpswp99 changed the title ~~Dict remain order after delete~~ make dict remain order after delete

DimitrisJim commented Aug 17, 2021

Member

Fix the passing test in test_ordered_dict (test_del) and I'll re-run the ci, not sure why the ubuntu check isn't finishing.


          remove test_ordered_dict delitem expected failure to passed test

b49a1e9

eldpswp99 commented Aug 17, 2021 •

edited

Loading

Contributor Author

@DimitrisJim I think there might be an infinite loop in the ubuntu test.
When i working on this commit, there was an infinite loop when implementing pop_back. when i have a inner with write lock and call lookup with lock None. but i fixed with making inner to read lock and passing it to lookup. the loop removed. but i'm not sure why the ci doesn't finished in ubuntu particularly.

DimitrisJim commented Aug 17, 2021

Member

It's weird that it only occurs there. I'll try and look into it.

youknowone requested changes

View reviewed changes

vm/src/dictdatatype.rs Outdated

vm/src/dictdatatype.rs Outdated

vm/src/dictdatatype.rs Outdated

vm/src/dictdatatype.rs Outdated

vm/src/dictdatatype.rs Outdated

vm/src/dictdatatype.rs Outdated

vm/src/dictdatatype.rs Outdated

vm/src/dictdatatype.rs Outdated

youknowone reviewed

View reviewed changes

vm/src/dictdatatype.rs Outdated

youknowone requested changes

View reviewed changes

vm/src/dictdatatype.rs Outdated

youknowone mentioned this pull request

Retain order of keys in dict when deleting a key #2550

Closed

eldpswp99 requested a review from youknowone

August 17, 2021 16:46

coolreader18 reviewed

View reviewed changes

vm/src/dictdatatype.rs Outdated

youknowone reviewed

View reviewed changes

vm/src/dictdatatype.rs Outdated

eldpswp99 force-pushed the dict-remain-order-after-delete branch from c80bcdf to abdbca0 Compare

August 17, 2021 17:16

youknowone reviewed

View reviewed changes

vm/src/dictdatatype.rs Outdated

youknowone reviewed

View reviewed changes

vm/src/dictdatatype.rs Outdated


          resolving deadlock and redundant lookup, grammatic mistakes

564eb29

eldpswp99 force-pushed the dict-remain-order-after-delete branch from abdbca0 to 564eb29 Compare

August 17, 2021 17:29

youknowone approved these changes

View reviewed changes

coolreader18 merged commit e277acc into RustPython:master

eldpswp99 commented Aug 17, 2021

Contributor Author

Thank you for all the reviews...!

DimitrisJim mentioned this pull request

Update typing to CPython 3.8 #2633

Merged

eldpswp99 mentioned this pull request

adjust dict reverse iterator next to new dict entries structure #2915

Merged

youknowone added the z-ca-2021 label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels