Voodoo debugging.

Author: fengttt

pkg/sql/colexec/dispatch/sendfunc.go

@@ -179,13 +179,8 @@ func sendBatToMultiMatchedReg(ap *Dispatch, proc *process.Process, bat *batch.Ba
 		batIndex := uint32(ap.ctr.remoteToIdx[r.Uid])
 		if shuffleIndex%localRegsCnt == batIndex%localRegsCnt {
 			if bat != nil && !bat.IsEmpty() {
-<<<<<<< HEAD
 				receiverID := fmt.Sprintf("%s(ShuffleIdx=%d)", r.Uid.String(), shuffleIndex)
-
-				encodeData, errEncode := bat.MarshalBinaryWithBuffer(&ap.ctr.marshalBuf)
-=======
 				encodeData, errEncode := bat.MarshalBinaryWithBuffer(&ap.ctr.marshalBuf, true)
->>>>>>> 78f7b397b (Really spill.)
 				if errEncode != nil {
 					return errEncode
 				}

pkg/sql/colexec/group/types2.go

@@ -177,6 +177,7 @@ func (ctr *container) freeGroupByBatches(proc *process.Process) {
 
 func (ctr *container) free(proc *process.Process) {
 	// free container stuff, WTH is the Free0?
+	ctr.inputDone = false
 	ctr.hr.Free0()
 
 	ctr.groupByEvaluate.Free()
@@ -193,6 +194,7 @@ func (ctr *container) free(proc *process.Process) {
 
 func (ctr *container) reset(proc *process.Process) {
 	ctr.state = vm.Build
+	ctr.inputDone = false
 	ctr.resetForSpill(proc)
 	ctr.freeSpillBkts(proc)
 }