Skip to content

Commit 5c3f1c7

Browse files
SergeiPavlovSergeiPavlov
committed
Rename TypeInfo properties
1 parent dcff709 commit 5c3f1c7

17 files changed

Lines changed: 75 additions & 75 deletions

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public static void DumpAncestor(this TypeInfo target, int indent)
9292
public static void DumpDescendants(this TypeInfo target, int indent)
9393
{
9494
WriteLine(indent, "Descendants:");
95-
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.Descendants);
96-
foreach (TypeInfo descendant in target.RecursiveDescendants) {
95+
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.DirectDescendants);
96+
foreach (TypeInfo descendant in target.AllDescendants) {
9797
if (direct.Contains(descendant))
9898
WriteLine(indent + 1, descendant.Name + " (direct)");
9999
else
@@ -104,8 +104,8 @@ public static void DumpDescendants(this TypeInfo target, int indent)
104104
public static void DumpInterfaces(this TypeInfo target, int indent)
105105
{
106106
WriteLine(indent, "Interfaces:");
107-
var direct = target.Interfaces;
108-
foreach (TypeInfo @interface in target.RecursiveInterfaces) {
107+
var direct = target.DirectInterfaces;
108+
foreach (TypeInfo @interface in target.AllInterfaces) {
109109
if (direct.Contains(@interface))
110110
WriteLine(indent + 1, @interface.Name + " (direct)");
111111
else
@@ -116,8 +116,8 @@ public static void DumpInterfaces(this TypeInfo target, int indent)
116116
public static void DumpImplementors(this TypeInfo target, int indent)
117117
{
118118
WriteLine(indent, "Implementors:");
119-
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.Implementors);
120-
foreach (TypeInfo implementor in target.RecursiveImplementors) {
119+
HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.DirectImplementors);
120+
foreach (TypeInfo implementor in target.AllImplementors) {
121121
if (direct.Contains(implementor))
122122
WriteLine(indent + 1, implementor.Name + " (direct)");
123123
else
@@ -166,7 +166,7 @@ public static void Dump(this TypeInfo target, int indent)
166166
WriteLine(indent, "Ancestor: " + target.Ancestor.Name);
167167
}
168168
else if (target.IsInterface) {
169-
WriteLine(indent, "Implementors: " + target.Implementors.Select(t => t.Name).ToCommaDelimitedString());
169+
WriteLine(indent, "Implementors: " + target.DirectImplementors.Select(t => t.Name).ToCommaDelimitedString());
170170
}
171171

172172
target.DumpMappingName(indent);

‎Orm/Xtensive.Orm.Tests/Storage/Prefetch/PrefetchTestHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static void AssertOnlySpecifiedColumnsAreLoaded(Key key, TypeInfo type, S
4343
var realType = state.Key.TypeInfo;
4444
Assert.IsTrue(realType.Equals(type)
4545
|| realType.Ancestors.Contains(type)
46-
|| (type.IsInterface && realType.RecursiveInterfaces.Contains(type)));
46+
|| (type.IsInterface && realType.AllInterfaces.Contains(type)));
4747
var tuple = state.Tuple;
4848
Assert.IsNotNull(tuple);
4949
foreach (var field in type.Fields) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private void BuildClassTableIndexes(TypeInfo type)
2525
var root = type.Hierarchy.Root;
2626
var typeDef = context.ModelDef.Types[type.UnderlyingType];
2727
var ancestors = type.Ancestors;
28-
var interfaces = type.Interfaces;
28+
var interfaces = type.DirectInterfaces;
2929

3030
// Building declared indexes both secondary and primary (for root of the hierarchy only)
3131
foreach (var indexDescriptor in typeDef.Indexes) {
@@ -80,14 +80,14 @@ private void BuildClassTableIndexes(TypeInfo type)
8080
}
8181

8282
// Build indexes for descendants
83-
foreach (var descendant in type.Descendants)
83+
foreach (var descendant in type.DirectDescendants)
8484
BuildClassTableIndexes(descendant);
8585

8686
// Import inherited indexes
8787
var primaryIndex = type.Indexes.FindFirst(IndexAttributes.Primary | IndexAttributes.Real);
8888
if (untypedIndexes.Contains(primaryIndex) && primaryIndex.ReflectedType == root)
8989
primaryIndex = type.Indexes.Single(i => i.DeclaringIndex == primaryIndex.DeclaringIndex && i.IsTyped);
90-
var filterByTypes = type.RecursiveDescendants.Append(type).ToList();
90+
var filterByTypes = type.AllDescendants.Append(type).ToList();
9191

9292
// Build virtual primary index
9393
if (ancestors.Count > 0) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ private void ChooseClusteredIndexes()
2323
var clusteredIndexesMap = new Dictionary<TypeInfo, IndexInfo>();
2424
queue.Enqueue(hierarchy.Root);
2525
while (queue.TryDequeue(out var type)) {
26-
foreach (var decendant in type.Descendants)
26+
foreach (var decendant in type.DirectDescendants)
2727
queue.Enqueue(decendant);
2828
var clusteredIndexes = type.Indexes
2929
.Where(index => index.IsClustered && index.IsSecondary)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void BuildConcreteTableIndexes(TypeInfo type)
5353
}
5454

5555
// Building inherited from interfaces indexes
56-
foreach (var @interface in type.RecursiveInterfaces) {
56+
foreach (var @interface in type.AllInterfaces) {
5757
foreach (var parentIndex in @interface.Indexes.Find(IndexAttributes.Primary, MatchType.None)) {
5858
if (parentIndex.DeclaringIndex != parentIndex)
5959
continue;
@@ -75,11 +75,11 @@ private void BuildConcreteTableIndexes(TypeInfo type)
7575
}
7676

7777
// Build indexes for descendants
78-
foreach (var descendant in type.Descendants)
78+
foreach (var descendant in type.DirectDescendants)
7979
BuildConcreteTableIndexes(descendant);
8080

8181
var ancestors = type.Ancestors;
82-
var descendants = type.RecursiveDescendants;
82+
var descendants = type.AllDescendants;
8383

8484
// Build primary virtual union index
8585
if (descendants.Count > 0) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private void BuildFullTextIndexesClassTable(TypeInfo root, IEnumerable<FullTextI
4444
var indexesToDefine = hierarchyIndexes.ToList();
4545
if (indexesToDefine.Any(fti => fti.Type.UnderlyingType != root.UnderlyingType) || indexesToDefine.Count > 1)
4646
throw new DomainBuilderException(string.Format(Strings.ExUnableToBuildFulltextIndexesForHierarchyWithInheritanceSchemaClassTable, root.Name));
47-
var descendants = root.RecursiveDescendants.Append(root);
47+
var descendants = root.AllDescendants.Append(root);
4848
var indexDef = indexesToDefine[0];
4949
var primaryIndex = root.Indexes.Single(i => i.IsPrimary && !i.IsVirtual);
5050
var name = context.NameBuilder.BuildFullTextIndexName(root);
@@ -68,7 +68,7 @@ private void BuildFullTextIndexesSingleTable(TypeInfo root, IEnumerable<FullText
6868
foreach (var fullTextIndexDef in hierarchyIndexes) {
6969
var type = model.Types[fullTextIndexDef.Type.UnderlyingType];
7070
types.Add(type);
71-
foreach (var descendant in type.RecursiveDescendants)
71+
foreach (var descendant in type.AllDescendants)
7272
types.Add(descendant);
7373
foreach (var fullTextFieldDef in fullTextIndexDef.Fields) {
7474
var fullTextColumn = GetFullTextColumn(type, fullTextFieldDef);
@@ -120,7 +120,7 @@ private Dictionary<TypeInfo, List<FullTextIndexDef>> GatherFullTextIndexDefinito
120120
{
121121
var model = context.Model;
122122
var processQueue = new Queue<TypeInfo>();
123-
foreach (var type in root.Descendants)
123+
foreach (var type in root.DirectDescendants)
124124
processQueue.Enqueue(type);
125125

126126
var indexDefs = hierarchyIndexes.ToDictionary(
@@ -141,7 +141,7 @@ private Dictionary<TypeInfo, List<FullTextIndexDef>> GatherFullTextIndexDefinito
141141
}
142142
}
143143
if (typeHasIndexDef)
144-
foreach (var descendant in type.Descendants)
144+
foreach (var descendant in type.DirectDescendants)
145145
processQueue.Enqueue(descendant);
146146
}
147147
return indexDefs;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void BuildSingleTableIndexes(TypeInfo type)
4242

4343
var parent = type.Ancestor;
4444
// Building inherited from interfaces indexes
45-
foreach (var @interface in type.Interfaces) {
45+
foreach (var @interface in type.DirectInterfaces) {
4646
foreach (var interfaceIndex in @interface.Indexes.Find(IndexAttributes.Primary, MatchType.None)) {
4747
if (root.Indexes.Any(i => i.DeclaringIndex == interfaceIndex.DeclaringIndex && i.ReflectedType == type))
4848
continue;
@@ -68,12 +68,12 @@ private void BuildSingleTableIndexes(TypeInfo type)
6868
}
6969

7070
// Build indexes for descendants
71-
foreach (var descendant in type.Descendants) {
71+
foreach (var descendant in type.DirectDescendants) {
7272
BuildSingleTableIndexes(descendant);
7373
}
7474

7575
if (type == root) return;
76-
var descendants = type.RecursiveDescendants;
76+
var descendants = type.AllDescendants;
7777

7878
var primaryIndexFilterTypes = new List<TypeInfo>();
7979
if (!type.IsAbstract)
@@ -96,7 +96,7 @@ private void BuildSingleTableIndexes(TypeInfo type)
9696
continue;
9797
if (ancestorIndex.DeclaringType.IsInterface) {
9898
var filteredDescendants = descendants
99-
.Where(t => !t.IsAbstract && !t.Interfaces.Contains(ancestorIndex.DeclaringType));
99+
.Where(t => !t.IsAbstract && !t.DirectInterfaces.Contains(ancestorIndex.DeclaringType));
100100
var filterByTypes = new List<TypeInfo>();
101101
if (!type.IsAbstract)
102102
filterByTypes.Add(type);

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private void CreateInterfaceIndexes(TypeInfo @interface, ICollection<TypeInfo> p
8080
context.Model.RealIndexes.Add(index);
8181
}
8282

83-
var interfaces = @interface.Interfaces;
83+
var interfaces = @interface.DirectInterfaces;
8484
foreach (var typeInfo in interfaces)
8585
CreateInterfaceIndexes(typeInfo, processedInterfaces);
8686

@@ -100,7 +100,7 @@ private void CreateInterfaceIndexes(TypeInfo @interface, ICollection<TypeInfo> p
100100
private void BuildInterfaceIndexes()
101101
{
102102
foreach (var @interface in context.Model.Types.Find(TypeAttributes.Interface)) {
103-
var implementors = @interface.Implementors;
103+
var implementors = @interface.DirectImplementors;
104104

105105
// Building primary indexes
106106
if (implementors.Count == 1) {
@@ -188,7 +188,7 @@ private void BuildInterfaceIndexes()
188188
}
189189
case InheritanceSchema.ConcreteTable: {
190190
var grouping = hierarchy;
191-
var allImplementors = @interface.RecursiveImplementors
191+
var allImplementors = @interface.AllImplementors
192192
.Where(t => t.Hierarchy == grouping.Key && !t.IsAbstract)
193193
.ToList();
194194
var primaryIndexes = allImplementors
@@ -231,7 +231,7 @@ private void BuildInterfaceIndexes()
231231
var filterByTypes = new List<TypeInfo>();
232232
if (!implementor.IsAbstract)
233233
filterByTypes.Add(implementor);
234-
var subHierarchyNodeCount = implementor.RecursiveDescendants.Count() + filterByTypes.Count;
234+
var subHierarchyNodeCount = implementor.AllDescendants.Count() + filterByTypes.Count;
235235
filterByTypes.AddRange(GatherDescendants(implementor, hierarchyImplementors));
236236
if (filterByTypes.Count != subHierarchyNodeCount)
237237
index = BuildFilterIndex(implementor, index, filterByTypes);
@@ -258,7 +258,7 @@ private void BuildInterfaceIndexes()
258258
break;
259259
}
260260
case InheritanceSchema.ConcreteTable: {
261-
var indexes = @interface.RecursiveImplementors
261+
var indexes = @interface.AllImplementors
262262
.Where(t => t.Hierarchy == grouping.Key)
263263
.Select(t => (Index: t.Indexes.Single(i => i.DeclaringIndex == localIndex.DeclaringIndex && !i.IsVirtual), Type: t))
264264
.Select(p => untypedIndexes.Contains(p.Index)
@@ -351,9 +351,9 @@ private IndexInfo BuildIndex(TypeInfo typeInfo, IndexDef indexDef, bool buildAbs
351351
if (indexDef.IsPrimary) {
352352
var typeInfoAsArray = new[] { typeInfo };
353353
var types = typeInfo.IsInterface
354-
? typeInfo.Interfaces.Union(typeInfoAsArray)
354+
? typeInfo.DirectInterfaces.Union(typeInfoAsArray)
355355
: typeInfo.Hierarchy.InheritanceSchema switch {
356-
InheritanceSchema.SingleTable => typeInfoAsArray.Concat(typeInfo.Hierarchy.Root.RecursiveDescendants.Except(typeInfoAsArray)), // Order does matter. typeInfo must be first.
356+
InheritanceSchema.SingleTable => typeInfoAsArray.Concat(typeInfo.Hierarchy.Root.AllDescendants.Except(typeInfoAsArray)), // Order does matter. typeInfo must be first.
357357
InheritanceSchema.ConcreteTable => typeInfo.Ancestors.Union(typeInfoAsArray),
358358
_ => typeInfoAsArray
359359
};
@@ -702,7 +702,7 @@ private IndexInfo BuildViewIndex(TypeInfo reflectedType, IndexInfo indexToApplyV
702702
? indexToApplyView.ReflectedType.Ancestors.Append(indexToApplyView.ReflectedType)
703703
: reflectedType.Ancestors.Append(reflectedType)).ToHashSet();
704704
var interfaces = (reflectedType.IsInterface
705-
? reflectedType.RecursiveInterfaces.Append(reflectedType)
705+
? reflectedType.AllInterfaces.Append(reflectedType)
706706
: Enumerable.Empty<TypeInfo>()).ToHashSet();
707707

708708
var indexReflectedType = indexToApplyView.ReflectedType;
@@ -774,7 +774,7 @@ private IndexInfo BuildViewIndex(TypeInfo reflectedType, IndexInfo indexToApplyV
774774

775775
private static IEnumerable<TypeInfo> GatherDescendants(TypeInfo type, ICollection<TypeInfo> hierarchyImplementors)
776776
{
777-
return type.RecursiveDescendants.Where(t => !t.IsAbstract).Except(hierarchyImplementors);
777+
return type.AllDescendants.Where(t => !t.IsAbstract).Except(hierarchyImplementors);
778778
}
779779

780780
private IEnumerable<ColumnInfo> GatherValueColumns(IEnumerable<ColumnInfo> columns)
@@ -888,7 +888,7 @@ private void ExtractAffectedIndexes(
888888
private void BuildAffectedIndexesForMaterializedInterface(TypeInfo typeInfo)
889889
{
890890
var primaryIndex = typeInfo.Indexes.PrimaryIndex;
891-
foreach (var descendant in typeInfo.RecursiveDescendants.Where(t => t.IsEntity).Distinct()) {
891+
foreach (var descendant in typeInfo.AllDescendants.Where(t => t.IsEntity).Distinct()) {
892892
descendant.AffectedIndexes.Add(primaryIndex);
893893
foreach (var indexInfo in typeInfo.Indexes.Find(IndexAttributes.Primary, MatchType.None)) {
894894
var descendantIndex = descendant.Indexes.Where(i => i.DeclaringIndex==indexInfo.DeclaringIndex).FirstOrDefault();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,8 @@ private void FindAndMarkInboundAndOutboundTypes(BuildingContext context)
477477
private void RegiserReferences(Dictionary<TypeInfo, int> referenceRegistrator, params TypeInfo[] typesToRegisterReferences)
478478
{
479479
foreach (var type in typesToRegisterReferences) {
480-
var typeImplementors = type.Implementors;
481-
var descendantTypes = type.RecursiveDescendants;
480+
var typeImplementors = type.DirectImplementors;
481+
var descendantTypes = type.AllDescendants;
482482
if (typeImplementors.Any())
483483
{
484484
foreach (var implementor in typeImplementors)

‎Orm/Xtensive.Orm/Orm/Building/Builders/StorageMappingValidator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private void EnsureMappingDatabaseIsValid()
6969
private void EnsureIntefacesAreImplementedWithinSingleDatabase()
7070
{
7171
foreach (var @interface in model.Types.Where(t => t.IsInterface)) {
72-
var implementors = @interface.RecursiveImplementors;
72+
var implementors = @interface.AllImplementors;
7373
if (implementors.Count == 0) {
7474
continue; // shouldn't reach here, but it's safer to do check anyway
7575
}

0 commit comments

Comments
 (0)