async multiplexed / pipeline implemented 1.24

Dapper NET40/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.23.0.0")]
-[assembly: AssemblyFileVersion("1.23.0.0")]
+[assembly: AssemblyVersion("1.24.0.0")]
+[assembly: AssemblyFileVersion("1.24.0.0")]

Dapper NET45/SqlMapperAsync.cs

@@ -71,6 +71,7 @@ public static Task<int> ExecuteAsync(this IDbConnection cnn, CommandDefinition c
                 return ExecuteImplAsync(cnn, command, param);
             }
         }
+       
         private static async Task<int> ExecuteMultiImplAsync(IDbConnection cnn, CommandDefinition command, IEnumerable multiExec)
         {
             bool isFirst = true;
@@ -79,26 +80,57 @@ private static async Task<int> ExecuteMultiImplAsync(IDbConnection cnn, CommandD
             try
             {
                 if (wasClosed) await ((DbConnection)cnn).OpenAsync().ConfigureAwait(false);
-                using (var cmd = (DbCommand)command.SetupCommand(cnn, null))
+                
+                CacheInfo info = null;
+                if ((command.Flags & CommandFlags.Pipelined) != 0)
                 {
-                    string masterSql = null;
-                    CacheInfo info = null;
+                    const int MAX_PENDING = 100;
+                    var pending = new Queue<Task<int>>(MAX_PENDING);
                     foreach (var obj in multiExec)
                     {
+                        var cmd = (DbCommand)command.SetupCommand(cnn, null);
                         if (isFirst)
                         {
-                            masterSql = cmd.CommandText;
                             isFirst = false;
                             var identity = new Identity(command.CommandText, cmd.CommandType, cnn, null, obj.GetType(), null);
                             info = GetCacheInfo(identity, obj);
                         }
-                        else
+                        info.ParamReader(cmd, obj);
+                        var task = cmd.ExecuteNonQueryAsync(command.CancellationToken);
+                        pending.Enqueue(task);
+                        if(pending.Count == MAX_PENDING)
                         {
-                            cmd.CommandText = masterSql; // because we do magic replaces on "in" etc
-                            cmd.Parameters.Clear(); // current code is Add-tastic
+                            total += await pending.Dequeue().ConfigureAwait(false);
+                        }
+                    }
+                    while(pending.Count != 0)
+                    {
+                        total += await pending.Dequeue().ConfigureAwait(false);
+                    }
+                    return total;
+                }
+                else
+                {
+                    using (var cmd = (DbCommand)command.SetupCommand(cnn, null))
+                    {
+                        string masterSql = null;
+                        foreach (var obj in multiExec)
+                        {
+                            if (isFirst)
+                            {
+                                masterSql = cmd.CommandText;
+                                isFirst = false;
+                                var identity = new Identity(command.CommandText, cmd.CommandType, cnn, null, obj.GetType(), null);
+                                info = GetCacheInfo(identity, obj);
+                            }
+                            else
+                            {
+                                cmd.CommandText = masterSql; // because we do magic replaces on "in" etc
+                                cmd.Parameters.Clear(); // current code is Add-tastic
+                            }
+                            info.ParamReader(cmd, obj);
+                            total += await cmd.ExecuteNonQueryAsync(command.CancellationToken).ConfigureAwait(false);
                         }
-                        info.ParamReader(cmd, obj);
-                        total += await cmd.ExecuteNonQueryAsync().ConfigureAwait(false);
                     }
                 }
             }

Dapper.Contrib.Tests/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.23.0.0")]
-[assembly: AssemblyFileVersion("1.23.0.0")]
+[assembly: AssemblyVersion("1.24.0.0")]
+[assembly: AssemblyFileVersion("1.24.0.0")]

Dapper.Contrib/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.23.0.0")]
-[assembly: AssemblyFileVersion("1.23.0.0")]
+[assembly: AssemblyVersion("1.24.0.0")]
+[assembly: AssemblyFileVersion("1.24.0.0")]

Dapper.SqlBuilder/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.23.0.0")]
-[assembly: AssemblyFileVersion("1.23.0.0")]
+[assembly: AssemblyVersion("1.24.0.0")]
+[assembly: AssemblyFileVersion("1.24.0.0")]

DapperTests NET35/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.23.0.0")]
-[assembly: AssemblyFileVersion("1.23.0.0")]
+[assembly: AssemblyVersion("1.24.0.0")]
+[assembly: AssemblyFileVersion("1.24.0.0")]

DapperTests NET45/Program.cs

@@ -16,9 +16,16 @@ static void Main()
         }
         public static readonly string connectionString = "Data Source=.;Initial Catalog=tempdb;Integrated Security=True";
 
-        public static SqlConnection GetOpenConnection()
+        public static SqlConnection GetOpenConnection(bool mars = false)
         {
-            var connection = new SqlConnection(connectionString);
+            var cs = connectionString;
+            if (mars)
+            {
+                SqlConnectionStringBuilder scsb = new SqlConnectionStringBuilder(cs);
+                scsb.MultipleActiveResultSets = true;
+                cs = scsb.ConnectionString;
+            }
+            var connection = new SqlConnection(cs);
             connection.Open();
             return connection;
         }

DapperTests NET45/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.23.0.0")]
-[assembly: AssemblyFileVersion("1.23.0.0")]
+[assembly: AssemblyVersion("1.24.0.0")]
+[assembly: AssemblyFileVersion("1.24.0.0")]

DapperTests NET45/Tests.cs

@@ -2,6 +2,7 @@
 using Dapper;
 using SqlMapper;
 using System.Data;
+using System.Diagnostics;
 
 namespace DapperTests_NET45
 {
@@ -207,6 +208,26 @@ public void LiteralIn()
             }
         }
 
+
+        public void RunSequentialVersusParallel()
+        {
+
+            var ids = Enumerable.Range(1, 2000).Select(id => new { id }).ToArray();
+            using (var connection = Program.GetOpenConnection(true))
+            {
+                connection.ExecuteAsync(new CommandDefinition("select @id", ids.Take(5), flags: CommandFlags.None)).Wait();
+
+                var watch = Stopwatch.StartNew();
+                connection.ExecuteAsync(new CommandDefinition("select @id", ids, flags: CommandFlags.None)).Wait();
+                watch.Stop();
+                System.Console.WriteLine("No pipeline: {0}ms", watch.ElapsedMilliseconds);
+
+                watch = Stopwatch.StartNew();
+                connection.ExecuteAsync(new CommandDefinition("select @id", ids, flags: CommandFlags.Pipelined)).Wait();
+                watch.Stop();
+                System.Console.WriteLine("Pipeline: {0}ms", watch.ElapsedMilliseconds);
+            }
+        }
         class Product
         {
             public int Id { get; set; }

Tests/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.23.0.0")]
-[assembly: AssemblyFileVersion("1.23.0.0")]
+[assembly: AssemblyVersion("1.24.0.0")]
+[assembly: AssemblyFileVersion("1.24.0.0")]

Tests/Tests.cs

@@ -2697,25 +2697,46 @@ enum AnEnum
             A = 2,
             B = 1
         }
+        enum AnotherEnum : byte
+        {
+            A = 2,
+            B = 1
+        }
         public void LiteralReplacementEnumAndString()
         {
-            var args = new { x = AnEnum.B, y = 123.45M };
-            var row = connection.Query("select {=x} as x,{=y} as y", args).Single();
+            var args = new { x = AnEnum.B, y = 123.45M, z = AnotherEnum.A };
+            var row = connection.Query("select {=x} as x,{=y} as y,cast({=z} as tinyint) as z", args).Single();
             AnEnum x = (AnEnum)(int)row.x;
             decimal y = row.y;
+            AnotherEnum z = (AnotherEnum)(byte)row.z;
             x.Equals(AnEnum.B);
             y.Equals(123.45M);
+            z.Equals(AnotherEnum.A);
         }
         public void LiteralReplacementDynamicEnumAndString()
         {
             var args = new DynamicParameters();
             args.Add("x", AnEnum.B);
             args.Add("y", 123.45M);
-            var row = connection.Query("select {=x} as x,{=y} as y", args).Single();
+            args.Add("z", AnotherEnum.A);
+            var row = connection.Query("select {=x} as x,{=y} as y,cast({=z} as tinyint) as z", args).Single();
             AnEnum x = (AnEnum)(int)row.x;
             decimal y = row.y;
+            AnotherEnum z = (AnotherEnum)(byte)row.z;
             x.Equals(AnEnum.B);
             y.Equals(123.45M);
+            z.Equals(AnotherEnum.A);
+        }
+
+        public void LiteralReplacementWithIn()
+        {
+            var data = connection.Query<MyRow>("select @x where 1 in @ids and 1 ={=a}",
+                new { x = 1, ids = new[] { 1, 2, 3 }, a = 1 }).ToList();
+        }
+
+        class MyRow
+        {
+            public int x { get; set; }
         }
 
         public void LiteralIn()

dapper.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata schemaVersion="2">
     <id>Dapper</id>
-    <version>1.23</version>
+    <version>1.24</version>
     <title>Dapper dot net</title>
     <authors>Sam Saffron,Marc Gravell</authors>
     <owners>Sam Saffron,Marc Gravell</owners>
@@ -19,6 +19,7 @@
       <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.0-Client, .NETFramework4.0" />
     </frameworkAssemblies>
     <releaseNotes>
+      * 1.24    - Implement pipelined async multi-exec, when flag is specified (only - requires MARS etc)
       * 1.23    - Improved support for optimize hints (@foo unknown) with list expansions
       * 1.22    - Literal support now extends to enumerable types (for "in" etc usage); move to command-flags model for "buffered" etc
       * 1.21    - Limit literals to numeric types; for enums, use value not name