HHVM-203, HHVM-204, HHVM-205: Upgrade libmongoc to 1.4.0 with changes so that it compiles

config.cmake

@@ -33,6 +33,7 @@ HHVM_EXTENSION(mongodb
  libbson/src/bson/bson-timegm.c libbson/src/bson/bson-utf8.c
  libbson/src/bson/bson-value.c libbson/src/bson/bson-version-functions.c
  libbson/src/bson/bson-writer.c libbson/src/bson/bson.c
+ libmongoc/src/mongoc/mongoc-apm.c
  libmongoc/src/mongoc/mongoc-async.c
  libmongoc/src/mongoc/mongoc-async-cmd.c
  libmongoc/src/mongoc/mongoc-array.c libmongoc/src/mongoc/mongoc-b64.c
@@ -41,8 +42,12 @@ HHVM_EXTENSION(mongodb
  libmongoc/src/mongoc/mongoc-client-pool.c libmongoc/src/mongoc/mongoc-client.c
  libmongoc/src/mongoc/mongoc-cluster.c libmongoc/src/mongoc/mongoc-collection.c
  libmongoc/src/mongoc/mongoc-counters.c
+ libmongoc/src/mongoc/mongoc-crypto.c
+ libmongoc/src/mongoc/mongoc-crypto-common-crypto.c
+ libmongoc/src/mongoc/mongoc-crypto-openssl.c
  libmongoc/src/mongoc/mongoc-cursor-array.c
  libmongoc/src/mongoc/mongoc-cursor-cursorid.c
+ libmongoc/src/mongoc/mongoc-cursor-transform.c
  libmongoc/src/mongoc/mongoc-cursor.c libmongoc/src/mongoc/mongoc-database.c
  libmongoc/src/mongoc/mongoc-find-and-modify.c
  libmongoc/src/mongoc/mongoc-gridfs-file-list.c
@@ -54,10 +59,14 @@ HHVM_EXTENSION(mongodb
  libmongoc/src/mongoc/mongoc-matcher-op.c libmongoc/src/mongoc/mongoc-matcher.c
  libmongoc/src/mongoc/mongoc-memcmp.c
  libmongoc/src/mongoc/mongoc-opcode.c
- libmongoc/src/mongoc/mongoc-queue.c libmongoc/src/mongoc/mongoc-rand.c
+ libmongoc/src/mongoc/mongoc-openssl.c
+ libmongoc/src/mongoc/mongoc-queue.c
+ libmongoc/src/mongoc/mongoc-rand-common-crypto.c
+ libmongoc/src/mongoc/mongoc-rand-openssl.c
  libmongoc/src/mongoc/mongoc-read-concern.c
  libmongoc/src/mongoc/mongoc-read-prefs.c libmongoc/src/mongoc/mongoc-rpc.c
  libmongoc/src/mongoc/mongoc-sasl.c libmongoc/src/mongoc/mongoc-scram.c
+ libmongoc/src/mongoc/mongoc-secure-transport.c
  libmongoc/src/mongoc/mongoc-server-description.c
  libmongoc/src/mongoc/mongoc-server-stream.c
  libmongoc/src/mongoc/mongoc-set.c
@@ -66,7 +75,11 @@ HHVM_EXTENSION(mongodb
  libmongoc/src/mongoc/mongoc-stream-file.c
  libmongoc/src/mongoc/mongoc-stream-gridfs.c
  libmongoc/src/mongoc/mongoc-stream-socket.c
- libmongoc/src/mongoc/mongoc-stream-tls.c libmongoc/src/mongoc/mongoc-stream.c
+ libmongoc/src/mongoc/mongoc-stream-tls.c
+ libmongoc/src/mongoc/mongoc-stream-tls-openssl.c
+ libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c
+ libmongoc/src/mongoc/mongoc-stream-tls-secure-transport.c
+ libmongoc/src/mongoc/mongoc-stream.c
  libmongoc/src/mongoc/mongoc-topology.c
  libmongoc/src/mongoc/mongoc-topology-description.c
  libmongoc/src/mongoc/mongoc-topology-scanner.c
@@ -82,6 +95,7 @@ HHVM_LINK_LIBRARIES(mongodb ${SASL_LIBRARIES})
 
 HHVM_DEFINE(mongodb "-DBSON_COMPILATION=1")
 HHVM_DEFINE(mongodb "-DMONGOC_COMPILATION=1")
+HHVM_DEFINE(mongodb "-DMONGOC_ENABLE_CRYPTO")
 HHVM_DEFINE(mongodb "-DMONGOC_ENABLE_SSL")
 HHVM_DEFINE(mongodb "-DMONGOC_ENABLE_SASL")
 HHVM_DEFINE(mongodb "-DMONGOC_TRACE=1")

src/MongoDB/Driver/BulkWrite.cpp

@@ -206,7 +206,7 @@ Array HHVM_METHOD(MongoDBDriverBulkWrite, __debugInfo)
 
 	retval.set(s_ordered, data->m_bulk->flags.ordered);
 	retval.set(s_executed, data->m_bulk->executed);
-	retval.set(s_server_id, (int64_t) data->m_bulk->hint);
+	retval.set(s_server_id, (int64_t) mongoc_bulk_operation_get_hint(data->m_bulk));
 
 	if (data->m_bulk->write_concern) {
 		Array wc_retval = Array::Create();

src/MongoDB/Driver/Manager.cpp

@@ -308,7 +308,7 @@ static bool hippo_mongo_driver_manager_apply_wc(mongoc_client_t *client, const A
 	/* This may be redundant in light of the last check (unacknowledged w with
 	 * journal), but we'll check anyway in case additional validation is
 	 * implemented. */
-	if (!_mongoc_write_concern_is_valid(new_wc)) {
+	if (!mongoc_write_concern_is_valid(new_wc)) {
 		throw MongoDriver::Utils::throwInvalidArgumentException("Write concern is not valid");
 		mongoc_write_concern_destroy(new_wc);
 
@@ -612,7 +612,7 @@ Object HHVM_METHOD(MongoDBDriverManager, selectServer, const Object &readPrefere
 	mongoc_server_description_t *selected_server = NULL;
 	Object tmp;
 
-	selected_server = mongoc_topology_select(data->m_client->topology, MONGOC_SS_READ, rp_data->m_read_preference, MONGOC_SS_DEFAULT_LOCAL_THRESHOLD_MS, &error);
+	selected_server = mongoc_topology_select(data->m_client->topology, MONGOC_SS_READ, rp_data->m_read_preference, &error);
 	if (selected_server) {
 		tmp = hippo_mongo_driver_server_create_from_id(data->m_client, selected_server->id);
 		mongoc_server_description_destroy(selected_server);

src/MongoDB/Driver/WriteResult.cpp

@@ -54,7 +54,7 @@ bool HHVM_METHOD(MongoDBDriverWriteResult, isAcknowledged)
 {
 	MongoDBDriverWriteResultData* data = Native::data<MongoDBDriverWriteResultData>(this_);
 
-	return !!_mongoc_write_concern_needs_gle(data->m_write_concern);
+	return mongoc_write_concern_is_acknowledged(data->m_write_concern);
 }
 
 const StaticString

utils.cpp

@@ -215,7 +215,7 @@ HPHP::Object Utils::doExecuteBulkWrite(const HPHP::String ns, mongoc_client_t *c
 	success = mongoc_bulk_operation_execute(bulk_data->m_bulk, &reply, &error);
 
 	/* Prepare result */
-	HPHP::Object obj = HPHP::hippo_write_result_init(&reply, &error, client, bulk_data->m_bulk->hint, success, write_concern);
+	HPHP::Object obj = HPHP::hippo_write_result_init(&reply, &error, client, mongoc_bulk_operation_get_hint(bulk_data->m_bulk), success, write_concern);
 	bson_destroy(&reply);
 
 	return obj;
@@ -242,7 +242,7 @@ HPHP::Object Utils::doExecuteCommand(const char *db, mongoc_client_t *client, in
 
 	/* Handle server hint */
 	if (server_id > 0) {
-		cursor->hint = server_id;
+		cursor->server_id = server_id;
 	}
 
 	if (!mongoc_cursor_next(cursor, &doc)) {
@@ -385,7 +385,7 @@ HPHP::Object Utils::doExecuteQuery(const HPHP::String ns, mongoc_client_t *clien
 
 	/* Handle server hint */
 	if (server_id > 0) {
-		cursor->hint = server_id;
+		cursor->server_id = server_id;
 	}
 
 	/* Check for errors */