Remove BulkWriteCommandResult::getServer()

Per CDRIVER-5843, libmongoc does not consistently populate this field. It also isn't required by the spec, so omit it for now.

Author: jmikola

src/MongoDB/BulkWriteCommandResult.c

@@ -27,7 +27,6 @@
 #include "phongo_error.h"
 
 #include "BSON/Document.h"
-#include "MongoDB/Server.h"
 #include "MongoDB/WriteConcernError.h"
 #include "MongoDB/WriteError.h"
 #include "BulkWriteCommandResult_arginfo.h"
@@ -192,21 +191,6 @@ static PHP_METHOD(MongoDB_Driver_BulkWriteCommandResult, getUpsertedCount)
 	RETURN_LONG(intern->upserted_count);
 }
 
-/* Returns the last Server used to execute a command for the bulk write */
-static PHP_METHOD(MongoDB_Driver_BulkWriteCommandResult, getServer)
-{
-	php_phongo_bulkwritecommandresult_t* intern;
-
-	intern = Z_BULKWRITECOMMANDRESULT_OBJ_P(getThis());
-
-	PHONGO_PARSE_PARAMETERS_NONE();
-
-	PHONGO_BULKWRITECOMMANDRESULT_CHECK_ACKNOWLEDGED("getServer");
-
-	// TODO: null handling
-	phongo_server_init(return_value, &intern->manager, intern->server_id);
-}
-
 static PHP_METHOD(MongoDB_Driver_BulkWriteCommandResult, getInsertResults)
 {
 	php_phongo_bulkwritecommandresult_t* intern;
@@ -401,17 +385,6 @@ static HashTable* php_phongo_bulkwritecommandresult_get_debug_info(zend_object*
 		ADD_ASSOC_NULL_EX(&retval, "errorReply");
 	}
 
-	if (intern->server_id) {
-		zval server;
-
-		phongo_server_init(&server, &intern->manager, intern->server_id);
-		ADD_ASSOC_ZVAL_EX(&retval, "server", &server);
-	} else {
-		/* TODO: Determine if this path is only reached when a partial result is
-		 * attached to a BulkWriteCommandException on an unacknowledged write. */
-		ADD_ASSOC_NULL_EX(&retval, "server");
-	}
-
 	return Z_ARRVAL(retval);
 }
 
@@ -451,8 +424,6 @@ php_phongo_bulkwritecommandresult_t* phongo_bulkwritecommandresult_init(zval* re
 		bwcr->insert_results = _bson_copy_or_null(mongoc_bulkwriteresult_insertresults(bw_ret->res));
 		bwcr->update_results = _bson_copy_or_null(mongoc_bulkwriteresult_updateresults(bw_ret->res));
 		bwcr->delete_results = _bson_copy_or_null(mongoc_bulkwriteresult_deleteresults(bw_ret->res));
-
-		bwcr->server_id = mongoc_bulkwriteresult_serverid(bw_ret->res);
 	}
 
 	// Copy mongoc_bulkwriteexception_t fields

src/MongoDB/BulkWriteCommandResult.stub.php

@@ -22,8 +22,6 @@ final public function getUpsertedCount(): int {}
 
     final public function getDeletedCount(): int {}
 
-    final public function getServer(): Server {}
-
     final public function getInsertResults(): ?\MongoDB\BSON\Document {}
 
     final public function getUpdateResults(): ?\MongoDB\BSON\Document {}

src/MongoDB/BulkWriteCommandResult_arginfo.h

@@ -65,7 +65,6 @@ typedef struct {
 	bson_t*     write_concern_errors;
 	bson_t*     error_reply;
 	zval        manager;
-	uint32_t    server_id;
 	zend_object std;
 } php_phongo_bulkwritecommandresult_t;
 

src/phongo_structs.h

@@ -60,8 +60,5 @@ object(MongoDB\Driver\BulkWriteCommandResult)#%d (%d) {
   }
   ["errorReply"]=>
   NULL
-  ["server"]=>
-  object(MongoDB\Driver\Server)#%d (%d) {%A
-  }
 }
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-ctor-bypassDocumentValidation-001.phpt

@@ -107,8 +107,5 @@ object(MongoDB\Driver\BulkWriteCommandResult)#%d (%d) {
   }
   ["errorReply"]=>
   NULL
-  ["server"]=>
-  object(MongoDB\Driver\Server)#%d (%d) {%A
-  }
 }
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-ctor-bypassDocumentValidation-002.phpt

@@ -64,8 +64,5 @@ object(MongoDB\Driver\BulkWriteCommandResult)#%d (%d) {
   }
   ["errorReply"]=>
   NULL
-  ["server"]=>
-  object(MongoDB\Driver\Server)#%d (%d) {%A
-  }
 }
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-ctor-let-001.phpt

@@ -68,8 +68,5 @@ object(MongoDB\Driver\BulkWriteCommandResult)#%d (%d) {
   }
   ["errorReply"]=>
   NULL
-  ["server"]=>
-  object(MongoDB\Driver\Server)#%d (%d) {%A
-  }
 }
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-ctor-ordered-001.phpt

@@ -68,8 +68,5 @@ object(MongoDB\Driver\BulkWriteCommandResult)#%d (%d) {
   }
   ["errorReply"]=>
   NULL
-  ["server"]=>
-  object(MongoDB\Driver\Server)#%d (%d) {%A
-  }
 }
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-ctor-ordered-002.phpt

@@ -102,8 +102,5 @@ object(MongoDB\Driver\BulkWriteCommandResult)#%d (%d) {
   }
   ["errorReply"]=>
   NULL
-  ["server"]=>
-  object(MongoDB\Driver\Server)#%d (%d) {%A
-  }
 }
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-ctor-verboseresults-001.phpt

@@ -52,8 +52,5 @@ object(MongoDB\Driver\BulkWriteCommandResult)#%d (%d) {
   }
   ["errorReply"]=>
   NULL
-  ["server"]=>
-  object(MongoDB\Driver\Server)#%d (%d) {%A
-  }
 }
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-ctor-verboseresults-002.phpt

@@ -196,8 +196,5 @@ object(MongoDB\Driver\BulkWriteCommandResult)#%d (%d) {
   }
   ["errorReply"]=>
   NULL
-  ["server"]=>
-  object(MongoDB\Driver\Server)#%d (%d) {%A
-  }
 }
 ===DONE===