Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit3dd2eab

Browse files
committed
Cleanup makeTargetEntry and remove internal.c.
1 parent97ac8f7 commit3dd2eab

File tree

10 files changed

+53
-125
lines changed

10 files changed

+53
-125
lines changed

‎src/backend/executor/execJunk.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.11 1998/06/15 19:28:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.12 1998/07/20 19:53:44 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,7 +20,7 @@
2020
#include"access/heapam.h"
2121
#include"executor/executor.h"
2222
#include"nodes/relation.h"
23-
#include"optimizer/tlist.h"/* forMakeTLE */
23+
#include"optimizer/tlist.h"/* formakeTargetEntry */
2424

2525
/*-------------------------------------------------------------------------
2626
*XXX this stuff should be rewritten to take advantage
@@ -111,9 +111,7 @@ ExecInitJunkFilter(List *targetList)
111111
/*
112112
* create a new target list entry
113113
*/
114-
tle=makeNode(TargetEntry);
115-
tle->resdom=cleanResdom;
116-
tle->expr=expr;
114+
tle=makeTargetEntry(cleanResdom,expr);
117115
cleanTargetList=lappend(cleanTargetList,tle);
118116
}
119117
}
@@ -134,7 +132,7 @@ ExecInitJunkFilter(List *targetList)
134132
cleanResdom= (Resdom)copyObject((Node)resdom);
135133
set_resno(cleanResdom,cleanResno);
136134
cleanResno++;
137-
tle= (List)MakeTLE(cleanResdom, (Expr)expr);
135+
tle= (List)makeTargetEntry(cleanResdom, (Node*)expr);
138136
set_fj_innerNode(cleanFjoin,tle);
139137

140138
foreach(fjListP,lnext(fjList))
@@ -150,7 +148,7 @@ ExecInitJunkFilter(List *targetList)
150148
/*
151149
* create a new target list entry
152150
*/
153-
tle= (List)MakeTLE(cleanResdom, (Expr)expr);
151+
tle= (List)makeTargetEntry(cleanResdom, (Node*)expr);
154152
cleanFjList=lappend(cleanFjList,tle);
155153
}
156154
lappend(cleanTargetList,cleanFjList);

‎src/backend/nodes/makefuncs.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.10 1998/07/12 21:29:16 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.11 1998/07/20 19:53:45 momjian Exp $
1111
*
1212
* NOTES
1313
* Creator functions in POSTGRES 4.2 are generated automatically. Most of
@@ -71,6 +71,20 @@ makeVar(Index varno,
7171
returnvar;
7272
}
7373

74+
/*
75+
* makeTargetEntry -
76+
* creates a TargetEntry node(contains a Resdom)
77+
*/
78+
TargetEntry*
79+
makeTargetEntry(Resdom*resdom,Node*expr)
80+
{
81+
TargetEntry*rt=makeNode(TargetEntry);
82+
83+
rt->resdom=resdom;
84+
rt->expr=expr;
85+
returnrt;
86+
}
87+
7488
/*
7589
* makeResdom -
7690
* creates a Resdom (Result Domain) node

‎src/backend/optimizer/plan/setrefs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.23 1998/07/19 05:49:15 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.24 1998/07/20 19:53:46 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -132,7 +132,7 @@ set_join_tlist_references(Join *join)
132132
outer_tlist,
133133
inner_tlist);
134134

135-
temp=MakeTLE(xtl->resdom, (Node*)joinvar);
135+
temp=makeTargetEntry(xtl->resdom, (Node*)joinvar);
136136
new_join_targetlist=lappend(new_join_targetlist,temp);
137137
}
138138

@@ -497,7 +497,7 @@ tlist_temp_references(Oid tempid,
497497
else
498498
oattno=0;
499499

500-
temp=MakeTLE(xtl->resdom,
500+
temp=makeTargetEntry(xtl->resdom,
501501
(Node*)makeVar(tempid,
502502
xtl->resdom->resno,
503503
xtl->resdom->restype,

‎src/backend/optimizer/prep/preptlist.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.13 1998/07/20 19:21:44 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.14 1998/07/20 19:53:47 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -114,9 +114,7 @@ preprocess_targetlist(List *tlist,
114114

115115
var=makeVar(result_relation,-1,TIDOID,-1,0,result_relation,-1);
116116

117-
ctid=makeNode(TargetEntry);
118-
ctid->resdom=resdom;
119-
ctid->expr= (Node*)var;
117+
ctid=makeTargetEntry(resdom, (Node*)var);
120118
t_list=lappend(t_list,ctid);
121119
}
122120

@@ -233,7 +231,7 @@ replace_matching_resname(List *new_tlist, List *old_tlist)
233231
newresno= (Resdom*)copyObject((Node*)old_tle->resdom);
234232
newresno->resno=length(t_list)+1;
235233
newresno->resjunk=1;
236-
new_tl=MakeTLE(newresno,old_tle->expr);
234+
new_tl=makeTargetEntry(newresno,old_tle->expr);
237235
t_list=lappend(t_list,new_tl);
238236
}
239237
}
@@ -296,7 +294,7 @@ new_relation_targetlist(Oid relid, Index rt_index, NodeTag node_type)
296294
false,/* not a set */
297295
false);
298296

299-
temp3=MakeTLE(makeResdom(attno,
297+
temp3=makeTargetEntry(makeResdom(attno,
300298
atttype,
301299
-1,
302300
attname,
@@ -317,7 +315,7 @@ new_relation_targetlist(Oid relid, Index rt_index, NodeTag node_type)
317315
get_atttypmod(relid,attno),
318316
0,rt_index,attno);
319317

320-
temp_list=MakeTLE(makeResdom(attno,
318+
temp_list=makeTargetEntry(makeResdom(attno,
321319
atttype,
322320
get_atttypmod(relid,attno),
323321
attname,

‎src/backend/optimizer/util/internal.c

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎src/backend/optimizer/util/tlist.c

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.14 1998/07/18 04:22:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.15 1998/07/20 19:53:48 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -133,19 +133,15 @@ add_tl_element(RelOptInfo *rel, Var *var)
133133
TargetEntry*
134134
create_tl_element(Var*var,intresdomno)
135135
{
136-
TargetEntry*tlelement=makeNode(TargetEntry);
137-
138-
tlelement->resdom=
139-
makeResdom(resdomno,
140-
var->vartype,
141-
var->vartypmod,
142-
NULL,
143-
(Index)0,
144-
(Oid)0,
145-
0);
146-
tlelement->expr= (Node*)var;
147-
148-
return (tlelement);
136+
137+
returnmakeTargetEntry(makeResdom(resdomno,
138+
var->vartype,
139+
var->vartypmod,
140+
NULL,
141+
(Index)0,
142+
(Oid)0,
143+
0),
144+
(Node*)var);
149145
}
150146

151147
/*
@@ -351,7 +347,7 @@ copy_vars(List *target, List *source)
351347
for (src=source,dest=target;src!=NIL&&
352348
dest!=NIL;src=lnext(src),dest=lnext(dest))
353349
{
354-
TargetEntry*temp=MakeTLE(((TargetEntry*)lfirst(dest))->resdom,
350+
TargetEntry*temp=makeTargetEntry(((TargetEntry*)lfirst(dest))->resdom,
355351
(Node*)get_expr(lfirst(src)));
356352

357353
result=lappend(result,temp);
@@ -404,7 +400,7 @@ flatten_tlist(List *tlist)
404400
(Oid)0,
405401
0);
406402
last_resdomno++;
407-
new_tlist=lappend(new_tlist,MakeTLE(r, (Node*)var));
403+
new_tlist=lappend(new_tlist,makeTargetEntry(r, (Node*)var));
408404
}
409405
}
410406

@@ -435,7 +431,7 @@ flatten_tlist_vars(List *full_tlist, List *flat_tlist)
435431

436432
result=
437433
lappend(result,
438-
MakeTLE(tle->resdom,
434+
makeTargetEntry(tle->resdom,
439435
flatten_tlistentry((Node*)get_expr(tle),
440436
flat_tlist)));
441437
}
@@ -544,16 +540,6 @@ flatten_tlistentry(Node *tlistentry, List *flat_tlist)
544540
}
545541

546542

547-
TargetEntry*
548-
MakeTLE(Resdom*resdom,Node*expr)
549-
{
550-
TargetEntry*rt=makeNode(TargetEntry);
551-
552-
rt->resdom=resdom;
553-
rt->expr=expr;
554-
returnrt;
555-
}
556-
557543
Var*
558544
get_expr(TargetEntry*tle)
559545
{
@@ -597,7 +583,7 @@ AddGroupAttrToTlist(List *tlist, List *grpCl)
597583
(Oid)0,
598584
0);
599585
last_resdomno++;
600-
tlist=lappend(tlist,MakeTLE(r, (Node*)var));
586+
tlist=lappend(tlist,makeTargetEntry(r, (Node*)var));
601587
}
602588
}
603589
}

‎src/backend/parser/analyze.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.77 1998/07/19 05:49:17 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.78 1998/07/20 19:53:49 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -312,14 +312,12 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
312312
* preptlist.c), but may break RULEs in some way. It seems
313313
* better to create proper target list here...
314314
*/
315-
te=makeNode(TargetEntry);
316-
te->resdom=makeResdom(defval[ndef].adnum,
315+
te=makeTargetEntry(makeResdom(defval[ndef].adnum,
317316
att[defval[ndef].adnum-1]->atttypid,
318317
att[defval[ndef].adnum-1]->atttypmod,
319318
pstrdup(nameout(&(att[defval[ndef].adnum-1]->attname))),
320-
0,0,0);
321-
te->fjoin=NULL;
322-
te->expr= (Node*)stringToNode(defval[ndef].adbin);
319+
0,0,0),
320+
(Node*)stringToNode(defval[ndef].adbin);
323321
qry->targetList=lappend(qry->targetList,te);
324322
}
325323
}

‎src/backend/parser/parse_func.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.22 1998/07/2011:17:11 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.23 1998/07/2019:53:51 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1240,9 +1240,7 @@ setup_tlist(char *attname, Oid relid)
12401240
0);
12411241
varnode=makeVar(-1,attno,typeid,type_mod,0,-1,attno);
12421242

1243-
tle=makeNode(TargetEntry);
1244-
tle->resdom=resnode;
1245-
tle->expr= (Node*)varnode;
1243+
tle=makeTargetEntry(resnode, (Node*)varnode);
12461244
return (lcons(tle,NIL));
12471245
}
12481246

@@ -1266,9 +1264,7 @@ setup_base_tlist(Oid typeid)
12661264
(Oid)0,
12671265
0);
12681266
varnode=makeVar(-1,1,typeid,-1,0,-1,1);
1269-
tle=makeNode(TargetEntry);
1270-
tle->resdom=resnode;
1271-
tle->expr= (Node*)varnode;
1267+
tle=makeTargetEntry(resnode, (Node*)varnode);
12721268

12731269
return (lcons(tle,NIL));
12741270
}

‎src/backend/parser/parse_target.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.18 1998/07/12 21:29:20 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.19 1998/07/20 19:53:52 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -692,7 +692,6 @@ printf("MakeTargetlistExpr: attrtypmod is %d\n", (int4) attrtypmod);
692692
attrtypmod=type_mod;
693693
}
694694

695-
tent=makeNode(TargetEntry);
696695
resnode=makeResdom((AttrNumber)resdomno,
697696
(Oid)attrtype,
698697
attrtypmod,
@@ -701,8 +700,7 @@ printf("MakeTargetlistExpr: attrtypmod is %d\n", (int4) attrtypmod);
701700
(Oid)0,
702701
0);
703702

704-
tent->resdom=resnode;
705-
tent->expr=expr;
703+
tent=makeTargetEntry(resnode,expr);
706704

707705
returntent;
708706
}/* MakeTargetlistExpr() */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp