Fix merge mem contro 1.2 (#17479)

aptend · web-flow · commit 424f10df979e · 2024-07-11T13:49:34.000Z
check memory usage first when considering popping Approved by: @XuPeng-SH, @sukki37
diff --git a/pkg/vm/engine/tae/db/merge/policyBasic.go b/pkg/vm/engine/tae/db/merge/policyBasic.go
@@ -325,12 +325,15 @@ func (o *basic) controlMem(objs []*catalog.ObjectEntry, mem int64) []*catalog.Ob
 	}
 
 	needPopout := func(ss []*catalog.ObjectEntry) bool {
+		_, esize, _ := estimateMergeConsume(ss)
+		if esize > int(2*mem/3) {
+			return true
+		}
+
 		if len(ss) <= 2 {
 			return false
 		}
-
-		_, esize, _ := estimateMergeConsume(ss)
-		return esize > int(2*mem/3)
+		return false
 	}
 	for needPopout(objs) {
 		objs = objs[:len(objs)-1]

Original file line number	Diff line number	Diff line change
`@@ -325,12 +325,15 @@ func (o basic) controlMem(objs []catalog.ObjectEntry, mem int64) []*catalog.Ob`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`needPopout := func(ss []*catalog.ObjectEntry) bool {`
	`328`	`+ _, esize, _ := estimateMergeConsume(ss)`
	`329`	`+ if esize > int(2*mem/3) {`
	`330`	`+ return true`
	`331`	`+ }`
	`332`	`+`
`328`	`333`	`if len(ss) <= 2 {`
`329`	`334`	`return false`
`330`	`335`	`}`
`331`		`-`
`332`		`- _, esize, _ := estimateMergeConsume(ss)`
`333`		`- return esize > int(2*mem/3)`
	`336`	`+ return false`
`334`	`337`	`}`
`335`	`338`	`for needPopout(objs) {`
`336`	`339`	`objs = objs[:len(objs)-1]`