Revert "CSHARP-959: wnote and jnote no longer throw errors on pre 2.6 servers."

craiggwilson · craiggwilson · commit 829737436512 · 2014-04-28T19:12:27.000-05:00
This reverts commit 10cfbad.
diff --git a/MongoDB.Driver/Exceptions/ExceptionMapper.cs b/MongoDB.Driver/Exceptions/ExceptionMapper.cs
@@ -90,22 +90,18 @@ public static Exception Map(WriteConcernResult writeConcernResult)
                 return new WriteConcernException(errorMessage, writeConcernResult);
             }
 
-            bool wnoteAndJnoteAreErrors = writeConcernResult.ServerInstance.BuildInfo.Version >= new Version(2, 6, 0);
             string lastErrorMessage = null;
             if (writeConcernResult.HasLastErrorMessage)
             {
                 lastErrorMessage = writeConcernResult.LastErrorMessage;
             }
-            else if (wnoteAndJnoteAreErrors)
+            else if (writeConcernResult.Response.Contains("jnote"))
             {
-                if (writeConcernResult.Response.Contains("jnote"))
-                {
-                    lastErrorMessage = writeConcernResult.Response["jnote"].ToString();
-                }
-                else if (writeConcernResult.Response.Contains("wnote"))
-                {
-                    lastErrorMessage = writeConcernResult.Response["wnote"].ToString();
-                }
+                lastErrorMessage = writeConcernResult.Response["jnote"].ToString();
+            }
+            else if (writeConcernResult.Response.Contains("wnote"))
+            {
+                lastErrorMessage = writeConcernResult.Response["wnote"].ToString();
             }
 
             if (lastErrorMessage != null)
diff --git a/MongoDB.Driver/Operations/BulkWriteResultConverter.cs b/MongoDB.Driver/Operations/BulkWriteResultConverter.cs
@@ -28,10 +28,9 @@ public BulkWriteResultConverter()
         }
 
         // public methods
-        public Exception ToWriteConcernException(MongoServerInstance serverInstance, BulkWriteException bulkWriteException)
+        public Exception ToWriteConcernException(BulkWriteException bulkWriteException)
         {
             var writeConcernResult = ToWriteConcernResult(bulkWriteException.Result, bulkWriteException);
-            writeConcernResult.ServerInstance = serverInstance;
 
             var exception = ExceptionMapper.Map(writeConcernResult.Response);
             if (exception == null)
@@ -114,6 +113,7 @@ private WriteConcernResult ToWriteConcernResult(BulkWriteResult bulkWriteResult,
                 { "upserted", () => upsert.Id, isUpdate && upsert != null },
             };
             getLastErrorResponse.Merge(details, false); // don't overwrite existing elements
+
             return new WriteConcernResult(getLastErrorResponse);
         }
     }
diff --git a/MongoDB.Driver/Operations/DeleteOpcodeOperationEmulator.cs b/MongoDB.Driver/Operations/DeleteOpcodeOperationEmulator.cs
@@ -58,7 +58,7 @@ public WriteConcernResult Execute(MongoConnection connection)
             var converter = new BulkWriteResultConverter();
             if (bulkWriteException != null)
             {
-                throw converter.ToWriteConcernException(serverInstance, bulkWriteException);
+                throw converter.ToWriteConcernException(bulkWriteException);
             }
             else
             {
diff --git a/MongoDB.Driver/Operations/InsertOpcodeOperationEmulator.cs b/MongoDB.Driver/Operations/InsertOpcodeOperationEmulator.cs
@@ -61,7 +61,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)
             var converter = new BulkWriteResultConverter();
             if (bulkWriteException != null)
             {
-                throw converter.ToWriteConcernException(serverInstance, bulkWriteException);
+                throw converter.ToWriteConcernException(bulkWriteException);
             }
             else
             {
diff --git a/MongoDB.Driver/Operations/UpdateOpcodeOperationEmulator.cs b/MongoDB.Driver/Operations/UpdateOpcodeOperationEmulator.cs
@@ -58,7 +58,7 @@ public WriteConcernResult Execute(MongoConnection connection)
             var converter = new BulkWriteResultConverter();
             if (bulkWriteException != null)
             {
-                throw converter.ToWriteConcernException(serverInstance, bulkWriteException);
+                throw converter.ToWriteConcernException(bulkWriteException);
             }
             else
             {
diff --git a/MongoDB.Driver/Operations/WriteOpcodeOperationBase.cs b/MongoDB.Driver/Operations/WriteOpcodeOperationBase.cs
@@ -50,7 +50,6 @@ protected WriteConcernResult ReadWriteConcernResult(MongoConnection connection,
             }
             var writeConcernResult = replyMessage.Documents[0];
             writeConcernResult.Command = sendMessageResult.GetLastErrorCommand;
-            writeConcernResult.ServerInstance = connection.ServerInstance;
 
             var mappedException = ExceptionMapper.Map(writeConcernResult);
             if (mappedException != null)
diff --git a/MongoDB.DriverUnitTests/Exceptions/ExceptionMapperTests.cs b/MongoDB.DriverUnitTests/Exceptions/ExceptionMapperTests.cs
@@ -13,7 +13,6 @@
 * limitations under the License.
 */
 
-using System;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using NUnit.Framework;
@@ -23,14 +22,6 @@ namespace MongoDB.DriverUnitTests.Exceptions
     [TestFixture]
     public class ExceptionMapperTests
     {
-        private MongoServerInstance _primary;
-
-        [TestFixtureSetUp]
-        public void Setup()
-        {
-            _primary = Configuration.TestServer.Primary;
-        }
-
         [Test]
         public void TestDoesNotThrowExceptionWhenEverythingIsKosherWithAWriteConcernResult()
         {
@@ -42,7 +33,6 @@ public void TestDoesNotThrowExceptionWhenEverythingIsKosherWithAWriteConcernResu
             };
 
             var writeConcernResult = new WriteConcernResult(response);
-            writeConcernResult.ServerInstance = _primary;
             var ex = ExceptionMapper.Map(writeConcernResult);
 
             Assert.IsNull(ex);
@@ -74,7 +64,6 @@ public void TestThrowsDuplicateKeyExceptionForMongod(int code)
             };
 
             var writeConcernResult = new WriteConcernResult(response);
-            writeConcernResult.ServerInstance = _primary;
             var ex = ExceptionMapper.Map(writeConcernResult);
 
             Assert.IsNotNull(ex);
@@ -109,7 +98,6 @@ public void TestThrowsDuplicateKeyExceptionForMongos(int code)
             };
 
             var writeConcernResult = new WriteConcernResult(response);
-            writeConcernResult.ServerInstance = _primary;
             var ex = ExceptionMapper.Map(writeConcernResult);
 
             Assert.IsNotNull(ex);
@@ -129,7 +117,6 @@ public void TestThrowsWriteConcernExceptionWhenNotOk()
             };
 
             var writeConcernResult = new WriteConcernResult(response);
-            writeConcernResult.ServerInstance = _primary;
             var ex = ExceptionMapper.Map(writeConcernResult);
 
             Assert.IsNotNull(ex);
@@ -149,69 +136,12 @@ public void TestThrowsWriteConcernExceptionWhenOkButHasLastErrorMessage()
             };
 
             var writeConcernResult = new WriteConcernResult(response);
-            writeConcernResult.ServerInstance = _primary;
             var ex = ExceptionMapper.Map(writeConcernResult);
 
             Assert.IsNotNull(ex);
             Assert.IsInstanceOf<WriteConcernException>(ex);
         }
 
-        [Test]
-        public void TestThrowsWriteConcernExceptionWhenOkButHasWNoteOnPre26Servers()
-        {
-            var response = new BsonDocument
-                {
-                    { "err", BsonNull.Value },
-                    { "code", 20 },
-                    { "n", 0 },
-                    { "connectionId", 1 },
-                    { "ok", 1 },
-                    { "wnote", "oops" }
-                };
-
-            var writeConcernResult = new WriteConcernResult(response);
-            writeConcernResult.ServerInstance = _primary;
-            var ex = ExceptionMapper.Map(writeConcernResult);
-
-            if (_primary.BuildInfo.Version < new Version(2, 6, 0))
-            {
-                Assert.IsNull(ex);
-            }
-            else
-            {
-                Assert.IsNotNull(ex);
-                Assert.IsInstanceOf<WriteConcernException>(ex);
-            }
-        }
-
-        [Test]
-        public void TestThrowsWriteConcernExceptionWhenOkButHasJNoteOnPre26Servers()
-        {
-            var response = new BsonDocument
-                {
-                    { "err", BsonNull.Value },
-                    { "code", 20 },
-                    { "n", 0 },
-                    { "connectionId", 1 },
-                    { "ok", 1 },
-                    { "jnote", "oops" }
-                };
-
-            var writeConcernResult = new WriteConcernResult(response);
-            writeConcernResult.ServerInstance = _primary;
-            var ex = ExceptionMapper.Map(writeConcernResult);
-
-            if (_primary.BuildInfo.Version < new Version(2, 6, 0))
-            {
-                Assert.IsNull(ex);
-            }
-            else
-            {
-                Assert.IsNotNull(ex);
-                Assert.IsInstanceOf<WriteConcernException>(ex);
-            }
-        }
-
         [Test]
         [TestCase(50)]
         [TestCase(13475)]

Original file line number	Diff line number	Diff line change
`@@ -90,22 +90,18 @@ public static Exception Map(WriteConcernResult writeConcernResult)`
`90`	`90`	`return new WriteConcernException(errorMessage, writeConcernResult);`
`91`	`91`	`}`
`92`	`92`
`93`		`- bool wnoteAndJnoteAreErrors = writeConcernResult.ServerInstance.BuildInfo.Version >= new Version(2, 6, 0);`
`94`	`93`	`string lastErrorMessage = null;`
`95`	`94`	`if (writeConcernResult.HasLastErrorMessage)`
`96`	`95`	`{`
`97`	`96`	`lastErrorMessage = writeConcernResult.LastErrorMessage;`
`98`	`97`	`}`
`99`		`- else if (wnoteAndJnoteAreErrors)`
	`98`	`+ else if (writeConcernResult.Response.Contains("jnote"))`
`100`	`99`	`{`
`101`		`- if (writeConcernResult.Response.Contains("jnote"))`
`102`		`- {`
`103`		`- lastErrorMessage = writeConcernResult.Response["jnote"].ToString();`
`104`		`- }`
`105`		`- else if (writeConcernResult.Response.Contains("wnote"))`
`106`		`- {`
`107`		`- lastErrorMessage = writeConcernResult.Response["wnote"].ToString();`
`108`		`- }`
	`100`	`+ lastErrorMessage = writeConcernResult.Response["jnote"].ToString();`
	`101`	`+ }`
	`102`	`+ else if (writeConcernResult.Response.Contains("wnote"))`
	`103`	`+ {`
	`104`	`+ lastErrorMessage = writeConcernResult.Response["wnote"].ToString();`
`109`	`105`	`}`
`110`	`106`
`111`	`107`	`if (lastErrorMessage != null)`
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,9 @@ public BulkWriteResultConverter()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`// public methods`
`31`		`- public Exception ToWriteConcernException(MongoServerInstance serverInstance, BulkWriteException bulkWriteException)`
	`31`	`+ public Exception ToWriteConcernException(BulkWriteException bulkWriteException)`
`32`	`32`	`{`
`33`	`33`	`var writeConcernResult = ToWriteConcernResult(bulkWriteException.Result, bulkWriteException);`
`34`		`- writeConcernResult.ServerInstance = serverInstance;`
`35`	`34`
`36`	`35`	`var exception = ExceptionMapper.Map(writeConcernResult.Response);`
`37`	`36`	`if (exception == null)`
`@@ -114,6 +113,7 @@ private WriteConcernResult ToWriteConcernResult(BulkWriteResult bulkWriteResult,`
`114`	`113`	`{ "upserted", () => upsert.Id, isUpdate && upsert != null },`
`115`	`114`	`};`
`116`	`115`	`getLastErrorResponse.Merge(details, false); // don't overwrite existing elements`
	`116`	`+`
`117`	`117`	`return new WriteConcernResult(getLastErrorResponse);`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public WriteConcernResult Execute(MongoConnection connection)`
`58`	`58`	`var converter = new BulkWriteResultConverter();`
`59`	`59`	`if (bulkWriteException != null)`
`60`	`60`	`{`
`61`		`- throw converter.ToWriteConcernException(serverInstance, bulkWriteException);`
	`61`	`+ throw converter.ToWriteConcernException(bulkWriteException);`
`62`	`62`	`}`
`63`	`63`	`else`
`64`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public IEnumerable<WriteConcernResult> Execute(MongoConnection connection)`
`61`	`61`	`var converter = new BulkWriteResultConverter();`
`62`	`62`	`if (bulkWriteException != null)`
`63`	`63`	`{`
`64`		`- throw converter.ToWriteConcernException(serverInstance, bulkWriteException);`
	`64`	`+ throw converter.ToWriteConcernException(bulkWriteException);`
`65`	`65`	`}`
`66`	`66`	`else`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ protected WriteConcernResult ReadWriteConcernResult(MongoConnection connection,`
`50`	`50`	`}`
`51`	`51`	`var writeConcernResult = replyMessage.Documents[0];`
`52`	`52`	`writeConcernResult.Command = sendMessageResult.GetLastErrorCommand;`
`53`		`- writeConcernResult.ServerInstance = connection.ServerInstance;`
`54`	`53`
`55`	`54`	`var mappedException = ExceptionMapper.Map(writeConcernResult);`
`56`	`55`	`if (mappedException != null)`