CSHARP-2222: Legacy API should use implicit sessions

rstam · rstam · commit 1c187c933deb · 2018-03-23T14:18:08.000-04:00
diff --git a/src/MongoDB.Driver.Legacy/MongoDatabase.cs b/src/MongoDB.Driver.Legacy/MongoDatabase.cs
@@ -559,7 +559,7 @@ public virtual MongoCollection<TDefaultDocument> GetCollection<TDefaultDocument>
         public virtual MongoCollection<TDefaultDocument> GetCollection<TDefaultDocument>(
             string collectionName, MongoCollectionSettings collectionSettings)
         {
-            return new MongoCollection<TDefaultDocument>(this, collectionName, collectionSettings);
+            return new MongoCollection<TDefaultDocument>(this, collectionName, collectionSettings, _operationExecutor);
         }
 
         /// <summary>
@@ -638,8 +638,12 @@ public virtual MongoCollection GetCollection(Type defaultDocumentType, string co
         {
             var collectionDefinition = typeof(MongoCollection<>);
             var collectionType = collectionDefinition.MakeGenericType(defaultDocumentType);
-            var constructorInfo = collectionType.GetTypeInfo().GetConstructor(new Type[] { typeof(MongoDatabase), typeof(string), typeof(MongoCollectionSettings) });
-            return (MongoCollection)constructorInfo.Invoke(new object[] { this, collectionName, collectionSettings });
+            var constructorParameterTypes = new Type[] { typeof(MongoDatabase), typeof(string), typeof(MongoCollectionSettings), typeof(IOperationExecutor) };
+            var constructorInfo = collectionType.GetTypeInfo()
+                .GetConstructors(BindingFlags.NonPublic | BindingFlags.Instance)
+                .Where(c => c.GetParameters().Select(p => p.ParameterType).SequenceEqual(constructorParameterTypes))
+                .Single();
+            return (MongoCollection)constructorInfo.Invoke(new object[] { this, collectionName, collectionSettings, _operationExecutor });
         }
 
         /// <summary>
diff --git a/tests/MongoDB.Driver.Legacy.Tests/DisposableMongoClientExtensions.cs b/tests/MongoDB.Driver.Legacy.Tests/DisposableMongoClientExtensions.cs
@@ -0,0 +1,31 @@
+﻿/* Copyright 2018-present MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System;
+using MongoDB.Driver.TestHelpers;
+
+namespace MongoDB.Driver.Legacy.Tests
+{
+    public static class DisposableMongoClientExtensions
+    {
+        public static MongoServer GetServer(this DisposableMongoClient disposableClient)
+        {
+            var client = (MongoClient)disposableClient.Wrapped;
+#pragma warning disable 618
+            return client.GetServer();
+#pragma warning restore
+        }
+    }
+}
diff --git a/tests/MongoDB.Driver.Legacy.Tests/MongoCollectionTests.cs b/tests/MongoDB.Driver.Legacy.Tests/MongoCollectionTests.cs
@@ -31,6 +31,10 @@
 using MongoDB.Driver.Core.TestHelpers.XunitExtensions;
 using MongoDB.Driver.Core.Clusters;
 using MongoDB.Driver.Core.Misc;
+using MongoDB.Driver.TestHelpers;
+using MongoDB.Driver.Core.Events;
+using MongoDB.Driver.Legacy.Tests;
+using MongoDB.Bson.TestHelpers;
 
 namespace MongoDB.Driver.Tests
 {
@@ -423,6 +427,26 @@ public void TestCountZero()
             Assert.Equal(0, count);
         }
 
+        [SkippableFact]
+        public void TestCountUsesImplicitSession()
+        {
+            RequireServer.Check();
+
+            var events = new EventCapturer().Capture<CommandStartedEvent>(x => x.CommandName == "count");
+            using (var client = DriverTestConfiguration.CreateDisposableClient(events))
+            {
+                var server = client.GetServer();
+                var database = server.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
+                var collection = database.GetCollection<BsonDocument>(DriverTestConfiguration.CollectionNamespace.CollectionName);
+                collection.Count();
+
+                var commandStartedEvent = events.Next().Should().BeOfType<CommandStartedEvent>().Subject;
+                var command = commandStartedEvent.Command;
+                var areSessionsSupported = AreSessionsSupported(client);
+                command.Contains("lsid").Should().Be(areSessionsSupported);
+            }
+        }
+
         [Fact]
         public void TestCountOne()
         {
@@ -1227,7 +1251,7 @@ public void TestFindAndRemoveWithWriteConcernError()
             var collection = _database.GetCollection(_collection.Name, collectionSettings);
             var args = new FindAndRemoveArgs
             {
-                Query = Query.EQ("x", 1)              
+                Query = Query.EQ("x", 1)
             };
 
             BsonDocument modifiedDocument;
@@ -3504,6 +3528,12 @@ public void TestWithWriteConcern()
         }
 
         // private methods
+        private bool AreSessionsSupported(IMongoClient client)
+        {
+            var description = client.Cluster.Description;
+            return description.LogicalSessionTimeout.HasValue;
+        }
+
         private void CheckExpectedResult(ExpectedWriteConcernResult expectedResult, WriteConcernResult result)
         {
             Assert.Equal(expectedResult.DocumentsAffected ?? 0, result.DocumentsAffected);
diff --git a/tests/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests.csproj b/tests/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests.csproj
@@ -85,6 +85,7 @@
     <Compile Include="CommandResults\DatabaseStatsResultTests.cs" />
     <Compile Include="CommandResults\ValidateCollectionResultTests.cs" />
     <Compile Include="DefaultLegacyOperationExecutorTests.cs" />
+    <Compile Include="DisposableMongoClientExtensions.cs" />
     <Compile Include="FailPoint.cs" />
     <Compile Include="Jira\CSharp100Tests.cs" />
     <Compile Include="Jira\CSharp101Tests.cs" />
diff --git a/tests/MongoDB.Driver.Legacy.Tests/MongoDatabaseTests.cs b/tests/MongoDB.Driver.Legacy.Tests/MongoDatabaseTests.cs
@@ -17,6 +17,7 @@
 using System.Linq;
 using FluentAssertions;
 using MongoDB.Bson;
+using MongoDB.Bson.TestHelpers;
 using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver;
 using MongoDB.Driver.Builders;
@@ -322,6 +323,7 @@ public void TestGetCollection()
             Assert.Equal(_database.Name + "." + collectionName, collection.FullName);
             Assert.Equal(collectionName, collection.Name);
             Assert.Equal(_database.Settings.WriteConcern, collection.Settings.WriteConcern);
+            Assert.Equal(_database._operationExecutor(), collection.OperationExecutor);
         }
 
         [Fact]
@@ -333,6 +335,7 @@ public void TestGetCollectionGeneric()
             Assert.Equal(_database.Name + "." + collectionName, collection.FullName);
             Assert.Equal(collectionName, collection.Name);
             Assert.Equal(_database.Settings.WriteConcern, collection.Settings.WriteConcern);
+            Assert.Equal(_database._operationExecutor(), collection.OperationExecutor);
         }
 
         [Fact]
@@ -589,4 +592,9 @@ private void EnsureCollectionExists(string collectionName)
             _database.CreateCollection(collectionName);
         }
     }
+
+    internal static class MongoDatabaseReflector
+    {
+        public static IOperationExecutor _operationExecutor(this MongoDatabase obj) => (IOperationExecutor)Reflector.GetFieldValue(obj, nameof(_operationExecutor));
+    }
 }
diff --git a/tests/MongoDB.Driver.Legacy.Tests/MongoServerTests.cs b/tests/MongoDB.Driver.Legacy.Tests/MongoServerTests.cs
@@ -17,6 +17,7 @@
 using System.Linq;
 using FluentAssertions;
 using MongoDB.Bson;
+using MongoDB.Bson.TestHelpers;
 using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver;
 using MongoDB.Driver.Core.Clusters;
@@ -178,6 +179,7 @@ public void TestGetDatabase()
             var database = __server.GetDatabase("test", settings);
             Assert.Equal("test", database.Name);
             Assert.Equal(ReadPreference.Primary, database.Settings.ReadPreference);
+            Assert.Equal(database._operationExecutor(), __server._operationExecutor());
         }
 
         [Fact]
@@ -346,4 +348,9 @@ public void TestWithWriteConcern()
             result.WithWriteConcern(originalWriteConcern).Settings.Should().Be(subject.Settings);
         }
     }
+
+    internal static class MongoServerReflector
+    {
+        public static IOperationExecutor _operationExecutor(this MongoServer obj) => (IOperationExecutor)Reflector.GetFieldValue(obj, nameof(_operationExecutor));
+    }
 }
diff --git a/tests/MongoDB.Driver.TestHelpers/DisposableMongoClient.cs b/tests/MongoDB.Driver.TestHelpers/DisposableMongoClient.cs
@@ -34,6 +34,8 @@ public DisposableMongoClient(IMongoClient wrapped)
 
         public MongoClientSettings Settings => wrapped.Settings;
 
+        public IMongoClient Wrapped => wrapped;
+
         public void DropDatabase(string name, CancellationToken cancellationToken = default(CancellationToken))
         {
             wrapped.DropDatabase(name, cancellationToken);
diff --git a/tests/MongoDB.Driver.TestHelpers/DriverTestConfiguration.cs b/tests/MongoDB.Driver.TestHelpers/DriverTestConfiguration.cs
@@ -14,6 +14,9 @@
 */
 
 using System;
+using MongoDB.Driver.Core;
+using MongoDB.Driver.Core.Configuration;
+using MongoDB.Driver.TestHelpers;
 
 namespace MongoDB.Driver.Tests
 {
@@ -67,6 +70,30 @@ public static DatabaseNamespace DatabaseNamespace
         }
 
         // public static methods
+        public static DisposableMongoClient CreateDisposableClient()
+        {
+            return CreateDisposableClient((MongoClientSettings s) => { });
+        }
+
+        public static DisposableMongoClient CreateDisposableClient(Action<ClusterBuilder> clusterConfigurator)
+        {
+            return CreateDisposableClient((MongoClientSettings s) => s.ClusterConfigurator = clusterConfigurator);
+        }
+
+        public static DisposableMongoClient CreateDisposableClient(Action<MongoClientSettings> clientSettingsConfigurator)
+        {
+            var connectionString = CoreTestConfiguration.ConnectionString.ToString();
+            var clientSettings = MongoClientSettings.FromUrl(new MongoUrl(connectionString));
+            clientSettingsConfigurator(clientSettings);
+            var client = new MongoClient(clientSettings);
+            return new DisposableMongoClient(client);
+        }
+
+        public static DisposableMongoClient CreateDisposableClient(EventCapturer capturer)
+        {
+            return CreateDisposableClient((ClusterBuilder c) => c.Subscribe(capturer));
+        }
+
         public static MongoClientSettings GetClientSettings()
         {
             var connectionString = CoreTestConfiguration.ConnectionString.ToString();
diff --git a/tests/MongoDB.Driver.Tests/CausalConsistencyTests.cs b/tests/MongoDB.Driver.Tests/CausalConsistencyTests.cs
@@ -209,11 +209,7 @@ public void ReadConcern_should_include_level_when_not_using_the_server_default()
 
         private DisposableMongoClient GetClient(EventCapturer capturer)
         {
-            var connectionString = CoreTestConfiguration.ConnectionString.ToString();
-            var clientSettings = MongoClientSettings.FromUrl(new MongoUrl(connectionString));
-            clientSettings.ClusterConfigurator = cb => cb.Subscribe(capturer);
-
-            return new DisposableMongoClient(new MongoClient(clientSettings));
+            return DriverTestConfiguration.CreateDisposableClient(capturer);
         }
     }
 }
diff --git a/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs b/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs
@@ -183,12 +183,11 @@ private DisposableMongoClient GetClient()
 
         private DisposableMongoClient GetClient(Action<ClusterBuilder> clusterConfigurator)
         {
-            var connectionString = CoreTestConfiguration.ConnectionString.ToString();
-            var clientSettings = MongoClientSettings.FromUrl(new MongoUrl(connectionString));
-            clientSettings.RetryWrites = true;
-            clientSettings.ClusterConfigurator = clusterConfigurator;
-
-            return new DisposableMongoClient(new MongoClient(clientSettings));
+            return DriverTestConfiguration.CreateDisposableClient((MongoClientSettings clientSettings) =>
+            {
+                clientSettings.ClusterConfigurator = clusterConfigurator;
+                clientSettings.RetryWrites = true;
+            });
         }
 
         private DisposableMongoClient GetClient(EventCapturer capturer)

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ public virtual MongoCollection<TDefaultDocument> GetCollection<TDefaultDocument>`
`559`	`559`	`public virtual MongoCollection<TDefaultDocument> GetCollection<TDefaultDocument>(`
`560`	`560`	`string collectionName, MongoCollectionSettings collectionSettings)`
`561`	`561`	`{`
`562`		`- return new MongoCollection<TDefaultDocument>(this, collectionName, collectionSettings);`
	`562`	`+ return new MongoCollection<TDefaultDocument>(this, collectionName, collectionSettings, _operationExecutor);`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`/// <summary>`
`@@ -638,8 +638,12 @@ public virtual MongoCollection GetCollection(Type defaultDocumentType, string co`
`638`	`638`	`{`
`639`	`639`	`var collectionDefinition = typeof(MongoCollection<>);`
`640`	`640`	`var collectionType = collectionDefinition.MakeGenericType(defaultDocumentType);`
`641`		`- var constructorInfo = collectionType.GetTypeInfo().GetConstructor(new Type[] { typeof(MongoDatabase), typeof(string), typeof(MongoCollectionSettings) });`
`642`		`- return (MongoCollection)constructorInfo.Invoke(new object[] { this, collectionName, collectionSettings });`
	`641`	`+ var constructorParameterTypes = new Type[] { typeof(MongoDatabase), typeof(string), typeof(MongoCollectionSettings), typeof(IOperationExecutor) };`
	`642`	`+ var constructorInfo = collectionType.GetTypeInfo()`
	`643`	`+ .GetConstructors(BindingFlags.NonPublic \| BindingFlags.Instance)`
	`644`	`+ .Where(c => c.GetParameters().Select(p => p.ParameterType).SequenceEqual(constructorParameterTypes))`
	`645`	`+ .Single();`
	`646`	`+ return (MongoCollection)constructorInfo.Invoke(new object[] { this, collectionName, collectionSettings, _operationExecutor });`
`643`	`647`	`}`
`644`	`648`
`645`	`649`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`using System.Linq;`
`18`	`18`	`using FluentAssertions;`
`19`	`19`	`using MongoDB.Bson;`
	`20`	`+using MongoDB.Bson.TestHelpers;`
`20`	`21`	`using MongoDB.Bson.TestHelpers.XunitExtensions;`
`21`	`22`	`using MongoDB.Driver;`
`22`	`23`	`using MongoDB.Driver.Builders;`
`@@ -322,6 +323,7 @@ public void TestGetCollection()`
`322`	`323`	`Assert.Equal(_database.Name + "." + collectionName, collection.FullName);`
`323`	`324`	`Assert.Equal(collectionName, collection.Name);`
`324`	`325`	`Assert.Equal(_database.Settings.WriteConcern, collection.Settings.WriteConcern);`
	`326`	`+ Assert.Equal(_database._operationExecutor(), collection.OperationExecutor);`
`325`	`327`	`}`
`326`	`328`
`327`	`329`	`[Fact]`
`@@ -333,6 +335,7 @@ public void TestGetCollectionGeneric()`
`333`	`335`	`Assert.Equal(_database.Name + "." + collectionName, collection.FullName);`
`334`	`336`	`Assert.Equal(collectionName, collection.Name);`
`335`	`337`	`Assert.Equal(_database.Settings.WriteConcern, collection.Settings.WriteConcern);`
	`338`	`+ Assert.Equal(_database._operationExecutor(), collection.OperationExecutor);`
`336`	`339`	`}`
`337`	`340`
`338`	`341`	`[Fact]`
`@@ -589,4 +592,9 @@ private void EnsureCollectionExists(string collectionName)`
`589`	`592`	`_database.CreateCollection(collectionName);`
`590`	`593`	`}`
`591`	`594`	`}`
	`595`	`+`
	`596`	`+ internal static class MongoDatabaseReflector`
	`597`	`+ {`
	`598`	`+ public static IOperationExecutor _operationExecutor(this MongoDatabase obj) => (IOperationExecutor)Reflector.GetFieldValue(obj, nameof(_operationExecutor));`
	`599`	`+ }`
`592`	`600`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ public DisposableMongoClient(IMongoClient wrapped)`
`34`	`34`
`35`	`35`	`public MongoClientSettings Settings => wrapped.Settings;`
`36`	`36`
	`37`	`+ public IMongoClient Wrapped => wrapped;`
	`38`	`+`
`37`	`39`	`public void DropDatabase(string name, CancellationToken cancellationToken = default(CancellationToken))`
`38`	`40`	`{`
`39`	`41`	`wrapped.DropDatabase(name, cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -209,11 +209,7 @@ public void ReadConcern_should_include_level_when_not_using_the_server_default()`
`209`	`209`
`210`	`210`	`private DisposableMongoClient GetClient(EventCapturer capturer)`
`211`	`211`	`{`
`212`		`- var connectionString = CoreTestConfiguration.ConnectionString.ToString();`
`213`		`- var clientSettings = MongoClientSettings.FromUrl(new MongoUrl(connectionString));`
`214`		`- clientSettings.ClusterConfigurator = cb => cb.Subscribe(capturer);`
`215`		`-`
`216`		`- return new DisposableMongoClient(new MongoClient(clientSettings));`
	`212`	`+ return DriverTestConfiguration.CreateDisposableClient(capturer);`
`217`	`213`	`}`
`218`	`214`	`}`
`219`	`215`	`}`