PHPC-359 and PHPC-801: RC, RP, and WC BSON serialization #424
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
jmikola
changed the title
jmikola
changed the title
derickr
suggested changes
Sep 26, 2016
| @@ -864,10 +907,10 @@ void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t | |||
| } | |||
|
|
|||
| if (!bson_empty0(tags)) { | |||
| /* Use PHONGO_TYPEMAP_NATIVE_ARRAY for the root type since tags is an | |||
| * array; however, inner documents and arrays can use the default. */ | |||
There was a problem hiding this comment.
Can we be explicit about the document_type? i.e., by setting it to something like:
state.map.document_type = PHONGO_TYPEMAP_DEFAULT;
There was a problem hiding this comment.
PHONGO_BSON_STATE_INITIALIZER is already the default, which we use for the state intialization. This should suffice.
| for (zend_hash_internal_pointer_reset_ex(ht_data, &pos); | ||
| zend_hash_get_current_data_ex(ht_data, (void **) &tagSet, &pos) == SUCCESS; | ||
| zend_hash_move_forward_ex(ht_data, &pos)) { | ||
| if (Z_TYPE_PP(tagSet) == IS_ARRAY) { |
There was a problem hiding this comment.
Looks like whitespace issues here.
There was a problem hiding this comment.
This is correct. The for components are all indented five spaces and the if (and lines below) are indented with a tab, since they're within the for block.
| @@ -100,6 +100,62 @@ static bool php_phongo_manager_merge_context_options(zval *zdriverOptions TSRMLS | |||
| return true; | |||
| } | |||
|
|
|||
| static void php_phongo_manager_prep_tagsets(zval *options TSRMLS_DC) | |||
There was a problem hiding this comment.
I'd like the comment that you used for RPs here too.
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-359
https://jira.mongodb.org/browse/PHPC-801