PHPLIB-1167: Fix CachingIterator::count() on empty Cursor
#1118
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix error: Cannot advance a completed or failed cursor.
5 tasks
alcaeus
approved these changes
Jun 26, 2023
GromNaN
added a commit
to GromNaN/mongo-php-library
that referenced
this pull request
Jun 26, 2023
* v1.16: PHPLIB-1167: Fix CachingIterator::count() on empty Cursor (mongodb#1118)
jmikola
reviewed
Jun 26, 2023
| @@ -152,6 +150,8 @@ private function exhaustIterator(): void | |||
| private function storeCurrentItem(): void | |||
| { | |||
| if (! $this->iterator->valid()) { | |||
| $this->iteratorExhausted = true; | |||
There was a problem hiding this comment.
I was looking at this last week but never submitted a review as I couldn't figure out a way to break the patch (^_^).
This addition struck me as a bit odd, since storeCurrentItem() now thinks about iteratorExhausted, but I suppose the alternative would have been copying
$this->iteratorExhausted = ! $this->iterator->valid();...into the constructor.
I'll assume it's OK as-is, since the regression test definitely covers the original bug.
There was a problem hiding this comment.
The private method could have been renamed.
In fact, this does 1 less call to $this->iterator->valid() at each next() call.
GromNaN
added a commit
to GromNaN/mongo-php-library
that referenced
this pull request
Jun 26, 2023
GromNaN
added a commit
to GromNaN/mongo-php-library
that referenced
this pull request
Jun 27, 2023
GromNaN
added a commit
to GromNaN/mongo-php-library
that referenced
this pull request
Jun 27, 2023
GromNaN
added a commit
to GromNaN/mongo-php-library
that referenced
this pull request
Jul 7, 2023
GromNaN
added a commit
to GromNaN/mongo-php-library
that referenced
this pull request
Jul 18, 2023
GromNaN
added a commit
to GromNaN/mongo-php-library
that referenced
this pull request
Jul 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix PHPLIB-1167 from #1097 (comment)
Previous error when calling
CachingIterator::count()on an empty Cursor (no result).After many tests, I have come to the conclusion that when
$iterator->valid()isfalseafter arewind(), it means that the$iteratoris empty. Therefore, we set the property$this->iteratorExhaustedtotrueso thenext()is not called.