Merge branch 'master' into master-net5-to-net7

Author: alex-kulakov

ChangeLog/7.2.0-Beta-1-dev.txt

@@ -10,5 +10,18 @@
 [main] TemporaryTableDescriptor changed interface to IMultiRecordPersistDescriptor, fully compatible with IPersistDescriptor
 [main] SqlNode.Clone() method now returns SqlNode to take advantage of C# covariant returns and reduce casts overhead
 [main] Improved exception handling if some appered during asynchronous Session opening
+[main] Obsolete LockableExtensions.EnsureNotLocked is removed
+[main] Obsolete DomainConfiguration.DefaultVersioningPolicy is removed
+[main] Obsolete TypeInfo methods (GetImplementors(), GetInterfaces(), GetDescendants(), GetAncestors() and GetRoot()) are removed
+[main] Obsolete TypeInfoCollection FindXXX methods are removed
+[main] Obsolete PersistRequest constructor removed
+[main] Obsolete PersistRequestBuilder.CreatePersistRequest() method is removed.
+[main] Obsolete StorageDriver.Compile(ISqlCompileUnit, NodeConfigruation) method is removed
+[main] Obsolete MethodHelper.GetMethod() and .GetConstructor() methods are removed
+[main] Obsolete TypeHelper.GetConstructor() and .GetInterfaces() are removed
+[main] Obsolete SqlCompilerConfiguration.SchemaMapping and .DatabaseMapping properties and constructor are removed
+[main] Obsolete SqlNodeActualizer class is removed
+[main] Obsolete SqlCompilerContext.SqlNodeActualizer property is removed
+[main] Obsolete XtensiveSql.Dml.Extensions.IsNullReference() extension method is removed
 [postgresql] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
 [oracle] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now

Orm/Xtensive.Orm/Core/Extensions/LockableExtensions.cs

@@ -120,7 +120,7 @@ private void BuildClassTableIndexes(TypeInfo type)
             var filteredIndex = BuildFilterIndex(type, ancestorIndex, filterByTypes);
             baseIndexes.Push(filteredIndex);
           }
-          var virtualPrimaryIndex = baseIndexes.Count == 1 
+          var virtualPrimaryIndex = baseIndexes.Count == 1
             ? baseIndexes.Pop()
             : BuildJoinIndex(type, baseIndexes);
           type.Indexes.Add(virtualPrimaryIndex);

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

@@ -93,11 +93,9 @@ private void BuildConcreteTableIndexes(TypeInfo type)
 
       // Build primary virtual union index
       if (descendants.Count > 0) {
-        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);
-        }
+        var indexesToUnion = descendants.Select(t => BuildViewIndex(type, t.Indexes.PrimaryIndex))
+          .Prepend(type.Indexes.PrimaryIndex);
+
         var virtualPrimaryIndex = BuildUnionIndex(type, indexesToUnion);
         type.Indexes.Add(virtualPrimaryIndex);
 

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

@@ -166,13 +166,10 @@ private void BuildInterfaceIndexes()
                   var filterIndex = BuildFilterIndex(implementor,
                     typedIndex ?? typeIndexes.Dequeue(),
                     NonAbstractTypeWithDescendants(implementor, hierarchyImplementors));
-                  var indexesToJoin = new List<IndexInfo>(1 + typeIndexes.Count);
-                  indexesToJoin.Add(filterIndex);
-                  indexesToJoin.AddRange(typeIndexes);
 
-                  var indexToApplyView = indexesToJoin.Count > 1
-                    ? BuildJoinIndex(implementor, indexesToJoin)
-                    : indexesToJoin[0];
+                  var indexToApplyView = typeIndexes.Count > 0
+                    ? BuildJoinIndex(implementor, typeIndexes.Prepend(filterIndex))
+                    : filterIndex;
                   var indexView = BuildViewIndex(@interface, indexToApplyView);
                   underlyingIndex.UnderlyingIndexes.Add(indexView);
                 }
@@ -499,7 +496,7 @@ private IndexInfo BuildTypedIndex(TypeInfo reflectedType, IndexInfo realIndex)
       var attributes = realIndex.Attributes
         & (IndexAttributes.Primary | IndexAttributes.Secondary | IndexAttributes.Unique | IndexAttributes.Abstract)
         | IndexAttributes.Typed | IndexAttributes.Virtual;
-      var result = new IndexInfo(reflectedType, attributes, realIndex, Array.Empty<IndexInfo>());
+      var result = new IndexInfo(reflectedType, attributes, realIndex, addAncestorToUnderlyings: true);
 
       // Adding key columns
       foreach (KeyValuePair<ColumnInfo, Direction> pair in realIndex.KeyColumns) {
@@ -534,7 +531,7 @@ private IndexInfo BuildFilterIndex(TypeInfo reflectedType, IndexInfo indexToFilt
       var attributes = indexToFilter.Attributes
         & (IndexAttributes.Primary | IndexAttributes.Secondary | IndexAttributes.Unique | IndexAttributes.Abstract)
         | IndexAttributes.Filtered | IndexAttributes.Virtual;
-      var result = new IndexInfo(reflectedType, attributes, indexToFilter, Array.Empty<IndexInfo>()) {
+      var result = new IndexInfo(reflectedType, attributes, indexToFilter, addAncestorToUnderlyings: true) {
         FilterByTypes = filterByTypes
       };
 
@@ -563,11 +560,10 @@ private IndexInfo BuildJoinIndex(TypeInfo reflectedType, IEnumerable<IndexInfo>
     {
       var nameBuilder = context.NameBuilder;
       var firstIndex = indexesToJoin.First();
-      var otherIndexes = indexesToJoin.Skip(1).ToArray();
       var attributes = firstIndex.Attributes
         & (IndexAttributes.Primary | IndexAttributes.Secondary | IndexAttributes.Unique)
         | IndexAttributes.Join | IndexAttributes.Virtual;
-      var result = new IndexInfo(reflectedType, attributes, firstIndex, otherIndexes);
+      var result = new IndexInfo(reflectedType, attributes, indexesToJoin);
 
       // Adding key columns
       foreach (KeyValuePair<ColumnInfo, Direction> pair in firstIndex.KeyColumns) {
@@ -648,11 +644,10 @@ private IndexInfo BuildUnionIndex(TypeInfo reflectedType, IEnumerable<IndexInfo>
     {
       var nameBuilder = context.NameBuilder;
       var firstIndex = indexesToUnion.First();
-      var otherIndexes = indexesToUnion.Skip(1).ToArray();
       var attributes = firstIndex.Attributes
         & (IndexAttributes.Primary | IndexAttributes.Secondary | IndexAttributes.Unique)
         | IndexAttributes.Union | IndexAttributes.Virtual;
-      var result = new IndexInfo(reflectedType, attributes, firstIndex, otherIndexes);
+      var result = new IndexInfo(reflectedType, attributes, indexesToUnion);
 
       // Adding key columns
       foreach (KeyValuePair<ColumnInfo, Direction> pair in firstIndex.KeyColumns) {
@@ -685,7 +680,7 @@ private IndexInfo BuildViewIndex(TypeInfo reflectedType, IndexInfo indexToApplyV
       var attributes = indexToApplyView.Attributes
         & (IndexAttributes.Primary | IndexAttributes.Secondary | IndexAttributes.Unique | IndexAttributes.Abstract)
         | IndexAttributes.View | IndexAttributes.Virtual;
-      var result = new IndexInfo(reflectedType, attributes, indexToApplyView, Array.Empty<IndexInfo>());
+      var result = new IndexInfo(reflectedType, attributes, indexToApplyView, addAncestorToUnderlyings: true);
 
       // Adding key columns
       foreach (KeyValuePair<ColumnInfo, Direction> pair in indexToApplyView.KeyColumns) {

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

@@ -81,12 +81,6 @@ public class DomainConfiguration : ConfigurationBase
     /// </summary>
     public const bool DefaultEnsureConnectionIsAlive = true;
 
-    /// <summary>
-    /// Default <see cref="EntityVersioningPolicy"/> value;
-    /// </summary>
-    [Obsolete("Use VersioningConvention.DefaultVersioningPolicy")]
-    public const EntityVersioningPolicy DefaultVersioningPolicy = EntityVersioningPolicy.Default;
-
     /// <summary>
     /// Default <see cref="UpgradeMode"/> value.
     /// </summary>

Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs

@@ -286,32 +286,38 @@ public override void UpdateState()
       base.UpdateState();
       CreateColumns();
       ValueColumns.UpdateState();
-      foreach (IndexInfo baseIndex in UnderlyingIndexes) {
+      foreach (var baseIndex in UnderlyingIndexes) {
         baseIndex.UpdateState();
       }
       filter?.UpdateState();
       CreateTupleDescriptors();
 
-      if (!IsPrimary)
+      if (!IsPrimary) {
         return;
+      }
 
-      var system = new List<int>();
+      var keyColumnsCount = KeyColumns.Count;
+      var system = new List<int>(keyColumnsCount + 1);
       var lazy = new List<int>();
-      var regular = new List<int>();
+      var regular = new List<int>(Columns.Count - keyColumnsCount);
 
       for (int i = 0, count = Columns.Count; i < count; i++) {
         var item = Columns[i];
-        if (item.IsPrimaryKey || item.IsSystem)
+        if (item.IsPrimaryKey || item.IsSystem) {
           system.Add(i);
+        }
+        else if (item.IsLazyLoad) {
+          lazy.Add(i);
+        }
         else {
-          if (item.IsLazyLoad)
-            lazy.Add(i);
-          else
-            regular.Add(i);
+          regular.Add(i);
         }
       }
 
-      ColumnIndexMap = new ColumnIndexMap(system, regular, lazy);
+      ColumnIndexMap = new ColumnIndexMap(
+        system,
+        (regular.Count == 0) ? Array.Empty<int>() : regular,
+        (lazy.Count == 0) ? Array.Empty<int>() : lazy);
     }
 
     /// <inheritdoc/>
@@ -345,15 +351,15 @@ private void CreateColumns()
       Columns = Array.AsReadOnly(KeyColumns.Select(static pair => pair.Key).Concat(ValueColumns).ToArray(KeyColumns.Count + ValueColumns.Count));
     }
 
-    // Constructors
-
-    private IndexInfo()
+    /// Unsubscribe ColumnInfoCollections from FieldInfo events to avoid memory leak.
+    public void Dispose()
     {
-      KeyColumns = new DirectionCollection<ColumnInfo>();
-      IncludedColumns = new ColumnInfoCollection(this, "IncludedColumns");
-      ValueColumns = new ColumnInfoCollection(this, "ValueColumns");
+      IncludedColumns.Clear();
+      ValueColumns.Clear();
     }
 
+    // Constructors
+
     /// <summary>
     /// Initializes a new instance of this class.
     /// </summary>
@@ -372,9 +378,10 @@ public IndexInfo(TypeInfo declaringType, IndexAttributes indexAttributes)
     /// Initializes a new instance of this class.
     /// </summary>
     /// <param name="reflectedType">Reflected type.</param>
-    /// <param name="ancestorIndex">The ancestors index.</param>
     /// <param name="indexAttributes"><see cref="IndexAttributes"/> attributes for this instance.</param>
-    public IndexInfo(TypeInfo reflectedType, IndexAttributes indexAttributes, IndexInfo ancestorIndex)
+    /// <param name="ancestorIndex">The ancestors index.</param>
+    /// <param name="addAncestorToUnderlyings"><see langword="true"/> if <paramref name="ancestorIndex"/> should also be treated as underlying index.</param>
+    public IndexInfo(TypeInfo reflectedType, IndexAttributes indexAttributes, IndexInfo ancestorIndex, bool addAncestorToUnderlyings = false)
       : this()
     {
       DeclaringType = ancestorIndex.DeclaringType;
@@ -385,6 +392,10 @@ public IndexInfo(TypeInfo reflectedType, IndexAttributes indexAttributes, IndexI
       filterExpression = ancestorIndex.FilterExpression;
       DeclaringIndex = ancestorIndex.DeclaringIndex;
       shortName = ancestorIndex.ShortName;
+
+      if (addAncestorToUnderlyings) {
+        UnderlyingIndexes.Add(ancestorIndex);
+      }
     }
 
     /// <summary>
@@ -394,6 +405,7 @@ public IndexInfo(TypeInfo reflectedType, IndexAttributes indexAttributes, IndexI
     /// <param name="indexAttributes">The index attributes.</param>
     /// <param name="baseIndex">Base index.</param>
     /// <param name="baseIndexes">The base indexes.</param>
+    [Obsolete("Use either IndexInfo(reflectedType, indexAttributes, ancestorIndex, true) in case of one base index or varaint with sequence of indexes")]
     public IndexInfo(TypeInfo reflectedType, IndexAttributes indexAttributes, IndexInfo baseIndex, params IndexInfo[] baseIndexes)
       : this()
     {
@@ -412,6 +424,33 @@ public IndexInfo(TypeInfo reflectedType, IndexAttributes indexAttributes, IndexI
         UnderlyingIndexes.Add(info);
     }
 
+    /// <summary>
+    /// Initializes a new instance of this class.
+    /// </summary>
+    /// <param name="reflectedType">Reflected type.</param>
+    /// <param name="indexAttributes">The index attributes.</param>
+    /// <param name="baseIndexes">The base indexes, first of which will be used as source index properties.</param>
+    public IndexInfo(TypeInfo reflectedType, IndexAttributes indexAttributes, IEnumerable<IndexInfo> baseIndexes)
+      : this()
+    {
+      this.ReflectedType = reflectedType;
+      attributes = indexAttributes;
+
+      foreach (var info in baseIndexes) {
+        if (DeclaringType is null) {
+          DeclaringType = info.DeclaringType;
+          fillFactor = info.FillFactor;
+          filterExpression = info.FilterExpression;
+          DeclaringIndex = info.DeclaringIndex;
+          shortName = info.ShortName;
+        }
+        UnderlyingIndexes.Add(info);
+      }
+      if (UnderlyingIndexes.Count == 0) {
+        throw new ArgumentException(Strings.ExSequenceContainsNoElements, nameof(baseIndexes));
+      }
+    }
+
     /// <summary>
     /// Used for cloning only.
     /// </summary>
@@ -430,11 +469,11 @@ private IndexInfo(IndexInfo original)
       DeclaringIndex = original.DeclaringIndex.DeclaringIndex;
     }
 
-    /// Unsubscribe ColumnInfoCollections from FieldInfo events to avoid memory leak.
-    public void Dispose()
+    private IndexInfo()
     {
-      IncludedColumns.Clear();
-      ValueColumns.Clear();
+      KeyColumns = new DirectionCollection<ColumnInfo>();
+      IncludedColumns = new ColumnInfoCollection(this, "IncludedColumns");
+      ValueColumns = new ColumnInfoCollection(this, "ValueColumns");
     }
   }
 }

Orm/Xtensive.Orm/Orm/Model/IndexInfo.cs

@@ -566,43 +566,6 @@ public Tuple InjectPrimaryKey(Tuple entityTuple, Tuple primaryKey)
       return primaryKeyInjector.Apply(TupleTransformType.Tuple, primaryKey, entityTuple);
     }
 
-    /// <summary>
-    /// Gets the direct implementors of this instance.
-    /// </summary>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and non-direct implementors will be returned.</param>
-    [Obsolete("Use DirectImplementors/AllImplementors properties instead")]
-    public IEnumerable<TypeInfo> GetImplementors(bool recursive = false) => recursive ? AllImplementors : DirectImplementors;
-
-    /// <summary>
-    /// Gets the persistent interfaces this instance implements.
-    /// </summary>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and non-direct implemented interfaces will be returned.</param>
-    [Obsolete("Use DirectInterfaces/AllInterfaces properties instead")]
-    public IEnumerable<TypeInfo> GetInterfaces(bool recursive = false) => recursive ? AllInterfaces : DirectInterfaces;
-
-    /// <summary>
-    /// Gets descendants of this instance.
-    /// </summary>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and nested descendants will be returned.</param>
-    /// <returns></returns>
-    [Obsolete("Use DirectDescendants/AllDescendants properties instead")]
-    public IEnumerable<TypeInfo> GetDescendants(bool recursive) => recursive ? AllDescendants : DirectDescendants;
-
-    /// <summary>
-    /// Gets the ancestors recursively. Root-to-inheritor order.
-    /// </summary>
-    /// <returns>The ancestor</returns>
-    [Obsolete("Use Ancestors property instead")]
-    public IReadOnlyList<TypeInfo> GetAncestors() => Ancestors.ToList();
-
-    /// <summary>
-    /// Gets the root of the hierarchy.
-    /// </summary>
-    /// <returns>The hierarchy root.</returns>
-    [Obsolete("Use Root property instead")]
-    [CanBeNull]
-    public TypeInfo GetRoot() => Root;
-
     public IEnumerable<AssociationInfo> GetTargetAssociations()
     {
       if (targetAssociations == null) {