PHPC-827: Update Max Staleness implementation #469
Merged
Conversation
This file contains hidden or 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
derickr
force-pushed
the
PHPC-827-update-max-staleness
branch
2 times, most recently
from
37bcbae to
4a0f8bc
Compare
jmikola
reviewed
Nov 28, 2016
| phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected maxStalenessSeconds to be <= %" PRId32 ", %" PHONGO_LONG_FORMAT " given", INT32_MAX, maxStalenessSeconds); | ||
| return; | ||
| } | ||
| if (maxStalenessSeconds > 0 && mode == MONGOC_READ_PRIMARY) { |
There was a problem hiding this comment.
This should check if it's not equal to NO_MAX_STALENESS.
jmikola
reviewed
Nov 28, 2016
| }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; | ||
|
|
||
| echo throws(function() { | ||
| new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessMS' => -1]); | ||
| new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => -2]); |
There was a problem hiding this comment.
Let's add test cases for 0 (another boundary case) and 42 (something less than 90) as well.
jmikola
reviewed
Nov 28, 2016
| }, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n"; | ||
|
|
||
| echo throws(function() { | ||
| $manager = new MongoDB\Driver\Manager(null, ['readPreference' => 'secondary', 'maxStalenessMS' => -1]); | ||
| $manager = new MongoDB\Driver\Manager(null, ['readPreference' => 'secondary', 'maxStalenessSeconds' => -2]); |
There was a problem hiding this comment.
Let's add test cases for 0 (another boundary case) and 42 (something less than 90) as well.
jmikola
approved these changes
Nov 28, 2016
derickr
force-pushed
the
PHPC-827-update-max-staleness
branch
from
4a0f8bc to
6f6f69e
Compare
derickr
force-pushed
the
PHPC-827-update-max-staleness
branch
2 times, most recently
from
7479e44 to
46c2fe6
Compare
jmikola
reviewed
Nov 28, 2016
| phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected maxStalenessSeconds to be <= %" PRId32 ", %" PHONGO_LONG_FORMAT " given", INT32_MAX, maxStalenessSeconds); | ||
| return; | ||
| } | ||
| if (maxStalenessSeconds != MONGOC_NO_MAX_STALENESS && mode == MONGOC_READ_PRIMARY) { |
There was a problem hiding this comment.
I just realized this is redundant since we're already within a maxStalenessSeconds != MONGOC_NO_MAX_STALENESS conditional. No harm in leaving this in place, though. We can always refactor later.
The expected output of bson-javascript-jsonserialize-004.phpt is logically incorrect because of an outstanding bug where Javascript objects are always serialized to BSON code types, irrespective of their scope property. That issue will be fixed by PHPC-838.
derickr
force-pushed
the
PHPC-827-update-max-staleness
branch
from
46c2fe6 to
5c63b8d
Compare
derickr
added a commit
that referenced
this pull request
Nov 28, 2016
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.
https://jira.mongodb.org/browse/PHPC-827
https://jira.mongodb.org/browse/PHPC-791
https://jira.mongodb.org/browse/PHPC-838
https://jira.mongodb.org/browse/PHPC-459