Commit32bb453

committed

Fix commitc11cb17.

I neglected to update copyfuncs/outfuncs/readfuncs.Discussion:https://postgr.es/m/12491.1582833409%40sss.pgh.pa.us

1 parent963ea55 commit32bb453Copy full SHA for 32bb453

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -988,6 +988,7 @@ _copyAgg(const Agg *from)`
`988`	`988`	`COPY_POINTER_FIELD(grpCollations,from->numCols*sizeof(Oid));`
`989`	`989`	`}`
`990`	`990`	`COPY_SCALAR_FIELD(numGroups);`
	`991`	`+COPY_SCALAR_FIELD(transitionSpace);`
`991`	`992`	`COPY_BITMAPSET_FIELD(aggParams);`
`992`	`993`	`COPY_NODE_FIELD(groupingSets);`
`993`	`994`	`COPY_NODE_FIELD(chain);`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -783,6 +783,7 @@ _outAgg(StringInfo str, const Agg *node)`
`783`	`783`	`WRITE_OID_ARRAY(grpOperators,node->numCols);`
`784`	`784`	`WRITE_OID_ARRAY(grpCollations,node->numCols);`
`785`	`785`	`WRITE_LONG_FIELD(numGroups);`
	`786`	`+WRITE_UINT64_FIELD(transitionSpace);`
`786`	`787`	`WRITE_BITMAPSET_FIELD(aggParams);`
`787`	`788`	`WRITE_NODE_FIELD(groupingSets);`
`788`	`789`	`WRITE_NODE_FIELD(chain);`
`@@ -1976,6 +1977,7 @@ _outAggPath(StringInfo str, const AggPath *node)`
`1976`	`1977`	`WRITE_ENUM_FIELD(aggstrategy,AggStrategy);`
`1977`	`1978`	`WRITE_ENUM_FIELD(aggsplit,AggSplit);`
`1978`	`1979`	`WRITE_FLOAT_FIELD(numGroups,"%.0f");`
	`1980`	`+WRITE_UINT64_FIELD(transitionSpace);`
`1979`	`1981`	`WRITE_NODE_FIELD(groupClause);`
`1980`	`1982`	`WRITE_NODE_FIELD(qual);`
`1981`	`1983`	`}`
`@@ -2013,6 +2015,7 @@ _outGroupingSetsPath(StringInfo str, const GroupingSetsPath *node)`
`2013`	`2015`	`WRITE_ENUM_FIELD(aggstrategy,AggStrategy);`
`2014`	`2016`	`WRITE_NODE_FIELD(rollups);`
`2015`	`2017`	`WRITE_NODE_FIELD(qual);`
	`2018`	`+WRITE_UINT64_FIELD(transitionSpace);`
`2016`	`2019`	`}`
`2017`	`2020`
`2018`	`2021`	`staticvoid`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2203,6 +2203,7 @@ _readAgg(void)`
`2203`	`2203`	`READ_OID_ARRAY(grpOperators,local_node->numCols);`
`2204`	`2204`	`READ_OID_ARRAY(grpCollations,local_node->numCols);`
`2205`	`2205`	`READ_LONG_FIELD(numGroups);`
	`2206`	`+READ_UINT64_FIELD(transitionSpace);`
`2206`	`2207`	`READ_BITMAPSET_FIELD(aggParams);`
`2207`	`2208`	`READ_NODE_FIELD(groupingSets);`
`2208`	`2209`	`READ_NODE_FIELD(chain);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1663,7 +1663,7 @@ typedef struct AggPath`
`1663`	`1663`	`AggStrategyaggstrategy;/* basic strategy, see nodes.h */`
`1664`	`1664`	`AggSplitaggsplit;/* agg-splitting mode, see nodes.h */`
`1665`	`1665`	`doublenumGroups;/* estimated number of groups in input */`
`1666`		`-SizetransitionSpace;/* for pass-by-ref transition data */`
	`1666`	`+uint64transitionSpace;/* for pass-by-ref transition data */`
`1667`	`1667`	`ListgroupClause;/ a list of SortGroupClause's */`
`1668`	`1668`	`Listqual;/ quals (HAVING quals), if any */`
`1669`	`1669`	`}AggPath;`
`@@ -1701,7 +1701,7 @@ typedef struct GroupingSetsPath`
`1701`	`1701`	`AggStrategyaggstrategy;/* basic strategy */`
`1702`	`1702`	`Listrollups;/ list of RollupData */`
`1703`	`1703`	`Listqual;/ quals (HAVING quals), if any */`
`1704`		`-SizetransitionSpace;/* for pass-by-ref transition data */`
	`1704`	`+uint64transitionSpace;/* for pass-by-ref transition data */`
`1705`	`1705`	`}GroupingSetsPath;`
`1706`	`1706`
`1707`	`1707`	`/*`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ typedef struct Agg`
`813`	`813`	`OidgrpOperators;/ equality operators to compare with */`
`814`	`814`	`Oid*grpCollations;`
`815`	`815`	`longnumGroups;/* estimated number of groups in input */`
`816`		`-SizetransitionSpace;/* for pass-by-ref transition data */`
	`816`	`+uint64transitionSpace;/* for pass-by-ref transition data */`
`817`	`817`	`BitmapsetaggParams;/ IDs of Params used in Aggref inputs */`
`818`	`818`	`/* Note: planner provides numGroups & aggParams only in HASHED/MIXED case */`
`819`	`819`	`ListgroupingSets;/ grouping sets to use */`

Comments

(0)