Merge branch 'main' into issue16716

matrixorigin · Jun 19, 2024 · be9759a · be9759a
2 parents 861bcf2 + b0bd74f
commit be9759a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/container/vector/reuse.go b/pkg/container/vector/reuse.go
@@ -44,7 +44,9 @@ func (v Vector) TypeName() string {
 }
 
 func NewVecFromReuse() *Vector {
-	v := reuse.Alloc[Vector](nil)
+	//v := reuse.Alloc[Vector](nil)
+	v := new(Vector)
+	v.nsp = &nulls.Nulls{}
 	// if v.OnUsed {
 	// 	panic("alloc onused vector")
 	// }

diff --git a/pkg/container/vector/vector.go b/pkg/container/vector/vector.go
@@ -23,7 +23,6 @@ import (
 
 	"github.com/matrixorigin/matrixone/pkg/common/moerr"
 	"github.com/matrixorigin/matrixone/pkg/common/mpool"
-	"github.com/matrixorigin/matrixone/pkg/common/reuse"
 	"github.com/matrixorigin/matrixone/pkg/container/nulls"
 	"github.com/matrixorigin/matrixone/pkg/container/types"
 	"github.com/matrixorigin/matrixone/pkg/vectorize/moarray"
@@ -446,7 +445,7 @@ func (v *Vector) Free(mp *mpool.MPool) {
 	// }
 	// v.FreeMsg = append(v.FreeMsg, time.Now().String()+" : typ="+v.typ.DescString()+" "+string(debug.Stack()))
 
-	reuse.Free[Vector](v, nil)
+	//reuse.Free[Vector](v, nil)
 }
 
 func (v *Vector) MarshalBinary() ([]byte, error) {