update

Author: reusee

pkg/sql/colexec/group/group.go

@@ -205,7 +205,7 @@ func (group *Group) mergeSpilledGroupsAndAggs(proc *process.Process, groups []*b
 			}
 
 			// If this is a new group, we need to add it to our results
-			if vals[0] > group.ctr.hr.Hash.GroupCount()-1 {
+			if vals[0] > group.ctr.hr.Hash.GroupCount() {
 				// This is a new group, add it to the result buffer
 				insertList := []uint8{1}
 				_, err := group.ctr.result1.AppendBatch(proc.Mp(), spilledBatch.Vecs, i, insertList)

pkg/sql/colexec/group/spill_manager.go

@@ -73,12 +73,20 @@ func (sm *SpillManager) SpillToDisk(groups []*batch.Batch, aggs []aggexec.AggFun
 	}
 	defer file.Close()
 
+	// Count non-empty groups
+	nonEmptyGroupCount := int32(0)
+	for _, groupBatch := range groups {
+		if groupBatch != nil && groupBatch.RowCount() > 0 {
+			nonEmptyGroupCount++
+		}
+	}
+
 	// Write header information
 	header := struct {
 		GroupCount int32
 		AggCount   int32
 	}{
-		GroupCount: int32(len(groups)),
+		GroupCount: nonEmptyGroupCount,
 		AggCount:   int32(len(aggs)),
 	}