PHPC-680: BulkWrite::count() should return number of operations

Previously, this returned the estimated number of round-trips, which is neither reliable (see: CDRIVER-653) nor particularly useful.

Author: jmikola

php_phongo_structs-5.h

@@ -87,6 +87,7 @@ typedef struct {
 typedef struct {
 	zend_object              std;
 	mongoc_bulk_operation_t *bulk;
+	size_t                   num_ops;
 } php_phongo_bulkwrite_t;
 
 typedef struct {

php_phongo_structs-7.h

@@ -86,6 +86,7 @@ typedef struct {
 
 typedef struct {
 	mongoc_bulk_operation_t *bulk;
+	size_t                   num_ops;
 	zend_object              std;
 } php_phongo_bulkwrite_t;
 

src/MongoDB/BulkWrite.c

@@ -76,6 +76,7 @@ PHP_METHOD(BulkWrite, __construct)
 	}
 
 	intern->bulk = phongo_bulkwrite_init(ordered);
+	intern->num_ops = 0;
 
 	if (options && php_array_exists(options, "bypassDocumentValidation")) {
 		mongoc_bulk_operation_set_bypass_document_validation(intern->bulk, php_array_fetch_bool(options, "bypassDocumentValidation"));
@@ -111,6 +112,8 @@ PHP_METHOD(BulkWrite, insert)
 	mongoc_bulk_operation_insert(intern->bulk, bson);
 	bson_clear(&bson);
 
+	intern->num_ops++;
+
 	if (bson_out && return_value_used) {
 		bson_iter_t iter;
 
@@ -177,6 +180,8 @@ PHP_METHOD(BulkWrite, update)
 		}
 	}
 
+	intern->num_ops++;
+
 	bson_clear(&bquery);
 	bson_clear(&bupdate);
 }
@@ -208,6 +213,8 @@ PHP_METHOD(BulkWrite, delete)
 		mongoc_bulk_operation_remove(intern->bulk, bson);
 	}
 
+	intern->num_ops++;
+
 	bson_clear(&bson);
 }
 /* }}} */
@@ -225,7 +232,7 @@ PHP_METHOD(BulkWrite, count)
 		return;
 	}
 
-	RETURN_LONG(intern->bulk->commands.len);
+	RETURN_LONG(intern->num_ops);
 }
 /* }}} */
 

tests/bulk/bulkwrite-count-001.phpt

@@ -0,0 +1,41 @@
+--TEST--
+MongoDB\Driver\BulkWrite::count() should return the number of operations
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$bulk = new MongoDB\Driver\BulkWrite;
+var_dump($bulk->count());
+
+$bulk->insert(['x' => 1]);
+var_dump($bulk->count());
+
+$bulk->insert(['x' => 2]);
+var_dump($bulk->count());
+
+$bulk->update(['x' => 3], ['$set' => ['y' => 3]]);
+var_dump($bulk->count());
+
+$bulk->update(['x' => 4], ['$set' => ['y' => 4]]);
+var_dump($bulk->count());
+
+$bulk->delete(['x' => 5]);
+var_dump($bulk->count());
+
+$bulk->delete(['x' => 6]);
+var_dump($bulk->count());
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+int(0)
+int(1)
+int(2)
+int(3)
+int(4)
+int(5)
+int(6)
+===DONE===