PHPC-1029 Support maxTimeMS getMore option for tailable command cursors #673
Conversation
|
Looking at the diff, this change will conflict with #672 so I'll put off any review until that PR is merged and this can be rebased. |
derickr
force-pushed
the
PHPC-1029-maxawaittimems-on-command
branch
from
f305ba3 to
b50f3b9
Compare
derickr
force-pushed
the
PHPC-1029-maxawaittimems-on-command
branch
from
8a12e4e to
4c33808
Compare
|
|
||
|
|
||
| # Python stuff for mongo-orchestration | ||
| apt-get install -y python python-dev python-pip | ||
|
|
||
| pip install --upgrade 'git+https://github.com/10gen/mongo-orchestration.git#egg=mongo_orchestration' | ||
| pip install --index-url=https://pypi.python.org/simple/ --upgrade 'git+https://github.com/10gen/mongo-orchestration.git#egg=mongo_orchestration' |
There was a problem hiding this comment.
The installed pip defaults to "http://pypi.python.org/simple/" which no longer works as it just returns "SSL is required"
| ], [ | ||
| 'tailable' => true, | ||
| 'awaitData' => true, | ||
| 'maxAwaitTimeMS' => 100, |
There was a problem hiding this comment.
Using "10" was too flakey, so hence made it 100ms.
| if (command->max_await_time_ms) { | ||
| bson_append_bool(&initial_reply, "awaitData", -1, 1); | ||
| bson_append_int32(&initial_reply, "maxAwaitTimeMS", -1, command->max_await_time_ms); | ||
| bson_append_bool(&initial_reply, "tailable", -1, 1); |
There was a problem hiding this comment.
You can use BSON_APPEND_BOOL() and friends here, which will run strlen() on the string literal.
|
|
||
| php_phongo_zval_to_bson(document, PHONGO_BSON_NONE, bson, NULL TSRMLS_CC); | ||
| intern->bson = bson; | ||
| php_phongo_command_init(intern, document, options TSRMLS_CC); |
There was a problem hiding this comment.
The return value is never checked here. Should we free intern->bson on error, or call the dtor? Or are we trusting PHP to run the dtor for us, since a false return value will correlate with an exception being thrown?
| @@ -2,12 +2,12 @@ | |||
| MongoDB\Driver\BulkWrite::update with arrayFilters | |||
| --SKIPIF-- | |||
| <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?> | |||
| <?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?> | |||
| <?php START('THROWAWAY', ["version" => "36-release"]); CLEANUP(THROWAWAY); ?> | |||
There was a problem hiding this comment.
This shouldn't be necessary, since 3.6 should be the default for MO (as the first version listed).
| @@ -0,0 +1,71 @@ | |||
| --TEST-- | |||
| MongoDB\Driver\Cursor tailable iteration with awaitData and maxAwaitTimeMS options | |||
There was a problem hiding this comment.
Should this title be changed to refer to commands, or not necessary?
Waiting on PHPC-1037 / PR #672