Merge branch 'main' into fix_iscp_3

mergify[bot] · web-flow · commit adeeb80608cc · 2025-09-01T09:54:37.000Z
diff --git a/pkg/vm/engine/tae/db/gc/v3/window.go b/pkg/vm/engine/tae/db/gc/v3/window.go
@@ -383,15 +383,17 @@ func collectMapData(
 	if len(objects) == 0 {
 		return nil
 	}
+	rows := 0
 	for _, tables := range objects {
 		for _, entry := range tables {
 			err := addObjectToBatch(bat, entry.stats, entry, mp)
 			if err != nil {
 				return err
 			}
+			rows++
 		}
 	}
-	batch.SetLength(bat, len(objects))
+	batch.SetLength(bat, rows)
 	return nil
 }
 
@@ -448,7 +450,8 @@ func loader(
 	mp *mpool.MPool,
 ) error {
 	for id := uint32(0); id < stats.BlkCnt(); id++ {
-		stats.ObjectLocation().SetID(uint16(id))
+		location := stats.ObjectLocation()
+		location.SetID(uint16(id))
 		data, _, err := ioutil.LoadOneBlock(cxt, fs, stats.ObjectLocation(), objectio.SchemaData)
 		if err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -383,15 +383,17 @@ func collectMapData(`
`383`	`383`	`if len(objects) == 0 {`
`384`	`384`	`return nil`
`385`	`385`	`}`
	`386`	`+ rows := 0`
`386`	`387`	`for _, tables := range objects {`
`387`	`388`	`for _, entry := range tables {`
`388`	`389`	`err := addObjectToBatch(bat, entry.stats, entry, mp)`
`389`	`390`	`if err != nil {`
`390`	`391`	`return err`
`391`	`392`	`}`
	`393`	`+ rows++`
`392`	`394`	`}`
`393`	`395`	`}`
`394`		`- batch.SetLength(bat, len(objects))`
	`396`	`+ batch.SetLength(bat, rows)`
`395`	`397`	`return nil`
`396`	`398`	`}`
`397`	`399`
`@@ -448,7 +450,8 @@ func loader(`
`448`	`450`	`mp *mpool.MPool,`
`449`	`451`	`) error {`
`450`	`452`	`for id := uint32(0); id < stats.BlkCnt(); id++ {`
`451`		`- stats.ObjectLocation().SetID(uint16(id))`
	`453`	`+ location := stats.ObjectLocation()`
	`454`	`+ location.SetID(uint16(id))`
`452`	`455`	`data, _, err := ioutil.LoadOneBlock(cxt, fs, stats.ObjectLocation(), objectio.SchemaData)`
`453`	`456`	`if err != nil {`
`454`	`457`	`return err`