Cleanup of agg copy.

bmomjian · bmomjian · commit 6b00ec3713f6 · 1997-12-18T05:58:40.000Z
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.18 1997/12/18 04:33:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.19 1997/12/18 05:58:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1519,6 +1519,7 @@ static Query *
 _copyQuery(Query *from)
 {
 	Query	   *newnode = makeNode(Query);
+	int i;
 	
 	newnode->commandType = from->commandType;
 	newnode->resultRelation = from->resultRelation;
@@ -1559,7 +1560,10 @@ _copyQuery(Query *from)
 	Node_Copy(from, newnode, havingQual); /* currently ignored */
 
 	newnode->qry_numAgg = from->qry_numAgg;
-	Node_Copy(from, newnode, qry_aggs);
+	newnode->qry_aggs =
+		(Aggreg **) palloc(sizeof(Aggreg *) * from->qry_numAgg);
+	for (i=0; i < from->qry_numAgg; i++)
+		newnode->qry_aggs[i] = _copyAggreg(from->qry_aggs[i]);
 
 	return newnode;
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.18 1997/12/18 04:33:31 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.19 1997/12/18 05:58:40 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1519,6 +1519,7 @@ static Query *`
`1519`	`1519`	`_copyQuery(Query *from)`
`1520`	`1520`	`{`
`1521`	`1521`	`Query *newnode = makeNode(Query);`
	`1522`	`+ int i;`
`1522`	`1523`
`1523`	`1524`	`newnode->commandType = from->commandType;`
`1524`	`1525`	`newnode->resultRelation = from->resultRelation;`
`@@ -1559,7 +1560,10 @@ _copyQuery(Query *from)`
`1559`	`1560`	`Node_Copy(from, newnode, havingQual); /* currently ignored */`
`1560`	`1561`
`1561`	`1562`	`newnode->qry_numAgg = from->qry_numAgg;`
`1562`		`- Node_Copy(from, newnode, qry_aggs);`
	`1563`	`+ newnode->qry_aggs =`
	`1564`	`+ (Aggreg *) palloc(sizeof(Aggreg ) * from->qry_numAgg);`
	`1565`	`+ for (i=0; i < from->qry_numAgg; i++)`
	`1566`	`+ newnode->qry_aggs[i] = _copyAggreg(from->qry_aggs[i]);`
`1563`	`1567`
`1564`	`1568`	`return newnode;`
`1565`	`1569`	`}`