Use paket magic mode to ensure v4.4.0

Add Benchmark.csproj Use some C# 7 features in AST composition
bchavez · Apr 25, 2017 · 4eb6361 · 4eb6361
1 parent cb56e79
commit 4eb6361
Show file tree

Hide file tree

Showing 19 changed files with 489 additions and 208 deletions.
diff --git a/.paket/paket.bootstrapper.exe → .paket/paket.exe b/.paket/paket.bootstrapper.exe → .paket/paket.exe
diff --git a/.paket/paket.targets b/.paket/paket.targets
diff --git a/Builder/build.fsx b/Builder/build.fsx
@@ -45,10 +45,14 @@ let TestGridProject = TestProject("RethinkDb.Driver.ReGrid.Tests", Folders)
 
 open AssemblyInfoFile
 
-let MakeAttributes (includeSnk:bool) (testProjects : string list ) =
+let MakeAttributes (includeSnk:bool) (testProjects : string list ) =   
     let attrs = [
-                    Attribute.Description GitHubUrl
+                   Attribute.Description GitHubUrl
                 ]
+                @ if not includeSnk then
+                      [ Attribute.InternalsVisibleTo("Benchmark") ]
+                  else
+                      []
 
     let mapInternalName (projectName : string) = 
         if includeSnk then

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,6 @@
+## v2.3.18
+* Use some C# 7 features in AST composition for performance.
+
 ## v2.3.17
 * Move to Visual Studio 2017 RTM Build Tools
 * .NET Core Tooling and Framework Reference Update

diff --git a/Source/Benchmark/App.config b/Source/Benchmark/App.config
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/Source/Benchmark/BenchReqlAst.cs b/Source/Benchmark/BenchReqlAst.cs
@@ -0,0 +1,56 @@
+using System;
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes.Exporters;
+using RethinkDb.Driver;
+using RethinkDb.Driver.Ast;
+
+namespace Benchmark
+{
+    [RPlotExporter]
+    public class BenchReqlAst
+    {
+        RethinkDB R = RethinkDB.R;
+
+        [Benchmark]
+        public void CSharp7()
+        {
+            R.Db("Test")
+                .Table("Foo")
+                .Insert(new
+                    {
+                        someValue = "fff",
+                        someObject = new
+                            {
+                                someNested = 25,
+                                someNested2 = false
+                            },
+                        someOtherProp = Guid.Parse("E111E216-EBD6-47CE-B2DE-CE5F60E2FA8F")
+                    })
+                    .Filter( x => x["someRow"] == 25)
+                    .Filter( x => x["someOtherRow"].Gt(44))
+                    .Delete()
+                    .Build();
+        }
+
+        [Benchmark]
+        public void CSharp6()
+        {
+            R.Db("Test")
+                .Table("Foo")
+                .Insert(new
+                    {
+                        someValue = "fff",
+                        someObject = new
+                            {
+                                someNested = 25,
+                                someNested2 = false
+                            },
+                        someOtherProp = Guid.Parse("E111E216-EBD6-47CE-B2DE-CE5F60E2FA8F")
+                    })
+                .Filter(x => x["someRow"] == 25)
+                .Filter(x => x["someOtherRow"].Gt(44))
+                .Delete()
+                .Build();
+        }
+    }
+}