Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 32bb453

Browse filesBrowse files
jeff-davisjeff-davis
committed
Fix commit c11cb17.
I neglected to update copyfuncs/outfuncs/readfuncs. Discussion: https://postgr.es/m/12491.1582833409%40sss.pgh.pa.us
1 parent 963ea55 commit 32bb453
Copy full SHA for 32bb453

File tree

Expand file treeCollapse file tree

5 files changed

+8
-3
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+8
-3
lines changed

‎src/backend/nodes/copyfuncs.c

Copy file name to clipboardExpand all lines: src/backend/nodes/copyfuncs.c
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,7 @@ _copyAgg(const Agg *from)
988988
COPY_POINTER_FIELD(grpCollations, from->numCols * sizeof(Oid));
989989
}
990990
COPY_SCALAR_FIELD(numGroups);
991+
COPY_SCALAR_FIELD(transitionSpace);
991992
COPY_BITMAPSET_FIELD(aggParams);
992993
COPY_NODE_FIELD(groupingSets);
993994
COPY_NODE_FIELD(chain);

‎src/backend/nodes/outfuncs.c

Copy file name to clipboardExpand all lines: src/backend/nodes/outfuncs.c
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@ _outAgg(StringInfo str, const Agg *node)
783783
WRITE_OID_ARRAY(grpOperators, node->numCols);
784784
WRITE_OID_ARRAY(grpCollations, node->numCols);
785785
WRITE_LONG_FIELD(numGroups);
786+
WRITE_UINT64_FIELD(transitionSpace);
786787
WRITE_BITMAPSET_FIELD(aggParams);
787788
WRITE_NODE_FIELD(groupingSets);
788789
WRITE_NODE_FIELD(chain);
@@ -1976,6 +1977,7 @@ _outAggPath(StringInfo str, const AggPath *node)
19761977
WRITE_ENUM_FIELD(aggstrategy, AggStrategy);
19771978
WRITE_ENUM_FIELD(aggsplit, AggSplit);
19781979
WRITE_FLOAT_FIELD(numGroups, "%.0f");
1980+
WRITE_UINT64_FIELD(transitionSpace);
19791981
WRITE_NODE_FIELD(groupClause);
19801982
WRITE_NODE_FIELD(qual);
19811983
}
@@ -2013,6 +2015,7 @@ _outGroupingSetsPath(StringInfo str, const GroupingSetsPath *node)
20132015
WRITE_ENUM_FIELD(aggstrategy, AggStrategy);
20142016
WRITE_NODE_FIELD(rollups);
20152017
WRITE_NODE_FIELD(qual);
2018+
WRITE_UINT64_FIELD(transitionSpace);
20162019
}
20172020

20182021
static void

‎src/backend/nodes/readfuncs.c

Copy file name to clipboardExpand all lines: src/backend/nodes/readfuncs.c
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2203,6 +2203,7 @@ _readAgg(void)
22032203
READ_OID_ARRAY(grpOperators, local_node->numCols);
22042204
READ_OID_ARRAY(grpCollations, local_node->numCols);
22052205
READ_LONG_FIELD(numGroups);
2206+
READ_UINT64_FIELD(transitionSpace);
22062207
READ_BITMAPSET_FIELD(aggParams);
22072208
READ_NODE_FIELD(groupingSets);
22082209
READ_NODE_FIELD(chain);

‎src/include/nodes/pathnodes.h

Copy file name to clipboardExpand all lines: src/include/nodes/pathnodes.h
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,7 +1663,7 @@ typedef struct AggPath
16631663
AggStrategy aggstrategy; /* basic strategy, see nodes.h */
16641664
AggSplit aggsplit; /* agg-splitting mode, see nodes.h */
16651665
double numGroups; /* estimated number of groups in input */
1666-
Size transitionSpace; /* for pass-by-ref transition data */
1666+
uint64 transitionSpace; /* for pass-by-ref transition data */
16671667
List *groupClause; /* a list of SortGroupClause's */
16681668
List *qual; /* quals (HAVING quals), if any */
16691669
} AggPath;
@@ -1701,7 +1701,7 @@ typedef struct GroupingSetsPath
17011701
AggStrategy aggstrategy; /* basic strategy */
17021702
List *rollups; /* list of RollupData */
17031703
List *qual; /* quals (HAVING quals), if any */
1704-
Size transitionSpace; /* for pass-by-ref transition data */
1704+
uint64 transitionSpace; /* for pass-by-ref transition data */
17051705
} GroupingSetsPath;
17061706

17071707
/*

‎src/include/nodes/plannodes.h

Copy file name to clipboardExpand all lines: src/include/nodes/plannodes.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ typedef struct Agg
813813
Oid *grpOperators; /* equality operators to compare with */
814814
Oid *grpCollations;
815815
long numGroups; /* estimated number of groups in input */
816-
Size transitionSpace; /* for pass-by-ref transition data */
816+
uint64 transitionSpace; /* for pass-by-ref transition data */
817817
Bitmapset *aggParams; /* IDs of Params used in Aggref inputs */
818818
/* Note: planner provides numGroups & aggParams only in HASHED/MIXED case */
819819
List *groupingSets; /* grouping sets to use */

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.