fix TestAppend2 (#21831)

fix TestAppend2, not GC

Approved by: @XuPeng-SH

Author: jiangxinmeng1

pkg/vm/engine/tae/catalog/table_test.go

@@ -17,6 +17,7 @@ package catalog
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/matrixorigin/matrixone/pkg/container/types"
@@ -95,3 +96,48 @@ func TestGetSoftdeleteObjects(t *testing.T) {
 	objs = tbl.GetSoftdeleteObjects(types.BuildTS(1, 0), types.BuildTS(3, 0))
 	require.Equal(t, 2, len(objs))
 }
+
+func TestGetSoftdeleteObjects2(t *testing.T) {
+	db := MockDBEntryWithAccInfo(0, 0)
+	tbl := MockTableEntryWithDB(db, 1)
+
+	addActiveObject := func(create int64) *ObjectEntry {
+		object := MockObjEntryWithTbl(tbl, 10, false)
+		object.CreatedAt = types.BuildTS(create, 0)
+		object.ObjectState = ObjectState_Create_ApplyCommit
+		object.CreateNode = txnbase.TxnMVCCNode{
+			Start:   types.BuildTS(create-1, 0),
+			Prepare: types.BuildTS(create, 0),
+			End:     types.BuildTS(create, 0),
+		}
+		tbl.dataObjects.modify(nil, object, nil)
+		return object
+	}
+
+	addSoftDeleteObject := func(create, delete int64) *ObjectEntry {
+		createEntry := addActiveObject(create)
+		dropEntry := createEntry.Clone()
+		dropEntry.DeletedAt = types.BuildTS(delete, 0)
+		dropEntry.ObjectState = ObjectState_Delete_ApplyCommit
+		dropEntry.CreateNode = txnbase.TxnMVCCNode{
+			Start:   types.BuildTS(delete-1, 0),
+			Prepare: types.BuildTS(delete, 0),
+			End:     types.BuildTS(delete, 0),
+		}
+		tbl.dataObjects.modify(nil, dropEntry, nil)
+		return dropEntry
+	}
+
+	addActiveObject(1)
+	objs := tbl.GetSoftdeleteObjects(types.BuildTS(1, 0), types.BuildTS(2, 0))
+	assert.Equal(t, 0, len(objs))
+	addSoftDeleteObject(1, 2)
+	objs = tbl.GetSoftdeleteObjects(types.BuildTS(1, 0), types.BuildTS(2, 0))
+	assert.Equal(t, 1, len(objs))
+	addSoftDeleteObject(1, 3)
+	objs = tbl.GetSoftdeleteObjects(types.BuildTS(1, 0), types.BuildTS(3, 0))
+	assert.Equal(t, 2, len(objs))
+	addActiveObject(4)
+	objs = tbl.GetSoftdeleteObjects(types.BuildTS(2, 0), types.BuildTS(5, 0))
+	assert.Equal(t, 2, len(objs))
+}

pkg/vm/engine/tae/db/test/db_test.go

@@ -229,7 +229,7 @@ func TestAppend2(t *testing.T) {
 	testutils.EnsureNoLeak(t)
 	ctx := context.Background()
 
-	opts := config.WithQuickScanAndCKPOpts(nil)
+	opts := config.WithQuickScanCKPAndLongGCOpts(nil)
 	db := testutil.NewTestEngine(ctx, ModuleName, t, opts)
 	defer db.Close()
 

pkg/vm/engine/tae/testutils/config/options.go

@@ -65,6 +65,31 @@ func WithQuickScanAndCKPOpts(
 	return opts
 }
 
+func WithQuickScanCKPAndLongGCOpts(
+	in *options.Options,
+	ops ...func(*options.Options),
+) (opts *options.Options) {
+	if in == nil {
+		opts = new(options.Options)
+	} else {
+		opts = in
+	}
+	opts.CheckpointCfg = new(options.CheckpointCfg)
+	opts.CheckpointCfg.ScanInterval = time.Millisecond * 10
+	opts.CheckpointCfg.FlushInterval = time.Millisecond * 10
+	opts.CheckpointCfg.MinCount = 1
+	opts.CheckpointCfg.IncrementalInterval = time.Millisecond * 20
+	opts.CheckpointCfg.GlobalMinCount = 1
+	opts.CheckpointCfg.GCCheckpointInterval = time.Millisecond * 10
+	opts.CheckpointCfg.BlockRows = 10
+	opts.CheckpointCfg.GlobalVersionInterval = time.Millisecond * 10
+	opts.Ctx = context.Background()
+	for _, op := range ops {
+		op(opts)
+	}
+	return opts
+}
+
 func WithQuickScanAndCKPAndGCOpts(
 	in *options.Options,
 	ops ...func(*options.Options),

pkg/vm/engine/tae/testutils/config/options_test.go

@@ -0,0 +1,27 @@
+// Copyright 2024 Matrix Origin
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package config
+
+import (
+	"testing"
+	"time"
+
+	"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/options"
+)
+
+func TestWithQuickScanAndLongCKPOpts(t *testing.T) {
+	opts := WithLongScanAndCKPOpts(nil)
+	WithQuickScanCKPAndLongGCOpts(opts, options.WithCatalogGCInterval(time.Millisecond*10))
+}