Fengttt spill doit.

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/aws/smithy-go v1.22.1
 	github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc
 	github.com/buger/jsonparser v1.1.1
-	github.com/bytedance/sonic v1.14.1
+	github.com/bytedance/sonic v1.14.2
 	github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5
 	github.com/cespare/xxhash/v2 v2.3.0
 	github.com/cockroachdb/errors v1.9.1
@@ -131,7 +131,7 @@ require (
 	github.com/bits-and-blooms/bitset v1.8.0 // indirect
 	github.com/bufbuild/protocompile v0.6.0 // indirect
 	github.com/bytedance/gopkg v0.1.3 // indirect
-	github.com/bytedance/sonic/loader v0.3.0 // indirect
+	github.com/bytedance/sonic/loader v0.4.0 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cilium/ebpf v0.9.1 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect

go.sum

@@ -125,10 +125,10 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMU
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
 github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
-github.com/bytedance/sonic v1.14.1 h1:FBMC0zVz5XUmE4z9wF4Jey0An5FueFvOsTKKKtwIl7w=
-github.com/bytedance/sonic v1.14.1/go.mod h1:gi6uhQLMbTdeP0muCnrjHLeCUPyb70ujhnNlhOylAFc=
-github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
-github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/bytedance/sonic v1.14.2 h1:k1twIoe97C1DtYUo+fZQy865IuHia4PR5RPiuGPPIIE=
+github.com/bytedance/sonic v1.14.2/go.mod h1:T80iDELeHiHKSc0C9tubFygiuXoGzrkjKzX2quAx980=
+github.com/bytedance/sonic/loader v0.4.0 h1:olZ7lEqcxtZygCK9EKYKADnpQoYkRQxaeY2NYzevs+o=
+github.com/bytedance/sonic/loader v0.4.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo=
 github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 h1:BjkPE3785EwPhhyuFkbINB+2a1xATwk8SNDWnJiD41g=
 github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5/go.mod h1:jtAfVaU/2cu1+wdSRPWE2c1N2qeAA3K4RH9pYgqwets=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
@@ -785,6 +785,7 @@ github.com/spkg/bom v1.0.0/go.mod h1:lAz2VbTuYNcvs7iaFF8WW0ufXrHShJ7ck1fYFFbVXJs
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=

pkg/bootstrap/versions/utils_test.go

@@ -17,6 +17,7 @@ package versions
 import (
 	"testing"
 
+	"github.com/matrixorigin/matrixone/pkg/common/mpool"
 	"github.com/matrixorigin/matrixone/pkg/common/pubsub"
 	"github.com/matrixorigin/matrixone/pkg/container/batch"
 	"github.com/matrixorigin/matrixone/pkg/testutil"
@@ -26,32 +27,34 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type MockTxnExecutor struct{}
+type MockTxnExecutor struct {
+	mp *mpool.MPool
+}
 
-func (MockTxnExecutor) Use(db string) {
+func (mock *MockTxnExecutor) Use(db string) {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (MockTxnExecutor) LockTable(table string) error {
+func (mock *MockTxnExecutor) LockTable(table string) error {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (MockTxnExecutor) Exec(sql string, options executor.StatementOption) (executor.Result, error) {
+func (mock *MockTxnExecutor) Exec(sql string, options executor.StatementOption) (executor.Result, error) {
 	bat := batch.New([]string{"a", "b", "c", "d", "e", "f", "g", "h"})
-	bat.Vecs[0] = testutil.MakeVarcharVector([]string{"PubName"}, nil)
-	bat.Vecs[1] = testutil.MakeVarcharVector([]string{"DbName"}, nil)
-	bat.Vecs[2] = testutil.MakeUint64Vector([]uint64{1}, nil)
-	bat.Vecs[3] = testutil.MakeVarcharVector([]string{"TablesStr"}, nil)
-	bat.Vecs[4] = testutil.MakeVarcharVector([]string{"SubAccountsStr"}, nil)
-	bat.Vecs[5] = testutil.MakeTimestampVector([]string{"2023-02-03 01:23:45"}, nil)
-	bat.Vecs[6] = testutil.MakeTimestampVector([]string{"2023-02-03 01:23:45"}, nil)
-	bat.Vecs[7] = testutil.MakeVarcharVector([]string{"Comment"}, nil)
+	bat.Vecs[0] = testutil.MakeVarcharVector([]string{"PubName"}, nil, mock.mp)
+	bat.Vecs[1] = testutil.MakeVarcharVector([]string{"DbName"}, nil, mock.mp)
+	bat.Vecs[2] = testutil.MakeUint64Vector([]uint64{1}, nil, mock.mp)
+	bat.Vecs[3] = testutil.MakeVarcharVector([]string{"TablesStr"}, nil, mock.mp)
+	bat.Vecs[4] = testutil.MakeVarcharVector([]string{"SubAccountsStr"}, nil, mock.mp)
+	bat.Vecs[5] = testutil.MakeTimestampVector([]string{"2023-02-03 01:23:45"}, nil, mock.mp)
+	bat.Vecs[6] = testutil.MakeTimestampVector([]string{"2023-02-03 01:23:45"}, nil, mock.mp)
+	bat.Vecs[7] = testutil.MakeVarcharVector([]string{"Comment"}, nil, mock.mp)
 	bat.SetRowCount(1)
 	return executor.Result{
 		Batches: []*batch.Batch{bat},
-		Mp:      testutil.TestUtilMp,
+		Mp:      mock.mp,
 	}, nil
 }
 
@@ -69,7 +72,13 @@ func TestGetAllPubInfos(t *testing.T) {
 	accNameInfoMap := map[string]*pubsub.AccountInfo{
 		"sys": {Id: 0, Name: "sys"},
 	}
-	infos, err := GetAllPubInfos(&MockTxnExecutor{}, accNameInfoMap)
+
+	mock := &MockTxnExecutor{
+		mp: mpool.MustNewZeroNoFixed(),
+	}
+	defer mpool.DeleteMPool(mock.mp)
+
+	infos, err := GetAllPubInfos(mock, accNameInfoMap)
 	assert.NoError(t, err)
 	assert.Equal(t, 1, len(infos))
 }

pkg/bootstrap/versions/v2_0_1/pubsub_test.go

@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/matrixorigin/matrixone/pkg/bootstrap/versions"
+	"github.com/matrixorigin/matrixone/pkg/common/mpool"
 	"github.com/matrixorigin/matrixone/pkg/common/pubsub"
 	"github.com/matrixorigin/matrixone/pkg/container/batch"
 	"github.com/matrixorigin/matrixone/pkg/testutil"
@@ -30,29 +31,30 @@ import (
 
 type MockTxnExecutor struct {
 	flag bool
+	mp   *mpool.MPool
 }
 
-func (MockTxnExecutor) Use(db string) {
+func (mock *MockTxnExecutor) Use(db string) {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (MockTxnExecutor) LockTable(table string) error {
+func (mock *MockTxnExecutor) LockTable(table string) error {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (e MockTxnExecutor) Exec(sql string, options executor.StatementOption) (executor.Result, error) {
-	if strings.HasPrefix(sql, "delete from mo_catalog.mo_subs") && e.flag {
+func (mock *MockTxnExecutor) Exec(sql string, options executor.StatementOption) (executor.Result, error) {
+	if strings.HasPrefix(sql, "delete from mo_catalog.mo_subs") && mock.flag {
 		return executor.Result{}, assert.AnError
 	}
 
 	bat := batch.New([]string{"a"})
-	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1}, nil)
+	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1}, nil, mock.mp)
 	bat.SetRowCount(1)
 	return executor.Result{
 		Batches: []*batch.Batch{bat},
-		Mp:      testutil.TestUtilMp,
+		Mp:      mock.mp,
 	}, nil
 }
 
@@ -62,7 +64,12 @@ func (MockTxnExecutor) Txn() client.TxnOperator {
 }
 
 func Test_getSubbedAccNames(t *testing.T) {
-	txn := &MockTxnExecutor{}
+	txn := &MockTxnExecutor{
+		mp: mpool.MustNewZeroNoFixed(),
+	}
+	txn.mp.EnableDetailRecording()
+	defer mpool.DeleteMPool(txn.mp)
+
 	accIdInfoMap := map[int32]*pubsub.AccountInfo{
 		1: {Id: 1, Name: "acc1"},
 	}
@@ -109,7 +116,10 @@ func Test_migrateMoPubs(t *testing.T) {
 	)
 	defer getSubbedAccNamesStub.Reset()
 
-	txn := &MockTxnExecutor{}
+	txn := &MockTxnExecutor{
+		mp: mpool.MustNewZeroNoFixed(),
+	}
+	defer mpool.DeleteMPool(txn.mp)
 	err := migrateMoPubs(txn)
 	assert.NoError(t, err)
 }
@@ -152,7 +162,11 @@ func Test_migrateMoPubs_deleteFailed(t *testing.T) {
 	)
 	defer getSubbedAccNamesStub.Reset()
 
-	txn := &MockTxnExecutor{flag: true}
+	txn := &MockTxnExecutor{
+		flag: true,
+		mp:   mpool.MustNewZeroNoFixed(),
+	}
+	defer mpool.DeleteMPool(txn.mp)
 	err := migrateMoPubs(txn)
 	assert.Error(t, err)
 }

pkg/cdc/sinker_test.go

@@ -223,9 +223,12 @@ func TestNewConsoleSinker(t *testing.T) {
 }
 
 func Test_consoleSinker_Sink(t *testing.T) {
+	proc := testutil.NewProcess(t)
+	defer proc.Free()
+
 	bat := batch.New([]string{"a", "b", "c"})
-	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1, 2, 3}, nil)
-	bat.Vecs[1] = testutil.MakeInt32Vector([]int32{1, 2, 3}, nil)
+	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1, 2, 3}, nil, proc.Mp())
+	bat.Vecs[1] = testutil.MakeInt32Vector([]int32{1, 2, 3}, nil, proc.Mp())
 	bat.SetRowCount(3)
 
 	fromTs := types.BuildTS(1, 1)

pkg/cdc/table_scanner_test.go

@@ -68,16 +68,19 @@ func TestTableScanner1(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
+	proc := testutil.NewProcess(t)
+	defer proc.Free()
+
 	bat := batch.New([]string{"tblId", "tblName", "dbId", "dbName", "createSql", "accountId"})
-	bat.Vecs[0] = testutil.MakeUint64Vector([]uint64{1}, nil)
-	bat.Vecs[1] = testutil.MakeVarcharVector([]string{"tblName"}, nil)
-	bat.Vecs[2] = testutil.MakeUint64Vector([]uint64{1}, nil)
-	bat.Vecs[3] = testutil.MakeVarcharVector([]string{"dbName"}, nil)
-	bat.Vecs[4] = testutil.MakeVarcharVector([]string{"createSql"}, nil)
-	bat.Vecs[5] = testutil.MakeUint32Vector([]uint32{1}, nil)
+	bat.Vecs[0] = testutil.MakeUint64Vector([]uint64{1}, nil, proc.Mp())
+	bat.Vecs[1] = testutil.MakeVarcharVector([]string{"tblName"}, nil, proc.Mp())
+	bat.Vecs[2] = testutil.MakeUint64Vector([]uint64{1}, nil, proc.Mp())
+	bat.Vecs[3] = testutil.MakeVarcharVector([]string{"dbName"}, nil, proc.Mp())
+	bat.Vecs[4] = testutil.MakeVarcharVector([]string{"createSql"}, nil, proc.Mp())
+	bat.Vecs[5] = testutil.MakeUint32Vector([]uint32{1}, nil, proc.Mp())
 	bat.SetRowCount(1)
 	res := executor.Result{
-		Mp:      testutil.TestUtilMp,
+		Mp:      proc.Mp(),
 		Batches: []*batch.Batch{bat},
 	}
 
@@ -850,29 +853,32 @@ func TestTableScanner_UpdateTableInfo(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
+	proc := testutil.NewProcess(t)
+	defer proc.Free()
+
 	bat1 := batch.New([]string{"tblId", "tblName", "dbId", "dbName", "createSql", "accountId"})
-	bat1.Vecs[0] = testutil.MakeUint64Vector([]uint64{1001}, nil)
-	bat1.Vecs[1] = testutil.MakeVarcharVector([]string{"tbl1"}, nil)
-	bat1.Vecs[2] = testutil.MakeUint64Vector([]uint64{1}, nil)
-	bat1.Vecs[3] = testutil.MakeVarcharVector([]string{"db1"}, nil)
-	bat1.Vecs[4] = testutil.MakeVarcharVector([]string{"create table tbl1 (a int)"}, nil)
-	bat1.Vecs[5] = testutil.MakeUint32Vector([]uint32{1}, nil)
+	bat1.Vecs[0] = testutil.MakeUint64Vector([]uint64{1001}, nil, proc.Mp())
+	bat1.Vecs[1] = testutil.MakeVarcharVector([]string{"tbl1"}, nil, proc.Mp())
+	bat1.Vecs[2] = testutil.MakeUint64Vector([]uint64{1}, nil, proc.Mp())
+	bat1.Vecs[3] = testutil.MakeVarcharVector([]string{"db1"}, nil, proc.Mp())
+	bat1.Vecs[4] = testutil.MakeVarcharVector([]string{"create table tbl1 (a int)"}, nil, proc.Mp())
+	bat1.Vecs[5] = testutil.MakeUint32Vector([]uint32{1}, nil, proc.Mp())
 	bat1.SetRowCount(1)
 	res1 := executor.Result{
-		Mp:      testutil.TestUtilMp,
+		Mp:      proc.Mp(),
 		Batches: []*batch.Batch{bat1},
 	}
 
 	bat2 := batch.New([]string{"tblId", "tblName", "dbId", "dbName", "createSql", "accountId"})
-	bat2.Vecs[0] = testutil.MakeUint64Vector([]uint64{1002}, nil) // 新的表ID
-	bat2.Vecs[1] = testutil.MakeVarcharVector([]string{"tbl1"}, nil)
-	bat2.Vecs[2] = testutil.MakeUint64Vector([]uint64{1}, nil)
-	bat2.Vecs[3] = testutil.MakeVarcharVector([]string{"db1"}, nil)
-	bat2.Vecs[4] = testutil.MakeVarcharVector([]string{"create table tbl1 (a int)"}, nil)
-	bat2.Vecs[5] = testutil.MakeUint32Vector([]uint32{1}, nil)
+	bat2.Vecs[0] = testutil.MakeUint64Vector([]uint64{1002}, nil, proc.Mp())
+	bat2.Vecs[1] = testutil.MakeVarcharVector([]string{"tbl1"}, nil, proc.Mp())
+	bat2.Vecs[2] = testutil.MakeUint64Vector([]uint64{1}, nil, proc.Mp())
+	bat2.Vecs[3] = testutil.MakeVarcharVector([]string{"db1"}, nil, proc.Mp())
+	bat2.Vecs[4] = testutil.MakeVarcharVector([]string{"create table tbl1 (a int)"}, nil, proc.Mp())
+	bat2.Vecs[5] = testutil.MakeUint32Vector([]uint32{1}, nil, proc.Mp())
 	bat2.SetRowCount(1)
 	res2 := executor.Result{
-		Mp:      testutil.TestUtilMp,
+		Mp:      proc.Mp(),
 		Batches: []*batch.Batch{bat2},
 	}
 

pkg/cdc/types_test.go

@@ -29,28 +29,36 @@ import (
 )
 
 func TestNewAtomicBatch(t *testing.T) {
-	actual := NewAtomicBatch(testutil.TestUtilMp)
+	mp := mpool.MustNewZeroNoFixed()
+	defer mpool.DeleteMPool(mp)
+	actual := NewAtomicBatch(mp)
 	assert.NotNil(t, actual.Rows)
 	assert.Equal(t, 0, actual.Rows.Len())
 }
 
 func TestAtomicBatch_Append(t *testing.T) {
+	mp := mpool.MustNewZeroNoFixed()
+	defer mpool.DeleteMPool(mp)
+
 	atomicBat := &AtomicBatch{
 		Batches: []*batch.Batch{},
 		Rows:    btree.NewBTreeGOptions(AtomicBatchRow.Less, btree.Options{Degree: 64}),
 	}
 	bat := batch.New([]string{"pk", "ts"})
-	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1}, nil)
-	bat.Vecs[1] = testutil.MakeTSVector([]types.TS{types.BuildTS(1, 1)}, nil)
+	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1}, nil, mp)
+	bat.Vecs[1] = testutil.MakeTSVector([]types.TS{types.BuildTS(1, 1)}, nil, mp)
 
 	atomicBat.Append(types.NewPacker(), bat, 1, 0)
 	assert.Equal(t, 1, len(atomicBat.Batches))
 	assert.Equal(t, 1, atomicBat.Rows.Len())
 }
 
 func TestAtomicBatch_Close(t *testing.T) {
+	mp := mpool.MustNewZeroNoFixed()
+	defer mpool.DeleteMPool(mp)
+
 	bat := batch.New([]string{"attr1"})
-	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1}, nil)
+	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1}, nil, mp)
 
 	type fields struct {
 		Mp      *mpool.MPool
@@ -63,7 +71,7 @@ func TestAtomicBatch_Close(t *testing.T) {
 	}{
 		{
 			fields: fields{
-				Mp:      testutil.TestUtilMp,
+				Mp:      mp,
 				Batches: []*batch.Batch{bat},
 				Rows:    btree.NewBTreeGOptions(AtomicBatchRow.Less, btree.Options{Degree: 64}),
 			},
@@ -174,8 +182,11 @@ func Test_atomicBatchRowIter(t *testing.T) {
 	rows.Set(row2)
 	rows.Set(row3)
 
+	mp := mpool.MustNewZeroNoFixed()
+	defer mpool.DeleteMPool(mp)
+
 	bat := batch.New([]string{"attr1"})
-	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1}, nil)
+	bat.Vecs[0] = testutil.MakeInt32Vector([]int32{1}, nil, mp)
 
 	// at init position (before the first row)
 	iter := &atomicBatchRowIter{
@@ -204,13 +215,16 @@ func Test_atomicBatchRowIter(t *testing.T) {
 }
 
 func TestAtomicBatch_RowCountDeduplicates(t *testing.T) {
-	bat := NewAtomicBatch(testutil.TestUtilMp)
+	mp := mpool.MustNewZeroNoFixed()
+	defer mpool.DeleteMPool(mp)
+
+	bat := NewAtomicBatch(mp)
 	ts := types.BuildTS(10, 2)
 
 	createBatch := func(pk int32) *batch.Batch {
 		b := batch.New([]string{"pk", "ts"})
-		b.Vecs[0] = testutil.MakeInt32Vector([]int32{pk}, nil)
-		b.Vecs[1] = testutil.MakeTSVector([]types.TS{ts}, nil)
+		b.Vecs[0] = testutil.MakeInt32Vector([]int32{pk}, nil, mp)
+		b.Vecs[1] = testutil.MakeTSVector([]types.TS{ts}, nil, mp)
 		return b
 	}