Merge pull request #18 from servicetitan/string-comparison

Use StringComparison.Ordinal to speedup string comparison

Author: alex-kulakov

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs

@@ -9,12 +9,10 @@
 using System.Data.Common;
 using System.Data.SqlClient;
 using System.Linq;
-using System.Text.RegularExpressions;
 using Xtensive.Core;
 using Xtensive.Orm;
 using Xtensive.Sql.Info;
 using SqlServerConnection = System.Data.SqlClient.SqlConnection;
-using JetBrains.Annotations;
 
 namespace Xtensive.Sql.Drivers.SqlServer
 {
@@ -56,7 +54,7 @@ private static bool IsAzure(SqlServerConnection connection)
     {
       using (var command = connection.CreateCommand()) {
         command.CommandText = "SELECT @@VERSION";
-        return ((string) command.ExecuteScalar()).Contains("Azure");
+        return ((string) command.ExecuteScalar()).IndexOf("Azure", StringComparison.Ordinal) >= 0;
       }
     }
 
@@ -66,7 +64,7 @@ protected override string BuildConnectionString(UrlInfo url)
       SqlHelper.ValidateConnectionUrl(url);
 
       var builder = new SqlConnectionStringBuilder();
-      
+
       // host, port, database
       if (url.Port==0)
         builder.DataSource = url.Host;

Orm/Xtensive.Orm/Core/Extensions/StringExtensions.cs

@@ -22,11 +22,11 @@ public static class StringExtensions
     /// </summary>
     /// <param name="value">The original string value.</param>
     /// <param name="suffix">The suffix to cut.</param>
-    /// <returns>String without <paramref name="suffix"/> if it was found; 
+    /// <returns>String without <paramref name="suffix"/> if it was found;
     /// otherwise, original <paramref name="value"/>.</returns>
     public static string TryCutSuffix(this string value, string suffix)
     {
-      if (!value.EndsWith(suffix))
+      if (!value.EndsWith(suffix, StringComparison.Ordinal))
         return value;
       return value.Substring(0, value.Length - suffix.Length);
     }
@@ -36,11 +36,11 @@ public static string TryCutSuffix(this string value, string suffix)
     /// </summary>
     /// <param name="value">The original string value.</param>
     /// <param name="prefix">The prefix to cut.</param>
-    /// <returns>String without <paramref name="prefix"/> if it was found; 
+    /// <returns>String without <paramref name="prefix"/> if it was found;
     /// otherwise, original <paramref name="value"/>.</returns>
     public static string TryCutPrefix(this string value, string prefix)
     {
-      if (!value.StartsWith(prefix))
+      if (!value.StartsWith(prefix, StringComparison.Ordinal))
         return value;
       return value.Substring(prefix.Length);
     }
@@ -412,7 +412,7 @@ public static bool Like(this string value, string sqlLikePattern, char escapeCha
           if (match.Value=="_") {
             return ".";
           }
-          if(match.Value.StartsWith(escapeCharacter.ToString())) {
+          if(match.Value.StartsWith(escapeCharacter.ToString(), StringComparison.Ordinal)) {
             return match.Value[1].ToString();
           }
           return Regex.Escape(match.Value);
@@ -429,12 +429,20 @@ public static string StripRoundBrackets(this string value)
     {
       var start = 0;
       var end = value.Length - 1;
-      var actualLenght = value.Length;
-      for (start = 0; value[start++]=='(' && value[end--]==')'; actualLenght -= 2) { }
+      var actualLength = value.Length;
+      for (start = 0; value[start++]=='(' && value[end--]==')'; actualLength -= 2) { }
 
       return start == 1
         ? value
-        : value.Substring(start - 1, actualLenght);
+        : value.Substring(start - 1, actualLength);
+    }
+
+    internal static bool Contains(this string str, string value, StringComparison comparison)
+    {
+      ArgumentValidator.EnsureArgumentNotNull(str, nameof(str));
+      ArgumentValidator.EnsureArgumentNotNull(value, nameof(value));
+
+      return str.IndexOf(value, comparison) >= 0;
     }
 
   }

Orm/Xtensive.Orm/Orm/Building/Builders/ModelBuilder.cs

@@ -156,7 +156,7 @@ private void BuildPrefetchActions()
         var action = actionContainer.BuildPrefetchAction();
         domain.PrefetchActionMap.Add(type, action);
       }
-    } 
+    }
 
     private void BuildTypes(IEnumerable<TypeDef> typeDefs)
     {
@@ -177,7 +177,7 @@ private void BuildTypes(IEnumerable<TypeDef> typeDefs)
     private void PreprocessAssociations()
     {
       foreach (var typeInfo in context.Model.Types.Where(t => t.IsEntity && !t.IsAuxiliary)) {
-        
+
         // pair integrity escalation and consistency check
         typesWithProcessedInheritedAssociations.Add(typeInfo);
         var refFields = typeInfo.Fields.Where(f => f.IsEntity || f.IsEntitySet).ToList();
@@ -368,12 +368,12 @@ private void BuildAuxiliaryTypes(IEnumerable<AssociationInfo> associations)
         // Updating fields names only if types differ.
         if (masterType != slaveType) {
           try {
-            if (!masterType.Name.Contains("."))
+            if (!masterType.Name.Contains(".", StringComparison.Ordinal))
               masterFieldDef.MappingName = context.NameBuilder.ApplyNamingRules(masterType.Name);
           }
           catch(DomainBuilderException){}
           try {
-            if (!slaveType.Name.Contains("."))
+            if (!slaveType.Name.Contains(".", StringComparison.Ordinal))
               slaveFieldDef.MappingName = context.NameBuilder.ApplyNamingRules(slaveType.Name);
           }
           catch (DomainBuilderException){}

Orm/Xtensive.Orm/Orm/Building/Builders/StorageMappingBuilder.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Xtensive LLC.
+// Copyright (C) 2012 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Denis Krjuchkov
@@ -25,7 +25,7 @@ private struct MappingRequest : IEquatable<MappingRequest>
 
       public bool Equals(MappingRequest other)
       {
-        return Equals(Assembly, other.Assembly) && string.Equals(Namespace, other.Namespace);
+        return Equals(Assembly, other.Assembly) && string.Equals(Namespace, other.Namespace, StringComparison.Ordinal);
       }
 
       public override bool Equals(object obj)
@@ -131,7 +131,7 @@ private static bool RuleMatch(MappingRule rule, Type type)
       var assemblyMatch =
         rule.Assembly==null || rule.Assembly==type.Assembly;
       var namespaceMatch =
-        string.IsNullOrEmpty(rule.Namespace) || type.FullName.StartsWith(rule.Namespace + ".");
+        string.IsNullOrEmpty(rule.Namespace) || type.FullName.StartsWith(rule.Namespace + ".", StringComparison.Ordinal);
       return assemblyMatch && namespaceMatch;
     }
 

Orm/Xtensive.Orm/Orm/Configuration/Internals/ConnectionInfoParser.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Xtensive LLC.
+// Copyright (C) 2013 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Denis Krjuchkov
@@ -35,7 +35,7 @@ private static string ExpandConnectionString(System.Configuration.Configuration
     {
       const string prefix = "#";
 
-      if (!connectionString.StartsWith(prefix))
+      if (!connectionString.StartsWith(prefix, StringComparison.Ordinal))
         return connectionString;
 
       string connectionStringName = connectionString.Substring(prefix.Length);

Orm/Xtensive.Orm/Orm/Configuration/Internals/DomainTypeRegistrationHandler.cs

@@ -11,11 +11,11 @@
 namespace Xtensive.Orm.Configuration
 {
   /// <summary>
-  /// <see cref="ITypeRegistrationProcessor"/> for processing <see cref="SessionBound"/> 
-  /// and <see cref="IEntity"/> descendants registration in 
+  /// <see cref="ITypeRegistrationProcessor"/> for processing <see cref="SessionBound"/>
+  /// and <see cref="IEntity"/> descendants registration in
   /// <see cref="DomainConfiguration.Types"/> registry.
   /// </summary>
-  /// <remarks>This implementation provides topologically sorted list 
+  /// <remarks>This implementation provides topologically sorted list
   /// of <see cref="Type"/>s.</remarks>
   internal sealed class DomainTypeRegistrationHandler : TypeRegistrationProcessorBase
   {
@@ -32,7 +32,7 @@ protected override bool IsAcceptable(TypeRegistration registration, Type type)
     {
       // Disallow implicit (via assembly scan) registration of types in Orm.Providers namespace
       return base.IsAcceptable(registration, type)
-        && (registration.Type!=null || !type.FullName.StartsWith(providersNamespace));
+        && (registration.Type!=null || !type.FullName.StartsWith(providersNamespace, StringComparison.Ordinal));
     }
 
     /// <inheritdoc/>
@@ -42,7 +42,7 @@ protected override void Process(TypeRegistry registry, TypeRegistration registra
         return;
       if (!DomainTypeRegistry.IsInterestingType(type))
         return;
-      // The type is interesting; 
+      // The type is interesting;
       // If it is a persistent type, let's register all its bases
       if (DomainTypeRegistry.IsPersistentType(type))
         Process(registry, registration, type.BaseType);

Orm/Xtensive.Orm/Orm/EntitySetBase.cs

@@ -159,7 +159,7 @@ protected void EnsureOwnerIsNotRemoved()
       if (Owner.IsRemoved)
         throw new InvalidOperationException(Strings.ExEntityIsRemoved);
     }
-    
+
     #region System-level event-like members
 
     private void SystemInitialize()
@@ -369,7 +369,7 @@ protected void NotifyCollectionChanged(NotifyCollectionChangedAction action, Ent
       var subscriptionInfo = GetSubscription(EntityEventBroker.CollectionChangedEventKey);
       if (subscriptionInfo.Second != null) {
         var handler = (NotifyCollectionChangedEventHandler) subscriptionInfo.Second;
-        if (action==NotifyCollectionChangedAction.Reset) 
+        if (action==NotifyCollectionChangedAction.Reset)
           handler.Invoke(this, new NotifyCollectionChangedEventArgs(action));
         else if (!index.HasValue) {
           if (action==NotifyCollectionChangedAction.Remove) {
@@ -378,11 +378,11 @@ protected void NotifyCollectionChanged(NotifyCollectionChangedAction action, Ent
             foreach (var @delegate in invocationList) {
               var typedDelegate = (NotifyCollectionChangedEventHandler) @delegate;
               var subscriberAssemblyName = @delegate.Method.DeclaringType.Assembly.FullName;
-              if (subscriberAssemblyName.StartsWith(presentationFrameworkAssemblyPrefix))
+              if (subscriberAssemblyName.StartsWith(presentationFrameworkAssemblyPrefix, StringComparison.Ordinal))
                 // WPF can't handle "Remove" event w/o item index
                 typedDelegate.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 #if DEBUG
-              else if (subscriberAssemblyName.StartsWith(storageTestsAssemblyPrefix))
+              else if (subscriberAssemblyName.StartsWith(storageTestsAssemblyPrefix, StringComparison.Ordinal))
                 typedDelegate.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 #endif
               else
@@ -543,15 +543,15 @@ internal bool Add(Entity item, SyncContext syncContext, RemovalContext removalCo
             Session.EntitySetChangeRegistry.Register(state);
             index = GetItemIndex(state, itemKey);
           };
-          
+
           operations.NotifyOperationStarting();
           if (association.IsPaired)
-            Session.PairSyncManager.ProcessRecursively(syncContext, removalContext, 
+            Session.PairSyncManager.ProcessRecursively(syncContext, removalContext,
               OperationType.Add, association, Owner, item, finalizer);
           else
             finalizer.Invoke();
 
-          // removalContext is unused here, since Add is never 
+          // removalContext is unused here, since Add is never
           // invoked in reference cleanup process directly
 
           if (!skipOwnerVersionChange)
@@ -626,7 +626,7 @@ internal bool Remove(Entity item, SyncContext syncContext, RemovalContext remova
             removalContext.EnqueueFinalizer(() => {
               try {
                 try {
-                  index = GetItemIndex(State, itemKey); // Necessary, since index can be already changed 
+                  index = GetItemIndex(State, itemKey); // Necessary, since index can be already changed
                   if (!skipOwnerVersionChange)
                     Owner.UpdateVersionInfo(Owner, Field);
                   SystemRemove(item, index);
@@ -662,7 +662,7 @@ internal bool Remove(Entity item, SyncContext syncContext, RemovalContext remova
         throw;
       }
     }
-    
+
     /// <summary>
     /// Clears this collection.
     /// </summary>
@@ -814,8 +814,8 @@ private bool Contains(Key key, Entity item)
       if (foundInCache)
         return true;
       var ownerState = Owner.PersistenceState;
-      var itemState = item == null 
-        ? PersistenceState.Synchronized 
+      var itemState = item == null
+        ? PersistenceState.Synchronized
         : item.PersistenceState;
       if (PersistenceState.New.In(ownerState, itemState) || State.IsFullyLoaded)
         return false;
@@ -901,7 +901,7 @@ private static EntitySetTypeState BuildEntitySetTypeState(object key, EntitySetB
           ArrayUtils<Type>.EmptyArray);
       return new EntitySetTypeState(seek, seekTransform, itemCtor, entitySet.GetItemCountQueryDelegate(field));
     }
-    
+
     private int? GetItemIndex(EntitySetState state, Key key)
     {
       if (!state.IsFullyLoaded)
@@ -912,7 +912,7 @@ private static EntitySetTypeState BuildEntitySetTypeState(object key, EntitySetB
       if (subscriptionInfo.Second==null)
         return null;
 
-      // Ok, it seems there is a reason 
+      // Ok, it seems there is a reason
       // to waste linear time on calculating this...
       int i = 0;
       foreach (var cachedKey in state) {
@@ -934,7 +934,7 @@ internal static void ExecuteOnValidate(EntitySetBase target)
     // Initialization
 
     /// <summary>
-    /// Performs initialization (see <see cref="Initialize()"/>) of the <see cref="EntitySetBase"/> 
+    /// Performs initialization (see <see cref="Initialize()"/>) of the <see cref="EntitySetBase"/>
     /// if type of <see langword="this" /> is the same as <paramref name="ctorType"/>.
     /// Automatically invoked in the epilogue of any constructor of this type and its ancestors.
     /// </summary>

Orm/Xtensive.Orm/Orm/Providers/NameBuilder.cs

@@ -26,7 +26,7 @@
 namespace Xtensive.Orm.Providers
 {
   /// <summary>
-  /// Name builder for <see cref="Orm.Model.DomainModel"/> nodes 
+  /// Name builder for <see cref="Orm.Model.DomainModel"/> nodes
   /// Provides names according to a set of naming rules contained in
   /// <see cref="NamingConvention"/>.
   /// </summary>
@@ -258,15 +258,15 @@ public string BuildColumnName(FieldInfo field, ColumnInfo baseColumn)
     }
 
     /// <summary>
-    /// Gets the name for <see cref="ColumnInfo"/> object concatenating 
+    /// Gets the name for <see cref="ColumnInfo"/> object concatenating
     /// <see cref="Node.Name"/> of its declaring type with the original column name.
     /// </summary>
     /// <param name="column">The <see cref="ColumnInfo"/> object.</param>
     /// <returns>Column name.</returns>
     public string BuildColumnName(ColumnInfo column)
     {
       ArgumentValidator.EnsureArgumentNotNull(column, "column");
-      if (column.Name.StartsWith(column.Field.DeclaringType.Name + "."))
+      if (column.Name.StartsWith(column.Field.DeclaringType.Name + ".", StringComparison.Ordinal))
         throw new InvalidOperationException();
       string result = string.Concat(column.Field.DeclaringType.Name, ".", column.Name);
       return ApplyNamingRules(result);
@@ -426,9 +426,9 @@ public string BuildPartialIndexName(IndexDef index, Type filterType, string filt
     /// <returns>Association name.</returns>
     public string BuildAssociationName(AssociationInfo target)
     {
-      return ApplyNamingRules(string.Format(AssociationPattern, 
-        target.OwnerType.Name, 
-        target.OwnerField.Name, 
+      return ApplyNamingRules(string.Format(AssociationPattern,
+        target.OwnerType.Name,
+        target.OwnerField.Name,
         target.TargetType.Name));
     }
 
@@ -441,9 +441,9 @@ public string BuildAssociationName(AssociationInfo target)
     /// <returns>Association name.</returns>
     public string BuildAssociationName(TypeInfo ownerType, FieldInfo ownerField, TypeInfo targetType)
     {
-      return ApplyNamingRules(string.Format(AssociationPattern, 
-        ownerType.Name, 
-        ownerField.Name, 
+      return ApplyNamingRules(string.Format(AssociationPattern,
+        ownerType.Name,
+        ownerField.Name,
         targetType.Name));
     }
 
@@ -455,9 +455,9 @@ public string BuildAssociationName(TypeInfo ownerType, FieldInfo ownerField, Typ
     /// <returns>Auxiliary type mapping name.</returns>
     public string BuildAuxiliaryTypeMappingName(AssociationInfo target)
     {
-      return ApplyNamingRules(string.Format(AssociationPattern, 
-        target.OwnerType.MappingName ?? target.OwnerType.Name, 
-        target.OwnerField.MappingName ?? target.OwnerField.Name, 
+      return ApplyNamingRules(string.Format(AssociationPattern,
+        target.OwnerType.MappingName ?? target.OwnerType.Name,
+        target.OwnerField.MappingName ?? target.OwnerField.Name,
         target.TargetType.MappingName ?? target.TargetType.Name));
     }
 

Orm/Xtensive.Orm/Orm/Providers/StorageDriver.cs

@@ -118,7 +118,7 @@ private void FixExtractionResultSqlite(SqlExtractionResult result)
         result.Catalogs
           .SelectMany(c => c.Schemas)
           .SelectMany(s => s.Tables)
-          .Where(t => t.Name.EndsWith("-Generator")
+          .Where(t => t.Name.EndsWith("-Generator", StringComparison.Ordinal)
             && t.TableColumns.Count==1
             && t.TableColumns[0].SequenceDescriptor==null);
 

Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameTypeHint.cs

@@ -37,7 +37,7 @@ public bool Equals(RenameTypeHint other)
         return false;
       if (ReferenceEquals(this, other))
         return true;
-      return base.Equals(other) 
+      return base.Equals(other)
         && other.NewType==NewType
         && other.OldType==OldType;
     }
@@ -78,7 +78,7 @@ public RenameTypeHint(string oldType, Type newType)
       ArgumentValidator.EnsureArgumentNotNull(newType, "newType");
       ArgumentValidator.EnsureArgumentNotNullOrEmpty(oldType, "oldType");
 
-      if (!oldType.Contains("."))
+      if (!oldType.Contains(".", StringComparison.Ordinal))
         oldType = newType.Namespace + "." + oldType;
       OldType = oldType;
       NewType = newType;