🌐 AI搜索 & 代理 主页
Skip to content

Commit 58dad7f

Browse files
committed
Update typedefs.list to match what the buildfarm currently reports.
The current list from the buildfarm includes quite a few typedef names that it used to miss. The reason is a bit obscure, but it seems likely to have something to do with our recent increased use of palloc_object and palloc_array. In any case, this makes the relevant struct declarations be much more nicely formatted, so I'll take it. Install the current list and re-run pgindent to update affected code. Syncing with the current list also removes some obsolete typedef names and fixes some alphabetization errors. Discussion: https://postgr.es/m/1681301.1765742268@sss.pgh.pa.us
1 parent 66b2282 commit 58dad7f

File tree

15 files changed

+46
-29
lines changed

15 files changed

+46
-29
lines changed

src/backend/access/heap/rewriteheap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ typedef struct RewriteStateData
150150
HTAB *rs_old_new_tid_map; /* unmatched B tuples */
151151
HTAB *rs_logical_mappings; /* logical remapping files */
152152
uint32 rs_num_rewrite_mappings; /* # in memory mappings */
153-
} RewriteStateData;
153+
} RewriteStateData;
154154

155155
/*
156156
* The lookup keys for the hash tables are tuple TID and xmin (we must check

src/backend/access/transam/twophase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ typedef struct GlobalTransactionData
168168
bool ondisk; /* true if prepare state file is on disk */
169169
bool inredo; /* true if entry was added via xlog_redo */
170170
char gid[GIDSIZE]; /* The GID assigned to the prepared xact */
171-
} GlobalTransactionData;
171+
} GlobalTransactionData;
172172

173173
/*
174174
* Two Phase Commit shared state. Access to this struct is protected

src/backend/executor/nodeWindowAgg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ typedef struct WindowStatePerFuncData
109109
uint8 ignore_nulls; /* ignore nulls */
110110

111111
WindowObject winobj; /* object used in window function API */
112-
} WindowStatePerFuncData;
112+
} WindowStatePerFuncData;
113113

114114
/*
115115
* For plain aggregate window functions, we also have one of these.

src/backend/partitioning/partdesc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ typedef struct PartitionDirectoryData
3737
MemoryContext pdir_mcxt;
3838
HTAB *pdir_hash;
3939
bool omit_detached;
40-
} PartitionDirectoryData;
40+
} PartitionDirectoryData;
4141

4242
typedef struct PartitionDirectoryEntry
4343
{

src/backend/utils/adt/arrayfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ typedef struct ArrayIteratorData
8787
/* current position information, updated on each iteration */
8888
char *data_ptr; /* our current position in the array */
8989
int current_item; /* the item # we're at in the array */
90-
} ArrayIteratorData;
90+
} ArrayIteratorData;
9191

9292
static bool ReadArrayDimensions(char **srcptr, int *ndim_p,
9393
int *dim, int *lBound,

src/include/access/gin_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ typedef struct GinScanEntryData
373373
bool reduceResult;
374374
uint32 predictNumberResult;
375375
GinBtreeData btree;
376-
} GinScanEntryData;
376+
} GinScanEntryData;
377377

378378
typedef struct GinScanOpaqueData
379379
{

src/include/access/heapam.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ typedef struct BitmapHeapScanDescData
106106
HeapScanDescData rs_heap_base;
107107

108108
/* Holds no data */
109-
} BitmapHeapScanDescData;
109+
} BitmapHeapScanDescData;
110110
typedef struct BitmapHeapScanDescData *BitmapHeapScanDesc;
111111

112112
/*

src/include/access/relscan.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ typedef struct IndexScanDescData
191191

192192
/* parallel index scan information, in shared memory */
193193
struct ParallelIndexScanDescData *parallel_scan;
194-
} IndexScanDescData;
194+
} IndexScanDescData;
195195

196196
/* Generic structure for parallel scans */
197197
typedef struct ParallelIndexScanDescData
@@ -214,6 +214,6 @@ typedef struct SysScanDescData
214214
struct IndexScanDescData *iscan; /* only valid in index-scan case */
215215
struct SnapshotData *snapshot; /* snapshot to unregister at end of scan */
216216
struct TupleTableSlot *slot;
217-
} SysScanDescData;
217+
} SysScanDescData;
218218

219219
#endif /* RELSCAN_H */

src/include/executor/nodeAgg.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ typedef struct AggStatePerTransData
173173
FunctionCallInfo serialfn_fcinfo;
174174

175175
FunctionCallInfo deserialfn_fcinfo;
176-
} AggStatePerTransData;
176+
} AggStatePerTransData;
177177

178178
/*
179179
* AggStatePerAggData - per-aggregate information
@@ -229,7 +229,7 @@ typedef struct AggStatePerAggData
229229
* aggregates because the final function is read-write.
230230
*/
231231
bool shareable;
232-
} AggStatePerAggData;
232+
} AggStatePerAggData;
233233

234234
/*
235235
* AggStatePerGroupData - per-aggregate-per-group working state
@@ -264,7 +264,7 @@ typedef struct AggStatePerGroupData
264264
* NULL and not auto-replace it with a later input value. Only the first
265265
* non-NULL input will be auto-substituted.
266266
*/
267-
} AggStatePerGroupData;
267+
} AggStatePerGroupData;
268268

269269
/*
270270
* AggStatePerPhaseData - per-grouping-set-phase state
@@ -297,7 +297,7 @@ typedef struct AggStatePerPhaseData
297297
*----------
298298
*/
299299
ExprState *evaltrans_cache[2][2];
300-
} AggStatePerPhaseData;
300+
} AggStatePerPhaseData;
301301

302302
/*
303303
* AggStatePerHashData - per-hashtable state
@@ -319,7 +319,7 @@ typedef struct AggStatePerHashData
319319
AttrNumber *hashGrpColIdxInput; /* hash col indices in input slot */
320320
AttrNumber *hashGrpColIdxHash; /* indices in hash table tuples */
321321
Agg *aggnode; /* original Agg node, for numGroups etc. */
322-
} AggStatePerHashData;
322+
} AggStatePerHashData;
323323

324324

325325
extern AggState *ExecInitAgg(Agg *node, EState *estate, int eflags);

src/include/nodes/execnodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ typedef struct TupleHashTableData
882882
ExprState *in_hash_expr; /* ExprState for hashing input datatype(s) */
883883
ExprState *cur_eq_func; /* comparator for input vs. table */
884884
ExprContext *exprcontext; /* expression context */
885-
} TupleHashTableData;
885+
} TupleHashTableData;
886886

887887
typedef tuplehash_iterator TupleHashIterator;
888888

0 commit comments

Comments
 (0)