Skip to content

Commit 80b2413

Browse files
alcaeuskevinAlbs
authored andcommitted
CDRIVER-3985 Remove Oppressive Terminology From Code (#794)
* Remove deprecated terminology for legacy hello * Remove deprecated terminology for secondaryOk * Remove deprecated terminology for allow/deny list * Remove deprecated terminology for notPrimary * Update terminology in spec tests * Fix issues from code review * Remove more language in docs * Undo accidental change to hello * Use secondaryOk when printing query flags * Fix wrong variable name * Remove deprecated terminology in tests * Remove branch name from installation docs * Clarify build examples in readme
1 parent 85ce8c7 commit 80b2413

File tree

127 files changed

+1949
-2001
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+1949
-2001
lines changed

NEWS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,7 +2049,7 @@ These notable bugs have been fixed since 1.1.11:
20492049
authentication failure
20502050
* Off-by-one error in mongoc_gridfs_file_seek with mode SEEK_END
20512051
* The writeConcernErrors field of bulk results is properly formatted.
2052-
* A cursor with a server "hint" sets slaveOkay and / or $readPreference.
2052+
* A cursor with a server "hint" sets secondaryOk and / or $readPreference.
20532053
* Destroying an exhaust cursor must close its socket
20542054
* "wtimeoutms" was ignored for write concerns besides "majority".
20552055
* Bulk write operations might fail in mixed-version sharded clusters with
@@ -2760,7 +2760,7 @@ In this release, you will find the following changes:
27602760
* client command functions can now take a fully qualified namespace.
27612761
* collections can now support names that indicate a command namespace.
27622762
* Commands will no longer fail if they do not contain an "ok" field.
2763-
* OP_QUERY will now set the slaveOk bit in the wire protocol if
2763+
* OP_QUERY will now set the secondaryOk bit in the wire protocol if
27642764
* readPreferences are set to non-PRIMARY.
27652765
* Various documentation and build fixes.
27662766

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ the `MongoDB Community Forums`_ to ask for help. Please include in your post all
4242
information:
4343

4444
- The version of the driver you are trying to build (branch or tag).
45-
- Examples: master branch, 1.9.5 tag
45+
- Examples: ``r1.17`` (branch), ``1.9.5`` (tag)
4646
- Host OS, version, and architecture.
4747
- Examples: Windows 10 64-bit x86, Ubuntu 16.04 64-bit x86, macOS 10.13
4848
- C Compiler and version.

src/libmongoc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ set (test-libmongoc-sources
986986
${PROJECT_SOURCE_DIR}/tests/test-mongoc-socket.c
987987
${PROJECT_SOURCE_DIR}/tests/test-mongoc-speculative-auth.c
988988
${PROJECT_SOURCE_DIR}/tests/test-mongoc-stream.c
989-
${PROJECT_SOURCE_DIR}/tests/test-mongoc-streamable-ismaster.c
989+
${PROJECT_SOURCE_DIR}/tests/test-mongoc-streamable-hello.c
990990
${PROJECT_SOURCE_DIR}/tests/test-mongoc-thread.c
991991
${PROJECT_SOURCE_DIR}/tests/test-mongoc-timeout.c
992992
${PROJECT_SOURCE_DIR}/tests/test-mongoc-topology-description.c

src/libmongoc/doc/connection-pooling.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To activate pooled mode, create a :symbol:`mongoc_client_pool_t`:
3333
3434
mongoc_client_pool_t *pool = mongoc_client_pool_new (uri);
3535
36-
When your program first calls :symbol:`mongoc_client_pool_pop`, the pool launches monitoring threads in the background. Monitoring threads independently connect to all servers in the connection string. As monitoring threads receive ismaster responses from the servers, they update the shared view of the server topology. Additional monitoring threads and connections are created as new servers are discovered. Monitoring threads are terminated when servers are removed from the shared view of the server topology.
36+
When your program first calls :symbol:`mongoc_client_pool_pop`, the pool launches monitoring threads in the background. Monitoring threads independently connect to all servers in the connection string. As monitoring threads receive hello responses from the servers, they update the shared view of the server topology. Additional monitoring threads and connections are created as new servers are discovered. Monitoring threads are terminated when servers are removed from the shared view of the server topology.
3737

3838
Each thread that executes MongoDB operations must check out a client from the pool:
3939

src/libmongoc/doc/installing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ A build configuration description similar to the one above will be displayed, th
192192
Preparing a build from a git repository clone
193193
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
194194

195-
Clone the repository and prepare the build on the current master branch or a particular release tag:
195+
Clone the repository and prepare the build on the current branch or a particular release tag:
196196

197197
.. parsed-literal::
198198

src/libmongoc/doc/mongoc_apm_server_heartbeat_failed_get_awaited.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Synopsis
1212
mongoc_apm_server_heartbeat_failed_get_awaited (
1313
const mongoc_apm_server_heartbeat_failed_t *event);
1414
15-
Returns whether this event came from an awaitable isMaster.
15+
Returns whether this event came from an awaitable hello.
1616

1717
Parameters
1818
----------
@@ -22,7 +22,7 @@ Parameters
2222
Returns
2323
-------
2424

25-
A bool indicating whether the heartbeat event came from an awaitable isMaster.
25+
A bool indicating whether the heartbeat event came from an awaitable hello.
2626

2727
.. seealso::
2828

src/libmongoc/doc/mongoc_apm_server_heartbeat_failed_t.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Heartbeat-failed event
88
Synopsis
99
--------
1010

11-
An event notification sent when the driver failed to send an "isMaster" command to check the status of a server.
11+
An event notification sent when the driver failed to send a "hello" command to check the status of a server.
1212

1313
.. seealso::
1414

src/libmongoc/doc/mongoc_apm_server_heartbeat_started_get_awaited.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Synopsis
1212
mongoc_apm_server_heartbeat_started_get_awaited (
1313
const mongoc_apm_server_heartbeat_started_t *event);
1414
15-
Returns whether this event came from an awaitable isMaster.
15+
Returns whether this event came from an awaitable hello.
1616

1717
Parameters
1818
----------
@@ -22,7 +22,7 @@ Parameters
2222
Returns
2323
-------
2424

25-
A bool indicating whether the heartbeat event came from an awaitable isMaster.
25+
A bool indicating whether the heartbeat event came from an awaitable hello.
2626

2727
.. seealso::
2828

src/libmongoc/doc/mongoc_apm_server_heartbeat_started_t.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Heartbeat-started event
88
Synopsis
99
--------
1010

11-
An event notification sent when the driver begins executing an "isMaster" command to check the status of a server.
11+
An event notification sent when the driver begins executing a "hello" command to check the status of a server.
1212

1313
.. seealso::
1414

src/libmongoc/doc/mongoc_apm_server_heartbeat_succeeded_get_awaited.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Synopsis
1212
mongoc_apm_server_heartbeat_succeeded_get_awaited (
1313
const mongoc_apm_server_heartbeat_succeeded_t *event);
1414
15-
Returns whether this event came from an awaitable isMaster.
15+
Returns whether this event came from an awaitable hello.
1616

1717
Parameters
1818
----------
@@ -22,7 +22,7 @@ Parameters
2222
Returns
2323
-------
2424

25-
A bool indicating whether the heartbeat event came from an awaitable isMaster.
25+
A bool indicating whether the heartbeat event came from an awaitable hello.
2626

2727
.. seealso::
2828

0 commit comments

Comments
 (0)