Skip to content

Commit fe10e17

Browse files
authored
CDRIVER-4006 remove deprecated public API with oppressive language (#1908)
* remove `mongoc_server_description_ismaster` * remove `MONGOC_QUERY_SLAVE_OK` * remove `MONGOC_URI_SLAVEOK`
1 parent d88f042 commit fe10e17

File tree

7 files changed

+3
-59
lines changed

7 files changed

+3
-59
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Unreleased (2.0.0)
1212

1313
* The `bson_md5_t` struct and associated API is removed.
1414
* The client side matching feature, `mongoc_matcher_t` and related functions are removed.
15+
* `mongoc_server_description_ismaster` is removed. Use the equivalent `mongoc_server_description_hello` instead.
16+
* `MONGOC_QUERY_SLAVE_OK` is removed. Use the equivalent `MONGOC_QUERY_SECONDARY_OK` instead.
17+
* `MONGOC_URI_SLAVEOK` is removed. It was unused.
1518

1619
### Forwarding headers (`#include <bson.h>` and `#include <mongoc.h>`)
1720

src/libmongoc/doc/mongoc_server_description_ismaster.rst

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/libmongoc/doc/mongoc_server_description_t.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ Applications receive a temporary reference to a ``mongoc_server_description_t``
3636
mongoc_server_description_hello_response
3737
mongoc_server_description_host
3838
mongoc_server_description_id
39-
mongoc_server_description_ismaster
4039
mongoc_server_description_last_update_time
4140
mongoc_server_description_new_copy
4241
mongoc_server_description_round_trip_time

src/libmongoc/src/mongoc/mongoc-flags.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ typedef enum {
9595
typedef enum {
9696
MONGOC_QUERY_NONE = 0,
9797
MONGOC_QUERY_TAILABLE_CURSOR = 1 << 1,
98-
MONGOC_QUERY_SLAVE_OK = 1 << 2,
9998
MONGOC_QUERY_SECONDARY_OK = 1 << 2,
10099
MONGOC_QUERY_OPLOG_REPLAY = 1 << 3,
101100
MONGOC_QUERY_NO_CURSOR_TIMEOUT = 1 << 4,

src/libmongoc/src/mongoc/mongoc-server-description.c

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -389,25 +389,6 @@ mongoc_server_description_hello_response (const mongoc_server_description_t *des
389389
return &description->last_hello_response;
390390
}
391391

392-
/*
393-
*--------------------------------------------------------------------------
394-
*
395-
* mongoc_server_description_ismaster --
396-
*
397-
* Return this server's most recent "hello" command response.
398-
*
399-
* Returns:
400-
* A reference to a BSON document, owned by the server description.
401-
*
402-
*--------------------------------------------------------------------------
403-
*/
404-
405-
const bson_t *
406-
mongoc_server_description_ismaster (const mongoc_server_description_t *description)
407-
{
408-
return mongoc_server_description_hello_response (description);
409-
}
410-
411392
/*
412393
*--------------------------------------------------------------------------
413394
*

src/libmongoc/src/mongoc/mongoc-server-description.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ mongoc_server_description_type (const mongoc_server_description_t *description);
5353
MONGOC_EXPORT (const bson_t *)
5454
mongoc_server_description_hello_response (const mongoc_server_description_t *description);
5555

56-
BSON_DEPRECATED_FOR (mongoc_server_description_hello_response)
57-
MONGOC_EXPORT (const bson_t *) mongoc_server_description_ismaster (const mongoc_server_description_t *description);
58-
5956
MONGOC_EXPORT (int32_t)
6057
mongoc_server_description_compressor_id (const mongoc_server_description_t *description);
6158

src/libmongoc/src/mongoc/mongoc-uri.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
#define MONGOC_URI_SERVERMONITORINGMODE "servermonitoringmode"
6161
#define MONGOC_URI_SERVERSELECTIONTIMEOUTMS "serverselectiontimeoutms"
6262
#define MONGOC_URI_SERVERSELECTIONTRYONCE "serverselectiontryonce"
63-
#define MONGOC_URI_SLAVEOK "slaveok"
6463
#define MONGOC_URI_SOCKETCHECKINTERVALMS "socketcheckintervalms"
6564
#define MONGOC_URI_SOCKETTIMEOUTMS "sockettimeoutms"
6665
#define MONGOC_URI_SRVSERVICENAME "srvservicename"

0 commit comments

Comments
 (0)