PHPC-539: Include read concern in Query debug output #218
+87
−1
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
| zval *zv; | ||
| #endif | ||
|
|
||
| php_phongo_read_concern_to_zval(&zv, intern->read_concern); |
There was a problem hiding this comment.
This doesn't work in PHP 5.4-5.6 as Travis says:
/home/travis/build/mongodb/mongo-php-driver/src/MongoDB/Query.c: In function ‘php_phongo_query_get_debug_info’:
/home/travis/build/mongodb/mongo-php-driver/src/MongoDB/Query.c:238:3: error: passing argument 1 of ‘php_phongo_read_concern_to_zval’ from incompatible pointer type [-Werror]
./php_phongo.h:133:6: note: expected ‘struct zval *’ but argument is of type ‘struct zval **’
jmikola
force-pushed
the
phpc-539
branch
3 times, most recently
from
b34f4b5 to
22d05ee
Compare
| zval read_concern; | ||
|
|
||
| php_phongo_read_concern_to_zval(&read_concern, intern->read_concern); | ||
| ADD_ASSOC_ZVAL_EX(&retval, "readConcern", &read_concern); |
There was a problem hiding this comment.
Does ADD_ASSOC_ZVAL_EX copy the read_concern zval? If not, it's value is going to be out of scope when the function ends. I would at least run the tests covering this with valgrind.
There was a problem hiding this comment.
Valgrind reported no issues. I poked into PHP 7's code for add_assoc_zval_ex() and it does appear to copy the zval argument. See: http://lxr.php.net/xref/PHP_7_0/Zend/zend_hash.c#552 and references to the pData argument therein. It's used with ZVAL_COPY_VALUE() when assigning the index.
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-539