Skip to content

Commit 90dcfba

Browse files
kevinAlbskevinAlbs
committed
Revert "CDRIVER-3871 implement public setters and getters for timeoutMS"
This reverts commit 95ed934.
1 parent d5f73e1 commit 90dcfba

23 files changed

+17
-399
lines changed

‎src/libmongoc/doc/errors.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ Many C Driver functions report errors by returning ``false`` or -1 and filling o
9797
+-----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
9898
| ``MONGOC_ERROR_CLIENT_SIDE_ENCRYPTION`` | Error code produced by libmongocrypt. | An error occurred in the library responsible for Client Side Encryption |
9999
+-----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
100-
| ``MONGOC_ERROR_TIMEOUT`` | ``MONGOC_ERROR_TIMEOUT_INVALID`` | You passed an invalid value for a timeout paramenter. |
101-
+-----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
102100

103101
.. _error_labels:
104102

‎src/libmongoc/doc/mongoc_client_get_timeout_ms.rst

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

‎src/libmongoc/doc/mongoc_client_t.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ Example
6868
mongoc_client_get_server_description
6969
mongoc_client_get_server_descriptions
7070
mongoc_client_get_server_status
71-
mongoc_client_get_timeout_ms
7271
mongoc_client_get_uri
7372
mongoc_client_get_write_concern
7473
mongoc_client_new

‎src/libmongoc/doc/mongoc_collection_get_timeout_ms.rst

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

‎src/libmongoc/doc/mongoc_collection_set_timeout_ms.rst

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

‎src/libmongoc/doc/mongoc_collection_t.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ Read preferences and write concerns are inherited from the parent client. They c
5858
mongoc_collection_get_name
5959
mongoc_collection_get_read_concern
6060
mongoc_collection_get_read_prefs
61-
mongoc_collection_get_timeout_ms
6261
mongoc_collection_get_write_concern
6362
mongoc_collection_insert
6463
mongoc_collection_insert_bulk
@@ -74,7 +73,6 @@ Read preferences and write concerns are inherited from the parent client. They c
7473
mongoc_collection_save
7574
mongoc_collection_set_read_concern
7675
mongoc_collection_set_read_prefs
77-
mongoc_collection_set_timeout_ms
7876
mongoc_collection_set_write_concern
7977
mongoc_collection_stats
8078
mongoc_collection_update

‎src/libmongoc/doc/mongoc_database_get_timeout_ms.rst

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

‎src/libmongoc/doc/mongoc_database_set_timeout_ms.rst

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

‎src/libmongoc/doc/mongoc_database_t.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ Read preferences and write concerns are inherited from the parent client. They c
4343
mongoc_database_get_name
4444
mongoc_database_get_read_concern
4545
mongoc_database_get_read_prefs
46-
mongoc_database_get_timeout_ms
4746
mongoc_database_get_write_concern
4847
mongoc_database_has_collection
4948
mongoc_database_read_command_with_opts
@@ -52,7 +51,6 @@ Read preferences and write concerns are inherited from the parent client. They c
5251
mongoc_database_remove_user
5352
mongoc_database_set_read_concern
5453
mongoc_database_set_read_prefs
55-
mongoc_database_set_timeout_ms
5654
mongoc_database_set_write_concern
5755
mongoc_database_watch
5856
mongoc_database_write_command_with_opts

‎src/libmongoc/src/mongoc/mongoc-client-private.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ struct _mongoc_client_t {
129129
mongoc_set_t *client_sessions;
130130
unsigned int csid_rand_seed;
131131

132-
int64_t timeout_ms;
133-
134132
uint32_t generation;
135133
};
136134

‎src/libmongoc/src/mongoc/mongoc-client.c

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,9 +1174,6 @@ _mongoc_client_new_from_uri (mongoc_topology_t *topology)
11741174
BSON_ASSERT (mongoc_client_set_appname (client, appname));
11751175
}
11761176

1177-
client->timeout_ms = mongoc_uri_get_option_as_int64 (
1178-
client->uri, MONGOC_URI_TIMEOUTMS, MONGOC_TIMEOUTMS_UNSET);
1179-
11801177
mongoc_cluster_init (&client->cluster, client->uri, client);
11811178

11821179
#ifdef MONGOC_ENABLE_SSL
@@ -1360,8 +1357,7 @@ mongoc_client_get_database (mongoc_client_t *client, const char *name)
13601357
name,
13611358
client->read_prefs,
13621359
client->read_concern,
1363-
client->write_concern,
1364-
client->timeout_ms);
1360+
client->write_concern);
13651361
}
13661362

13671363

@@ -1440,8 +1436,7 @@ mongoc_client_get_collection (mongoc_client_t *client,
14401436
collection,
14411437
client->read_prefs,
14421438
client->read_concern,
1443-
client->write_concern,
1444-
client->timeout_ms);
1439+
client->write_concern);
14451440
}
14461441

14471442

@@ -3105,8 +3100,6 @@ mongoc_client_enable_auto_encryption (mongoc_client_t *client,
31053100
mongoc_auto_encryption_opts_t *opts,
31063101
bson_error_t *error)
31073102
{
3108-
BSON_ASSERT_PARAM (client);
3109-
31103103
if (!client->topology->single_threaded) {
31113104
bson_set_error (error,
31123105
MONGOC_ERROR_CLIENT,
@@ -3118,14 +3111,6 @@ mongoc_client_enable_auto_encryption (mongoc_client_t *client,
31183111
return _mongoc_cse_client_enable_auto_encryption (client, opts, error);
31193112
}
31203113

3121-
int64_t
3122-
mongoc_client_get_timeout_ms (const mongoc_client_t *client)
3123-
{
3124-
BSON_ASSERT_PARAM (client);
3125-
3126-
return client->timeout_ms;
3127-
}
3128-
31293114
bool
31303115
mongoc_client_set_server_api (mongoc_client_t *client,
31313116
const mongoc_server_api_t *api,

‎src/libmongoc/src/mongoc/mongoc-client.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,6 @@ mongoc_client_enable_auto_encryption (mongoc_client_t *client,
269269
mongoc_auto_encryption_opts_t *opts,
270270
bson_error_t *error);
271271

272-
MONGOC_EXPORT (int64_t)
273-
mongoc_client_get_timeout_ms (const mongoc_client_t *client);
274-
275272
MONGOC_EXPORT (bool)
276273
mongoc_client_set_server_api (mongoc_client_t *client,
277274
const mongoc_server_api_t *api,

‎src/libmongoc/src/mongoc/mongoc-collection-private.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ struct _mongoc_collection_t {
3737
mongoc_read_concern_t *read_concern;
3838
mongoc_write_concern_t *write_concern;
3939
bson_t *gle;
40-
int64_t timeout_ms;
4140
};
4241

4342

@@ -47,8 +46,7 @@ _mongoc_collection_new (mongoc_client_t *client,
4746
const char *collection,
4847
const mongoc_read_prefs_t *read_prefs,
4948
const mongoc_read_concern_t *read_concern,
50-
const mongoc_write_concern_t *write_concern,
51-
int64_t timeout_ms);
49+
const mongoc_write_concern_t *write_concern);
5250

5351
bool
5452
_mongoc_collection_create_index_if_not_exists (mongoc_collection_t *collection,

‎src/libmongoc/src/mongoc/mongoc-collection.c

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,23 @@
2222
#include "mongoc-bulk-operation-private.h"
2323
#include "mongoc-change-stream-private.h"
2424
#include "mongoc-client-private.h"
25+
#include "mongoc-find-and-modify-private.h"
26+
#include "mongoc-find-and-modify.h"
2527
#include "mongoc-collection.h"
2628
#include "mongoc-collection-private.h"
2729
#include "mongoc-cursor-private.h"
28-
#include "mongoc-database-private.h"
2930
#include "mongoc-error.h"
30-
#include "mongoc-error-private.h"
31-
#include "mongoc-find-and-modify-private.h"
32-
#include "mongoc-find-and-modify.h"
3331
#include "mongoc-index.h"
3432
#include "mongoc-log.h"
35-
#include "mongoc-opts-private.h"
33+
#include "mongoc-trace-private.h"
3634
#include "mongoc-read-concern-private.h"
35+
#include "mongoc-write-concern-private.h"
3736
#include "mongoc-read-prefs-private.h"
38-
#include "mongoc-trace-private.h"
39-
#include "mongoc-uri.h"
4037
#include "mongoc-util-private.h"
4138
#include "mongoc-write-command-private.h"
39+
#include "mongoc-opts-private.h"
4240
#include "mongoc-write-command-private.h"
43-
#include "mongoc-write-concern-private.h"
41+
#include "mongoc-error-private.h"
4442

4543
#undef MONGOC_LOG_DOMAIN
4644
#define MONGOC_LOG_DOMAIN "collection"
@@ -168,8 +166,7 @@ _mongoc_collection_new (mongoc_client_t *client,
168166
const char *collection,
169167
const mongoc_read_prefs_t *read_prefs,
170168
const mongoc_read_concern_t *read_concern,
171-
const mongoc_write_concern_t *write_concern,
172-
int64_t timeout_ms)
169+
const mongoc_write_concern_t *write_concern)
173170
{
174171
mongoc_collection_t *col;
175172

@@ -198,8 +195,6 @@ _mongoc_collection_new (mongoc_client_t *client,
198195

199196
col->gle = NULL;
200197

201-
col->timeout_ms = timeout_ms;
202-
203198
RETURN (col);
204199
}
205200

@@ -285,8 +280,7 @@ mongoc_collection_copy (mongoc_collection_t *collection) /* IN */
285280
collection->collection,
286281
collection->read_prefs,
287282
collection->read_concern,
288-
collection->write_concern,
289-
collection->timeout_ms));
283+
collection->write_concern));
290284
}
291285

292286

@@ -3591,31 +3585,3 @@ mongoc_collection_watch (const mongoc_collection_t *coll,
35913585
{
35923586
return _mongoc_change_stream_new_from_collection (coll, pipeline, opts);
35933587
}
3594-
3595-
bool
3596-
mongoc_collection_set_timeout_ms (mongoc_collection_t *coll,
3597-
int64_t timeout_ms,
3598-
bson_error_t *error)
3599-
{
3600-
BSON_ASSERT_PARAM (coll);
3601-
3602-
if (timeout_ms < 0) {
3603-
bson_set_error (error,
3604-
MONGOC_ERROR_TIMEOUT,
3605-
MONGOC_ERROR_TIMEOUT_INVALID,
3606-
"timeoutMS must be a non-negative integer");
3607-
return false;
3608-
}
3609-
3610-
coll->timeout_ms = timeout_ms;
3611-
3612-
return true;
3613-
}
3614-
3615-
int64_t
3616-
mongoc_collection_get_timeout_ms (const mongoc_collection_t *coll)
3617-
{
3618-
BSON_ASSERT_PARAM (coll);
3619-
3620-
return coll->timeout_ms;
3621-
}

‎src/libmongoc/src/mongoc/mongoc-collection.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,6 @@ mongoc_collection_estimated_document_count (
351351
bson_t *reply,
352352
bson_error_t *error);
353353

354-
MONGOC_EXPORT (bool)
355-
mongoc_collection_set_timeout_ms (mongoc_collection_t *coll,
356-
int64_t timeout_ms,
357-
bson_error_t *error);
358-
359-
MONGOC_EXPORT (int64_t)
360-
mongoc_collection_get_timeout_ms (const mongoc_collection_t *coll);
361-
362354
BSON_END_DECLS
363355

364356

0 commit comments

Comments
 (0)