Update physical_plans.go

planner/core/physical_plans.go

@@ -75,6 +75,19 @@ type tableScanAndPartitionInfo struct {
 	partitionInfo PartitionInfo
 }
 
+// MemoryUsage return the memory usage of tableScanAndPartitionInfo
+func (t *tableScanAndPartitionInfo) MemoryUsage() (sum int64) {
+	if t == nil {
+		return
+	}
+
+	sum += t.partitionInfo.MemoryUsage()
+	if t.tableScan != nil {
+		sum += t.tableScan.MemoryUsage()
+	}
+	return
+}
+
 // ReadReqType is the read request type of the operator. Currently, only PhysicalTableReader uses this.
 type ReadReqType uint8
 
@@ -200,8 +213,8 @@ func (p *PhysicalTableReader) MemoryUsage() (sum int64) {
 	for _, plan := range p.TablePlans {
 		sum += plan.MemoryUsage()
 	}
-	for _, pInfos := range p.PartitionInfos {
-		sum += pInfos.tableScan.MemoryUsage() + pInfos.partitionInfo.MemoryUsage()
+	for _, pInfo := range p.PartitionInfos {
+		sum += pInfo.MemoryUsage()
 	}
 	return
 }
@@ -941,7 +954,7 @@ func (ts *PhysicalTableScan) MemoryUsage() (sum int64) {
 	}
 
 	sum = emptyPhysicalTableScanSize + ts.physicalSchemaProducer.MemoryUsage() + ts.DBName.MemoryUsage() +
-		int64(cap(ts.HandleIdx))*size.SizeOfInt + ts.PartitionInfo.MemoryUsage()
+		int64(cap(ts.HandleIdx))*size.SizeOfInt + ts.PartitionInfo.MemoryUsage() + int64(len(ts.rangeInfo))
 	if ts.TableAsName != nil {
 		sum += ts.TableAsName.MemoryUsage()
 	}
@@ -961,7 +974,6 @@ func (ts *PhysicalTableScan) MemoryUsage() (sum int64) {
 	for _, rang := range ts.Ranges {
 		sum += rang.MemUsage()
 	}
-	sum += int64(len(ts.rangeInfo))
 	for _, col := range ts.tblCols {
 		sum += col.MemoryUsage()
 	}
@@ -1458,8 +1470,6 @@ func (p *PhysicalExchangeReceiver) GetExchangeSender() *PhysicalExchangeSender {
 	return p.children[0].(*PhysicalExchangeSender)
 }
 
-const emptyMPPTaskSize = int64(unsafe.Sizeof(mppTask{}))
-
 // MemoryUsage return the memory usage of PhysicalExchangeReceiver
 func (p *PhysicalExchangeReceiver) MemoryUsage() (sum int64) {
 	if p == nil {