Skip to content

Commit 16a32cb

Browse files
authored
CDRIVER-3769 remove macros for unused URI options (#1918)
Removes `MONGOC_URI_WAITQUEUEMULTIPLE` and `MONGOC_URI_MAXIDLETIMEMS`
1 parent c0e3c82 commit 16a32cb

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Unreleased (2.0.0)
1717
* `MONGOC_QUERY_SLAVE_OK` is removed. Use the equivalent `MONGOC_QUERY_SECONDARY_OK` instead.
1818
* `MONGOC_URI_SLAVEOK` is removed. It was unused.
1919
* `mongoc_collection_save` is removed. Use `mongoc_collection_insert_one` or `mongoc_collection_replace_one` instead.
20+
* `MONGOC_URI_MAXIDLETIMEMS` and `MONGOC_URI_WAITQUEUEMULTIPLE` are removed. They were unused.
2021
* `bson_string_t` and associated functions are removed.
2122
* `mongoc_cursor_is_alive` is removed. Use the equivalent `mongoc_cursor_more` instead.
2223
* `mongoc_collection_delete` is removed. Use `mongoc_collection_delete_one` or `mongoc_collection_delete_many` instead.

src/libmongoc/doc/mongoc_uri_t.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,6 @@ Constant Key Des
202202
========================================== ================================= =========================================================================================================================================================================================================================
203203
MONGOC_URI_MAXPOOLSIZE maxpoolsize The maximum number of clients created by a :symbol:`mongoc_client_pool_t` total (both in the pool and checked out). The default value is 100. Once it is reached, :symbol:`mongoc_client_pool_pop` blocks until another thread pushes a client.
204204
MONGOC_URI_MINPOOLSIZE minpoolsize Deprecated. This option's behavior does not match its name, and its actual behavior will likely hurt performance.
205-
MONGOC_URI_MAXIDLETIMEMS maxidletimems Not implemented.
206-
MONGOC_URI_WAITQUEUEMULTIPLE waitqueuemultiple Not implemented.
207205
MONGOC_URI_WAITQUEUETIMEOUTMS waitqueuetimeoutms The maximum time to wait for a client to become available from the pool.
208206
========================================== ================================= =========================================================================================================================================================================================================================
209207

src/libmongoc/src/mongoc/mongoc-uri.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,10 +723,6 @@ mongoc_uri_option_is_int32 (const char *key)
723723
!strcasecmp (key, MONGOC_URI_MAXSTALENESSSECONDS) || !strcasecmp (key, MONGOC_URI_MINPOOLSIZE) ||
724724
!strcasecmp (key, MONGOC_URI_WAITQUEUETIMEOUTMS) || !strcasecmp (key, MONGOC_URI_ZLIBCOMPRESSIONLEVEL) ||
725725
!strcasecmp (key, MONGOC_URI_SRVMAXHOSTS);
726-
/* Not including deprecated unimplemented options:
727-
* - MONGOC_URI_MAXIDLETIMEMS
728-
* - MONGOC_URI_WAITQUEUEMULTIPLE
729-
*/
730726
}
731727

732728
bool

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
#define MONGOC_URI_JOURNAL "journal"
4747
#define MONGOC_URI_LOADBALANCED "loadbalanced"
4848
#define MONGOC_URI_LOCALTHRESHOLDMS "localthresholdms"
49-
#define MONGOC_URI_MAXIDLETIMEMS "maxidletimems"
5049
#define MONGOC_URI_MAXPOOLSIZE "maxpoolsize"
5150
#define MONGOC_URI_MAXSTALENESSSECONDS "maxstalenessseconds"
5251
#define MONGOC_URI_MINPOOLSIZE "minpoolsize"
@@ -74,7 +73,6 @@
7473
#define MONGOC_URI_TLSDISABLECERTIFICATEREVOCATIONCHECK "tlsdisablecertificaterevocationcheck"
7574
#define MONGOC_URI_TLSDISABLEOCSPENDPOINTCHECK "tlsdisableocspendpointcheck"
7675
#define MONGOC_URI_W "w"
77-
#define MONGOC_URI_WAITQUEUEMULTIPLE "waitqueuemultiple"
7876
#define MONGOC_URI_WAITQUEUETIMEOUTMS "waitqueuetimeoutms"
7977
#define MONGOC_URI_WTIMEOUTMS "wtimeoutms"
8078
#define MONGOC_URI_ZLIBCOMPRESSIONLEVEL "zlibcompressionlevel"

0 commit comments

Comments
 (0)