Skip to content

CDRIVER-4006 remove deprecated public API with oppressive language #1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 13, 2025
Merged

CDRIVER-4006 remove deprecated public API with oppressive language #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86e74e9
remove `mongoc_server_description_ismaster`
kevinAlbs Mar 11, 2025
6c1d55c
remove `MONGOC_QUERY_SLAVE_OK`
kevinAlbs Mar 11, 2025
625b6be
remove `MONGOC_URI_SLAVEOK`
kevinAlbs Mar 11, 2025
0549507
update NEWS
kevinAlbs Mar 11, 2025
204c293
format
kevinAlbs Mar 11, 2025
9bfc809
Merge branch 'master' into C4006
kevinAlbs Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Unreleased (2.0.0)

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

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

Expand Down
34 changes: 0 additions & 34 deletions src/libmongoc/doc/mongoc_server_description_ismaster.rst
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/libmongoc/doc/mongoc_server_description_t.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Applications receive a temporary reference to a ``mongoc_server_description_t``
mongoc_server_description_hello_response
mongoc_server_description_host
mongoc_server_description_id
mongoc_server_description_ismaster
mongoc_server_description_last_update_time
mongoc_server_description_new_copy
mongoc_server_description_round_trip_time
Expand Down
1 change: 0 additions & 1 deletion src/libmongoc/src/mongoc/mongoc-flags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ typedef enum {
typedef enum {
MONGOC_QUERY_NONE = 0,
MONGOC_QUERY_TAILABLE_CURSOR = 1 << 1,
MONGOC_QUERY_SLAVE_OK = 1 << 2,
MONGOC_QUERY_SECONDARY_OK = 1 << 2,
MONGOC_QUERY_OPLOG_REPLAY = 1 << 3,
MONGOC_QUERY_NO_CURSOR_TIMEOUT = 1 << 4,
Expand Down
19 changes: 0 additions & 19 deletions src/libmongoc/src/mongoc/mongoc-server-description.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,25 +389,6 @@ mongoc_server_description_hello_response (const mongoc_server_description_t *des
return &description->last_hello_response;
}

/*
*--------------------------------------------------------------------------
*
* mongoc_server_description_ismaster --
*
* Return this server's most recent "hello" command response.
*
* Returns:
* A reference to a BSON document, owned by the server description.
*
*--------------------------------------------------------------------------
*/

const bson_t *
mongoc_server_description_ismaster (const mongoc_server_description_t *description)
{
return mongoc_server_description_hello_response (description);
}

/*
*--------------------------------------------------------------------------
*
Expand Down
3 changes: 0 additions & 3 deletions src/libmongoc/src/mongoc/mongoc-server-description.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ mongoc_server_description_type (const mongoc_server_description_t *description);
MONGOC_EXPORT (const bson_t *)
mongoc_server_description_hello_response (const mongoc_server_description_t *description);

BSON_DEPRECATED_FOR (mongoc_server_description_hello_response)
MONGOC_EXPORT (const bson_t *) mongoc_server_description_ismaster (const mongoc_server_description_t *description);

MONGOC_EXPORT (int32_t)
mongoc_server_description_compressor_id (const mongoc_server_description_t *description);

Expand Down
1 change: 0 additions & 1 deletion src/libmongoc/src/mongoc/mongoc-uri.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
#define MONGOC_URI_SERVERMONITORINGMODE "servermonitoringmode"
#define MONGOC_URI_SERVERSELECTIONTIMEOUTMS "serverselectiontimeoutms"
#define MONGOC_URI_SERVERSELECTIONTRYONCE "serverselectiontryonce"
#define MONGOC_URI_SLAVEOK "slaveok"
#define MONGOC_URI_SOCKETCHECKINTERVALMS "socketcheckintervalms"
#define MONGOC_URI_SOCKETTIMEOUTMS "sockettimeoutms"
#define MONGOC_URI_SRVSERVICENAME "srvservicename"
Expand Down