PHPC-1985: Server::getLatency() should return null if unset

Author: jmikola

src/MongoDB/Server.c

@@ -350,30 +350,31 @@ static PHP_METHOD(Server, getInfo)
 	mongoc_server_description_destroy(sd);
 } /* }}} */
 
-/* {{{ proto integer MongoDB\Driver\Server::getLatency()
-   Returns the last measured latency for this Server */
+/* {{{ proto integer|null MongoDB\Driver\Server::getLatency()
+   Returns the measured latency (i.e. round trip time in milliseconds) for
+   this Server, or null if unset. */
 static PHP_METHOD(Server, getLatency)
 {
-	zend_error_handling          error_handling;
 	php_phongo_server_t*         intern;
 	mongoc_server_description_t* sd;
 
+	PHONGO_PARSE_PARAMETERS_NONE();
+
 	intern = Z_SERVER_OBJ_P(getThis());
 
-	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
-	if (zend_parse_parameters_none() == FAILURE) {
-		zend_restore_error_handling(&error_handling);
+	if (!(sd = mongoc_client_get_server_description(Z_MANAGER_OBJ_P(&intern->manager)->client, intern->server_id))) {
+		phongo_throw_exception(PHONGO_ERROR_RUNTIME, "Failed to get server description");
 		return;
 	}
-	zend_restore_error_handling(&error_handling);
 
-	if ((sd = mongoc_client_get_server_description(Z_MANAGER_OBJ_P(&intern->manager)->client, intern->server_id))) {
+	/* TODO: Use MONGOC_RTT_UNSET once it is added to libmongoc's public API (CDRIVER-4176) */
+	if (mongoc_server_description_round_trip_time(sd) == -1) {
+		RETVAL_NULL();
+	} else {
 		RETVAL_LONG((zend_long) mongoc_server_description_round_trip_time(sd));
-		mongoc_server_description_destroy(sd);
-		return;
 	}
 
-	phongo_throw_exception(PHONGO_ERROR_RUNTIME, "Failed to get server description");
+	mongoc_server_description_destroy(sd);
 } /* }}} */
 
 /* {{{ proto integer MongoDB\Driver\Server::getPort()

tests/server/server-getLatency-001.phpt

@@ -0,0 +1,20 @@
+--TEST--
+MongoDB\Driver\Server::getLatency() returns a non-negative integer when set
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+<?php skip_if_load_balanced(); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = create_test_manager();
+$server = $manager->selectServer(new MongoDB\Driver\ReadPreference('primary'));
+var_dump($server->getLatency());
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+int(%d)
+===DONE===

tests/server/server-getLatency-002.phpt

@@ -0,0 +1,20 @@
+--TEST--
+MongoDB\Driver\Server::getLatency() returns null when unset (e.g. load balancer)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+<?php skip_if_not_load_balanced(); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = create_test_manager();
+$server = $manager->selectServer(new MongoDB\Driver\ReadPreference('primary'));
+var_dump($server->getLatency());
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+NULL
+===DONE===