Skip to content

Commit 693872b

Browse files
zilderzilder
committed
rename some internal structs
1 parent 8ef6541 commit 693872b

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

‎src/backend/commands/partition.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ create_hash_partitions(PartitionInfo *pinfo,
116116
tablespaces = palloc(sizeof(char *) * pinfo->partitions_count);
117117
foreach(lc, pinfo->partitions)
118118
{
119-
RangePartitionInfo *p = (RangePartitionInfo *) lfirst(lc);
119+
PartitionNode *p = (PartitionNode *) lfirst(lc);
120120

121121
relnames[i] = RangeVarGetString(p->relation);
122122
tablespaces[i] = p->tablespace ?
@@ -206,9 +206,9 @@ create_range_partitions(PartitionInfo *pinfo,
206206
/* Add partitions */
207207
foreach(lc, pinfo->partitions)
208208
{
209-
RangePartitionInfo *p = (RangePartitionInfo *) lfirst(lc);
210-
Node *orig = (Node *) p->upper_bound;
211-
Node *bound_expr;
209+
PartitionNode *p = (PartitionNode *) lfirst(lc);
210+
Node *orig = (Node *) p->upper_bound;
211+
Node *bound_expr;
212212

213213
/* Transform raw expression */
214214
bound_expr = cookDefault(pstate, orig, atttype, atttypmod, (char *) attname);
@@ -343,7 +343,7 @@ cookPartitionKeyValue(Oid relid, const char *attname, Node *raw_value)
343343

344344

345345
void
346-
add_range_partition(Oid parent, RangePartitionInfo *rpinfo)
346+
add_range_partition(Oid parent, PartitionNode *rpinfo)
347347
{
348348
char *attname;
349349
AttrNumber attnum;
@@ -380,7 +380,7 @@ add_range_partition(Oid parent, RangePartitionInfo *rpinfo)
380380

381381

382382
void
383-
merge_range_partitions(List *partitions, RangePartitionInfo *into)
383+
merge_range_partitions(List *partitions, PartitionNode *into)
384384
{
385385
List *relids = NIL;
386386
ListCell *lc;
@@ -431,12 +431,12 @@ void
431431
split_range_partition(Oid parent,
432432
AlterTableCmd *cmd)
433433
{
434-
Node *split_value;
435-
RangePartitionInfo *orig, *p1, *p2;
436-
char *attname;
437-
Oid partition_relid;
438-
char *p2_relname = NULL;
439-
char *p2_tablespace = NULL;
434+
Node *split_value;
435+
PartitionNode *orig, *p1, *p2;
436+
char *attname;
437+
Oid partition_relid;
438+
char *p2_relname = NULL;
439+
char *p2_tablespace = NULL;
440440

441441
/*
442442
* partitions list should contain at least one element -- the relation
@@ -451,7 +451,7 @@ split_range_partition(Oid parent,
451451
attname = pm_get_partition_key(parent);
452452

453453
/* Split value is stored in def attribute */
454-
orig = (RangePartitionInfo *) linitial(cmd->partitions);
454+
orig = (PartitionNode *) linitial(cmd->partitions);
455455
split_value = cookPartitionKeyValue(parent, attname, (Node *) cmd->def);
456456

457457
partition_relid = RangeVarGetRelid(orig->relation, NoLock, false);
@@ -470,8 +470,8 @@ split_range_partition(Oid parent,
470470
*/
471471
if (list_length(cmd->partitions) == 3)
472472
{
473-
p1 = (RangePartitionInfo *) lsecond(cmd->partitions);
474-
p2 = (RangePartitionInfo *) lthird(cmd->partitions);
473+
p1 = (PartitionNode *) lsecond(cmd->partitions);
474+
p2 = (PartitionNode *) lthird(cmd->partitions);
475475

476476
p2_relname = RangeVarGetString(p2->relation);
477477
p2_tablespace = p2->tablespace;

‎src/backend/commands/tablecmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12366,8 +12366,8 @@ AtExecMergePartitions(Relation rel, List *rangevars)
1236612366
* The first element is a tablename to merge all partitions into. The rest
1236712367
* are partitions themselves
1236812368
*/
12369-
RangePartitionInfo *into = linitial(rangevars);
12370-
List *partitions = list_copy_tail(rangevars, 1);
12369+
PartitionNode *into = linitial(rangevars);
12370+
List *partitions = list_copy_tail(rangevars, 1);
1237112371

1237212372
merge_range_partitions(partitions, into);
1237312373
}

‎src/backend/nodes/copyfuncs.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4282,10 +4282,10 @@ _copyForeignKeyCacheInfo(const ForeignKeyCacheInfo *from)
42824282
}
42834283

42844284

4285-
static RangePartitionInfo *
4286-
_copyRangePartitionInfo(const RangePartitionInfo *from)
4285+
static PartitionNode *
4286+
_copyPartitionNode(const PartitionNode *from)
42874287
{
4288-
RangePartitionInfo *newnode = makeNode(RangePartitionInfo);
4288+
PartitionNode *newnode = makeNode(PartitionNode);
42894289

42904290
COPY_NODE_FIELD(relation);
42914291
COPY_NODE_FIELD(upper_bound);
@@ -5131,8 +5131,8 @@ copyObject(const void *from)
51315131
case T_PartitionInfo:
51325132
retval = _copyPartitionInfo(from);
51335133
break;
5134-
case T_RangePartitionInfo:
5135-
retval = _copyRangePartitionInfo(from);
5134+
case T_PartitionNode:
5135+
retval = _copyPartitionNode(from);
51365136
break;
51375137

51385138

‎src/backend/parser/gram.y

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
228228
InsertStmt *istmt;
229229
VariableSetStmt *vsetstmt;
230230
PartitionInfo *partinfo;
231-
RangePartitionInfo *rangeinfo;
231+
PartitionNode *rangeinfo;
232232
}
233233

234234
%type <node> stmt schema_stmt
@@ -2427,7 +2427,7 @@ alter_table_cmd:
24272427
}
24282428
| SPLIT PARTITION qualified_name AT '(' b_expr ')' OptIntoPartitions
24292429
{
2430-
RangePartitionInfo *orig = makeNode(RangePartitionInfo);
2430+
PartitionNode *orig = makeNode(PartitionNode);
24312431
AlterTableCmd *n = makeNode(AlterTableCmd);
24322432
List *into_partitions = $8;
24332433

@@ -2591,7 +2591,7 @@ PartitionNameTablespaceList:
25912591
PartitionNameTablespace:
25922592
PARTITION qualified_name OptTableSpace
25932593
{
2594-
RangePartitionInfo *n = makeNode(RangePartitionInfo);
2594+
PartitionNode *n = makeNode(PartitionNode);
25952595
n->relation = $2;
25962596
n->tablespace = $3;
25972597
$$ = n;
@@ -3103,11 +3103,11 @@ OptRangePartitionsList:
31033103
OptRangePartitionsListElement:
31043104
PARTITION qualified_name VALUES LESS THAN '(' b_expr ')' OptTableSpace
31053105
{
3106-
RangePartitionInfo *n = makeNode(RangePartitionInfo);
3106+
PartitionNode *n = makeNode(PartitionNode);
31073107
n->relation = $2;
31083108
n->upper_bound = $7;
31093109
n->tablespace = $9;
3110-
$$ = (RangePartitionInfo *)n;
3110+
$$ = (PartitionNode *)n;
31113111
}
31123112
;
31133113

@@ -3125,10 +3125,10 @@ OptHashPartitionsList:
31253125
OptHashPartitionsListElement:
31263126
PARTITION qualified_name OptTableSpace
31273127
{
3128-
RangePartitionInfo *n = makeNode(RangePartitionInfo);
3128+
PartitionNode *n = makeNode(PartitionNode);
31293129
n->relation = $2;
31303130
n->tablespace = $3;
3131-
$$ = (RangePartitionInfo *)n;
3131+
$$ = (PartitionNode *)n;
31323132
}
31333133
;
31343134

‎src/include/commands/partition.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ typedef enum PartitionDataType
2222
} PartitionDataType;
2323

2424
extern void create_partitions(PartitionInfo *pinfo, Oid relid, PartitionDataType partition_data);
25-
extern void merge_range_partitions(List *partitions, RangePartitionInfo *into);
26-
extern void add_range_partition(Oid parent, RangePartitionInfo *rpinfo);
25+
extern void merge_range_partitions(List *partitions, PartitionNode *into);
26+
extern void add_range_partition(Oid parent, PartitionNode *rpinfo);
2727
extern void split_range_partition(Oid relid, AlterTableCmd *cmd);
2828
extern void rename_partition(Oid parent, AlterTableCmd *cmd);
2929
extern void drop_partition(Oid parent, AlterTableCmd *cmd);

‎src/include/nodes/nodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ typedef enum NodeTag
488488
*/
489489
T_PartitionStmt,
490490
T_PartitionInfo,
491-
T_RangePartitionInfo
491+
T_PartitionNode
492492
} NodeTag;
493493

494494
/*

‎src/include/nodes/parsenodes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,16 +1449,16 @@ typedef struct PartitionInfo
14491449
uint32 partitions_count; /* for PT_HASH only */
14501450
Node *interval; /* for PT_RANGE only */
14511451
Node *start_value; /* for PT_RANGE only */
1452-
List *partitions; /* List of RangePartitionInfo */
1452+
List *partitions; /* List of PartitionNodes */
14531453
} PartitionInfo;
14541454

1455-
typedef struct RangePartitionInfo
1455+
typedef struct PartitionNode
14561456
{
14571457
NodeTag type;
14581458
RangeVar *relation;
14591459
Node *upper_bound; /* For RANGE partitions only */
14601460
char *tablespace;
1461-
} RangePartitionInfo;
1461+
} PartitionNode;
14621462

14631463
/* ----------------------
14641464
* Create Schema Statement

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy