CDRIVER-1446 rename "metadata" to "handshake" in public API

# Conflicts:
#	build/autotools/versions.ldscript
#	doc/mongoc_handshake_data_append.page
#	tests/test-mongoc-metadata.c

Author: ajdavis

build/autotools/versions.ldscript

@@ -341,10 +341,10 @@ LIBMONGOC_1.4 {
         mongoc_cursor_set_limit;
         mongoc_find_and_modify_opts_set_max_time_ms;
         mongoc_find_and_modify_opts_append;
-        mongoc_gridfs_file_set_id; 
+        mongoc_gridfs_file_set_id;
+        mongoc_handshake_data_append;
         mongoc_log_trace_disable;
         mongoc_log_trace_enable;
-        mongoc_metadata_append;
         mongoc_server_description_ismaster;
         mongoc_server_description_round_trip_time;
         mongoc_server_description_type;

build/cmake/libmongoc-experimental.def

@@ -211,6 +211,7 @@ mongoc_gridfs_find_one_by_filename
 mongoc_gridfs_get_chunks
 mongoc_gridfs_get_files
 mongoc_gridfs_remove_by_filename
+mongoc_handshake_data_append
 mongoc_index_opt_geo_get_default
 mongoc_index_opt_geo_init
 mongoc_index_opt_get_default
@@ -227,7 +228,6 @@ mongoc_log_trace_enable
 mongoc_matcher_destroy
 mongoc_matcher_match
 mongoc_matcher_new
-mongoc_metadata_append
 mongoc_read_concern_copy
 mongoc_read_concern_destroy
 mongoc_read_concern_get_level

build/cmake/libmongoc-ssl-experimental.def

@@ -213,6 +213,7 @@ mongoc_gridfs_find_one_by_filename
 mongoc_gridfs_get_chunks
 mongoc_gridfs_get_files
 mongoc_gridfs_remove_by_filename
+mongoc_handshake_data_append
 mongoc_index_opt_geo_get_default
 mongoc_index_opt_geo_init
 mongoc_index_opt_get_default
@@ -229,7 +230,6 @@ mongoc_log_trace_enable
 mongoc_matcher_destroy
 mongoc_matcher_match
 mongoc_matcher_new
-mongoc_metadata_append
 mongoc_rand_add
 mongoc_rand_seed
 mongoc_rand_status

src/libmongoc.symbols

@@ -254,8 +254,8 @@ mongoc_server_description_id
 mongoc_server_description_ismaster
 mongoc_server_description_new_copy
 mongoc_server_description_round_trip_time
-mongoc_server_descriptions_destroy_all
 mongoc_server_description_type
+mongoc_server_descriptions_destroy_all
 mongoc_socket_accept
 mongoc_socket_bind
 mongoc_socket_check_closed

src/mongoc/mongoc-metadata.c

@@ -280,9 +280,9 @@ _append_and_truncate (char       **s,
  * All arguments are optional.
  */
 bool
-mongoc_metadata_append (const char *driver_name,
-                        const char *driver_version,
-                        const char *platform)
+mongoc_handshake_data_append (const char *driver_name,
+                              const char *driver_version,
+                              const char *platform)
 {
    int max_size = 0;
 

src/mongoc/mongoc-metadata.h

@@ -28,9 +28,9 @@ BSON_BEGIN_DECLS
 
 #define MONGOC_METADATA_APPNAME_MAX 128
 
-bool mongoc_metadata_append (const char *driver_name,
-                             const char *driver_version,
-                             const char *platform);
+bool mongoc_handshake_data_append (const char *driver_name,
+                                   const char *driver_version,
+                                   const char *platform);
 
 BSON_END_DECLS
 

tests/test-mongoc-metadata.c

@@ -27,7 +27,7 @@
 #include "mock_server/mock-server.h"
 
 /*
- * Call this before any test which uses mongoc_metadata_append, to
+ * Call this before any test which uses mongoc_handshake_data_append, to
  * reset the global state and unfreeze the metadata struct. Call it
  * after a test so later tests don't have a weird metadata document
  *
@@ -108,7 +108,7 @@ test_mongoc_metadata_appname_frozen_pooled (void)
 }
 
 static void
-test_mongoc_metadata_append_success (void)
+test_mongoc_handshake_data_append_success (void)
 {
    mock_server_t *server;
    mongoc_uri_t *uri;
@@ -132,7 +132,7 @@ test_mongoc_metadata_append_success (void)
 
    _reset_metadata ();
    /* Make sure setting the metadata works */
-   ASSERT (mongoc_metadata_append (driver_name, driver_version, platform));
+   ASSERT (mongoc_handshake_data_append (driver_name, driver_version, platform));
 
    server = mock_server_new ();
    mock_server_run (server);
@@ -212,7 +212,7 @@ test_mongoc_metadata_append_success (void)
 }
 
 static void
-test_mongoc_metadata_append_after_cmd (void)
+test_mongoc_handshake_data_append_after_cmd (void)
 {
    mongoc_client_pool_t *pool;
    mongoc_client_t *client;
@@ -228,7 +228,12 @@ test_mongoc_metadata_append_after_cmd (void)
 
    client = mongoc_client_pool_pop (pool);
 
-   ASSERT (!mongoc_metadata_append ("a", "a", "a"));
+   capture_logs (true);
+   ASSERT (!mongoc_handshake_data_append ("a", "a", "a"));
+   ASSERT_CAPTURED_LOG ("mongoc_handshake_data_append",
+                        MONGOC_LOG_LEVEL_ERROR,
+                        "Cannot set metadata more than once");
+   capture_logs (false);
 
    mongoc_client_pool_push (pool, client);
 
@@ -265,7 +270,7 @@ test_mongoc_metadata_too_big (void)
 
    memset (big_string, 'a', BUFFER_SIZE - 1);
    big_string[BUFFER_SIZE - 1] = '\0';
-   ASSERT (mongoc_metadata_append (NULL, NULL, big_string));
+   ASSERT (mongoc_handshake_data_append (NULL, NULL, big_string));
 
    uri = mongoc_uri_copy (mock_server_get_uri (server));
    client = mongoc_client_new_from_uri (uri);
@@ -405,9 +410,9 @@ test_metadata_install (TestSuite *suite)
                   test_mongoc_metadata_appname_frozen_pooled);
 
    TestSuite_Add (suite, "/ClientMetadata/success",
-                  test_mongoc_metadata_append_success);
+                  test_mongoc_handshake_data_append_success);
    TestSuite_Add (suite, "/ClientMetadata/failure",
-                  test_mongoc_metadata_append_after_cmd);
+                  test_mongoc_handshake_data_append_after_cmd);
    TestSuite_Add (suite, "/ClientMetadata/too_big",
                   test_mongoc_metadata_too_big);
    TestSuite_Add (suite, "/ClientMetadata/cannot_send",