Various string manipulation optimizations (#1543)

bahusoid · fredericDelaporte · commit 956bffebbc83 · 2018-01-20T23:54:31.000+01:00
* Avoid code duplication for Root determination - added IsNotRoot
* string.IndexOf ordinal comparison where applicable
* Avoid full string conversion
* SqlString avoid ToString conversion
* Generalized HqlVariable determination - introduced ParserHelper.HasHqlVariable and ParserHelper.IsHqlVariable
diff --git a/src/NHibernate/AdoNet/Util/BasicFormatter.cs b/src/NHibernate/AdoNet/Util/BasicFormatter.cs
@@ -430,7 +430,7 @@ private static bool IsFunctionName(string tok)
 
 			private static bool IsWhitespace(string token)
 			{
-				return StringHelper.WhiteSpace.IndexOf(token) >= 0;
+				return StringHelper.WhiteSpace.IndexOf(token, StringComparison.Ordinal) >= 0;
 			}
 
 			private void Newline()
@@ -451,4 +451,4 @@ public void Dispose()
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/AdoNet/Util/DdlFormatter.cs b/src/NHibernate/AdoNet/Util/DdlFormatter.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Text;
 using NHibernate.Util;
@@ -18,15 +19,15 @@ public class DdlFormatter: IFormatter
 		/// </summary>
 		public virtual string Format(string sql)
 		{
-			if (sql.ToLowerInvariant().StartsWith("create table"))
+			if (sql.StartsWith("create table", StringComparison.OrdinalIgnoreCase))
 			{
 				return FormatCreateTable(sql);
 			}
-			else if (sql.ToLowerInvariant().StartsWith("alter table"))
+			else if (sql.StartsWith("alter table", StringComparison.OrdinalIgnoreCase))
 			{
 				return FormatAlterTable(sql);
 			}
-			else if (sql.ToLowerInvariant().StartsWith("comment on"))
+			else if (sql.StartsWith("comment on", StringComparison.OrdinalIgnoreCase))
 			{
 				return FormatCommentOn(sql);
 			}
@@ -138,4 +139,4 @@ private static bool IsQuote(string token)
 			return "\"".Equals(token) || "`".Equals(token) || "]".Equals(token) || "[".Equals(token) || "'".Equals(token);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
@@ -221,7 +221,7 @@ private void BindCollection(ICollectionPropertiesMapping collectionMapping, Mapp
 
 			//ORPHAN DELETE (used for programmer error detection)
 			var cascadeAtt = collectionMapping.Cascade;
-			if (!string.IsNullOrEmpty(cascadeAtt) && cascadeAtt.IndexOf("delete-orphan") >= 0)
+			if (!string.IsNullOrEmpty(cascadeAtt) && cascadeAtt.IndexOf("delete-orphan", StringComparison.Ordinal) >= 0)
 				model.HasOrphanDelete = true;
 
 			// GENERIC
diff --git a/src/NHibernate/Engine/Query/CallableParser.cs b/src/NHibernate/Engine/Query/CallableParser.cs
@@ -21,9 +21,11 @@ public static Detail Parse(string sqlString)
 		{
 			Detail callableDetail = new Detail();
 
-			callableDetail.IsCallable = sqlString.IndexOf("{") == 0 &&
-										sqlString.IndexOf("}") == (sqlString.Length - 1) &&
-										sqlString.IndexOf("call") > 0;
+			int indexOfCall = -1;
+			callableDetail.IsCallable = sqlString.Length > 5 && // to be able to check sqlString[0] we at least need to make sure that string has at least 1 character. The simplest case all other conditions are true is "{call}" which is 6 characters, so check it.
+										sqlString[0] == '{' &&
+										sqlString[sqlString.Length - 1] == '}' &&
+										(indexOfCall = sqlString.IndexOf("call", StringComparison.Ordinal)) > 0;
 
 			if (!callableDetail.IsCallable)
 				return callableDetail;
@@ -35,13 +37,20 @@ public static Detail Parse(string sqlString)
 
 			callableDetail.FunctionName = functionMatch.Groups[1].Value;
 
-			callableDetail.HasReturn = sqlString.IndexOf("call") > 0 &&
-										sqlString.IndexOf("?") > 0 &&
-										sqlString.IndexOf("=") > 0 &&
-										sqlString.IndexOf("?") < sqlString.IndexOf("call") &&
-										sqlString.IndexOf("=") < sqlString.IndexOf("call");
+			callableDetail.HasReturn = HasReturnParameter(sqlString, indexOfCall);
 
 			return callableDetail;
 		}
+
+		internal static bool HasReturnParameter(string sqlString, int indexOfCall)
+		{
+			int indexOfQuestionMark;
+			int indexOfEqual;
+			return indexOfCall > 0 &&
+					(indexOfQuestionMark = sqlString.IndexOf('?')) > 0 &&
+					(indexOfEqual = sqlString.IndexOf('=')) > 0 &&
+					indexOfQuestionMark < indexOfCall &&
+					indexOfEqual < indexOfCall;
+		}
 	}
-}
+}
diff --git a/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs b/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs
@@ -120,7 +120,7 @@ public int PerformExecuteUpdate(QueryParameters queryParameters, ISessionImpleme
 		private SqlString ExpandDynamicFilterParameters(SqlString sqlString, ICollection<IParameterSpecification> parameterSpecs, ISessionImplementor session)
 		{
 			var enabledFilters = session.EnabledFilters;
-			if (enabledFilters.Count == 0 || sqlString.ToString().IndexOf(ParserHelper.HqlVariablePrefix) < 0)
+			if (enabledFilters.Count == 0 || !ParserHelper.HasHqlVariable(sqlString))
 			{
 				return sqlString;
 			}
@@ -143,7 +143,7 @@ private SqlString ExpandDynamicFilterParameters(SqlString sqlString, ICollection
 
 				foreach (string token in tokens)
 				{
-					if (token.StartsWith(ParserHelper.HqlVariablePrefix))
+					if (ParserHelper.IsHqlVariable(token))
 					{
 						string filterParameterName = token.Substring(1);
 						string[] parts = StringHelper.ParseFilterParameterName(filterParameterName);
diff --git a/src/NHibernate/Engine/Query/ParameterParser.cs b/src/NHibernate/Engine/Query/ParameterParser.cs
@@ -42,11 +42,8 @@ private ParameterParser()
 		public static void Parse(string sqlString, IRecognizer recognizer)
 		{
 			// TODO: WTF? "CALL"... it may work for ORACLE but what about others RDBMS ? (by FM)
-			bool hasMainOutputParameter = sqlString.IndexOf("call") > 0 &&
-										  sqlString.IndexOf("?") > 0 &&
-										  sqlString.IndexOf("=") > 0 &&
-										  sqlString.IndexOf("?") < sqlString.IndexOf("call") &&
-										  sqlString.IndexOf("=") < sqlString.IndexOf("call");
+			var indexOfCall = sqlString.IndexOf("call", StringComparison.Ordinal);
+			bool hasMainOutputParameter = CallableParser.HasReturnParameter(sqlString, indexOfCall);
 			bool foundMainOutputParam = false;
 
 			int stringLength = sqlString.Length;
@@ -59,7 +56,7 @@ public static void Parse(string sqlString, IRecognizer recognizer)
 				// check comments
 				if (indx + 1 < stringLength && sqlString.Substring(indx,2) == "/*")
 				{
-					var closeCommentIdx = sqlString.IndexOf("*/", indx+2);
+					var closeCommentIdx = sqlString.IndexOf("*/", indx + 2, StringComparison.Ordinal);
 					recognizer.Other(sqlString.Substring(indx, (closeCommentIdx- indx)+2));
 					indx = closeCommentIdx + 1;
 					continue;
@@ -112,7 +109,7 @@ public static void Parse(string sqlString, IRecognizer recognizer)
 					if (c == ':')
 					{
 						// named parameter
-						int right = StringHelper.FirstIndexOfChar(sqlString, ParserHelper.HqlSeparators, indx + 1);
+						int right = StringHelper.FirstIndexOfChar(sqlString, ParserHelper.HqlSeparatorsAsCharArray, indx + 1);
 						int chopLocation = right < 0 ? sqlString.Length : right;
 						string param = sqlString.Substring(indx + 1, chopLocation - (indx + 1));
 						recognizer.NamedParameter(param, indx);
@@ -124,7 +121,7 @@ public static void Parse(string sqlString, IRecognizer recognizer)
 						if (indx < stringLength - 1 && char.IsDigit(sqlString[indx + 1]))
 						{
 							// a peek ahead showed this as an ejb3-positional parameter
-							int right = StringHelper.FirstIndexOfChar(sqlString, ParserHelper.HqlSeparators, indx + 1);
+							int right = StringHelper.FirstIndexOfChar(sqlString, ParserHelper.HqlSeparatorsAsCharArray, indx + 1);
 							int chopLocation = right < 0 ? sqlString.Length : right;
 							string param = sqlString.Substring(indx + 1, chopLocation - (indx + 1));
 							// make sure this "name" is an integral
@@ -160,4 +157,4 @@ public static void Parse(string sqlString, IRecognizer recognizer)
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs b/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs
@@ -168,12 +168,12 @@ public static void ProcessDynamicFilterParameters(
 
 		private static bool HasDynamicFilterParam(SqlString sqlFragment)
 		{
-			return sqlFragment.IndexOfCaseInsensitive(ParserHelper.HqlVariablePrefix) < 0;
+			return !ParserHelper.HasHqlVariable(sqlFragment);
 		}
 
 		private static bool HasCollectionFilterParam(SqlString sqlFragment)
 		{
-			return sqlFragment.IndexOfCaseInsensitive("?") < 0;
+			return sqlFragment.IndexOfOrdinal("?") < 0;
 		}
 
 		private class JoinSequenceSelector : JoinSequence.ISelector
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Util/SyntheticAndFactory.cs b/src/NHibernate/Hql/Ast/ANTLR/Util/SyntheticAndFactory.cs
@@ -74,7 +74,7 @@ public void AddWhereFragment(
 			if (hqlSqlWalker.IsFilter())
 			{
 				//if (whereFragment.IndexOfCaseInsensitive("?") >= 0)
-                if (whereFragment.ToString().IndexOf("?") >= 0)
+                if (whereFragment.IndexOfOrdinal("?") >= 0)
                 {
 					IType collectionFilterKeyType = hqlSqlWalker.SessionFactoryHelper
 							.RequireQueryableCollection(hqlSqlWalker.CollectionFilterRole)
diff --git a/src/NHibernate/Hql/ParserHelper.cs b/src/NHibernate/Hql/ParserHelper.cs
@@ -1,10 +1,14 @@
+using System;
+using NHibernate.SqlCommand;
+
 namespace NHibernate.Hql
 {
 	public static class ParserHelper
 	{
 		public const string HqlVariablePrefix = ":";
 
 		public const string HqlSeparators = " \n\r\f\t,()=<>&|+-=/*'^![]#~\\;";
+		internal static readonly char[] HqlSeparatorsAsCharArray = HqlSeparators.ToCharArray();
 		//NOTICE: no " or . since they are part of (compound) identifiers
 		
 		public const string Whitespace = " \n\r\f\t";
@@ -13,7 +17,22 @@ public static class ParserHelper
 
 		public static bool IsWhitespace(string str)
 		{
-			return Whitespace.IndexOf(str) > - 1;
+			return Whitespace.IndexOf(str, StringComparison.Ordinal) > - 1;
+		}
+
+		internal static bool HasHqlVariable(string value)
+		{
+			return value.IndexOf(HqlVariablePrefix, StringComparison.Ordinal) >= 0;
+		}
+		
+		internal static bool HasHqlVariable(SqlString value)
+		{
+			return value.IndexOfOrdinal(HqlVariablePrefix) >= 0;
+		}
+
+		internal static bool IsHqlVariable(string value)
+		{
+			return value.StartsWith(HqlVariablePrefix, StringComparison.Ordinal);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Impl/SessionImpl.cs b/src/NHibernate/Impl/SessionImpl.cs
@@ -2034,7 +2034,7 @@ public override IDictionary<string, IFilter> EnabledFilters
 
 		private string[] ParseFilterParameterName(string filterParameterName)
 		{
-			int dot = filterParameterName.IndexOf(".");
+			int dot = filterParameterName.IndexOf('.');
 			if (dot <= 0)
 			{
 				throw new ArgumentException("Invalid filter-parameter name format", "filterParameterName");
diff --git a/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs b/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
@@ -344,10 +344,9 @@ private string GetWholeAssociationPath(CriteriaImpl.Subcriteria subcriteria)
 			// some messy, complex stuff here, since createCriteria() can take an
 			// aliased path, or a path rooted at the creating criteria instance
 			ICriteria parent = null;
-			if (path.IndexOf('.') > 0)
+			if (StringHelper.IsNotRoot(path, out var testAlias))
 			{
 				// if it is a compound path
-				string testAlias = StringHelper.Root(path);
 				if (!testAlias.Equals(subcriteria.Alias))
 				{
 					// and the qualifier is not the alias of this criteria
@@ -678,9 +677,8 @@ private Persister.Entity.IPropertyMapping GetPropertyMapping(string entityName)
 
 		public string GetEntityName(ICriteria subcriteria, string propertyName)
 		{
-			if (propertyName.IndexOf('.') > 0)
+			if (StringHelper.IsNotRoot(propertyName, out var root))
 			{
-				string root = StringHelper.Root(propertyName);
 				ICriteria crit = GetAliasedCriteria(root);
 				if (crit != null)
 				{
@@ -692,9 +690,8 @@ public string GetEntityName(ICriteria subcriteria, string propertyName)
 
 		public string GetSQLAlias(ICriteria criteria, string propertyName)
 		{
-			if (propertyName.IndexOf('.') > 0)
+			if (StringHelper.IsNotRoot(propertyName, out var root))
 			{
-				string root = StringHelper.Root(propertyName);
 				ICriteria subcriteria = GetAliasedCriteria(root);
 				if (subcriteria != null)
 				{
@@ -706,9 +703,8 @@ public string GetSQLAlias(ICriteria criteria, string propertyName)
 
 		public string GetPropertyName(string propertyName)
 		{
-			if (propertyName.IndexOf('.') > 0)
+			if (StringHelper.IsNotRoot(propertyName, out var root))
 			{
-				string root = StringHelper.Root(propertyName);
 				ICriteria crit = GetAliasedCriteria(root);
 				if (crit != null)
 				{
diff --git a/src/NHibernate/Loader/Loader.cs b/src/NHibernate/Loader/Loader.cs
@@ -1770,7 +1770,7 @@ protected void AdjustQueryParametersForSubSelectFetching(SqlString filteredSqlSt
 		protected SqlString ExpandDynamicFilterParameters(SqlString sqlString, ICollection<IParameterSpecification> parameterSpecs, ISessionImplementor session)
 		{
 			var enabledFilters = session.EnabledFilters;
-			if (enabledFilters.Count == 0 || sqlString.ToString().IndexOf(ParserHelper.HqlVariablePrefix) < 0)
+			if (enabledFilters.Count == 0 || !ParserHelper.HasHqlVariable(sqlString))
 			{
 				return sqlString;
 			}
@@ -1793,7 +1793,7 @@ protected SqlString ExpandDynamicFilterParameters(SqlString sqlString, ICollecti
 
 				foreach (string token in tokens)
 				{
-					if (token.StartsWith(ParserHelper.HqlVariablePrefix))
+					if (ParserHelper.IsHqlVariable(token))
 					{
 						string filterParameterName = token.Substring(1);
 						string[] parts = StringHelper.ParseFilterParameterName(filterParameterName);
diff --git a/src/NHibernate/SqlCommand/SqlString.cs b/src/NHibernate/SqlCommand/SqlString.cs
@@ -404,6 +404,11 @@ public int IndexOfCaseInsensitive(string text)
 			return IndexOf(text, 0, _length, StringComparison.InvariantCultureIgnoreCase);
 		}
 
+		internal int IndexOfOrdinal(string text)
+		{
+			return IndexOf(text, 0, _length, StringComparison.Ordinal);
+		}
+
 		/// <summary>
 		/// Returns the index of the first occurrence of <paramref name="text" />, case-insensitive.
 		/// </summary>
diff --git a/src/NHibernate/Util/StringHelper.cs b/src/NHibernate/Util/StringHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ private static bool IsFunctionName(string tok)`
`430`	`430`
`431`	`431`	`private static bool IsWhitespace(string token)`
`432`	`432`	`{`
`433`		`- return StringHelper.WhiteSpace.IndexOf(token) >= 0;`
	`433`	`+ return StringHelper.WhiteSpace.IndexOf(token, StringComparison.Ordinal) >= 0;`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`private void Newline()`
`@@ -451,4 +451,4 @@ public void Dispose()`
`451`	`451`
`452`	`452`	`#endregion`
`453`	`453`	`}`
`454`		`-}`
	`454`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Collections.Generic;`
`2`	`3`	`using System.Text;`
`3`	`4`	`using NHibernate.Util;`
`@@ -18,15 +19,15 @@ public class DdlFormatter: IFormatter`
`18`	`19`	`/// </summary>`
`19`	`20`	`public virtual string Format(string sql)`
`20`	`21`	`{`
`21`		`- if (sql.ToLowerInvariant().StartsWith("create table"))`
	`22`	`+ if (sql.StartsWith("create table", StringComparison.OrdinalIgnoreCase))`
`22`	`23`	`{`
`23`	`24`	`return FormatCreateTable(sql);`
`24`	`25`	`}`
`25`		`- else if (sql.ToLowerInvariant().StartsWith("alter table"))`
	`26`	`+ else if (sql.StartsWith("alter table", StringComparison.OrdinalIgnoreCase))`
`26`	`27`	`{`
`27`	`28`	`return FormatAlterTable(sql);`
`28`	`29`	`}`
`29`		`- else if (sql.ToLowerInvariant().StartsWith("comment on"))`
	`30`	`+ else if (sql.StartsWith("comment on", StringComparison.OrdinalIgnoreCase))`
`30`	`31`	`{`
`31`	`32`	`return FormatCommentOn(sql);`
`32`	`33`	`}`
`@@ -138,4 +139,4 @@ private static bool IsQuote(string token)`
`138`	`139`	return "\"".Equals(token) \|\| "`".Equals(token) \|\| "]".Equals(token) \|\| "[".Equals(token) \|\| "'".Equals(token);
`139`	`140`	`}`
`140`	`141`	`}`
`141`		`-}`
	`142`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public int PerformExecuteUpdate(QueryParameters queryParameters, ISessionImpleme`
`120`	`120`	`private SqlString ExpandDynamicFilterParameters(SqlString sqlString, ICollection<IParameterSpecification> parameterSpecs, ISessionImplementor session)`
`121`	`121`	`{`
`122`	`122`	`var enabledFilters = session.EnabledFilters;`
`123`		`- if (enabledFilters.Count == 0 \|\| sqlString.ToString().IndexOf(ParserHelper.HqlVariablePrefix) < 0)`
	`123`	`+ if (enabledFilters.Count == 0 \|\| !ParserHelper.HasHqlVariable(sqlString))`
`124`	`124`	`{`
`125`	`125`	`return sqlString;`
`126`	`126`	`}`
`@@ -143,7 +143,7 @@ private SqlString ExpandDynamicFilterParameters(SqlString sqlString, ICollection`
`143`	`143`
`144`	`144`	`foreach (string token in tokens)`
`145`	`145`	`{`
`146`		`- if (token.StartsWith(ParserHelper.HqlVariablePrefix))`
	`146`	`+ if (ParserHelper.IsHqlVariable(token))`
`147`	`147`	`{`
`148`	`148`	`string filterParameterName = token.Substring(1);`
`149`	`149`	`string[] parts = StringHelper.ParseFilterParameterName(filterParameterName);`
Original file line number	Diff line number	Diff line change
`@@ -168,12 +168,12 @@ public static void ProcessDynamicFilterParameters(`
`168`	`168`
`169`	`169`	`private static bool HasDynamicFilterParam(SqlString sqlFragment)`
`170`	`170`	`{`
`171`		`- return sqlFragment.IndexOfCaseInsensitive(ParserHelper.HqlVariablePrefix) < 0;`
	`171`	`+ return !ParserHelper.HasHqlVariable(sqlFragment);`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`private static bool HasCollectionFilterParam(SqlString sqlFragment)`
`175`	`175`	`{`
`176`		`- return sqlFragment.IndexOfCaseInsensitive("?") < 0;`
	`176`	`+ return sqlFragment.IndexOfOrdinal("?") < 0;`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`private class JoinSequenceSelector : JoinSequence.ISelector`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void AddWhereFragment(`
`74`	`74`	`if (hqlSqlWalker.IsFilter())`
`75`	`75`	`{`
`76`	`76`	`//if (whereFragment.IndexOfCaseInsensitive("?") >= 0)`
`77`		`- if (whereFragment.ToString().IndexOf("?") >= 0)`
	`77`	`+ if (whereFragment.IndexOfOrdinal("?") >= 0)`
`78`	`78`	`{`
`79`	`79`	`IType collectionFilterKeyType = hqlSqlWalker.SessionFactoryHelper`
`80`	`80`	`.RequireQueryableCollection(hqlSqlWalker.CollectionFilterRole)`
Original file line number	Diff line number	Diff line change
`@@ -2034,7 +2034,7 @@ public override IDictionary<string, IFilter> EnabledFilters`
`2034`	`2034`
`2035`	`2035`	`private string[] ParseFilterParameterName(string filterParameterName)`
`2036`	`2036`	`{`
`2037`		`- int dot = filterParameterName.IndexOf(".");`
	`2037`	`+ int dot = filterParameterName.IndexOf('.');`
`2038`	`2038`	`if (dot <= 0)`
`2039`	`2039`	`{`
`2040`	`2040`	`throw new ArgumentException("Invalid filter-parameter name format", "filterParameterName");`