[queries] Skip down-traversal leaf check for non-traversable tables

Fix CI errors

Author: SanderMertens

distr/flecs.c

@@ -1483,9 +1483,9 @@ typedef enum {
 } ecs_trav_direction_t;
 
 typedef struct {
-    ecs_map_t src;        /* map<table_id, trav_up_t> (up direction) */
-    ecs_trav_down_t down; /* reused buffer (down direction) */
-    ecs_trav_up_t up;     /* reused buffer for top-level up result */
+    ecs_map_t src;
+    ecs_trav_down_t down;
+    ecs_trav_up_t up;
     ecs_id_t with;
     ecs_trav_direction_t dir;
 } ecs_trav_up_cache_t;
@@ -2658,10 +2658,6 @@ ecs_iter_t flecs_query_iter(
     const ecs_world_t *world,
     const ecs_query_t *q);
 
-/* Fast path for testing a trivial query against a table range, used by
- * observers. Avoids creating a full query iterator. Returns 1 on match, 0 on no
- * match, and -1 if the query is not eligible for this path (caller must fall
- * back to ecs_query_has_range). On a match, populates 'it'. */
 int flecs_query_trivial_has_range(
     const ecs_query_t *q,
     ecs_iter_t *it,
@@ -13395,11 +13391,12 @@ void flecs_iter_init(
         char *buf = flecs_stack_alloc(stack, wide + cols,
             ECS_ALIGNOF(ecs_id_t));
 
-        it->ids = (ecs_id_t*)buf;
-        it->sources = (ecs_entity_t*)(buf + (ecs_size_t)sizeof(ecs_id_t) * fc);
-        it->trs = (const ecs_table_record_t**)(buf +
+        it->ids = (ecs_id_t*)(void*)buf;
+        it->sources = (ecs_entity_t*)(void*)(buf +
+            (ecs_size_t)sizeof(ecs_id_t) * fc);
+        it->trs = (const ecs_table_record_t**)(void*)(buf +
             (ecs_size_t)(sizeof(ecs_id_t) + sizeof(ecs_entity_t)) * fc);
-        int16_t *columns = (int16_t*)(buf + wide);
+        int16_t *columns = (int16_t*)(void*)(buf + wide);
 
         ecs_os_memset(buf, 0, wide);
         ecs_os_memset(columns, 0xFF, cols);
@@ -17122,6 +17119,7 @@ void flecs_multi_observer_invoke(
     }
 
     ecs_table_t *lock_table = table;
+    (void)lock_table;
     table = table ? table : &world->store.root;
     prev_table = prev_table ? prev_table : &world->store.root;
 
@@ -17147,9 +17145,6 @@ void flecs_multi_observer_invoke(
             ecs_assert(match, ECS_INTERNAL_ERROR, NULL);
         }
     } else {
-        /* Fast path: for trivial observer queries we can test the table
-         * directly without creating a full query iterator. Monitors are handled
-         * by the regular path as they require an additional check. */
         int trivial = -1;
         if (!(impl->flags & EcsObserverIsMonitor)) {
             trivial = flecs_query_trivial_has_range(o->query, &user_it,
@@ -17249,7 +17244,6 @@ void flecs_multi_observer_invoke_no_query(
     flecs_poly_assert(o, ecs_observer_t);
 
     ecs_world_t *world = it->real_world;
-    ecs_table_t *table = it->table;
     ecs_iter_t user_it = *it;
 
     user_it.ctx = o->ctx;
@@ -17262,7 +17256,7 @@ void flecs_multi_observer_invoke_no_query(
 
     ecs_entity_t old_system = flecs_stage_set_system(
         world->stages[0], o->entity);
-    ECS_TABLE_LOCK(it->world, table);
+    ECS_TABLE_LOCK(it->world, it->table);
 
     if (o->run) {
         user_it.next = flecs_default_next_callback;
@@ -17271,7 +17265,7 @@ void flecs_multi_observer_invoke_no_query(
         user_it.callback(&user_it);
     }
 
-    ECS_TABLE_UNLOCK(it->world, table);
+    ECS_TABLE_UNLOCK(it->world, it->table);
     flecs_stage_set_system(world->stages[0], old_system);
 }
 
@@ -86019,10 +86013,6 @@ int flecs_query_trivial_has_range(
     ecs_flags32_t flags = q->flags;
     ecs_flags32_t trivial_flags = EcsQueryIsTrivial|EcsQueryMatchOnlySelf;
 
-    /* Only handle the case where the constrained query would take the trivial
-     * test code path. This mirrors the conditions in
-     * flecs_query_apply_iter_flags. For anything else, signal the caller to use
-     * the regular (full iterator) path. */
     if (impl->cache ||
         ((flags & trivial_flags) != trivial_flags) ||
         (flags & EcsQueryMatchWildcards) ||
@@ -86031,8 +86021,6 @@ int flecs_query_trivial_has_range(
         return -1;
     }
 
-    /* Eval count is incremented unconditionally, matching ecs_query_iter and
-     * the bloom filter reject path in ecs_query_has_range. */
     ECS_CONST_CAST(ecs_query_t*, q)->eval_count ++;
 
     if (table && ((offset + count) > ecs_table_count(table))) {
@@ -86043,9 +86031,6 @@ int flecs_query_trivial_has_range(
         return 0;
     }
 
-    /* Build a minimal iterator for the trivial test. Unlike flecs_query_iter
-     * this skips the var/written/op_ctx allocations and the query VM, which the
-     * trivial test never uses. */
     ecs_iter_t lit = {0};
     lit.world = ECS_CONST_CAST(ecs_world_t*, world);
     lit.real_world = q->real_world;
@@ -86058,8 +86043,6 @@ int flecs_query_trivial_has_range(
     lit.offset = offset;
     lit.count = count;
 
-    /* flecs_iter_init asserts that EcsIterIsValid is not set on entry, so only
-     * mark the iterator valid after initialization. */
     flecs_iter_init(lit.world, &lit, true);
     lit.flags |= EcsIterIsValid;
 
@@ -89912,15 +89895,14 @@ void flecs_trav_entity_down_iter_children(
         bool leaf = false;
 
         /* Check if table has the component */
-        if (flecs_component_get_table(cr_with, r->table) != NULL) {
-            if (self) {
-                /* If matching self and the table has the component, entity
-                 * shouldn't be matched through traversal and will instead
-                 * be matched directly. */
-                continue;
-            }
+        if (self || r->table->_->traversable_count) {
+            if (flecs_component_get_table(cr_with, r->table) != NULL) {
+                if (self) {
+                    continue;
+                }
 
-            leaf = true;
+                leaf = true;
+            }
         }
 
         /* Add element to the cache for a single child */
@@ -89962,11 +89944,13 @@ void flecs_trav_entity_down_iter_tables(
             ecs_table_t *table = tr->hdr.table;
             bool leaf = false;
 
-            if (flecs_component_get_table(cr_with, table) != NULL) {
-                if (self) {
-                    continue;
+            if (self || table->_->traversable_count) {
+                if (flecs_component_get_table(cr_with, table) != NULL) {
+                    if (self) {
+                        continue;
+                    }
+                    leaf = true;
                 }
-                leaf = true;
             }
 
             /* If record is not the first instance of (trav, *), don't add it

src/iter.c

@@ -60,11 +60,12 @@ void flecs_iter_init(
         char *buf = flecs_stack_alloc(stack, wide + cols,
             ECS_ALIGNOF(ecs_id_t));
 
-        it->ids = (ecs_id_t*)buf;
-        it->sources = (ecs_entity_t*)(buf + (ecs_size_t)sizeof(ecs_id_t) * fc);
-        it->trs = (const ecs_table_record_t**)(buf +
+        it->ids = (ecs_id_t*)(void*)buf;
+        it->sources = (ecs_entity_t*)(void*)(buf +
+            (ecs_size_t)sizeof(ecs_id_t) * fc);
+        it->trs = (const ecs_table_record_t**)(void*)(buf +
             (ecs_size_t)(sizeof(ecs_id_t) + sizeof(ecs_entity_t)) * fc);
-        int16_t *columns = (int16_t*)(buf + wide);
+        int16_t *columns = (int16_t*)(void*)(buf + wide);
 
         ecs_os_memset(buf, 0, wide);
         ecs_os_memset(columns, 0xFF, cols);

src/observer.c

@@ -589,6 +589,7 @@ void flecs_multi_observer_invoke(
     }
 
     ecs_table_t *lock_table = table;
+    (void)lock_table;
     table = table ? table : &world->store.root;
     prev_table = prev_table ? prev_table : &world->store.root;
 
@@ -614,9 +615,6 @@ void flecs_multi_observer_invoke(
             ecs_assert(match, ECS_INTERNAL_ERROR, NULL);
         }
     } else {
-        /* Fast path: for trivial observer queries we can test the table
-         * directly without creating a full query iterator. Monitors are handled
-         * by the regular path as they require an additional check. */
         int trivial = -1;
         if (!(impl->flags & EcsObserverIsMonitor)) {
             trivial = flecs_query_trivial_has_range(o->query, &user_it,
@@ -716,7 +714,6 @@ void flecs_multi_observer_invoke_no_query(
     flecs_poly_assert(o, ecs_observer_t);
 
     ecs_world_t *world = it->real_world;
-    ecs_table_t *table = it->table;
     ecs_iter_t user_it = *it;
 
     user_it.ctx = o->ctx;
@@ -729,7 +726,7 @@ void flecs_multi_observer_invoke_no_query(
 
     ecs_entity_t old_system = flecs_stage_set_system(
         world->stages[0], o->entity);
-    ECS_TABLE_LOCK(it->world, table);
+    ECS_TABLE_LOCK(it->world, it->table);
 
     if (o->run) {
         user_it.next = flecs_default_next_callback;
@@ -738,7 +735,7 @@ void flecs_multi_observer_invoke_no_query(
         user_it.callback(&user_it);
     }
 
-    ECS_TABLE_UNLOCK(it->world, table);
+    ECS_TABLE_UNLOCK(it->world, it->table);
     flecs_stage_set_system(world->stages[0], old_system);
 }
 

src/query/engine/eval_iter.c

@@ -579,10 +579,6 @@ int flecs_query_trivial_has_range(
     ecs_flags32_t flags = q->flags;
     ecs_flags32_t trivial_flags = EcsQueryIsTrivial|EcsQueryMatchOnlySelf;
 
-    /* Only handle the case where the constrained query would take the trivial
-     * test code path. This mirrors the conditions in
-     * flecs_query_apply_iter_flags. For anything else, signal the caller to use
-     * the regular (full iterator) path. */
     if (impl->cache ||
         ((flags & trivial_flags) != trivial_flags) ||
         (flags & EcsQueryMatchWildcards) ||
@@ -591,8 +587,6 @@ int flecs_query_trivial_has_range(
         return -1;
     }
 
-    /* Eval count is incremented unconditionally, matching ecs_query_iter and
-     * the bloom filter reject path in ecs_query_has_range. */
     ECS_CONST_CAST(ecs_query_t*, q)->eval_count ++;
 
     if (table && ((offset + count) > ecs_table_count(table))) {
@@ -603,9 +597,6 @@ int flecs_query_trivial_has_range(
         return 0;
     }
 
-    /* Build a minimal iterator for the trivial test. Unlike flecs_query_iter
-     * this skips the var/written/op_ctx allocations and the query VM, which the
-     * trivial test never uses. */
     ecs_iter_t lit = {0};
     lit.world = ECS_CONST_CAST(ecs_world_t*, world);
     lit.real_world = q->real_world;
@@ -618,8 +609,6 @@ int flecs_query_trivial_has_range(
     lit.offset = offset;
     lit.count = count;
 
-    /* flecs_iter_init asserts that EcsIterIsValid is not set on entry, so only
-     * mark the iterator valid after initialization. */
     flecs_iter_init(lit.world, &lit, true);
     lit.flags |= EcsIterIsValid;
 

src/query/engine/trav_down_cache.c

@@ -163,15 +163,14 @@ void flecs_trav_entity_down_iter_children(
         bool leaf = false;
 
         /* Check if table has the component */
-        if (flecs_component_get_table(cr_with, r->table) != NULL) {
-            if (self) {
-                /* If matching self and the table has the component, entity
-                 * shouldn't be matched through traversal and will instead
-                 * be matched directly. */
-                continue;
-            }
+        if (self || r->table->_->traversable_count) {
+            if (flecs_component_get_table(cr_with, r->table) != NULL) {
+                if (self) {
+                    continue;
+                }
 
-            leaf = true;
+                leaf = true;
+            }
         }
 
         /* Add element to the cache for a single child */
@@ -213,11 +212,13 @@ void flecs_trav_entity_down_iter_tables(
             ecs_table_t *table = tr->hdr.table;
             bool leaf = false;
 
-            if (flecs_component_get_table(cr_with, table) != NULL) {
-                if (self) {
-                    continue;
+            if (self || table->_->traversable_count) {
+                if (flecs_component_get_table(cr_with, table) != NULL) {
+                    if (self) {
+                        continue;
+                    }
+                    leaf = true;
                 }
-                leaf = true;
             }
 
             /* If record is not the first instance of (trav, *), don't add it

src/query/query.h

@@ -38,10 +38,6 @@ ecs_iter_t flecs_query_iter(
     const ecs_world_t *world,
     const ecs_query_t *q);
 
-/* Fast path for testing a trivial query against a table range, used by
- * observers. Avoids creating a full query iterator. Returns 1 on match, 0 on no
- * match, and -1 if the query is not eligible for this path (caller must fall
- * back to ecs_query_has_range). On a match, populates 'it'. */
 int flecs_query_trivial_has_range(
     const ecs_query_t *q,
     ecs_iter_t *it,

src/query/types.h

@@ -221,9 +221,9 @@ typedef enum {
 } ecs_trav_direction_t;
 
 typedef struct {
-    ecs_map_t src;        /* map<table_id, trav_up_t> (up direction) */
-    ecs_trav_down_t down; /* reused buffer (down direction) */
-    ecs_trav_up_t up;     /* reused buffer for top-level up result */
+    ecs_map_t src;
+    ecs_trav_down_t down;
+    ecs_trav_up_t up;
     ecs_id_t with;
     ecs_trav_direction_t dir;
 } ecs_trav_up_cache_t;