Skip to content

Commit af28608

Browse files
committed
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
1 parent 58247c2 commit af28608

File tree

7 files changed

+24
-19
lines changed

7 files changed

+24
-19
lines changed

build/autotools/versions.ldscript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,10 @@ LIBMONGOC_1.4 {
341341
mongoc_cursor_set_limit;
342342
mongoc_find_and_modify_opts_set_max_time_ms;
343343
mongoc_find_and_modify_opts_append;
344-
mongoc_gridfs_file_set_id;
344+
mongoc_gridfs_file_set_id;
345+
mongoc_handshake_data_append;
345346
mongoc_log_trace_disable;
346347
mongoc_log_trace_enable;
347-
mongoc_metadata_append;
348348
mongoc_server_description_ismaster;
349349
mongoc_server_description_round_trip_time;
350350
mongoc_server_description_type;

build/cmake/libmongoc-experimental.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ mongoc_gridfs_find_one_by_filename
211211
mongoc_gridfs_get_chunks
212212
mongoc_gridfs_get_files
213213
mongoc_gridfs_remove_by_filename
214+
mongoc_handshake_data_append
214215
mongoc_index_opt_geo_get_default
215216
mongoc_index_opt_geo_init
216217
mongoc_index_opt_get_default
@@ -227,7 +228,6 @@ mongoc_log_trace_enable
227228
mongoc_matcher_destroy
228229
mongoc_matcher_match
229230
mongoc_matcher_new
230-
mongoc_metadata_append
231231
mongoc_read_concern_copy
232232
mongoc_read_concern_destroy
233233
mongoc_read_concern_get_level

build/cmake/libmongoc-ssl-experimental.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ mongoc_gridfs_find_one_by_filename
213213
mongoc_gridfs_get_chunks
214214
mongoc_gridfs_get_files
215215
mongoc_gridfs_remove_by_filename
216+
mongoc_handshake_data_append
216217
mongoc_index_opt_geo_get_default
217218
mongoc_index_opt_geo_init
218219
mongoc_index_opt_get_default
@@ -229,7 +230,6 @@ mongoc_log_trace_enable
229230
mongoc_matcher_destroy
230231
mongoc_matcher_match
231232
mongoc_matcher_new
232-
mongoc_metadata_append
233233
mongoc_rand_add
234234
mongoc_rand_seed
235235
mongoc_rand_status

src/libmongoc.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ mongoc_server_description_id
254254
mongoc_server_description_ismaster
255255
mongoc_server_description_new_copy
256256
mongoc_server_description_round_trip_time
257-
mongoc_server_descriptions_destroy_all
258257
mongoc_server_description_type
258+
mongoc_server_descriptions_destroy_all
259259
mongoc_socket_accept
260260
mongoc_socket_bind
261261
mongoc_socket_check_closed

src/mongoc/mongoc-metadata.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ _append_and_truncate (char **s,
280280
* All arguments are optional.
281281
*/
282282
bool
283-
mongoc_metadata_append (const char *driver_name,
284-
const char *driver_version,
285-
const char *platform)
283+
mongoc_handshake_data_append (const char *driver_name,
284+
const char *driver_version,
285+
const char *platform)
286286
{
287287
int max_size = 0;
288288

src/mongoc/mongoc-metadata.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ BSON_BEGIN_DECLS
2828

2929
#define MONGOC_METADATA_APPNAME_MAX 128
3030

31-
bool mongoc_metadata_append (const char *driver_name,
32-
const char *driver_version,
33-
const char *platform);
31+
bool mongoc_handshake_data_append (const char *driver_name,
32+
const char *driver_version,
33+
const char *platform);
3434

3535
BSON_END_DECLS
3636

tests/test-mongoc-metadata.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "mock_server/mock-server.h"
2828

2929
/*
30-
* Call this before any test which uses mongoc_metadata_append, to
30+
* Call this before any test which uses mongoc_handshake_data_append, to
3131
* reset the global state and unfreeze the metadata struct. Call it
3232
* after a test so later tests don't have a weird metadata document
3333
*
@@ -108,7 +108,7 @@ test_mongoc_metadata_appname_frozen_pooled (void)
108108
}
109109

110110
static void
111-
test_mongoc_metadata_append_success (void)
111+
test_mongoc_handshake_data_append_success (void)
112112
{
113113
mock_server_t *server;
114114
mongoc_uri_t *uri;
@@ -132,7 +132,7 @@ test_mongoc_metadata_append_success (void)
132132

133133
_reset_metadata ();
134134
/* Make sure setting the metadata works */
135-
ASSERT (mongoc_metadata_append (driver_name, driver_version, platform));
135+
ASSERT (mongoc_handshake_data_append (driver_name, driver_version, platform));
136136

137137
server = mock_server_new ();
138138
mock_server_run (server);
@@ -212,7 +212,7 @@ test_mongoc_metadata_append_success (void)
212212
}
213213

214214
static void
215-
test_mongoc_metadata_append_after_cmd (void)
215+
test_mongoc_handshake_data_append_after_cmd (void)
216216
{
217217
mongoc_client_pool_t *pool;
218218
mongoc_client_t *client;
@@ -228,7 +228,12 @@ test_mongoc_metadata_append_after_cmd (void)
228228

229229
client = mongoc_client_pool_pop (pool);
230230

231-
ASSERT (!mongoc_metadata_append ("a", "a", "a"));
231+
capture_logs (true);
232+
ASSERT (!mongoc_handshake_data_append ("a", "a", "a"));
233+
ASSERT_CAPTURED_LOG ("mongoc_handshake_data_append",
234+
MONGOC_LOG_LEVEL_ERROR,
235+
"Cannot set metadata more than once");
236+
capture_logs (false);
232237

233238
mongoc_client_pool_push (pool, client);
234239

@@ -265,7 +270,7 @@ test_mongoc_metadata_too_big (void)
265270

266271
memset (big_string, 'a', BUFFER_SIZE - 1);
267272
big_string[BUFFER_SIZE - 1] = '\0';
268-
ASSERT (mongoc_metadata_append (NULL, NULL, big_string));
273+
ASSERT (mongoc_handshake_data_append (NULL, NULL, big_string));
269274

270275
uri = mongoc_uri_copy (mock_server_get_uri (server));
271276
client = mongoc_client_new_from_uri (uri);
@@ -405,9 +410,9 @@ test_metadata_install (TestSuite *suite)
405410
test_mongoc_metadata_appname_frozen_pooled);
406411

407412
TestSuite_Add (suite, "/ClientMetadata/success",
408-
test_mongoc_metadata_append_success);
413+
test_mongoc_handshake_data_append_success);
409414
TestSuite_Add (suite, "/ClientMetadata/failure",
410-
test_mongoc_metadata_append_after_cmd);
415+
test_mongoc_handshake_data_append_after_cmd);
411416
TestSuite_Add (suite, "/ClientMetadata/too_big",
412417
test_mongoc_metadata_too_big);
413418
TestSuite_Add (suite, "/ClientMetadata/cannot_send",

0 commit comments

Comments
 (0)