Skip to content

Commit 9f57daa

Browse files
authored
Merge branch 'main' into fix_iscp_3
2 parents adeeb80 + 52336b0 commit 9f57daa

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

pkg/vm/engine/tae/db/gc/v3/check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (c *gcChecker) Verify(ctx context.Context, mp *mpool.MPool) (returnStr stri
6565
returnStr += "{'verify': 'skip gc check, cost is high'}"
6666
return
6767
}
68-
buffer := MakeGCWindowBuffer(mpool.MB)
68+
buffer := MakeGCWindowBuffer(32 * mpool.MB)
6969
defer buffer.Close(mp)
7070
bat := buffer.Fetch()
7171
defer buffer.Putback(bat, mp)

pkg/vm/engine/tae/db/gc/v3/exec_v1.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,12 @@ func MakeBloomfilterCoarseFilter(
276276
return
277277
}
278278

279-
bm.Add(uint64(i))
280279
createTS := createTSs[i]
281280
dropTS := dropTSs[i]
282281
if !createTS.LT(ts) || !dropTS.LT(ts) {
283282
return
284283
}
285-
284+
bm.Add(uint64(i))
286285
buf := bat.Vecs[0].GetRawBytesAt(i)
287286
stats := (objectio.ObjectStats)(buf)
288287
name := stats.ObjectName().UnsafeString()

pkg/vm/engine/tae/db/gc/v3/window.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ func loader(
452452
for id := uint32(0); id < stats.BlkCnt(); id++ {
453453
location := stats.ObjectLocation()
454454
location.SetID(uint16(id))
455-
data, _, err := ioutil.LoadOneBlock(cxt, fs, stats.ObjectLocation(), objectio.SchemaData)
455+
data, _, err := ioutil.LoadOneBlock(cxt, fs, location, objectio.SchemaData)
456456
if err != nil {
457457
return err
458458
}

0 commit comments

Comments
 (0)