From d8c7957c9d1e3968cd3c13ea890881e88ac6d6a3 Mon Sep 17 00:00:00 2001 From: kay Date: Mon, 18 Mar 2013 13:27:42 -0400 Subject: [PATCH] minor 2.4 patch edits --- source/faq/concurrency.txt | 38 +++---------------- source/includes/fact-eval-authentication.rst | 3 +- source/reference/limits.txt | 8 +--- .../reference/method/db.collection.insert.txt | 4 -- source/reference/mongoperf.txt | 16 ++++---- .../manage-chunks-in-sharded-cluster.txt | 4 -- 6 files changed, 16 insertions(+), 57 deletions(-) diff --git a/source/faq/concurrency.txt b/source/faq/concurrency.txt index 130caf393d1..da94a5b431b 100644 --- a/source/faq/concurrency.txt +++ b/source/faq/concurrency.txt @@ -145,11 +145,6 @@ The following administrative operations require an exclusive - :method:`db.copyDatabase()`. This operation may lock all databases. See :ref:`faq-concurrency-lock-multiple-dbs`. -The :method:`db.collection.group()` operation takes a read lock and does -not allow any other threads to execute JavaScript while it is running. - -.. todo The above sentence might no longer apply in version 2.4, which will use V8. - The following administrative commands lock the database but only hold the lock for a very short time: @@ -233,31 +228,8 @@ secondaries, in a two phases: What kind of concurrency does MongoDB provide for JavaScript operations? ------------------------------------------------------------------------ -A single :program:`mongod` can only run a *single* JavaScript -operation at once. Therefore, operations that rely on JavaScript cannot -run concurrently; however, the :program:`mongod` can often run other -database operations concurrently with the JavaScript execution. This -limitation with JavaScript affects the following operations: - -- :dbcommand:`mapReduce` - - The JavaScript operations within a :dbcommand:`mapReduce` job are - short lived and yield many times during the operation. Portions of - the map-reduce operation take database locks for reading, writing - data to a temporary collection and writing the final output of the - write operation. - -- :dbcommand:`group` - - The :dbcommand:`group` takes a read lock in addition to blocking all - other JavaScript execution. - -- :method:`db.eval()` - - Unless you specify the ``nolock`` option, :method:`db.eval()` takes - a write lock in addition to blocking all JavaScript operations. - -- :operator:`$where` - - Only a single query that uses the :operator:`$where` operation can - run at a time. +.. versionchanged:: 2.4 + The V8 JavaScript engine added in 2.4 allows multiple JavaScript + operations to run at the same time. Prior to 2.4, a single + :program:`mongod` could only run a *single* JavaScript operation at + once. diff --git a/source/includes/fact-eval-authentication.rst b/source/includes/fact-eval-authentication.rst index 3d6242e9b74..691653c2bef 100644 --- a/source/includes/fact-eval-authentication.rst +++ b/source/includes/fact-eval-authentication.rst @@ -2,4 +2,5 @@ With :setting:`authentication ` enabled, |object| will fail during the operation if you do not have the permission to perform a specified task. -.. .. versionchanged:: 2.4 You must have full admin access to run. \ No newline at end of file +.. versionchanged:: 2.4 + You must have full admin access to run. \ No newline at end of file diff --git a/source/reference/limits.txt b/source/reference/limits.txt index 1c78d0021a3..134da0a91a2 100644 --- a/source/reference/limits.txt +++ b/source/reference/limits.txt @@ -101,18 +101,12 @@ Capped Collections ~~~~~~~~~~~~~~~~~~ .. limit:: Maximum Number of Documents in a Capped Collection - - Capped collections can hold no more than 2\ :sup:`32` documents. - -.. COMMENT - -.. FOR 2.4, change this section to match the following... .. versionchanged:: 2.4 If you specify a maximum number of documents for a capped collection using the ``max`` parameter to - :dbcommand:`createCollection`, the limit must be less than 2\ :sup:`32` + :dbcommand:`create`, the limit must be less than 2\ :sup:`32` documents. If you do not specify a maximum number of documents when creating a capped collection, there is no limit on the number of documents. diff --git a/source/reference/method/db.collection.insert.txt b/source/reference/method/db.collection.insert.txt index e724c65d8a1..cdb3e9b231d 100644 --- a/source/reference/method/db.collection.insert.txt +++ b/source/reference/method/db.collection.insert.txt @@ -14,10 +14,6 @@ db.collection.insert() an array of documents to perform a bulk insert of the documents into the collection. - .. include:: /includes/note-bulk-inserts-on-sharded-clusters.rst - - .. todo:: for 2.4, remove: /includes/note-bulk-inserts-on-sharded-clusters.rst - Consider the following behaviors of the :method:`insert() ` method: diff --git a/source/reference/mongoperf.txt b/source/reference/mongoperf.txt index dcbadccc3fd..a2f5c590eee 100644 --- a/source/reference/mongoperf.txt +++ b/source/reference/mongoperf.txt @@ -150,16 +150,16 @@ Configuration Fields Either :setting:`~mongoperf.r` or :setting:`~mongoperf.w` must be ``true``. -.. version-added-2.4 +.. setting:: mongoperf.recSizeKB - .. setting:: mongoperf.recSizeKB: {integer}` + .. versionadded:: 2.4 + + *Type:* Integer. + + *Default:* 4 kb + + The size of each write operation. - *Type:* Integer. - - *Default:* 4 kb - - The size of each write operation. - .. setting:: mongoperf.syncDelay *Type:* Integer. diff --git a/source/tutorial/manage-chunks-in-sharded-cluster.txt b/source/tutorial/manage-chunks-in-sharded-cluster.txt index 97c127aa974..6783a107928 100644 --- a/source/tutorial/manage-chunks-in-sharded-cluster.txt +++ b/source/tutorial/manage-chunks-in-sharded-cluster.txt @@ -380,7 +380,3 @@ cluster`. For bulk insert operations, consider the following strategies: and see :ref:`Shard Key Internals ` (in particular, :ref:`sharding-internals-operations-and-reliability` and :ref:`sharding-internals-choose-shard-key`). - -.. todo:: remove the below include for 2.4 - -.. include:: /includes/note-bulk-inserts-on-sharded-clusters.rst