Minor optimizations

Author: ENikS

package.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>5.8.4</Version>
+    <Version>5.8.5</Version>
     <PackageReleaseNotes>This package is distributed as .NET Standard 1.0, .NET 4.0, 4.5, 4.6, 4.7 package.</PackageReleaseNotes>
   </PropertyGroup>
 

src/Builder/BuilderContext.cs

@@ -62,7 +62,7 @@ public BuilderContext(IBuilderContext original, IEnumerable<BuilderStrategy> cha
             _ownsOverrides = true;
         }
 
-        protected BuilderContext(IBuilderContext original, InternalRegistration registration)
+        internal BuilderContext(IBuilderContext original, InternalRegistration registration)
         {
             var parent = (BuilderContext)original;
 

src/UnityContainer.Implementation.cs

@@ -73,7 +73,6 @@ public partial class UnityContainer
         internal GetPolicyDelegate GetPolicy;
         internal SetPolicyDelegate SetPolicy;
         internal ClearPolicyDelegate ClearPolicy;
-        internal Func<Type, string, bool> RegistrationExists;
 
         private Func<Type, string, IPolicySet> _get;
         private Func<Type, string, Type, IPolicySet> _getGenericRegistration;
@@ -115,7 +114,6 @@ public UnityContainer()
             GetPolicy = Get;
             SetPolicy = Set;
             ClearPolicy = Clear;
-            RegistrationExists = (type, name) => null != _get(type, name);
 
             // TODO: Initialize disposables 
             _lifetimeContainer.Add(_strategies);
@@ -180,7 +178,6 @@ private UnityContainer(UnityContainer parent)
             GetPolicy = parent.GetPolicy;
             SetPolicy = CreateAndSetPolicy;
             ClearPolicy = delegate { };
-            RegistrationExists = (type, name) => null != _get(type, name);
 
             // Strategies
             _strategies = _parent._strategies;

src/UnityContainer.Registration.cs

@@ -217,6 +217,67 @@ private bool IsTypeTypeExplicitlyRegisteredLocally(Type type)
             return _parent?._isTypeExplicitlyRegistered(type) ?? false;
         }
 
+        internal bool RegistrationExists(Type type, string name)
+        {
+            IPolicySet defaultRegistration = null;
+            IPolicySet noNameRegistration = null;
+
+            var hashCode = (type?.GetHashCode() ?? 0) & 0x7FFFFFFF;
+            for (var container = this; null != container; container = container._parent)
+            {
+                if (null == _registrations) continue;
+
+                var targetBucket = hashCode % container._registrations.Buckets.Length;
+                for (var i = container._registrations.Buckets[targetBucket]; i >= 0; i = container._registrations.Entries[i].Next)
+                {
+                    if (container._registrations.Entries[i].HashCode != hashCode ||
+                        container._registrations.Entries[i].Key != type)
+                    {
+                        continue;
+                    }
+
+                    var registry = container._registrations.Entries[i].Value;
+
+                    if (null != registry[name]) return true;
+                    if (null == defaultRegistration) defaultRegistration = registry[string.Empty];
+                    if (null != name && null == noNameRegistration) noNameRegistration = registry[null];
+                }
+            }
+
+            if (null != defaultRegistration) return true;
+            if (null != noNameRegistration) return true;
+
+            var info = type.GetTypeInfo();
+            if (!info.IsGenericType) return false;
+
+            type = info.GetGenericTypeDefinition();
+            hashCode = (type?.GetHashCode() ?? 0) & 0x7FFFFFFF;
+            for (var container = this; null != container; container = container._parent)
+            {
+                if (null == _registrations) continue;
+
+                var targetBucket = hashCode % container._registrations.Buckets.Length;
+                for (var i = container._registrations.Buckets[targetBucket]; i >= 0; i = container._registrations.Entries[i].Next)
+                {
+                    if (container._registrations.Entries[i].HashCode != hashCode ||
+                        container._registrations.Entries[i].Key != type)
+                    {
+                        continue;
+                    }
+
+                    var registry = container._registrations.Entries[i].Value;
+
+                    if (null != registry[name]) return true;
+                    if (null == defaultRegistration) defaultRegistration = registry[string.Empty];
+                    if (null != name && null == noNameRegistration) noNameRegistration = registry[null];
+                }
+            }
+
+            if (null != defaultRegistration) return true;
+            return null != noNameRegistration;
+        }
+
+
         #endregion
 
 

tests/Unity.Specification/Unity.Specification.Tests.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0-preview-20180307-01" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0-beta2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0-beta2" />
   </ItemGroup>

tests/Unity.Tests/Unity.Tests.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0-preview-20180307-01" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0-beta2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0-beta2" />
   </ItemGroup>