Undo slice pooling for filters/queries (#423)

* undo slice pooling for filters/queries
* undo entity column and table ID in query

Author: mlange-42

ecs/column.go

@@ -7,19 +7,14 @@ import (
 
 // column storage for components in an table.
 type column struct {
-	columnLayout
-	data       reflect.Value // data buffer
-	elemType   reflect.Type  // element type of the column
-	index      uint32        // index of the column in the containing table
-	isRelation bool          // whether this column is for a relation component
-	isTrivial  bool          // Whether the column's type is trivial , i.e. without pointers.
-}
-
-// columnLayout contains the minimal necessary information for column.Get.
-type columnLayout struct {
-	pointer  unsafe.Pointer // pointer to the first element
-	itemSize uintptr        // memory size of items
-	target   Entity         // target entity if for a relation component
+	data       reflect.Value  // data buffer
+	pointer    unsafe.Pointer // pointer to the first element
+	itemSize   uintptr        // memory size of items
+	elemType   reflect.Type   // element type of the column
+	target     Entity         // target entity if for a relation component
+	index      uint32         // index of the column in the containing table
+	isRelation bool           // whether this column is for a relation component
+	isTrivial  bool           // Whether the column's type is trivial , i.e. without pointers.
 }
 
 // newColumn creates a new column for a given type and capacity.
@@ -29,11 +24,9 @@ func newColumn(index uint32, tp reflect.Type, itemSize uintptr, isRelation bool,
 	pointer := data.Addr().UnsafePointer()
 
 	return column{
-		columnLayout: columnLayout{
-			pointer:  pointer,
-			itemSize: itemSize,
-			target:   target,
-		},
+		pointer:    pointer,
+		itemSize:   itemSize,
+		target:     target,
 		index:      index,
 		data:       data,
 		isRelation: isRelation,
@@ -43,7 +36,7 @@ func newColumn(index uint32, tp reflect.Type, itemSize uintptr, isRelation bool,
 }
 
 // Get returns a pointer to the component at the given index.
-func (c *columnLayout) Get(index uintptr) unsafe.Pointer {
+func (c *column) Get(index uintptr) unsafe.Pointer {
 	return unsafe.Add(c.pointer, index*c.itemSize)
 }
 
@@ -137,11 +130,6 @@ func (c *entityColumn) Get(index uintptr) unsafe.Pointer {
 	return unsafe.Add(c.pointer, index*entitySize)
 }
 
-// GetEntity returns the entity at the given index.
-func (c *entityColumn) GetEntity(index uintptr) Entity {
-	return *(*Entity)(unsafe.Add(c.pointer, index*entitySize))
-}
-
 // CopyToEnd copies from the given column to the end of this column.
 // Column length must be increased before.
 func (c *entityColumn) CopyToEnd(from *entityColumn, ownLen uint32, count uint32) {

ecs/exchange_gen.go

@@ -38,17 +38,12 @@ func (f UnsafeFilter) Exclusive() UnsafeFilter {
 
 // Query returns a new query matching this filter and the given entity relation targets.
 func (f UnsafeFilter) Query(relations ...Relation) UnsafeQuery {
-	f.world.storage.mu.Lock()
-	lock := f.world.lock()
-	rel := f.world.storage.slices.relationsPool.Get()
-	f.world.storage.mu.Unlock()
-
-	rel = relationSlice(relations).ToRelationIDsForUnsafe(f.world, rel)
+	rel := relationSlice(relations).ToRelationIDsForUnsafe(f.world, nil)
 	return UnsafeQuery{
 		world:     f.world,
 		filter:    f.filter,
 		relations: rel,
-		lock:      lock,
+		lock:      f.world.lockSafe(),
 		cursor: cursor{
 			archetype: -1,
 			table:     -1,