Merge branch 'master' of https://github.com/nhibernate/nhibernate-core into sparse

hazzik · hazzik · commit 2e56d25fdf74 · 2025-03-18T16:30:47.000+10:00
diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2898/BinaryFormatterCache.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2898/BinaryFormatterCache.cs
@@ -23,31 +23,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2898
 	public partial class BinaryFormatterCache : CacheBase
 	{
 
-		public override Task<object> GetAsync(object key, CancellationToken cancellationToken)
-		{
-			try
-			{
-				var entry = _hashtable[key] as byte[];
-				if (entry == null)
-					return Task.FromResult<object>(null);
-
-				var fmt = new BinaryFormatter
-				{
-#if !NETFX
-					SurrogateSelector = new SerializationHelper.SurrogateSelector()	
-#endif
-				};
-				using (var stream = new MemoryStream(entry))
-				{
-					return Task.FromResult<object>(fmt.Deserialize(stream));
-				}
-			}
-			catch (System.Exception ex)
-			{
-				return Task.FromException<object>(ex);
-			}
-		}
-
 		public override Task PutAsync(object key, object value, CancellationToken cancellationToken)
 		{
 			try
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -68,7 +68,7 @@
     <PackageReference Include="NHibernate.Caches.CoreDistributedCache.Memory" Version="5.9.0" />
     <PackageReference Include="NHibernate.Caches.Util.JsonSerializer" Version="5.9.0" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.14" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0" />
diff --git a/src/NHibernate/Criterion/EntityProjection.cs b/src/NHibernate/Criterion/EntityProjection.cs
@@ -1,11 +1,12 @@
-﻿﻿using System;
+﻿using System;
 using System.Collections.Generic;
 using NHibernate.Engine;
-using NHibernate.Loader;
 using NHibernate.Loader.Criteria;
 using NHibernate.Persister.Entity;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
+using NHibernate.Util;
+
 using IQueryable = NHibernate.Persister.Entity.IQueryable;
 
 namespace NHibernate.Criterion
@@ -204,7 +205,7 @@ private void SetFields(ICriteriaQuery criteriaQuery)
 				subcriteria,
 				Persister.IdentifierPropertyName ?? string.Empty);
 
-			ColumnAliasSuffix = BasicLoader.GenerateSuffix(criteriaQuery.GetIndexForAlias());
+			ColumnAliasSuffix = StringHelper.GenerateSuffix(criteriaQuery.GetIndexForAlias());
 
 			_identifierColumnAliases = Persister.GetIdentifierAliases(ColumnAliasSuffix);
 
diff --git a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
@@ -485,7 +485,7 @@ internal string GetSuffix(FromElement fromElement)
 				return suffix;
 			}
 
-			suffix = _suffixes.Count == 0 ? string.Empty : _suffixes.Count.ToString() + '_';
+			suffix = _suffixes.Count == 0 ? string.Empty : StringHelper.GenerateSuffix(_suffixes.Count);
 			_suffixes.Add(fromElement, suffix);
 
 			return suffix;
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs
@@ -532,7 +532,7 @@ private static string GetSuffix(int size, int sequence)
 
 		private static string GenerateSuffix(int size, int k)
 		{
-			String suffix = size == 1 ? "" : k.ToString() + '_';
+			String suffix = size == 1 ? "" : StringHelper.GenerateSuffix(k);
 			return suffix;
 		}
 
diff --git a/src/NHibernate/Loader/BasicLoader.cs b/src/NHibernate/Loader/BasicLoader.cs
@@ -99,15 +99,15 @@ public static string[] GenerateSuffixes(int seed, int length)
 
 			for (int i = 0; i < length; i++)
 			{
-				suffixes[i] = GenerateSuffix(i + seed);
+				suffixes[i] = StringHelper.GenerateSuffix(i + seed);
 			}
 
 			return suffixes;
 		}
 
 		public static string GenerateSuffix(int index)
 		{
-			return index.ToString() + StringHelper.Underscore;
+			return StringHelper.GenerateSuffix(index);
 		}
 	}
 }
diff --git a/src/NHibernate/Mapping/Property.cs b/src/NHibernate/Mapping/Property.cs
@@ -66,7 +66,7 @@ public IEnumerable<ISelectable> ColumnIterator
 		public string Name
 		{
 			get { return name; }
-			set { name = value; }
+			set { name = value == null ? null : string.Intern(value); }
 		}
 
 		public bool IsComposite
@@ -122,7 +122,7 @@ public CascadeStyle CascadeStyle
 		public string Cascade
 		{
 			get { return cascade; }
-			set { cascade = value; }
+			set { cascade = value == null ? null : string.Intern(value); }
 		}
 
 		public bool IsUpdateable
@@ -168,7 +168,7 @@ public bool IsOptional
 		public string PropertyAccessorName
 		{
 			get { return propertyAccessorName; }
-			set { propertyAccessorName = value; }
+			set { propertyAccessorName = value == null ? null : string.Intern(value); }
 		}
 
 		public IGetter GetGetter(System.Type clazz)
diff --git a/src/NHibernate/Mapping/SimpleValue.cs b/src/NHibernate/Mapping/SimpleValue.cs
@@ -60,7 +60,7 @@ public IDictionary<string, string> IdentifierGeneratorProperties
 		public string IdentifierGeneratorStrategy
 		{
 			get { return identifierGeneratorStrategy; }
-			set { identifierGeneratorStrategy = value; }
+			set { identifierGeneratorStrategy = value == null ? null : string.Intern(value); }
 		}
 
 		public virtual bool IsComposite
@@ -127,7 +127,7 @@ public string TypeName
 				if ((typeName == null && value != null) || (typeName != null && !typeName.Equals(value)))
 				{
 					// the property change
-					typeName = value;
+					typeName = value == null ? null : string.Intern(value);
 					type = null; // invalidate type
 				}
 			}
@@ -353,7 +353,8 @@ public virtual void SetTypeUsingReflection(string className, string propertyName
 				}
 				try
 				{
-					typeName = ReflectHelper.ReflectedPropertyClass(className, propertyName, accesorName).AssemblyQualifiedName;
+					var aqn = ReflectHelper.ReflectedPropertyClass(className, propertyName, accesorName).AssemblyQualifiedName;
+					typeName = aqn == null ? null : string.Intern(aqn);
 				}
 				catch (HibernateException he)
 				{
@@ -372,7 +373,8 @@ public virtual void SetTypeUsingReflection(System.Type propertyOwnerType, string
 				}
 				try
 				{
-					typeName = ReflectHelper.ReflectedPropertyClass(propertyOwnerType, propertyName, accessorName).AssemblyQualifiedName;
+					var aqn = ReflectHelper.ReflectedPropertyClass(propertyOwnerType, propertyName, accessorName).AssemblyQualifiedName;
+					typeName = aqn == null ? null : string.Intern(aqn);
 				}
 				catch (HibernateException he)
 				{
diff --git a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs
@@ -2376,14 +2376,14 @@ protected void InitSubclassPropertyAliasesMap(PersistentClass model)
 				{
 					if (entityMetamodel.HasNonIdentifierPropertyNamedId)
 					{
-						subclassPropertyAliases[EntityPersister.EntityID + "." + idPropertyNames[i]] = new string[] { idAliases[i] };
-						subclassPropertyColumnNames[EntityPersister.EntityID + "." + IdentifierPropertyName + "." + idPropertyNames[i]] = new string[] { idColumnNames[i] };
+						subclassPropertyAliases[string.Intern(EntityPersister.EntityID + "." + idPropertyNames[i])] = new string[] { idAliases[i] };
+						subclassPropertyColumnNames[string.Intern(EntityPersister.EntityID + "." + IdentifierPropertyName + "." + idPropertyNames[i])] = new string[] { idColumnNames[i] };
 					}
 					//				if (hasIdentifierProperty() && !ENTITY_ID.equals( getIdentifierPropertyName() ) ) {
 					if (HasIdentifierProperty)
 					{
-						subclassPropertyAliases[IdentifierPropertyName + "." + idPropertyNames[i]] = new string[] { idAliases[i] };
-						subclassPropertyColumnNames[IdentifierPropertyName + "." + idPropertyNames[i]] = new string[] { idColumnNames[i] };
+						subclassPropertyAliases[string.Intern(IdentifierPropertyName + "." + idPropertyNames[i])] = new string[] { idAliases[i] };
+						subclassPropertyColumnNames[string.Intern(IdentifierPropertyName + "." + idPropertyNames[i])] = new string[] { idColumnNames[i] };
 					}
 					else
 					{
diff --git a/src/NHibernate/Persister/Entity/AbstractPropertyMapping.cs b/src/NHibernate/Persister/Entity/AbstractPropertyMapping.cs
@@ -211,7 +211,7 @@ private static string ExtendPath(string path, string property)
 			if (string.IsNullOrEmpty(path))
 				return property;
 			
-			return StringHelper.Qualify(path, property);
+			return string.Intern(StringHelper.Qualify(path, property));
 		}
 
 		public string[] GetColumnNames(string propertyName)
diff --git a/src/NHibernate/Tuple/Entity/EntityMetamodel.cs b/src/NHibernate/Tuple/Entity/EntityMetamodel.cs
@@ -449,7 +449,7 @@ private void MapIdentifierPropertyTypes(string path, IType propertyType)
 				for (var i = 0; i < componentType.PropertyNames.Length; i++)
 				{
 					MapIdentifierPropertyTypes(
-						!string.IsNullOrEmpty(path) ? $"{path}.{componentType.PropertyNames[i]}" : componentType.PropertyNames[i],
+						!string.IsNullOrEmpty(path) ? string.Intern($"{path}.{componentType.PropertyNames[i]}") : componentType.PropertyNames[i],
 						componentType.Subtypes[i]);
 				}
 			}
diff --git a/src/NHibernate/Type/PersistentEnumType.cs b/src/NHibernate/Type/PersistentEnumType.cs
@@ -294,7 +294,7 @@ public class EnumType<T> : PersistentEnumType
 		public EnumType() : base(typeof (T))
 		{
 			System.Type type = GetType();
-			typeName = type.FullName + ", " + type.Assembly.GetName().Name;
+			typeName = string.Intern(type.FullName + ", " + type.Assembly.GetName().Name);
 		}
 
 		public override string Name
diff --git a/src/NHibernate/Util/StringHelper.cs b/src/NHibernate/Util/StringHelper.cs
@@ -871,5 +871,15 @@ public static bool IsAnyNewLine(this string str, int index, out int newLineLengt
 			newLineLength = 0;
 			return false;
 		}
+
+		public static string GenerateSuffix(int index)
+		{
+			return index switch
+			{
+				0 => "0_",
+				1 => "1_",
+				_ => string.Intern(index.ToString() + Underscore)
+			};
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ internal string GetSuffix(FromElement fromElement)`
`485`	`485`	`return suffix;`
`486`	`486`	`}`
`487`	`487`
`488`		`- suffix = _suffixes.Count == 0 ? string.Empty : _suffixes.Count.ToString() + '_';`
	`488`	`+ suffix = _suffixes.Count == 0 ? string.Empty : StringHelper.GenerateSuffix(_suffixes.Count);`
`489`	`489`	`_suffixes.Add(fromElement, suffix);`
`490`	`490`
`491`	`491`	`return suffix;`
Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ private static string GetSuffix(int size, int sequence)`
`532`	`532`
`533`	`533`	`private static string GenerateSuffix(int size, int k)`
`534`	`534`	`{`
`535`		`- String suffix = size == 1 ? "" : k.ToString() + '_';`
	`535`	`+ String suffix = size == 1 ? "" : StringHelper.GenerateSuffix(k);`
`536`	`536`	`return suffix;`
`537`	`537`	`}`
`538`	`538`
Original file line number	Diff line number	Diff line change
`@@ -99,15 +99,15 @@ public static string[] GenerateSuffixes(int seed, int length)`
`99`	`99`
`100`	`100`	`for (int i = 0; i < length; i++)`
`101`	`101`	`{`
`102`		`- suffixes[i] = GenerateSuffix(i + seed);`
	`102`	`+ suffixes[i] = StringHelper.GenerateSuffix(i + seed);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`return suffixes;`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public static string GenerateSuffix(int index)`
`109`	`109`	`{`
`110`		`- return index.ToString() + StringHelper.Underscore;`
	`110`	`+ return StringHelper.GenerateSuffix(index);`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public IEnumerable<ISelectable> ColumnIterator`
`66`	`66`	`public string Name`
`67`	`67`	`{`
`68`	`68`	`get { return name; }`
`69`		`- set { name = value; }`
	`69`	`+ set { name = value == null ? null : string.Intern(value); }`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public bool IsComposite`
`@@ -122,7 +122,7 @@ public CascadeStyle CascadeStyle`
`122`	`122`	`public string Cascade`
`123`	`123`	`{`
`124`	`124`	`get { return cascade; }`
`125`		`- set { cascade = value; }`
	`125`	`+ set { cascade = value == null ? null : string.Intern(value); }`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`public bool IsUpdateable`
`@@ -168,7 +168,7 @@ public bool IsOptional`
`168`	`168`	`public string PropertyAccessorName`
`169`	`169`	`{`
`170`	`170`	`get { return propertyAccessorName; }`
`171`		`- set { propertyAccessorName = value; }`
	`171`	`+ set { propertyAccessorName = value == null ? null : string.Intern(value); }`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`public IGetter GetGetter(System.Type clazz)`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public IDictionary<string, string> IdentifierGeneratorProperties`
`60`	`60`	`public string IdentifierGeneratorStrategy`
`61`	`61`	`{`
`62`	`62`	`get { return identifierGeneratorStrategy; }`
`63`		`- set { identifierGeneratorStrategy = value; }`
	`63`	`+ set { identifierGeneratorStrategy = value == null ? null : string.Intern(value); }`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public virtual bool IsComposite`
`@@ -127,7 +127,7 @@ public string TypeName`
`127`	`127`	`if ((typeName == null && value != null) \|\| (typeName != null && !typeName.Equals(value)))`
`128`	`128`	`{`
`129`	`129`	`// the property change`
`130`		`- typeName = value;`
	`130`	`+ typeName = value == null ? null : string.Intern(value);`
`131`	`131`	`type = null; // invalidate type`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -353,7 +353,8 @@ public virtual void SetTypeUsingReflection(string className, string propertyName`
`353`	`353`	`}`
`354`	`354`	`try`
`355`	`355`	`{`
`356`		`- typeName = ReflectHelper.ReflectedPropertyClass(className, propertyName, accesorName).AssemblyQualifiedName;`
	`356`	`+ var aqn = ReflectHelper.ReflectedPropertyClass(className, propertyName, accesorName).AssemblyQualifiedName;`
	`357`	`+ typeName = aqn == null ? null : string.Intern(aqn);`
`357`	`358`	`}`
`358`	`359`	`catch (HibernateException he)`
`359`	`360`	`{`
`@@ -372,7 +373,8 @@ public virtual void SetTypeUsingReflection(System.Type propertyOwnerType, string`
`372`	`373`	`}`
`373`	`374`	`try`
`374`	`375`	`{`
`375`		`- typeName = ReflectHelper.ReflectedPropertyClass(propertyOwnerType, propertyName, accessorName).AssemblyQualifiedName;`
	`376`	`+ var aqn = ReflectHelper.ReflectedPropertyClass(propertyOwnerType, propertyName, accessorName).AssemblyQualifiedName;`
	`377`	`+ typeName = aqn == null ? null : string.Intern(aqn);`
`376`	`378`	`}`
`377`	`379`	`catch (HibernateException he)`
`378`	`380`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2376,14 +2376,14 @@ protected void InitSubclassPropertyAliasesMap(PersistentClass model)`
`2376`	`2376`	`{`
`2377`	`2377`	`if (entityMetamodel.HasNonIdentifierPropertyNamedId)`
`2378`	`2378`	`{`
`2379`		`- subclassPropertyAliases[EntityPersister.EntityID + "." + idPropertyNames[i]] = new string[] { idAliases[i] };`
`2380`		`- subclassPropertyColumnNames[EntityPersister.EntityID + "." + IdentifierPropertyName + "." + idPropertyNames[i]] = new string[] { idColumnNames[i] };`
	`2379`	`+ subclassPropertyAliases[string.Intern(EntityPersister.EntityID + "." + idPropertyNames[i])] = new string[] { idAliases[i] };`
	`2380`	`+ subclassPropertyColumnNames[string.Intern(EntityPersister.EntityID + "." + IdentifierPropertyName + "." + idPropertyNames[i])] = new string[] { idColumnNames[i] };`
`2381`	`2381`	`}`
`2382`	`2382`	`// if (hasIdentifierProperty() && !ENTITY_ID.equals( getIdentifierPropertyName() ) ) {`
`2383`	`2383`	`if (HasIdentifierProperty)`
`2384`	`2384`	`{`
`2385`		`- subclassPropertyAliases[IdentifierPropertyName + "." + idPropertyNames[i]] = new string[] { idAliases[i] };`
`2386`		`- subclassPropertyColumnNames[IdentifierPropertyName + "." + idPropertyNames[i]] = new string[] { idColumnNames[i] };`
	`2385`	`+ subclassPropertyAliases[string.Intern(IdentifierPropertyName + "." + idPropertyNames[i])] = new string[] { idAliases[i] };`
	`2386`	`+ subclassPropertyColumnNames[string.Intern(IdentifierPropertyName + "." + idPropertyNames[i])] = new string[] { idColumnNames[i] };`
`2387`	`2387`	`}`
`2388`	`2388`	`else`
`2389`	`2389`	`{`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ private static string ExtendPath(string path, string property)`
`211`	`211`	`if (string.IsNullOrEmpty(path))`
`212`	`212`	`return property;`
`213`	`213`
`214`		`- return StringHelper.Qualify(path, property);`
	`214`	`+ return string.Intern(StringHelper.Qualify(path, property));`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`public string[] GetColumnNames(string propertyName)`