Merge pull request #293 from DataObjects-NET/master-domain-build-imp

Contains changes of PR #242 made ready to merge
plus additional small improvements

Author: alex-kulakov

ChangeLog/7.1.0-Beta-2-dev.txt

@@ -10,9 +10,35 @@
 [main] Changed translation of queries when DomainConfiguration.ShareStorageSchemaOverNodes set to true
 [main] StorageDriver.Compile(ISqlCompileUnit, NodeConfiguration) became obsolete
 [main] SqlNodeActualizer became obsolete
+[main] TypeInfoCollection.FindAncestor method became obsolete, use new TypeInfo.Ancestor property
+[main] TypeInfoCollection.FindDescendants methods became obsolete, use new TypeInfo.DirectDescendants/.AllDescendants properties
+[main] TypeInfoCollection.FindInterfaces methods became obsolete, use new TypeInfo.DirectInterfaces/.AllInterfaces properties
+[main] TypeInfoCollection.FindImplementors methods became obsolete, use new TypeInfo.DirectImplementors/.AllImplementors properties
+[main] TypeInfoCollection.FindRoot method became obsolete, use introduced TypeInfo.Root property
+[main] TypeInfo.GetImplementors(bool) became obsolete, use new TypeInfo.DirectImplementors/.AllImplementors properties
+[main] TypeInfo.GetInterfaces(bool) became obsolete, use new TypeInfo.DirectInterfaces/.AllInterfaces properties
+[main] TypeInfo.GetDescendants(bool) became obsolete, use new TypeInfo.DirectDescendants/.AllDescendants properties
+[main] TypeInfo.GetAncestors() became obsolete, use new TypeInfo.Ancestors property
+[main] TypeInfo.GetRoot() became obsolete, use introduced TypeInfo.Root property
+[main] IPropertyValidator.IsImmediate is read-only now
+[main] PropertyValidator.IsImmediate property has no setter, only init
+[main] PropertyValidator.ValidateOnlyIfModified property has no setter, only init
+[main] PropertyValidator.SkipOnTransactionCommit property has no setter, only init
+[main] RecordSetHeader.OrderTupleDescriptor became nullable to compensate TupleDescriptor's transition to read-only struct
+[main] IndexInfo.FilterByTypes changed result type to IReadOnlyList<TypeInfo>
+[main] IndexInfo.SelectColumns changed result type to IReadOnlyList<int>
+[main] IndexInfo.ValueColumnsMap changed result type to IReadOnlyList<Pair<int, List<int>>>
 [main] SqlCompilerConfiguration's DatabaseMapping and SchemaMapping moved to SqlPostCompilerConfiguration
 [main] Some EventArgs inheritors that were sealed classes transformed to read-only structures
 [main] DbCommandEventArgs became read-only structure
+[main] ILockable.Lock() now has default implementation that refers to ILockable.Lock(true)
+[main] TupleDescriptor became read-only struct
+[main] InterfaceMapping became read-only struct
+[main] ColumnIndexMap became read-only struct and properties changed retun type to IReadOnlyList<int>
+[main] TopologicalSorter.Sort() methods return IEnumerable<T>, use .SortToList() if results are needed as collection
+[main] TypeHelper.OrderByInheritance() returns IEnumerable<T> to avoid copying
+[main] TypeHelper.GetInterfaces() became obsolete, GetInterfacesUnordered() and GetInterfacesOrderedByInheritance() introduced
+[main] TypeDef.Validators and FieldDef.Validators properties return List<T>
 [main] SqlCustomFunctionCall and SqlFunctionCall share one base type
 [main] SqlFunctionCall.Arguments property is IReadOnlyList now and parameters can't be changed after instance creation
 [main] Xtensive.Sql.Dml.Extensions.IsNullReference() extension method is marked obsolete, use 'is null' operator instead
@@ -24,8 +50,13 @@
 [main] Queries use parameters instead of constant values for type indentifiers within columns list
 [main] Added DomainConfiguration.PreferTypeIdsAsQueryParameters to choose between contants and parameters for TypeIds
 [main] ShareStorageSchemaOverNodes option now includes shared query cache when TypeIds as paremters are prefered
+[main] Introduced TypeInfo.Ancestor property
+[main] Introduced TypeInfo.DirectDescendants and.AllDescendants properties
+[main] Introduced TypeInfo.DirectInterfaces and.AllInterfaces properties
+[main] Introduced TypeInfo.DirectImplementors .AllImplementors properties
 [main] BitFaster.Caching package reference is updated to 1.0.7
 [main] No error caused by ambiguity due to new IQueryable extension methods of .Net 6
+[main] General performance and memory efficiency improvements
 [reprocessing] DomainBuildErrorEventArgs (not sealed) became read-only structure
 [reprocessing] ExecuteErrorEventArgs (not sealed) became read-only structure
 [tracking] TrackingCompletedEventArgs (sealed) became read-only structure

Orm/Xtensive.Orm.Tests.Core/Helpers/TopologicalSorterTest.cs

@@ -61,7 +61,7 @@ private static void InternalPerformanceTest(int nodeCount, int averageConnection
             GC.GetTotalMemory(true);
             using (new Measurement("Sorting", nodeCount + connectionCount)) {
                 List<Node<int, int>> removedEdges;
-                var result = TopologicalSorter.Sort(nodes, out removedEdges);
+                var result = TopologicalSorter.SortToList(nodes, out removedEdges);
                 if (!allowLoops)
                     Assert.AreEqual(nodeCount, result.Count);
             }
@@ -75,8 +75,7 @@ public void SelfReferenceTest()
             var connection = new NodeConnection<int, string>(node, node, "ConnectionItem");
             connection.BindToNodes();
 
-            List<NodeConnection<int, string>> removedEdges;
-            List<int> result = TopologicalSorter.Sort(EnumerableUtils.One(node), out removedEdges);
+            var result = TopologicalSorter.SortToList(EnumerableUtils.One(node), out var removedEdges);
             Assert.AreEqual(1, result.Count);
             Assert.AreEqual(node.Item, result[0]);
             Assert.AreEqual(1, removedEdges.Count);
@@ -97,8 +96,7 @@ public void RemoveWholeNodeTest()
 
             // Remove edge by edge.
 
-            List<NodeConnection<int, string>> removedEdges;
-            List<int> result = TopologicalSorter.Sort(new[] {node2, node1}, out removedEdges);
+            var result = TopologicalSorter.SortToList(new[] {node2, node1}, out List<NodeConnection<int, string>> removedEdges);
             Assert.AreEqual(2, result.Count);
             Assert.AreEqual(node1.Item, result[0]);
             Assert.AreEqual(node2.Item, result[1]);
@@ -111,7 +109,7 @@ public void RemoveWholeNodeTest()
             connection12_2.BindToNodes();
             connection21_1.BindToNodes();
 
-            result = TopologicalSorter.Sort(new[] {node2, node1}, out removedEdges, true);
+            result = TopologicalSorter.SortToList(new[] {node2, node1}, out removedEdges, true);
             Assert.AreEqual(2, result.Count);
             Assert.AreEqual(node1.Item, result[1]);
             Assert.AreEqual(node2.Item, result[0]);
@@ -131,8 +129,7 @@ public void CombinedTest()
 
         private void TestSort<T>(T[] data, Predicate<T, T> connector, T[] expected, T[] loops)
         {
-            List<Node<T, object>> actualLoopNodes;
-            List<T> actual = TopologicalSorter.Sort(data, connector, out actualLoopNodes);
+            var actual = TopologicalSorter.SortToList(data, connector, out List<Node<T, object>> actualLoopNodes);
             T[] actualLoops = null;
             if (actualLoopNodes != null)
                 actualLoops = actualLoopNodes
@@ -143,8 +140,7 @@ private void TestSort<T>(T[] data, Predicate<T, T> connector, T[] expected, T[]
             AssertEx.HasSameElements(expected, actual);
             AssertEx.HasSameElements(loops, actualLoops);
 
-            List<NodeConnection<T, object>> removedEdges;
-            List<T> sortWithRemove = TopologicalSorter.Sort(data, connector, out removedEdges);
+            var sortWithRemove = TopologicalSorter.SortToList(data, connector, out List<NodeConnection<T, object>> removedEdges);
             Assert.AreEqual(sortWithRemove.Count, data.Length);
             if (loops == null) {
                 Assert.AreEqual(sortWithRemove.Count, actual.Count);

Orm/Xtensive.Orm.Tests.Core/Tuples/TupleDescriptorTest.cs

@@ -117,7 +117,7 @@ public void CombinedTest()
       desc = TestDescriptor(desc, new Type[] {typeof(bool?), typeof(bool), typeof(bool?)});
     }
 
-    private TupleDescriptor TestDescriptor(TupleDescriptor theSame, Type[] types)
+    private TupleDescriptor TestDescriptor(TupleDescriptor? theSame, Type[] types)
     {
       var d1 = TupleDescriptor.Create(types);
       var d2 = TupleDescriptor.Create(types);

Orm/Xtensive.Orm.Tests.Framework/DomainModelExtensions.cs

@@ -92,7 +92,7 @@ public static void DumpAncestor(this TypeInfo target, int indent)
     public static void DumpDescendants(this TypeInfo target, int indent)
     {
       WriteLine(indent, "Descendants:");
-      HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.DirectDescendants);
+      var direct = target.DirectDescendants;
       foreach (TypeInfo descendant in target.AllDescendants) {
         if (direct.Contains(descendant))
           WriteLine(indent + 1, descendant.Name + " (direct)");
@@ -116,7 +116,7 @@ public static void DumpInterfaces(this TypeInfo target, int indent)
     public static void DumpImplementors(this TypeInfo target, int indent)
     {
       WriteLine(indent, "Implementors:");
-      HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.DirectImplementors);
+      var direct = target.DirectImplementors;
       foreach (TypeInfo implementor in target.AllImplementors) {
         if (direct.Contains(implementor))
           WriteLine(indent + 1, implementor.Name + " (direct)");

Orm/Xtensive.Orm/Core/Interfaces/ILockable.cs

@@ -25,7 +25,7 @@ public interface ILockable
     /// <summary>
     /// Locks the instance recursively.
     /// </summary>
-    void Lock();
+    void Lock() => Lock(true);
 
     /// <summary>
     /// Locks the instance and (possibly) all dependent objects.

Orm/Xtensive.Orm/Core/LockableBase.cs

@@ -41,21 +41,13 @@ public void EnsureNotLocked()
 
     // Constructors
 
-    /// <summary>
-    /// Initializes new instance of this type.
-    /// </summary>
-    protected LockableBase()
-      : this (false)
-    {
-    }
-
     /// <summary>
     /// Initializes new instance of this type.
     /// </summary>
     /// <param name="isLocked">Initial <see cref="IsLocked"/> property value.</param>
-    protected LockableBase(bool isLocked)
+    protected LockableBase(bool isLocked = false)
     {
       IsLocked = isLocked;
     }
   }
-}
+}

Orm/Xtensive.Orm/InternalLogs.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using Xtensive.Orm.Logging;
 using JetBrains.Annotations;
 
@@ -569,10 +570,8 @@ public static Exception Info(Exception exception)
       return exception;
     }
 
-    public static void Warning(string format, params object[] args)
-    {
+    public static void Warning(string format, params object[] args) =>
       instance.Warning(format, args);
-    }
 
     public static Exception Warning(Exception exception, string format, params object[] args)
     {
@@ -623,6 +622,4 @@ static TestLog()
       instance = manager.GetLog(Name);
     }
   }
-
 }
- 

Orm/Xtensive.Orm/Modelling/NodeCollection.cs

@@ -224,12 +224,12 @@ internal void Add(Node node)
       if (node.Index!=list.Count)
         throw Exceptions.InternalError("Wrong NodeCollection.Add arguments: node.Index!=list.Count!", CoreLog.Instance);
       string name = node.Name;
-      if (nameIndex.ContainsKey(name))
-        throw Exceptions.InternalError("Wrong NodeCollection.Add arguments: nameIndex[node.Name]!=null!", CoreLog.Instance);
       int count = list.Count;
+      if (!nameIndex.TryAdd(name, node)) {
+        throw Exceptions.InternalError("Wrong NodeCollection.Add arguments: nameIndex[node.Name]!=null!", CoreLog.Instance);
+      }
       try {
         list.Add(node);
-        nameIndex.Add(name, node);
         OnCollectionChanged(new NotifyCollectionChangedEventArgs(
           NotifyCollectionChangedAction.Add, node.Index));
       }

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.ClassTable.cs

@@ -31,7 +31,7 @@ private void BuildClassTableIndexes(TypeInfo type)
         // Skip indef building for inherited fields
         var hasInheritedFields = indexDescriptor.KeyFields
           .Select(kvp => type.Fields[kvp.Key])
-          .Any(f => f.IsInherited);
+          .Any(static f => f.IsInherited);
         if (hasInheritedFields) {
           continue;
         }
@@ -102,8 +102,8 @@ private void BuildClassTableIndexes(TypeInfo type)
       // Build virtual primary index
       if (ancestors.Count > 0) {
         var baseIndexes = new Stack<IndexInfo>();
-        foreach (var ancestor in ancestors.Where(t => t.Fields.Any(f => !f.IsPrimaryKey && !f.IsTypeId && f.IsDeclared))) {
-          var ancestorIndex = ancestor.Indexes.Single(i => i.IsPrimary && !i.IsVirtual);
+        foreach (var ancestor in ancestors.Where(t => t.Fields.Any(static f => !f.IsPrimaryKey && !f.IsTypeId && f.IsDeclared))) {
+          var ancestorIndex = ancestor.Indexes.Single(static i => i.IsPrimary && !i.IsVirtual);
           if (untypedIndexes.Contains(ancestorIndex) && ancestorIndex.ReflectedType == root) {
             ancestorIndex = ancestor.Indexes.Single(i => i.DeclaringIndex == ancestorIndex.DeclaringIndex && i.IsTyped);
           }
@@ -112,7 +112,7 @@ private void BuildClassTableIndexes(TypeInfo type)
           }
         }
         if (baseIndexes.Count > 0) {
-          if (primaryIndex.ValueColumns.Count > 0 && type.Fields.Any(f => !f.IsPrimaryKey && !f.IsTypeId && f.IsDeclared)) {
+          if (primaryIndex.ValueColumns.Count > 0 && type.Fields.Any(static f => !f.IsPrimaryKey && !f.IsTypeId && f.IsDeclared)) {
             baseIndexes.Push(primaryIndex);
           }
           else {

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.ClusteredIndexes.cs

@@ -23,8 +23,9 @@ private void ChooseClusteredIndexes()
         var clusteredIndexesMap = new Dictionary<TypeInfo, IndexInfo>();
         queue.Enqueue(hierarchy.Root);
         while (queue.TryDequeue(out var type)) {
-          foreach (var decendant in type.DirectDescendants)
+          foreach (var decendant in type.DirectDescendants) {
             queue.Enqueue(decendant);
+          }
           var clusteredIndexes = type.Indexes
             .Where(index => index.IsClustered && index.IsSecondary)
             .ToList();

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.ConcreteTable.cs

@@ -30,7 +30,7 @@ private void BuildConcreteTableIndexes(TypeInfo type)
         // and if they have some indexes then IndexDef.IsInherited of them will be true and it's truth actually,
         // but fields inherited from removed entities will have FieldInfo.IsInherited = false.
         // So, if we check only IndexDef.IsInherited then some indexes will be ignored.
-        if (indexDescriptor.IsInherited && indexDescriptor.KeyFields.Select(kf=> type.Fields[kf.Key]).Any(f=>f.IsInherited)) {
+        if (indexDescriptor.IsInherited && indexDescriptor.KeyFields.Select(kf=> type.Fields[kf.Key]).Any(static f => f.IsInherited)) {
           continue;
         }
 
@@ -92,8 +92,8 @@ private void BuildConcreteTableIndexes(TypeInfo type)
 
       // Build primary virtual union index
       if (descendants.Count > 0) {
-        var indexesToUnion = new List<IndexInfo>() { type.Indexes.PrimaryIndex };
-        foreach (var index in descendants.Select(t => t.Indexes.PrimaryIndex)) {
+        var indexesToUnion = new List<IndexInfo>(descendants.Count + 1) { type.Indexes.PrimaryIndex };
+        foreach (var index in descendants.Select(static t => t.Indexes.PrimaryIndex)) {
           var indexView = BuildViewIndex(type, index);
           indexesToUnion.Add(indexView);
         }
@@ -128,7 +128,7 @@ private void BuildConcreteTableIndexes(TypeInfo type)
 
       // Build virtual secondary indexes
       if (descendants.Count > 0) {
-        foreach (var index in type.Indexes.Where(i => !i.IsPrimary && !i.IsVirtual).ToList()) {
+        foreach (var index in type.Indexes.Where(static i => !i.IsPrimary && !i.IsVirtual).ToChainedBuffer()) {
           var isUntyped = untypedIndexes.Contains(index);
           var indexToUnion = isUntyped
             ? type.Indexes.Single(i => i.DeclaringIndex == index.DeclaringIndex && i.IsTyped)

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.FullText.cs

@@ -67,9 +67,8 @@ private void BuildFullTextIndexesSingleTable(TypeInfo root, IEnumerable<FullText
       var types = new HashSet<TypeInfo>();
       foreach (var fullTextIndexDef in hierarchyIndexes) {
         var type = model.Types[fullTextIndexDef.Type.UnderlyingType];
-        types.Add(type);
-        foreach (var descendant in type.AllDescendants)
-          types.Add(descendant);
+        _ = types.Add(type);
+        types.UnionWith(type.AllDescendants);
         foreach (var fullTextFieldDef in fullTextIndexDef.Fields) {
           var fullTextColumn = GetFullTextColumn(type, fullTextFieldDef);
           index.Columns.Add(fullTextColumn);
@@ -110,8 +109,8 @@ private static FullTextColumnInfo GetFullTextColumn(TypeInfo type, FullTextField
         typeColumn = field.Column;
       }
       return new FullTextColumnInfo(column) {
-        IsAnalyzed = fullTextFieldDef.IsAnalyzed, 
-        Configuration = fullTextFieldDef.Configuration, 
+        IsAnalyzed = fullTextFieldDef.IsAnalyzed,
+        Configuration = fullTextFieldDef.Configuration,
         TypeColumn = typeColumn
       };
     }
@@ -120,8 +119,9 @@ private Dictionary<TypeInfo, List<FullTextIndexDef>> GatherFullTextIndexDefinito
     {
       var model = context.Model;
       var processQueue = new Queue<TypeInfo>();
-      foreach (var type in root.DirectDescendants)
+      foreach (var type in root.DirectDescendants) {
         processQueue.Enqueue(type);
+      }
 
       var indexDefs = hierarchyIndexes.ToDictionary(
         ftid => model.Types[ftid.Type.UnderlyingType],
@@ -141,8 +141,9 @@ private Dictionary<TypeInfo, List<FullTextIndexDef>> GatherFullTextIndexDefinito
           }
         }
         if (typeHasIndexDef)
-          foreach (var descendant in type.DirectDescendants)
+          foreach (var descendant in type.DirectDescendants) {
             processQueue.Enqueue(descendant);
+          }
       }
       return indexDefs;
     }

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.SingleTable.cs

@@ -32,7 +32,7 @@ private void BuildSingleTableIndexes(TypeInfo type)
         // and if they have some indexes then IndexDef.IsInherited of them will be true and it's truth actually,
         // but fields inherited from removed entities will have FieldInfo.IsInherited = false.
         // So, if we check only IndexDef.IsInherited then some indexes will be ignored.
-        if (indexDescriptor.IsInherited && indexDescriptor.KeyFields.Select(kf => type.Fields[kf.Key]).Any(f => f.IsInherited)) {
+        if (indexDescriptor.IsInherited && indexDescriptor.KeyFields.Select(kf => type.Fields[kf.Key]).Any(static f => f.IsInherited)) {
           continue;
         }
 
@@ -83,10 +83,11 @@ private void BuildSingleTableIndexes(TypeInfo type)
       }
       var descendants = type.AllDescendants;
 
-      var primaryIndexFilterTypes = !type.IsAbstract
-        ? descendants.Prepend(type)
-        : descendants;
-      
+      var primaryIndexFilterTypes = new List<TypeInfo>(type.IsAbstract ? descendants.Count : descendants.Count + 1);
+      if (!type.IsAbstract)
+        primaryIndexFilterTypes.Add(type);
+      primaryIndexFilterTypes.AddRange(descendants);
+
       // Import inherited indexes
       var ancestorIndexes = root.Indexes
         .Where(i => types.Contains(i.ReflectedType) && !i.IsTyped)
@@ -106,7 +107,7 @@ private void BuildSingleTableIndexes(TypeInfo type)
         if (ancestorIndex.DeclaringType.IsInterface) {
           var filteredDescendants = descendants
             .Where(t => !t.IsAbstract && !t.DirectInterfaces.Contains(ancestorIndex.DeclaringType));
-          var filterByTypes = new List<TypeInfo>();
+          var filterByTypes = new List<TypeInfo>(2);
           if (!type.IsAbstract) {
             filterByTypes.Add(type);
           }