Skip to content

Commit d9e0b19

Browse files
committed
MK tech review 2
1 parent 89ba82a commit d9e0b19

File tree

4 files changed

+22
-26
lines changed

4 files changed

+22
-26
lines changed

source/connection/specify-connection-options/csot.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ set the ``timeoutMS`` option in the following ways:
4343
``MongoClientSettings.Builder`` class
4444
- Setting the ``timeoutMS`` parameter in your connection string
4545

46-
The following code examples set a client-level timeout of ``5`` seconds.
46+
The following code examples set a client-level timeout of ``200`` milliseconds.
4747
Select the :guilabel:`MongoClientSettings` or :guilabel:`Connection
4848
String` tab to see the corresponding code.
4949

@@ -100,7 +100,7 @@ accepted values for ``timeoutMS``:
100100

101101
If you specify the ``timeoutMS`` option, the driver automatically applies the
102102
specified timeout to each server operation. The following code example specifies
103-
a timeout of ``5`` seconds at the client level, and then calls the
103+
a timeout of ``200`` milliseconds at the client level, and then calls the
104104
``MongoCollection.insertOne()`` method:
105105

106106
.. literalinclude:: /includes/connect/CsotExample.java
@@ -177,7 +177,7 @@ configuration can override a client-level timeout configuration:
177177
:dedent:
178178
:emphasize-lines: 10
179179

180-
.. _java-csot-txn:
180+
.. _java-csot-transaction:
181181

182182
Transactions
183183
~~~~~~~~~~~~
@@ -213,8 +213,8 @@ transaction:
213213

214214
.. literalinclude:: /includes/connect/CsotExample.java
215215
:language: java
216-
:start-after: start-txn-timeout
217-
:end-before: end-txn-timeout
216+
:start-after: start-transaction-timeout
217+
:end-before: end-transaction-timeout
218218
:dedent:
219219

220220
To learn more about transactions, see the :ref:`java-fundamentals-transactions` guide.

source/crud/transactions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ documentation <api-docs-transaction>` to learn more about these methods.
129129

130130
You can set a limit on amount of time that operations can take
131131
to complete in your transactions. To learn more, see the
132-
:ref:`java-csot-txn` section of the Limit Server Execution Time guide.
132+
:ref:`java-csot-transaction` section of the Limit Server Execution Time guide.
133133

134134
Example
135135
-------

source/includes/connect/CsotExample.java

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
package org.example;
22

3-
import static com.mongodb.client.model.Filters.eq;
43
import static com.mongodb.client.model.Filters.gte;
5-
import static java.util.concurrent.TimeUnit.SECONDS;
4+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
65

76
import com.mongodb.ClientSessionOptions;
87
import com.mongodb.ConnectionString;
98
import com.mongodb.MongoClientSettings;
109
import com.mongodb.TransactionOptions;
1110
import com.mongodb.client.*;
1211
import com.mongodb.client.cursor.TimeoutMode;
13-
import com.mongodb.client.model.InsertOneOptions;
14-
import com.mongodb.client.model.bulk.ClientBulkWriteOptions;
15-
import com.mongodb.client.result.InsertOneResult;
1612
import org.bson.Document;
1713

1814

1915
public class CsotExample {
2016

2117
public static void main(String[] args) {
22-
MongoClient mongoClient = new csot().mongoClientSettings();
18+
MongoClient mongoClient = new CsotExample().mongoClientSettings();
2319
}
2420

2521
private MongoClient mongoClientSettings(){
2622
// start-mongoclientsettings
2723
MongoClientSettings settings = MongoClientSettings.builder()
2824
.applyConnectionString(new ConnectionString("<connection string>"))
29-
.timeout(5L, SECONDS)
25+
.timeout(200L, MILLISECONDS)
3026
.build();
3127

3228
MongoClient mongoClient = MongoClients.create(settings);
@@ -37,7 +33,7 @@ private MongoClient mongoClientSettings(){
3733

3834
private MongoClient connectionString(){
3935
// start-string
40-
String uri = "<connection string>/?timeoutMS=5000";
36+
String uri = "<connection string>/?timeoutMS=200";
4137
MongoClient mongoClient = MongoClients.create(uri);
4238
// end-string
4339

@@ -48,7 +44,7 @@ private void operationTimeout(){
4844
// start-operation-timeout
4945
MongoClientSettings settings = MongoClientSettings.builder()
5046
.applyConnectionString(new ConnectionString("<connection string>"))
51-
.timeout(5L, SECONDS)
47+
.timeout(200L, MILLISECONDS)
5248
.build();
5349

5450
try (MongoClient mongoClient = MongoClients.create(settings)) {
@@ -64,21 +60,21 @@ private void overrideTimeout(){
6460
// start-override
6561
MongoClientSettings settings = MongoClientSettings.builder()
6662
.applyConnectionString(new ConnectionString("<connection string>"))
67-
.timeout(5L, SECONDS)
63+
.timeout(200L, MILLISECONDS)
6864
.build();
6965

7066
try (MongoClient mongoClient = MongoClients.create(settings)) {
7167
MongoDatabase database = mongoClient.getDatabase("db");
7268
MongoCollection<Document> collection = database
7369
.getCollection("people")
74-
.withTimeout(10L, SECONDS);
70+
.withTimeout(300L, MILLISECONDS);
7571

7672
// ... perform operations on MongoCollection
7773
}
7874
// end-override
7975
}
8076

81-
private void txnTimeout(){
77+
private void transactionTimeout(){
8278
MongoClientSettings settings = MongoClientSettings.builder()
8379
.applyConnectionString(new ConnectionString("<connection string>"))
8480
.build();
@@ -90,26 +86,26 @@ private void txnTimeout(){
9086

9187
// start-session-timeout
9288
ClientSessionOptions opts = ClientSessionOptions.builder()
93-
.defaultTimeout(5L, SECONDS)
89+
.defaultTimeout(200L, MILLISECONDS)
9490
.build();
9591

9692
ClientSession session = mongoClient.startSession(opts);
9793
// ... perform operations on ClientSession
9894
// end-session-timeout
9995

100-
// start-txn-timeout
101-
TransactionOptions txnOptions = TransactionOptions.builder()
102-
.timeout(5L, SECONDS)
96+
// start-transaction-timeout
97+
TransactionOptions transactionOptions = TransactionOptions.builder()
98+
.timeout(200L, MILLISECONDS)
10399
.build();
104-
// end-txn-timeout
100+
// end-transaction-timeout
105101
}
106102

107103
}
108104

109105
private void cursorTimeout(){
110106
MongoClientSettings settings = MongoClientSettings.builder()
111107
.applyConnectionString(new ConnectionString("<connection string>"))
112-
.timeout(5L, SECONDS)
108+
.timeout(200L, MILLISECONDS)
113109
.build();
114110

115111
try (MongoClient mongoClient = MongoClients.create(settings)) {

source/includes/fundamentals/code-snippets/Transaction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static void main(String[] args) {
1818
MongoCollection<Document> collection = database.getCollection("books");
1919

2020
// Sets transaction options
21-
TransactionOptions txnOptions = TransactionOptions.builder()
21+
TransactionOptions transactionOptions = TransactionOptions.builder()
2222
.writeConcern(WriteConcern.MAJORITY)
2323
.build();
2424

@@ -32,7 +32,7 @@ public static void main(String[] args) {
3232
new Document("title", "Song of Solomon").append("author", "Toni Morrison")
3333
));
3434
return null; // Return value as expected by the lambda
35-
}, txnOptions);
35+
}, transactionOptions);
3636
}
3737
} catch (Exception e) {
3838
e.printStackTrace();

0 commit comments

Comments
 (0)