#680 replace storage_type with separate count and ids members

Author: SanderMertens

flecs.c

@@ -6981,15 +6981,6 @@ FLECS_API
 ecs_table_t* ecs_table_get_storage_table(
     const ecs_table_t *table);
 
-/** Get number of storages for table.
- *
- * @param table The table.
- * @return The number of storages (components) in table.
- */
-FLECS_API
-int32_t ecs_table_storage_count(
-    const ecs_table_t *table);
-
 /** Convert index in table type to index in table storage type. */
 int32_t ecs_table_type_to_storage_index(
     const ecs_table_t *table,

flecs.h

@@ -4224,15 +4224,6 @@ FLECS_API
 ecs_table_t* ecs_table_get_storage_table(
     const ecs_table_t *table);
 
-/** Get number of storages for table.
- *
- * @param table The table.
- * @return The number of storages (components) in table.
- */
-FLECS_API
-int32_t ecs_table_storage_count(
-    const ecs_table_t *table);
-
 /** Convert index in table type to index in table storage type. */
 int32_t ecs_table_type_to_storage_index(
     const ecs_table_t *table,

include/flecs.h

@@ -31,8 +31,7 @@ ecs_data_t* duplicate_data(
     }
 
     ecs_data_t *result = ecs_os_calloc(ECS_SIZEOF(ecs_data_t));
-    ecs_type_t storage_type = table->storage_type;
-    int32_t i, column_count = ecs_vector_count(storage_type);
+    int32_t i, column_count = table->storage_count;
     result->columns = ecs_os_memdup_n(
         main_data->columns, ecs_column_t, column_count);
 

src/addons/snapshot.c

@@ -31,8 +31,7 @@ void* get_component_w_index(
     int32_t column_index,
     int32_t row)
 {
-    ecs_check(column_index < ecs_table_storage_count(table), 
-        ECS_NOT_A_COMPONENT, NULL);
+    ecs_check(column_index < table->storage_count, ECS_NOT_A_COMPONENT, NULL);
 
     ecs_type_info_t *ti = &table->type_info[column_index];
     ecs_column_t *column = &table->storage.columns[column_index];
@@ -1305,9 +1304,8 @@ void flecs_notify_on_set(
 
     ecs_ids_t local_ids;
     if (!ids) {
-        ecs_type_t storage_type = table->storage_type;
-        local_ids.array = ecs_vector_first(storage_type, ecs_id_t);
-        local_ids.count = ecs_vector_count(storage_type);
+        local_ids.array = table->storage_ids;
+        local_ids.count = table->storage_count;
         ids = &local_ids;
     }
 
@@ -2332,7 +2330,7 @@ void ecs_clear(
     if (table) {
         ecs_table_diff_t diff = {
             .removed = flecs_type_to_ids(table->type),
-            .un_set = flecs_type_to_ids(table->storage_type)
+            .un_set = { table->storage_ids, table->storage_count, 0 }
         };
 
         delete_entity(world, table, &table->storage, info.row, &diff);
@@ -2752,7 +2750,7 @@ void ecs_delete(
         if (table_id && flecs_sparse_is_alive(&world->store.tables, table_id)) {
             ecs_table_diff_t diff = {
                 .removed = flecs_type_to_ids(table->type),
-                .un_set = flecs_type_to_ids(table->storage_type)
+                .un_set = { table->storage_ids, table->storage_count, 0 }
             };
 
             delete_entity(world, table, info.data, info.row, &diff);

src/entity.c

@@ -88,7 +88,7 @@ typedef struct ecs_table_event_t {
     /* If the nubmer of fields gets out of hand, this can be turned into a union
      * but since events are very temporary objects, this works for now and makes
      * initializing an event a bit simpler. */
-} ecs_table_event_t;    
+} ecs_table_event_t;
 
 /** A component column. */
 struct ecs_column_t {
@@ -122,8 +122,7 @@ struct ecs_data_t {
 #define EcsTableHasChildOf          8u    /* Does the table type ChildOf relation */
 #define EcsTableHasPairs            16u   /* Does the table type have pairs */
 #define EcsTableHasModule           32u   /* Does the table have module data */
-#define EcsTableHasXor              64u   /* Does the table type has XOR */
-#define EcsTableIsDisabled          128u   /* Does the table type has EcsDisabled */
+#define EcsTableIsDisabled          128u  /* Does the table type has EcsDisabled */
 #define EcsTableHasCtors            256u
 #define EcsTableHasDtors            512u
 #define EcsTableHasCopy             1024u
@@ -188,31 +187,31 @@ struct ecs_table_t {
     uint64_t id;                     /* Table id in sparse set */
     ecs_type_t type;                 /* Identifies table type in type_index */
     ecs_flags32_t flags;             /* Flags for testing table properties */
+    int32_t storage_count;           /* Number of (non-zero sized) components */
 
     struct ecs_table_record_t *records; /* Array with table records */
-    int32_t record_count;
-
     ecs_table_t *storage_table;      /* Table w/type without tags */
-    ecs_type_t storage_type;         /* Storage table type (prevents indirection) */
+    ecs_id_t *storage_ids;           /* Storage ids (prevent indirection) */
     int32_t *storage_map;            /* Map type <-> storage type
                                       *  - 0..count(T):         type -> storage_type
                                       *  - count(T)..count(S):  storage_type -> type
                                       */
 
     ecs_graph_node_t node;           /* Graph node */
     ecs_data_t storage;              /* Component storage */
-    ecs_type_info_t *type_info;     /* Cached pointers to type info */
+    ecs_type_info_t *type_info;      /* Cached pointers to type info */
 
     int32_t *dirty_state;            /* Keep track of changes in columns */
-    int32_t alloc_count;             /* Increases when columns are reallocd */
-
+    
     int16_t sw_column_count;
     int16_t sw_column_offset;
     int16_t bs_column_count;
     int16_t bs_column_offset;
 
+    int32_t alloc_count;             /* Increases when columns are reallocd */
     int32_t lock;
     int32_t refcount;
+    int32_t record_count;
 };
 
 /** Must appear as first member in payload of table cache */