Skip to content

Commit 86f75bf

Browse files
committed
fix backport
1 parent c3357ef commit 86f75bf

File tree

3 files changed

+201
-107
lines changed

3 files changed

+201
-107
lines changed

source/faq/concurrency.txt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,23 +158,18 @@ locks they use:
158158

159159
* - :method:`db.eval()`
160160

161-
- Write lock. The :method:`db.eval()` method takes a global write
162-
lock while evaluating the JavaScript function.
163-
To avoid taking this global write lock, you can
164-
use the :dbcommand:`eval` command with ``nolock: true``.
161+
- Write lock. :method:`db.eval()` blocks all other JavaScript
162+
processes.
165163

166164

167165
* - :dbcommand:`eval`
168166

169-
- Write lock. By default, :dbcommand:`eval` command takes a global
170-
write lock while evaluating the JavaScript function. If used
171-
with ``nolock: true``, the :dbcommand:`eval`
172-
command does *not* take a global write lock while evaluating
173-
the JavaScript function. However, the logic within the
174-
JavaScript function may take write locks for write operations.
167+
- Write lock. If used with the ``nolock`` lock option, the
168+
:dbcommand:`eval` option does not take a write lock and
169+
cannot write data to the database.
175170

176171

177-
* - :method:`~db.collection.aggregate()`
172+
* - :method:`aggregate() <db.collection.aggregate()>`
178173

179174
- Read lock
180175

source/reference/sql-aggregation-comparison.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@ terms, functions, and concepts and the corresponding MongoDB
6565

6666
* - join
6767

68-
- No direct corresponding operator; however, the
68+
- No direct corresponding operator; *however*, the
6969
:pipeline:`$unwind` operator allows for somewhat similar
7070
functionality, but with fields embedded within the document.
7171

72-
7372
.. seealso:: :doc:`/reference/sql-comparison`
7473

7574
Examples

0 commit comments

Comments
 (0)