Some comp query optimisations (#4203)

space-wizards · Jul 29, 2023 · 161b187 · 161b187
1 parent 7c3634f
commit 161b187
Show file tree

Hide file tree

Showing 5 changed files with 175 additions and 70 deletions.
diff --git a/Robust.Server/Bql/BqlQuerySelector.Builtin.cs b/Robust.Server/Bql/BqlQuerySelector.Builtin.cs
@@ -30,7 +30,7 @@ public override IEnumerable<EntityUid> DoInitialSelection(IReadOnlyList<object>
             }
 
             return entityManager.GetAllComponents((Type) arguments[0], includePaused: true)
-                .Select(x => x.Owner);
+                .Select(x => x.Uid);
         }
     }
 

diff --git a/Robust.Shared/GameObjects/EntityManager.Components.cs b/Robust.Shared/GameObjects/EntityManager.Components.cs
@@ -1270,28 +1270,26 @@ public IEnumerable<T> EntityQuery<T>(bool includePaused = false) where T : IComp
         #endregion
 
         /// <inheritdoc />
-        public IEnumerable<IComponent> GetAllComponents(Type type, bool includePaused = false)
+        public IEnumerable<(EntityUid Uid, Component Component)> GetAllComponents(Type type, bool includePaused = false)
         {
             var comps = _entTraitDict[type];
 
             if (includePaused)
             {
-                foreach (var comp in comps.Values)
+                foreach (var (uid, comp) in comps)
                 {
                     if (comp.Deleted) continue;
 
-                    yield return comp;
+                    yield return (uid, comp);
                 }
             }
             else
             {
-                var metaQuery = GetEntityQuery<MetaDataComponent>();
-
-                foreach (var comp in comps.Values)
+                foreach (var (uid, comp) in comps)
                 {
-                    if (comp.Deleted || !metaQuery.TryGetComponent(comp.Owner, out var meta) || meta.EntityPaused) continue;
+                    if (comp.Deleted || !_metaQuery.TryGetComponent(uid, out var meta) || meta.EntityPaused) continue;
 
-                    yield return comp;
+                    yield return (uid, comp);
                 }
             }
         }

diff --git a/Robust.Shared/GameObjects/IEntityManager.Components.cs b/Robust.Shared/GameObjects/IEntityManager.Components.cs
@@ -488,7 +488,7 @@ EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> EntityQueryEnumerator<TCom
         /// <param name="type">A trait or component type to check for.</param>
         /// <param name="includePaused"></param>
         /// <returns>All components that are the specified type.</returns>
-        IEnumerable<IComponent> GetAllComponents(Type type, bool includePaused = false);
+        IEnumerable<(EntityUid Uid, Component Component)> GetAllComponents(Type type, bool includePaused = false);
 
         /// <summary>
         ///     Culls all components from the collection that are marked as deleted. This needs to be called often.

diff --git a/Robust.Shared/GameObjects/Systems/EntityLookup.Queries.cs b/Robust.Shared/GameObjects/Systems/EntityLookup.Queries.cs
@@ -144,6 +144,9 @@ private bool AnyEntitiesIntersecting(EntityUid lookupUid,
                 tuple.found = true;
                 return false;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
+
+            if (state.found)
+                return true;
         }
 
         if ((flags & LookupFlags.Static) != 0x0)
@@ -156,6 +159,9 @@ private bool AnyEntitiesIntersecting(EntityUid lookupUid,
                 tuple.found = true;
                 return false;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
+
+            if (state.found)
+                return true;
         }
 
         if ((flags & LookupFlags.StaticSundries) == LookupFlags.StaticSundries)
@@ -168,6 +174,9 @@ private bool AnyEntitiesIntersecting(EntityUid lookupUid,
                 tuple.found = true;
                 return false;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
+
+            if (state.found)
+                return true;
         }
 
         if ((flags & LookupFlags.Sundries) != 0x0)
@@ -182,10 +191,7 @@ private bool AnyEntitiesIntersecting(EntityUid lookupUid,
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
 
-        if (state.found)
-            return true;
-
-        return false;
+        return state.found;
     }
 
     private bool AnyEntitiesIntersecting(EntityUid lookupUid,
@@ -209,6 +215,9 @@ private bool AnyEntitiesIntersecting(EntityUid lookupUid,
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
 
+        if (state.found)
+            return true;
+
         if ((flags & LookupFlags.Static) != 0x0)
         {
             lookup.StaticTree.QueryAabb(ref state, (ref (EntityUid? ignored, bool found) tuple, in FixtureProxy value) =>
@@ -221,6 +230,9 @@ private bool AnyEntitiesIntersecting(EntityUid lookupUid,
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
 
+        if (state.found)
+            return true;
+
         if ((flags & LookupFlags.StaticSundries) == LookupFlags.StaticSundries)
         {
             lookup.StaticSundriesTree.QueryAabb(ref state, static (ref (EntityUid? ignored, bool found) tuple, in EntityUid value) =>
@@ -233,6 +245,9 @@ private bool AnyEntitiesIntersecting(EntityUid lookupUid,
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
 
+        if (state.found)
+            return true;
+
         if ((flags & LookupFlags.Sundries) != 0x0)
         {
             lookup.SundriesTree.QueryAabb(ref state, static (ref (EntityUid? ignored, bool found) tuple, in EntityUid value) =>
@@ -245,9 +260,6 @@ private bool AnyEntitiesIntersecting(EntityUid lookupUid,
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
 
-        if (state.found)
-            return true;
-
         return state.found;
     }