Skip to content

Commit 2fdf9e0

Browse files
tglsfdctglsfdc
committed
Change addRangeTableEntryForRelation() to take a Relation pointer instead
of just a relation OID, thereby not having to open the relation for itself. This actually saves code rather than adding it for most of the existing callers, which had the rel open already. The main point though is to be able to use this rather than plain addRangeTableEntry in setTargetTable, thus saving one relation_openrv/relation_close cycle for every INSERT, UPDATE, or DELETE. Seems to provide a several percent win on simple INSERTs.
1 parent 45c79a3 commit 2fdf9e0

File tree

7 files changed

+45
-57
lines changed

7 files changed

+45
-57
lines changed

‎src/backend/catalog/heap.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.281 2005/03/20 22:00:51 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.282 2005/04/13 16:50:54 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1482,7 +1482,6 @@ AddRelationRawConstraints(Relation rel,
14821482
List *rawConstraints)
14831483
{
14841484
List *cookedConstraints = NIL;
1485-
char *relname = RelationGetRelationName(rel);
14861485
TupleDesc tupleDesc;
14871486
TupleConstr *oldconstr;
14881487
int numoldchecks;
@@ -1517,8 +1516,8 @@ AddRelationRawConstraints(Relation rel,
15171516
*/
15181517
pstate = make_parsestate(NULL);
15191518
rte = addRangeTableEntryForRelation(pstate,
1520-
RelationGetRelid(rel),
1521-
makeAlias(relname, NIL),
1519+
rel,
1520+
NULL,
15221521
false,
15231522
true);
15241523
addRTEtoQuery(pstate, rte, true, true);
@@ -1576,7 +1575,7 @@ AddRelationRawConstraints(Relation rel,
15761575
ereport(ERROR,
15771576
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
15781577
errmsg("only table \"%s\" can be referenced in check constraint",
1579-
relname)));
1578+
RelationGetRelationName(rel))));
15801579

15811580
/*
15821581
* No subplans or aggregates, either...

‎src/backend/commands/tablecmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.152 2005/03/29 00:16:57 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.153 2005/04/13 16:50:54 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -4732,8 +4732,8 @@ ATPrepAlterColumnType(List **wqueue,
47324732

47334733
/* Expression must be able to access vars of old table */
47344734
rte = addRangeTableEntryForRelation(pstate,
4735-
RelationGetRelid(rel),
4736-
makeAlias(RelationGetRelationName(rel), NIL),
4735+
rel,
4736+
NULL,
47374737
false,
47384738
true);
47394739
addRTEtoQuery(pstate, rte, false, true);

‎src/backend/commands/view.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.88 2005/04/06 16:34:04 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.89 2005/04/13 16:50:54 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -329,6 +329,7 @@ DefineViewRules(const RangeVar *view, Query *viewParse, bool replace)
329329
static Query *
330330
UpdateRangeTableOfViewParse(Oid viewOid, Query *viewParse)
331331
{
332+
Relation viewRel;
332333
List *new_rt;
333334
RangeTblEntry *rt_entry1,
334335
*rt_entry2;
@@ -343,14 +344,17 @@ UpdateRangeTableOfViewParse(Oid viewOid, Query *viewParse)
343344
*/
344345
viewParse = (Query *) copyObject(viewParse);
345346

347+
/* need to open the rel for addRangeTableEntryForRelation */
348+
viewRel = relation_open(viewOid, AccessShareLock);
349+
346350
/*
347351
* Create the 2 new range table entries and form the new range
348352
* table... OLD first, then NEW....
349353
*/
350-
rt_entry1 = addRangeTableEntryForRelation(NULL, viewOid,
354+
rt_entry1 = addRangeTableEntryForRelation(NULL, viewRel,
351355
makeAlias("*OLD*", NIL),
352356
false, false);
353-
rt_entry2 = addRangeTableEntryForRelation(NULL, viewOid,
357+
rt_entry2 = addRangeTableEntryForRelation(NULL, viewRel,
354358
makeAlias("*NEW*", NIL),
355359
false, false);
356360
/* Must override addRangeTableEntry's default access-check flags */
@@ -366,6 +370,8 @@ UpdateRangeTableOfViewParse(Oid viewOid, Query *viewParse)
366370
*/
367371
OffsetVarNodes((Node *) viewParse, 2, 0);
368372

373+
relation_close(viewRel, AccessShareLock);
374+
369375
return viewParse;
370376
}
371377

‎src/backend/parser/analyze.c

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.318 2005/04/07 01:51:38 neilc Exp $
9+
* $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.319 2005/04/13 16:50:54 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1536,6 +1536,7 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
15361536
List **extras_before, List **extras_after)
15371537
{
15381538
Query *qry;
1539+
Relation rel;
15391540
RangeTblEntry *oldrte;
15401541
RangeTblEntry *newrte;
15411542

@@ -1547,24 +1548,22 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
15471548
* To avoid deadlock, make sure the first thing we do is grab
15481549
* AccessExclusiveLock on the target relation. This will be needed by
15491550
* DefineQueryRewrite(), and we don't want to grab a lesser lock
1550-
* beforehand. We don't need to hold a refcount on the relcache
1551-
* entry, however.
1551+
* beforehand.
15521552
*/
1553-
heap_close(heap_openrv(stmt->relation, AccessExclusiveLock),
1554-
NoLock);
1553+
rel = heap_openrv(stmt->relation, AccessExclusiveLock);
15551554

15561555
/*
15571556
* NOTE: 'OLD' must always have a varno equal to 1 and 'NEW' equal to
15581557
* 2. Set up their RTEs in the main pstate for use in parsing the
15591558
* rule qualification.
15601559
*/
15611560
Assert(pstate->p_rtable == NIL);
1562-
oldrte = addRangeTableEntry(pstate, stmt->relation,
1563-
makeAlias("*OLD*", NIL),
1564-
false, true);
1565-
newrte = addRangeTableEntry(pstate, stmt->relation,
1566-
makeAlias("*NEW*", NIL),
1567-
false, true);
1561+
oldrte = addRangeTableEntryForRelation(pstate, rel,
1562+
makeAlias("*OLD*", NIL),
1563+
false, true);
1564+
newrte = addRangeTableEntryForRelation(pstate, rel,
1565+
makeAlias("*NEW*", NIL),
1566+
false, true);
15681567
/* Must override addRangeTableEntry's default access-check flags */
15691568
oldrte->requiredPerms = 0;
15701569
newrte->requiredPerms = 0;
@@ -1659,12 +1658,12 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
16591658
* or they won't be accessible at all. We decide later
16601659
* whether to put them in the joinlist.
16611660
*/
1662-
oldrte = addRangeTableEntry(sub_pstate, stmt->relation,
1663-
makeAlias("*OLD*", NIL),
1664-
false, false);
1665-
newrte = addRangeTableEntry(sub_pstate, stmt->relation,
1666-
makeAlias("*NEW*", NIL),
1667-
false, false);
1661+
oldrte = addRangeTableEntryForRelation(sub_pstate, rel,
1662+
makeAlias("*OLD*", NIL),
1663+
false, false);
1664+
newrte = addRangeTableEntryForRelation(sub_pstate, rel,
1665+
makeAlias("*NEW*", NIL),
1666+
false, false);
16681667
oldrte->requiredPerms = 0;
16691668
newrte->requiredPerms = 0;
16701669
addRTEtoQuery(sub_pstate, oldrte, false, true);
@@ -1791,6 +1790,9 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
17911790
stmt->actions = newactions;
17921791
}
17931792

1793+
/* Close relation, but keep the exclusive lock */
1794+
heap_close(rel, NoLock);
1795+
17941796
return qry;
17951797
}
17961798

‎src/backend/parser/parse_clause.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.139 2005/04/06 16:34:06 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.140 2005/04/13 16:50:55 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -144,7 +144,8 @@ setTargetTable(ParseState *pstate, RangeVar *relation,
144144
/*
145145
* Now build an RTE.
146146
*/
147-
rte = addRangeTableEntry(pstate, relation, NULL, inh, false);
147+
rte = addRangeTableEntryForRelation(pstate, pstate->p_target_relation,
148+
NULL, inh, false);
148149
pstate->p_target_rangetblentry = rte;
149150

150151
/* assume new rte is at end */

‎src/backend/parser/parse_relation.c

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.105 2005/04/07 01:51:39 neilc Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.106 2005/04/13 16:50:55 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -809,34 +809,21 @@ addRangeTableEntry(ParseState *pstate,
809809
* Add an entry for a relation to the pstate's range table (p_rtable).
810810
*
811811
* This is just like addRangeTableEntry() except that it makes an RTE
812-
* given a relation OID instead of a RangeVar reference.
813-
*
814-
* Note that an alias clause *must* be supplied.
812+
* given an already-open relation instead of a RangeVar reference.
815813
*/
816814
RangeTblEntry *
817815
addRangeTableEntryForRelation(ParseState *pstate,
818-
Oid relid,
816+
Relation rel,
819817
Alias *alias,
820818
bool inh,
821819
bool inFromCl)
822820
{
823821
RangeTblEntry *rte = makeNode(RangeTblEntry);
824-
char *refname = alias->aliasname;
825-
LOCKMODE lockmode;
826-
Relation rel;
822+
char *refname = alias ? alias->aliasname : RelationGetRelationName(rel);
827823

828824
rte->rtekind = RTE_RELATION;
829825
rte->alias = alias;
830-
831-
/*
832-
* Get the rel's relcache entry. This access ensures that we have an
833-
* up-to-date relcache entry for the rel. Since this is typically the
834-
* first access to a rel in a statement, be careful to get the right
835-
* access level depending on whether we're doing SELECT FOR UPDATE.
836-
*/
837-
lockmode = isForUpdate(pstate, refname) ? RowShareLock : AccessShareLock;
838-
rel = heap_open(relid, lockmode);
839-
rte->relid = relid;
826+
rte->relid = RelationGetRelid(rel);
840827

841828
/*
842829
* Build the list of effective column names using user-supplied
@@ -845,13 +832,6 @@ addRangeTableEntryForRelation(ParseState *pstate,
845832
rte->eref = makeAlias(refname, NIL);
846833
buildRelationAliases(rel->rd_att, alias, rte->eref);
847834

848-
/*
849-
* Drop the rel refcount, but keep the access lock till end of
850-
* transaction so that the table can't be deleted or have its schema
851-
* modified underneath us.
852-
*/
853-
heap_close(rel, NoLock);
854-
855835
/*----------
856836
* Flags:
857837
* - this RTE should be expanded to include descendant tables,

‎src/include/parser/parse_relation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.48 2004/12/31 22:03:38 pgsql Exp $
10+
* $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.49 2005/04/13 16:50:55 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -45,7 +45,7 @@ extern RangeTblEntry *addRangeTableEntry(ParseState *pstate,
4545
bool inh,
4646
bool inFromCl);
4747
extern RangeTblEntry *addRangeTableEntryForRelation(ParseState *pstate,
48-
Oid relid,
48+
Relation rel,
4949
Alias *alias,
5050
bool inh,
5151
bool inFromCl);

0 commit comments

Comments
 (0)