Merge pull request #158

Author: jmikola

config.m4

@@ -161,6 +161,7 @@ if test "$MONGODB" != "no"; then
       src/MongoDB/CursorId.c \
       src/MongoDB/Manager.c \
       src/MongoDB/Query.c \
+      src/MongoDB/ReadConcern.c \
       src/MongoDB/ReadPreference.c \
       src/MongoDB/Server.c \
       src/MongoDB/BulkWrite.c \

config.w32

@@ -10,7 +10,7 @@ if (PHP_MONGODB != "no") {
   EXTENSION("mongodb", "php_phongo.c");
   ADD_SOURCES(configure_module_dirname + "/src", "bson.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/BSON", "Type.c Unserializable.c Serializable.c Persistable.c Binary.c Javascript.c MaxKey.c MinKey.c ObjectID.c Regex.c Timestamp.c UTCDateTime.c", "mongodb");
-  ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "Command.c Cursor.c CursorId.c Manager.c Query.c ReadPreference.c Server.c BulkWrite.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
+  ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "Command.c Cursor.c CursorId.c Manager.c Query.c ReadConcern.c ReadPreference.c Server.c BulkWrite.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "Exception.c LogicException.c RuntimeException.c UnexpectedValueException.c InvalidArgumentException.c ConnectionException.c AuthenticationException.c SSLConnectionException.c ExecutionTimeoutException.c ConnectionTimeoutException.c WriteException.c BulkWriteException.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/contrib/", "php-ssl.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libbson/src/yajl", "yajl_version.c yajl.c yajl_encode.c yajl_lex.c yajl_parser.c yajl_buf.c yajl_tree.c yajl_alloc.c yajl_gen.c", "mongodb");

php_phongo.c

@@ -30,6 +30,7 @@
 #include "mongoc-cursor-cursorid-private.h"
 #include "mongoc-read-prefs-private.h"
 #include "mongoc-bulk-operation-private.h"
+#include "mongoc-read-concern-private.h"
 #include "mongoc-write-concern-private.h"
 #include "mongoc-uri-private.h"
 #include "mongoc-trace.h"
@@ -243,6 +244,17 @@ void phongo_server_init(zval *return_value, mongoc_client_t *client, int server_
 }
 /* }}} */
 
+void phongo_readconcern_init(zval *return_value, const mongoc_read_concern_t *read_concern TSRMLS_DC) /* {{{ */
+{
+	php_phongo_readconcern_t *intern;
+
+	object_init_ex(return_value, php_phongo_readconcern_ce);
+
+	intern = (php_phongo_readconcern_t *)zend_object_store_get_object(return_value TSRMLS_CC);
+	intern->read_concern = mongoc_read_concern_copy(read_concern);
+}
+/* }}} */
+
 void phongo_readpreference_init(zval *return_value, const mongoc_read_prefs_t *read_prefs TSRMLS_DC) /* {{{ */
 {
 	php_phongo_readpreference_t *intern;
@@ -585,6 +597,10 @@ int phongo_execute_query(mongoc_client_t *client, const char *namespace, const p
 	efree(dbname);
 	efree(collname);
 
+	if (query->read_concern) {
+		mongoc_collection_set_read_concern(collection, query->read_concern);
+	}
+
 	cursor = mongoc_collection_find(collection, query->flags, query->skip, query->limit, query->batch_size, query->query, query->selector, read_preference);
 	mongoc_collection_destroy(collection);
 
@@ -1208,6 +1224,19 @@ const mongoc_write_concern_t* phongo_write_concern_from_zval(zval *zwrite_concer
 	return NULL;
 } /* }}} */
 
+const mongoc_read_concern_t* phongo_read_concern_from_zval(zval *zread_concern TSRMLS_DC) /* {{{ */
+{
+	if (zread_concern) {
+		php_phongo_readconcern_t *intern = (php_phongo_readconcern_t *)zend_object_store_get_object(zread_concern TSRMLS_CC);
+
+		if (intern) {
+			return intern->read_concern;
+		}
+	}
+
+	return NULL;
+} /* }}} */
+
 const mongoc_read_prefs_t* phongo_read_preference_from_zval(zval *zread_preference TSRMLS_DC) /* {{{ */
 {
 	if (zread_preference) {
@@ -1296,6 +1325,19 @@ void php_phongo_server_to_zval(zval *retval, const mongoc_server_description_t *
 
 } /* }}} */
 
+void php_phongo_read_concern_to_zval(zval *retval, const mongoc_read_concern_t *read_concern) /* {{{ */
+{
+	const char *level = mongoc_read_concern_get_level(read_concern);
+
+	array_init_size(retval, 1);
+
+	if (level) {
+		add_assoc_string_ex(retval, ZEND_STRS("level"), (char *)level, 1);
+	} else {
+		add_assoc_null_ex(retval, ZEND_STRS("level"));
+	}
+} /* }}} */
+
 void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t *read_prefs) /* {{{ */
 {
 
@@ -2189,6 +2231,7 @@ PHP_MINIT_FUNCTION(mongodb)
 	PHP_MINIT(CursorId)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(Manager)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(Query)(INIT_FUNC_ARGS_PASSTHRU);
+	PHP_MINIT(ReadConcern)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(ReadPreference)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(Server)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(BulkWrite)(INIT_FUNC_ARGS_PASSTHRU);

php_phongo.h

@@ -110,6 +110,7 @@ PHONGO_API zval* phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_
 PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void);
 
 void phongo_server_init                              (zval *return_value, mongoc_client_t *client, int server_id TSRMLS_DC);
+void                     phongo_readconcern_init     (zval *return_value, const mongoc_read_concern_t *read_concern TSRMLS_DC);
 void                     phongo_readpreference_init  (zval *return_value, const mongoc_read_prefs_t *read_prefs TSRMLS_DC);
 void                     phongo_writeconcern_init    (zval *return_value, const mongoc_write_concern_t *write_concern TSRMLS_DC);
 bool                     phongo_query_init           (php_phongo_query_t *query, bson_t *filter, bson_t *options TSRMLS_DC);
@@ -119,11 +120,13 @@ int                      phongo_execute_command      (mongoc_client_t *client, c
 int                      phongo_execute_query        (mongoc_client_t *client, const char *namespace, const php_phongo_query_t *query, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC);
 
 mongoc_stream_t*         phongo_stream_initiator     (const mongoc_uri_t *uri, const mongoc_host_list_t *host, void *user_data, bson_error_t *error);
+const mongoc_read_concern_t*  phongo_read_concern_from_zval   (zval *zread_concern TSRMLS_DC);
 const mongoc_read_prefs_t*    phongo_read_preference_from_zval(zval *zread_preference TSRMLS_DC);
 const mongoc_write_concern_t* phongo_write_concern_from_zval  (zval *zwrite_concern TSRMLS_DC);
 const php_phongo_query_t*     phongo_query_from_zval          (zval *zquery TSRMLS_DC);
 
 void php_phongo_server_to_zval(zval *retval, const mongoc_server_description_t *sd);
+void php_phongo_read_concern_to_zval(zval *retval, const mongoc_read_concern_t *read_concern);
 void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t *read_prefs);
 void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t *write_concern);
 void php_phongo_cursor_to_zval(zval *retval, php_phongo_cursor_t *cursor);

php_phongo_classes.h

@@ -67,8 +67,14 @@ typedef struct {
 	uint32_t                 skip;
 	uint32_t                 limit;
 	uint32_t                 batch_size;
+	mongoc_read_concern_t   *read_concern;
 } php_phongo_query_t;
 
+typedef struct {
+	zend_object              std;
+	mongoc_read_concern_t   *read_concern;
+} php_phongo_readconcern_t;
+
 typedef struct {
 	zend_object              std;
 	mongoc_read_prefs_t     *read_preference;
@@ -166,6 +172,7 @@ extern PHONGO_API zend_class_entry *php_phongo_cursor_ce;
 extern PHONGO_API zend_class_entry *php_phongo_cursorid_ce;
 extern PHONGO_API zend_class_entry *php_phongo_manager_ce;
 extern PHONGO_API zend_class_entry *php_phongo_query_ce;
+extern PHONGO_API zend_class_entry *php_phongo_readconcern_ce;
 extern PHONGO_API zend_class_entry *php_phongo_readpreference_ce;
 extern PHONGO_API zend_class_entry *php_phongo_result_ce;
 extern PHONGO_API zend_class_entry *php_phongo_server_ce;
@@ -214,6 +221,7 @@ PHP_MINIT_FUNCTION(Cursor);
 PHP_MINIT_FUNCTION(CursorId);
 PHP_MINIT_FUNCTION(Manager);
 PHP_MINIT_FUNCTION(Query);
+PHP_MINIT_FUNCTION(ReadConcern);
 PHP_MINIT_FUNCTION(ReadPreference);
 PHP_MINIT_FUNCTION(Result);
 PHP_MINIT_FUNCTION(Server);

src/MongoDB/Manager.c

@@ -180,6 +180,24 @@ PHP_METHOD(Manager, executeBulkWrite)
 	phongo_execute_write(intern->client, namespace, bulk->bulk, phongo_write_concern_from_zval(zwrite_concern TSRMLS_CC), -1, return_value, return_value_used TSRMLS_CC);
 }
 /* }}} */
+/* {{{ proto MongoDB\Driver\ReadConcern Manager::getReadConcern()
+   Returns the ReadConcern associated with this Manager */
+PHP_METHOD(Manager, getReadConcern)
+{
+	php_phongo_manager_t *intern;
+	(void)return_value_ptr;
+
+	intern = (php_phongo_manager_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	if (return_value_used) {
+		phongo_readconcern_init(return_value, mongoc_client_get_read_concern(intern->client) TSRMLS_CC);
+	}
+}
+/* }}} */
 /* {{{ proto MongoDB\Driver\ReadPreference Manager::getReadPreference()
    Returns the ReadPreference associated with this Manager */
 PHP_METHOD(Manager, getReadPreference)
@@ -329,6 +347,9 @@ ZEND_BEGIN_ARG_INFO_EX(ai_Manager_executeBulkWrite, 0, 0, 2)
 	ZEND_ARG_OBJ_INFO(0, writeConcern, MongoDB\\Driver\\WriteConcern, 1)
 ZEND_END_ARG_INFO();
 
+ZEND_BEGIN_ARG_INFO_EX(ai_Manager_getReadConcern, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
 ZEND_BEGIN_ARG_INFO_EX(ai_Manager_getReadPreference, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
@@ -347,6 +368,7 @@ static zend_function_entry php_phongo_manager_me[] = {
 	PHP_ME(Manager, executeCommand, ai_Manager_executeCommand, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Manager, executeQuery, ai_Manager_executeQuery, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Manager, executeBulkWrite, ai_Manager_executeBulkWrite, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+	PHP_ME(Manager, getReadConcern, ai_Manager_getReadConcern, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Manager, getReadPreference, ai_Manager_getReadPreference, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Manager, getServers, ai_Manager_getServers, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Manager, getWriteConcern, ai_Manager_getWriteConcern, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)

src/MongoDB/Query.c

@@ -34,6 +34,10 @@
 #include <ext/standard/info.h>
 #include <Zend/zend_interfaces.h>
 #include <ext/spl/spl_iterators.h>
+
+/* PHP array helpers */
+#include "php_array_api.h"
+
 /* Our Compatability header */
 #include "phongo_compat.h"
 
@@ -75,8 +79,22 @@ PHP_METHOD(Query, __construct)
 	zval_to_bson(zfilter, PHONGO_BSON_NONE, &bfilter, NULL TSRMLS_CC);
 
 	if (zoptions) {
+		if (php_array_exists(zoptions, "readConcern")) {
+			zval *zread_concern = php_array_fetchc(zoptions, "readConcern");
+
+			if (Z_TYPE_P(zread_concern) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(zread_concern), php_phongo_readconcern_ce TSRMLS_CC)) {
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"readConcern\" option to be %s, %s given", php_phongo_readconcern_ce->name, zend_get_type_by_const(Z_TYPE_P(zread_concern)));
+				bson_clear(&intern->query);
+				return;
+			}
+
+			intern->read_concern = mongoc_read_concern_copy(phongo_read_concern_from_zval(zread_concern TSRMLS_CC));
+			php_array_unsetc(zoptions, "readConcern");
+		}
+
 		zval_to_bson(zoptions, PHONGO_BSON_NONE, &boptions, NULL TSRMLS_CC);
 	}
+
 	if (!phongo_query_init(intern, &bfilter, &boptions TSRMLS_CC)) {
 		bson_clear(&intern->query);
 	}
@@ -117,6 +135,10 @@ static void php_phongo_query_free_object(void *object TSRMLS_DC) /* {{{ */
 		bson_clear(&intern->query);
 	}
 
+	if (intern->read_concern) {
+		mongoc_read_concern_destroy(intern->read_concern);
+	}
+
 	efree(intern);
 } /* }}} */