~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4476.1.33.

  • Committer: John Arbash Meinel
  • Date: 2009-07-01 18:37:14 UTC
  • mto: This revision was merged to the branch mainline in revision 4536.
  • Revision ID: john@arbash-meinel.com-20090701183714-1kb1acs6np4d4a4h
Simpify the code a lot by ignoring the heapq stuff.
We *could* filter items slightly better if we used the heap, when the
trees are > 2 deep (root + internal + leaf).
However, 99.9% of our trees are going to be 2 deep (~<50k entries),
which means we would have a lot of extra complexity to only handle
cases like OOo.
Also, note that while we would end up evaluating more nodes than
we need to, the correctness of the items result is still preserved.
CHK pages are always fully filled in according to the current stacking
rules, so looking at more pages doesn't hurt, only requesting extra
text keys.

More simplifications to follow.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: