PHPC-783: Use mongoc_collection_find_with_opts() for Query exec

Query struct fields have been consolidated to a filter and opts BSON documents.

This also changes the Query debug output significantly.

Author: jmikola

php_phongo.c

@@ -351,117 +351,6 @@ void phongo_writeconcern_init(zval *return_value, const mongoc_write_concern_t *
 }
 /* }}} */
 
-int32_t phongo_bson_find_as_int32(bson_t *bson, const char *key, int32_t fallback)
-{
-	bson_iter_t iter;
-
-	if (bson_iter_init_find(&iter, bson, key) && BSON_ITER_HOLDS_INT32(&iter)) {
-		return bson_iter_int32(&iter);
-	}
-
-	return fallback;
-}
-
-bool phongo_bson_find_as_bool(bson_t *bson, const char *key, bool fallback)
-{
-	bson_iter_t iter;
-
-	if (bson_iter_init_find(&iter, bson, key) && BSON_ITER_HOLDS_BOOL(&iter)) {
-		return bson_iter_bool(&iter);
-	}
-
-	return fallback;
-}
-
-void phongo_bson_iter_as_document(const bson_iter_t  *iter, uint32_t *document_len, const uint8_t **document)
-{
-   *document = NULL;
-   *document_len = 0;
-
-   if (BSON_ITER_HOLDS_DOCUMENT(iter) || BSON_ITER_HOLDS_ARRAY(iter)) {
-      memcpy (document_len, (iter->raw + iter->d1), sizeof (*document_len));
-      *document_len = BSON_UINT32_FROM_LE (*document_len);
-      *document = (iter->raw + iter->d1);
-   }
-}
-
-bool phongo_query_init(php_phongo_query_t *query, bson_t *filter, bson_t *options TSRMLS_DC) /* {{{ */
-{
-	bson_iter_t iter;
-
-	if (options) {
-		query->batch_size = phongo_bson_find_as_int32(options, "batchSize", 0);
-		query->limit = phongo_bson_find_as_int32(options, "limit", 0);
-		query->skip = phongo_bson_find_as_int32(options, "skip", 0);
-
-		query->flags = 0;
-		query->flags |= phongo_bson_find_as_bool(options, "tailable", false)        ? MONGOC_QUERY_TAILABLE_CURSOR   : 0;
-		query->flags |= phongo_bson_find_as_bool(options, "slaveOk", false)         ? MONGOC_QUERY_SLAVE_OK          : 0;
-		query->flags |= phongo_bson_find_as_bool(options, "oplogReplay", false)     ? MONGOC_QUERY_OPLOG_REPLAY      : 0;
-		query->flags |= phongo_bson_find_as_bool(options, "noCursorTimeout", false) ? MONGOC_QUERY_NO_CURSOR_TIMEOUT : 0;
-		query->flags |= phongo_bson_find_as_bool(options, "awaitData", false)       ? MONGOC_QUERY_AWAIT_DATA        : 0;
-		query->flags |= phongo_bson_find_as_bool(options, "exhaust", false)         ? MONGOC_QUERY_EXHAUST           : 0;
-		query->flags |= phongo_bson_find_as_bool(options, "partial", false)         ? MONGOC_QUERY_PARTIAL           : 0;
-
-
-		if (bson_iter_init_find(&iter, options, "modifiers")) {
-			uint32_t len = 0;
-			const uint8_t *data = NULL;
-
-			if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
-				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected modifiers to be array or object, %d given", bson_iter_type(&iter));
-				return false;
-			}
-
-			bson_iter_document(&iter, &len, &data);
-			if (len) {
-				bson_t tmp;
-
-				bson_init_static(&tmp, data, len);
-				bson_copy_to_excluding_noinit(&tmp, query->query, "not-used-value", NULL);
-				bson_destroy (&tmp);
-			}
-		}
-
-		if (bson_iter_init_find(&iter, options, "projection")) {
-			uint32_t len = 0;
-			const uint8_t *data = NULL;
-
-			if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
-				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected projection to be array or object, %d given", bson_iter_type(&iter));
-				return false;
-			}
-
-			bson_iter_document(&iter, &len, &data);
-			if (len) {
-				query->selector = bson_new_from_data(data, len);
-			}
-		}
-
-		if (bson_iter_init_find(&iter, options, "sort")) {
-			uint32_t len = 0;
-			const uint8_t *data = NULL;
-
-			if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
-				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected sort to be array or object, %d given", bson_iter_type(&iter));
-				return false;
-			}
-
-			phongo_bson_iter_as_document(&iter, &len, &data);
-			if (len) {
-				bson_t tmp;
-
-				bson_init_static(&tmp, data, len);
-				bson_append_document(query->query, "$orderby", -1, &tmp);
-				bson_destroy(&tmp);
-			}
-		}
-	}
-
-	BSON_APPEND_DOCUMENT(query->query, "$query", filter);
-	return true;
-} /* }}} */
-
 zend_bool phongo_writeconcernerror_init(zval *return_value, bson_t *bson TSRMLS_DC) /* {{{ */
 {
 	bson_iter_t iter;
@@ -716,7 +605,7 @@ int phongo_execute_query(zval *manager, const char *namespace, zval *zquery, zva
 		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, phongo_read_preference_from_zval(zreadPreference TSRMLS_CC));
+	cursor = mongoc_collection_find_with_opts(collection, query->filter, query->opts, phongo_read_preference_from_zval(zreadPreference TSRMLS_CC));
 	mongoc_collection_destroy(collection);
 
 	/* mongoc issues a warning we need to catch somehow */

php_phongo.h

@@ -117,7 +117,6 @@ void                     phongo_server_init          (zval *return_value, zval *
 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);
 mongoc_bulk_operation_t* phongo_bulkwrite_init       (zend_bool ordered);
 bool                     phongo_execute_write        (zval *manager, const char *namespace, php_phongo_bulkwrite_t  *bulk_write, const mongoc_write_concern_t *write_concern, int server_id, zval *return_value, int return_value_used TSRMLS_DC);
 int                      phongo_execute_command      (zval *manager, const char *db, zval *zcommand, zval *zreadPreference, int server_id, zval *return_value, int return_value_used TSRMLS_DC);

php_phongo_structs.h

@@ -86,12 +86,8 @@ typedef struct {
 
 typedef struct {
 	PHONGO_ZEND_OBJECT_PRE
-	bson_t                *query;
-	bson_t                *selector;
-	mongoc_query_flags_t   flags;
-	uint32_t               skip;
-	uint32_t               limit;
-	uint32_t               batch_size;
+	bson_t                *filter;
+	bson_t                *opts;
 	mongoc_read_concern_t *read_concern;
 	PHONGO_ZEND_OBJECT_POST
 } php_phongo_query_t;