Skip to content

Commit 412a5e6

Browse files
bmomjianbmomjian
committed
Parser cleanup.
Add lock to i386 asm.
1 parent 8700377 commit 412a5e6

23 files changed

+267
-524
lines changed

‎src/backend/executor/execUtils.c

Lines changed: 3 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/executor/execUtils.c,v 1.25 1998/01/19 02:37:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.26 1998/01/20 05:03:30 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -51,6 +51,7 @@
5151
#include "optimizer/clauses.h"
5252
#include "utils/palloc.h"
5353
#include "utils/mcxt.h"
54+
#include "utils/lsyscache.h"
5455
#include "commands/command.h"
5556
#include "catalog/index.h"
5657
#include "catalog/catname.h"
@@ -1207,15 +1208,11 @@ setAtttypmodForCreateTable(TupleDesc tupType, List *targetList,
12071208
{
12081209
Var *var;
12091210
RangeTblEntry *rtentry;
1210-
Relation rd;
12111211

12121212
var = (Var *) expr;
12131213
rtentry = rt_fetch(var->varnoold, rangeTable);
1214-
rd = heap_open(rtentry->relid);
1215-
/* set length to that defined in relation */
12161214
tupType->attrs[varno]->atttypmod =
1217-
(*rd->rd_att->attrs[var->varoattno - 1]).atttypmod;
1218-
heap_close(rd);
1215+
get_atttypmod(rtentry->relid, var->varoattno);
12191216
}
12201217
else
12211218
elog(ERROR, "setAtttypmodForCreateTable: can't get atttypmod for field (for length, etc.)");

‎src/backend/nodes/copyfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.33 1998/01/19 18:10:48 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.34 1998/01/20 05:03:40 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -908,7 +908,7 @@ _copySubLink(SubLink *from)
908908
newnode->subLinkType = from->subLinkType;
909909
newnode->useor = from->useor;
910910
Node_Copy(from, newnode, lefthand);
911-
newnode->oper = listCopy(from->oper);
911+
Node_Copy(from, newnode, oper);
912912
Node_Copy(from, newnode, subselect);
913913

914914
return newnode;

‎src/backend/nodes/outfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.24 1998/01/19 18:10:50 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.25 1998/01/20 05:03:49 momjian Exp $
1111
*
1212
* NOTES
1313
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -771,7 +771,7 @@ _outSubLink(StringInfo str, SubLink *node)
771771
appendStringInfo(str, " :lefthand ");
772772
_outNode(str, node->lefthand);
773773
appendStringInfo(str, " :oper ");
774-
_outIntList(str, node->oper);
774+
_outNode(str, node->oper);
775775
appendStringInfo(str, " :subselect ");
776776
_outNode(str, node->subselect);
777777
}

‎src/backend/nodes/print.c

Lines changed: 2 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/nodes/print.c,v 1.13 1998/01/07 15:32:29 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.14 1998/01/20 05:03:54 momjian Exp $
1111
*
1212
* HISTORY
1313
* AUTHOR DATE MAJOR EVENT
@@ -187,15 +187,11 @@ print_expr(Node *expr, List *rtable)
187187
break;
188188
default:
189189
{
190-
Relation r;
191-
192190
rt = rt_fetch(var->varno, rtable);
193191
relname = rt->relname;
194-
r = heap_openr(relname);
195192
if (rt->refname)
196193
relname = rt->refname; /* table renamed */
197-
attname = attnumAttName(r, var->varattno);
198-
heap_close(r);
194+
attname = get_attname(rt->relid, var->varattno);
199195
}
200196
break;
201197
}

‎src/backend/nodes/readfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.20 1998/01/19 18:10:52 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.21 1998/01/20 05:03:57 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1182,7 +1182,7 @@ _readSubLink()
11821182
local_node->lefthand = nodeRead(true); /* now read it */
11831183

11841184
token = lsptok(NULL, &length); /* eat :oper */
1185-
local_node->oper = toIntList(nodeRead(true)); /* now read it */
1185+
local_node->oper = nodeRead(true); /* now read it */
11861186

11871187
token = lsptok(NULL, &length); /* eat :subselect */
11881188
local_node->subselect = nodeRead(true); /* now read it */

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