Skip to content

Commit 475c55a

Browse files
author
rstam
committed
Renamed SafeMode.J to Journal to match official connection string option name.
1 parent 6e2b87c commit 475c55a

File tree

8 files changed

+42
-31
lines changed

8 files changed

+42
-31
lines changed

‎Driver/Core/MongoConnectionStringBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public SafeMode SafeMode
291291
{
292292
base["safe"] = "true";
293293
base["fsync"] = (value.FSync) ? "true" : null;
294-
base["journal"] = (value.J) ? "true" : null;
294+
base["journal"] = (value.Journal) ? "true" : null;
295295
base["w"] = (value.W != 0) ? value.W.ToString() : (value.WMode != null) ? value.WMode : null;
296296
base["wtimeout"] = (value.W != 0 && value.WTimeout != TimeSpan.Zero) ? MongoUrlBuilder.FormatTimeSpan(value.WTimeout) : null;
297297
}
@@ -464,7 +464,7 @@ public override object this[string keyword]
464464
case "j":
465465
case "journal":
466466
if (_safeMode == null) { _safeMode = new SafeMode(false); }
467-
_safeMode.J = Convert.ToBoolean(value);
467+
_safeMode.Journal = Convert.ToBoolean(value);
468468
SafeMode = _safeMode;
469469
break;
470470
case "maxidletime":

‎Driver/Core/MongoServerSettings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public class MongoServerSettings
4747
private TimeSpan _socketTimeout;
4848
private int _waitQueueSize;
4949
private TimeSpan _waitQueueTimeout;
50+
5051
// the following fields are set when Freeze is called
5152
private bool _isFrozen;
5253
private int _frozenHashCode;

‎Driver/Core/MongoUrlBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ public void Parse(string url)
521521
case "j":
522522
case "journal":
523523
if (_safeMode == null) { _safeMode = new SafeMode(false); }
524-
SafeMode.J = ParseBoolean(name, value);
524+
SafeMode.Journal = ParseBoolean(name, value);
525525
break;
526526
case "maxidletime":
527527
case "maxidletimems":
@@ -669,7 +669,7 @@ public override string ToString()
669669
{
670670
query.Append("fsync=true;");
671671
}
672-
if (_safeMode.J)
672+
if (_safeMode.Journal)
673673
{
674674
query.Append("journal=true;");
675675
}

‎Driver/Core/SafeMode.cs

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class SafeMode : IEquatable<SafeMode>
3737
// private fields
3838
private bool _enabled;
3939
private bool _fsync;
40-
private bool _j;
40+
private bool _journal;
4141
private int _w;
4242
private string _wmode;
4343
private TimeSpan _wtimeout;
@@ -133,7 +133,7 @@ public SafeMode(SafeMode other)
133133
{
134134
_enabled = other._enabled;
135135
_fsync = other._fsync;
136-
_j = other._j;
136+
_journal = other._journal;
137137
_w = other._w;
138138
_wmode = other._wmode;
139139
_wtimeout = other._wtimeout;
@@ -227,13 +227,23 @@ public bool FSync
227227
/// <summary>
228228
/// Gets whether wait for journal commit is true.
229229
/// </summary>
230+
[Obsolete("Use Journal instead.")]
230231
public bool J
231232
{
232-
get { return _j; }
233+
get { return Journal; }
234+
set { Journal = value; }
235+
}
236+
237+
/// <summary>
238+
/// Gets whether wait for journal commit is true.
239+
/// </summary>
240+
public bool Journal
241+
{
242+
get { return _journal; }
233243
set
234244
{
235245
if (_isFrozen) { ThrowFrozenException(); }
236-
_j = value;
246+
_journal = value;
237247
_enabled |= value;
238248
}
239249
}
@@ -433,7 +443,7 @@ public bool Equals(SafeMode rhs)
433443
return
434444
_enabled == rhs._enabled &&
435445
_fsync == rhs._fsync &&
436-
_j == rhs._j &&
446+
_journal == rhs._journal &&
437447
_w == rhs._w &&
438448
_wmode == rhs._wmode &&
439449
_wtimeout == rhs._wtimeout;
@@ -484,7 +494,7 @@ public override int GetHashCode()
484494
int hash = 17;
485495
hash = 37 * hash + _enabled.GetHashCode();
486496
hash = 37 * hash + _fsync.GetHashCode();
487-
hash = 37 * hash + _j.GetHashCode();
497+
hash = 37 * hash + _journal.GetHashCode();
488498
hash = 37 * hash + _w.GetHashCode();
489499
hash = 37 * hash + ((_wmode == null) ? 0 : _wmode.GetHashCode());
490500
hash = 37 * hash + _wtimeout.GetHashCode();
@@ -503,9 +513,9 @@ public override string ToString()
503513
{
504514
sb.Append(",fsync=true");
505515
}
506-
if (_j)
516+
if (_journal)
507517
{
508-
sb.Append(",j=true");
518+
sb.Append(",journal=true");
509519
}
510520
if (_w != 0 || _wmode != null)
511521
{
@@ -530,7 +540,7 @@ private void ResetValues()
530540
{
531541
_enabled = false;
532542
_fsync = false;
533-
_j = false;
543+
_journal = false;
534544
_w = 0;
535545
_wmode = null;
536546
_wtimeout = TimeSpan.Zero;

‎Driver/Internal/MongoConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ internal SafeModeResult SendMessage(MongoRequestMessage message, SafeMode safeMo
459459
{
460460
{ "getlasterror", 1 }, // use all lowercase for backward compatibility
461461
{ "fsync", true, safeMode.FSync },
462-
{ "j", true, safeMode.J },
462+
{ "j", true, safeMode.Journal },
463463
{ "w", safeMode.W, safeMode.W > 1 },
464464
{ "w", safeMode.WMode, safeMode.WMode != null },
465465
{ "wtimeout", (int) safeMode.WTimeout.TotalMilliseconds, safeMode.W > 1 && safeMode.WTimeout != TimeSpan.Zero }

‎DriverUnitTests/Core/MongoConnectionStringBuilderTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -638,9 +638,9 @@ public void TestSafeModeFSyncTrue()
638638
[Test]
639639
public void TestSafeModeJFalse()
640640
{
641-
var builder = new MongoConnectionStringBuilder() { Server = __localhost, SafeMode = new SafeMode(false) { J = false } };
641+
var builder = new MongoConnectionStringBuilder() { Server = __localhost, SafeMode = new SafeMode(false) { Journal = false } };
642642
Assert.AreEqual(false, builder.SafeMode.Enabled);
643-
Assert.AreEqual(false, builder.SafeMode.J);
643+
Assert.AreEqual(false, builder.SafeMode.Journal);
644644

645645
var connectionString = "server=localhost;safe=false";
646646
Assert.AreEqual(connectionString, builder.ToString());
@@ -654,9 +654,9 @@ public void TestSafeModeJFalse()
654654
[Test]
655655
public void TestSafeModeJTrue()
656656
{
657-
var builder = new MongoConnectionStringBuilder() { Server = __localhost, SafeMode = new SafeMode(false) { J = true } };
657+
var builder = new MongoConnectionStringBuilder() { Server = __localhost, SafeMode = new SafeMode(false) { Journal = true } };
658658
Assert.AreEqual(true, builder.SafeMode.Enabled);
659-
Assert.AreEqual(true, builder.SafeMode.J);
659+
Assert.AreEqual(true, builder.SafeMode.Journal);
660660

661661
var connectionString = "server=localhost;safe=true;journal=true";
662662
Assert.AreEqual(connectionString, builder.ToString());
@@ -1062,7 +1062,7 @@ public void TestAll()
10621062
Assert.AreEqual(ConnectionMode.ReplicaSet, builder.ConnectionMode);
10631063
Assert.AreEqual("name", builder.ReplicaSetName);
10641064
Assert.AreEqual(GuidRepresentation.PythonLegacy, builder.GuidRepresentation);
1065-
Assert.AreEqual(new SafeMode(true) { FSync = true, J = true, W = 2, WTimeout = TimeSpan.FromSeconds(2) }, builder.SafeMode);
1065+
Assert.AreEqual(new SafeMode(true) { FSync = true, Journal = true, W = 2, WTimeout = TimeSpan.FromSeconds(2) }, builder.SafeMode);
10661066
Assert.AreEqual(true, builder.SlaveOk);
10671067
Assert.AreEqual(connectionString, builder.ToString());
10681068
}

‎DriverUnitTests/Core/MongoUrlBuilderTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,9 @@ public void TestSafeModeFSyncTrue()
635635
[Test]
636636
public void TestSafeModeJFalse()
637637
{
638-
var builder = new MongoUrlBuilder("mongodb://localhost") { SafeMode = new SafeMode(false) { J = false } };
638+
var builder = new MongoUrlBuilder("mongodb://localhost") { SafeMode = new SafeMode(false) { Journal = false } };
639639
Assert.AreEqual(false, builder.SafeMode.Enabled);
640-
Assert.AreEqual(false, builder.SafeMode.J);
640+
Assert.AreEqual(false, builder.SafeMode.Journal);
641641

642642
var connectionString = "mongodb://localhost";
643643
Assert.AreEqual(connectionString, builder.ToString());
@@ -651,9 +651,9 @@ public void TestSafeModeJFalse()
651651
[Test]
652652
public void TestSafeModeJTrue()
653653
{
654-
var builder = new MongoUrlBuilder("mongodb://localhost") { SafeMode = new SafeMode(false) { J = true } };
654+
var builder = new MongoUrlBuilder("mongodb://localhost") { SafeMode = new SafeMode(false) { Journal = true } };
655655
Assert.AreEqual(true, builder.SafeMode.Enabled);
656-
Assert.AreEqual(true, builder.SafeMode.J);
656+
Assert.AreEqual(true, builder.SafeMode.Journal);
657657

658658
var connectionString = "mongodb://localhost/?safe=true;journal=true";
659659
Assert.AreEqual(connectionString, builder.ToString());

‎DriverUnitTests/Core/SafeModeTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void TestCreateWithEnabled()
3434
var safeMode = new SafeMode(true);
3535
Assert.AreEqual(true, safeMode.Enabled);
3636
Assert.AreEqual(false, safeMode.FSync);
37-
Assert.AreEqual(false, safeMode.J);
37+
Assert.AreEqual(false, safeMode.Journal);
3838
Assert.AreEqual(0, safeMode.W);
3939
Assert.AreEqual(null, safeMode.WMode);
4040
Assert.AreEqual(TimeSpan.Zero, safeMode.WTimeout);
@@ -46,7 +46,7 @@ public void TestCreateWithEnabledAndFSync()
4646
var safeMode = new SafeMode(true, true);
4747
Assert.AreEqual(true, safeMode.Enabled);
4848
Assert.AreEqual(true, safeMode.FSync);
49-
Assert.AreEqual(false, safeMode.J);
49+
Assert.AreEqual(false, safeMode.Journal);
5050
Assert.AreEqual(0, safeMode.W);
5151
Assert.AreEqual(null, safeMode.WMode);
5252
Assert.AreEqual(TimeSpan.Zero, safeMode.WTimeout);
@@ -58,7 +58,7 @@ public void TestCreateWithEnabledAndFSyncAndW()
5858
var safeMode = new SafeMode(true, true, 2);
5959
Assert.AreEqual(true, safeMode.Enabled);
6060
Assert.AreEqual(true, safeMode.FSync);
61-
Assert.AreEqual(false, safeMode.J);
61+
Assert.AreEqual(false, safeMode.Journal);
6262
Assert.AreEqual(2, safeMode.W);
6363
Assert.AreEqual(null, safeMode.WMode);
6464
Assert.AreEqual(TimeSpan.Zero, safeMode.WTimeout);
@@ -70,7 +70,7 @@ public void TestCreateWithEnabledAndFSyncAndWAndWTimeout()
7070
var safeMode = new SafeMode(true, true, 2, TimeSpan.FromSeconds(30));
7171
Assert.AreEqual(true, safeMode.Enabled);
7272
Assert.AreEqual(true, safeMode.FSync);
73-
Assert.AreEqual(false, safeMode.J);
73+
Assert.AreEqual(false, safeMode.Journal);
7474
Assert.AreEqual(2, safeMode.W);
7575
Assert.AreEqual(null, safeMode.WMode);
7676
Assert.AreEqual(TimeSpan.FromSeconds(30), safeMode.WTimeout);
@@ -82,7 +82,7 @@ public void TestCreateWithW()
8282
var safeMode = new SafeMode(2);
8383
Assert.AreEqual(true, safeMode.Enabled);
8484
Assert.AreEqual(false, safeMode.FSync);
85-
Assert.AreEqual(false, safeMode.J);
85+
Assert.AreEqual(false, safeMode.Journal);
8686
Assert.AreEqual(2, safeMode.W);
8787
Assert.AreEqual(null, safeMode.WMode);
8888
Assert.AreEqual(TimeSpan.Zero, safeMode.WTimeout);
@@ -94,7 +94,7 @@ public void TestCreateWithWAndTimeout()
9494
var safeMode = new SafeMode(2, TimeSpan.FromSeconds(30));
9595
Assert.AreEqual(true, safeMode.Enabled);
9696
Assert.AreEqual(false, safeMode.FSync);
97-
Assert.AreEqual(false, safeMode.J);
97+
Assert.AreEqual(false, safeMode.Journal);
9898
Assert.AreEqual(2, safeMode.W);
9999
Assert.AreEqual(null, safeMode.WMode);
100100
Assert.AreEqual(TimeSpan.FromSeconds(30), safeMode.WTimeout);
@@ -113,7 +113,7 @@ public void TestCreateWithWMode()
113113
var safeMode = new SafeMode(true) { WMode = "majority" };
114114
Assert.AreEqual(true, safeMode.Enabled);
115115
Assert.AreEqual(false, safeMode.FSync);
116-
Assert.AreEqual(false, safeMode.J);
116+
Assert.AreEqual(false, safeMode.Journal);
117117
Assert.AreEqual(0, safeMode.W);
118118
Assert.AreEqual("majority", safeMode.WMode);
119119
Assert.AreEqual(TimeSpan.Zero, safeMode.WTimeout);
@@ -127,7 +127,7 @@ public void TestEquals()
127127
var a3 = a2;
128128
var b = new SafeMode(false) { Enabled = true };
129129
var c = new SafeMode(false) { FSync = true };
130-
var d = new SafeMode(false) { J = true };
130+
var d = new SafeMode(false) { Journal = true };
131131
var e = new SafeMode(false) { W = 2 };
132132
var f = new SafeMode(false) { WMode = "mode" };
133133
var g = new SafeMode(false) { WTimeout = TimeSpan.FromMinutes(1) };

0 commit comments

Comments
 (0)