Relocating memory usage dump from ExecutorEnd to MemoryAccounting_Reset() as...

Relocating memory usage dump from ExecutorEnd to MemoryAccounting_Reset() as we no longer call ExecutorEnd upon abort. This ensures that we dump memory usage (if configured) once per command before resetting memory accounting. (#2113)

src/backend/executor/execMain.c

@@ -1111,10 +1111,6 @@ ExecutorEnd(QueryDesc *queryDesc)
 	}
 	END_MEMORY_ACCOUNT();
 
-	if (gp_dump_memory_usage)
-	{
-		MemoryAccounting_SaveToFile(currentSliceId);
-	}
 	ReportOOMConsumption();
 }
 

src/backend/utils/mmgr/memaccounting.c

@@ -202,6 +202,11 @@ MemoryAccounting_Reset()
 	 */
 	if (MemoryAccounting_IsInitialized())
 	{
+		if (gp_dump_memory_usage)
+		{
+			MemoryAccounting_SaveToFile(currentSliceId);
+		}
+
 		/* No one should create child context under MemoryAccountMemoryContext */
 		Assert(MemoryAccountMemoryContext->firstchild == NULL);