From 6beba218d7f6f764e946751df6dc0d0180da05fa Mon Sep 17 00:00:00 2001
From: "Vadim B. Mikheev" <vadim4o@yahoo.com>
Date: Fri, 27 Nov 1998 19:52:36 +0000
Subject: New HeapTuple structure/interface.

---
 src/backend/executor/nodeAgg.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/backend/executor/nodeAgg.c')

diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index c7e69d1a72f..0eed756319a 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -248,16 +248,12 @@ ExecAgg(Agg *node)
 		 */
 		for (;;)
 		{
-			HeapTuple	outerTuple = NULL;
 			TupleTableSlot *outerslot;
 
 			isNull = isNull1 = isNull2 = 0;
 			outerslot = ExecProcNode(outerPlan, (Plan *) node);
-			if (outerslot)
-				outerTuple = outerslot->val;
-			if (!HeapTupleIsValid(outerTuple))
+			if (TupIsNull(outerslot))
 			{
-
 				/*
 				 * when the outerplan doesn't return a single tuple,
 				 * create a dummy heaptuple anyway because we still need
@@ -666,7 +662,7 @@ aggGetAttr(TupleTableSlot *slot,
 			tempSlot->ttc_buffer = InvalidBuffer;
 		tempSlot->ttc_whichplan = -1;
 
-		tup = heap_copytuple(slot->val);
+		tup = heap_copytuple(heapTuple);
 		td = CreateTupleDescCopy(slot->ttc_tupleDescriptor);
 
 		ExecSetSlotDescriptor(tempSlot, td);
-- 
cgit v1.2.3