Update dictionary

usausa · Sep 6, 2019 · 03bf536 · 03bf536
1 parent 9616a63
commit 03bf536
Show file tree

Hide file tree

Showing 12 changed files with 273 additions and 61 deletions.
diff --git a/Example.GenericHost/Example.GenericHost.csproj b/Example.GenericHost/Example.GenericHost.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
-    <PackageReference Include="Usa.Smart.Core" Version="1.7.7" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.7.8-beta1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Example.WebApplication/Example.WebApplication.csproj b/Example.WebApplication/Example.WebApplication.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.6" />
-    <PackageReference Include="Usa.Smart.Core" Version="1.7.7" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.7.8-beta1" />
     <PackageReference Include="Usa.Smart.Data" Version="1.2.0" />
   </ItemGroup>
 

diff --git a/Smart.Resolver.Benchmark/Smart.Resolver.Benchmark.csproj b/Smart.Resolver.Benchmark/Smart.Resolver.Benchmark.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Usa.Smart.Core" Version="1.7.7" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.7.8-beta1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...olver.Extensions.DependencyInjection/Smart.Resolver.Extensions.DependencyInjection.csproj b/...olver.Extensions.DependencyInjection/Smart.Resolver.Extensions.DependencyInjection.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Usa.Smart.Core" Version="1.7.7" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.7.8-beta1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Smart.Resolver.Tests/Smart.Resolver.Tests.csproj b/Smart.Resolver.Tests/Smart.Resolver.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Usa.Smart.Core" Version="1.7.7" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.7.8-beta1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Smart.Resolver.Xamarin/Smart.Resolver.Xamarin.csproj b/Smart.Resolver.Xamarin/Smart.Resolver.Xamarin.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Usa.Smart.Core" Version="1.7.7" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.7.8-beta1" />
     <PackageReference Include="Xamarin.Forms" Version="4.2.0.709249">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>

diff --git a/Smart.Resolver.ruleset b/Smart.Resolver.ruleset
@@ -20,6 +20,7 @@
     <Rule Id="SA1402" Action="Hidden" />
     <Rule Id="SA1413" Action="Hidden" />
     <Rule Id="SA1512" Action="Hidden" />
+    <Rule Id="SA1513" Action="Hidden" />
     <Rule Id="SA1515" Action="Hidden" />
     <Rule Id="SA1600" Action="Hidden" />
     <Rule Id="SA1606" Action="Hidden" />

diff --git a/Smart.Resolver/Resolver/RequestKey.cs b/Smart.Resolver/Resolver/RequestKey.cs
diff --git a/Smart.Resolver/Resolver/RequestKeyComparer.cs b/Smart.Resolver/Resolver/RequestKeyComparer.cs
diff --git a/Smart.Resolver/Resolver/SmartResolver.cs b/Smart.Resolver/Resolver/SmartResolver.cs
@@ -35,7 +35,7 @@ public FactoryEntry(bool canGet, Func<IResolver, object> single, Func<IResolver,
 
         private readonly ThreadsafeTypeHashArrayMap<FactoryEntry> factoriesCache = new ThreadsafeTypeHashArrayMap<FactoryEntry>();
 
-        private readonly ThreadsafeHashArrayMap<RequestKey, FactoryEntry> factoriesCacheWithConstraint = new ThreadsafeHashArrayMap<RequestKey, FactoryEntry>(RequestKeyComparer.Default);
+        private readonly TypeConstraintHashArray<FactoryEntry> factoriesCacheWithConstraint = new TypeConstraintHashArray<FactoryEntry>();
 
         private readonly ThreadsafeTypeHashArrayMap<Action<IResolver, object>[]> injectorsCache = new ThreadsafeTypeHashArrayMap<Action<IResolver, object>[]>();
 
@@ -194,10 +194,9 @@ private FactoryEntry FindFactoryEntry(Type type)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private FactoryEntry FindFactoryEntry(Type type, IConstraint constraint)
         {
-            var key = new RequestKey(type, constraint);
-            if (!factoriesCacheWithConstraint.TryGetValue(key, out var entry))
+            if (!factoriesCacheWithConstraint.TryGetValue(type, constraint, out var entry))
             {
-                entry = factoriesCacheWithConstraint.AddIfNotExist(key, x => CreateFactoryEntry(x.Type, x.Constraint, this));
+                entry = factoriesCacheWithConstraint.AddIfNotExist(type, constraint, (t, c) => CreateFactoryEntry(t, c, this));
             }
 
             return entry;
@@ -217,10 +216,9 @@ private FactoryEntry FindFactoryEntry(IResolver resolver, Type type)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private FactoryEntry FindFactoryEntry(IResolver resolver, Type type, IConstraint constraint)
         {
-            var key = new RequestKey(type, constraint);
-            if (!factoriesCacheWithConstraint.TryGetValue(key, out var entry))
+            if (!factoriesCacheWithConstraint.TryGetValue(type, constraint, out var entry))
             {
-                entry = factoriesCacheWithConstraint.AddIfNotExist(key, x => CreateFactoryEntry(x.Type, x.Constraint, resolver));
+                entry = factoriesCacheWithConstraint.AddIfNotExist(type, constraint, (t, c) => CreateFactoryEntry(t, c, resolver));
             }
 
             return entry;