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

Commitc5451c2

Browse files
committed
Make relhasrules and relhastriggers work like relhasindex, namely we let
VACUUM reset them to false rather than trying to clean 'em up during DROP.
1 parente4718f2 commitc5451c2

File tree

7 files changed

+67
-43
lines changed

7 files changed

+67
-43
lines changed

‎doc/src/sgml/catalogs.sgml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.181 2008/11/09 21:24:32 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.182 2008/11/10 00:49:36 tgl Exp $ -->
22
<!--
33
Documentation of the system catalogs, directed toward PostgreSQL developers
44
-->
@@ -4478,6 +4478,13 @@
44784478
</para>
44794479
</note>
44804480

4481+
<note>
4482+
<para>
4483+
<literal>pg_class.relhastriggers</literal>
4484+
must be true if a table has any triggers in this catalog.
4485+
</para>
4486+
</note>
4487+
44814488
</sect1>
44824489

44834490

‎src/backend/commands/analyze.c‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.127 2008/11/02 01:45:27 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.128 2008/11/10 00:49:37 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -463,21 +463,19 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt,
463463
*/
464464
if (!vacstmt->vacuum)
465465
{
466-
vac_update_relstats(RelationGetRelid(onerel),
466+
vac_update_relstats(onerel,
467467
RelationGetNumberOfBlocks(onerel),
468-
totalrows,hasindex,
469-
InvalidTransactionId);
468+
totalrows,hasindex,InvalidTransactionId);
470469

471470
for (ind=0;ind<nindexes;ind++)
472471
{
473472
AnlIndexData*thisdata=&indexdata[ind];
474473
doubletotalindexrows;
475474

476475
totalindexrows=ceil(thisdata->tupleFract*totalrows);
477-
vac_update_relstats(RelationGetRelid(Irel[ind]),
476+
vac_update_relstats(Irel[ind],
478477
RelationGetNumberOfBlocks(Irel[ind]),
479-
totalindexrows, false,
480-
InvalidTransactionId);
478+
totalindexrows, false,InvalidTransactionId);
481479
}
482480

483481
/* report results to the stats collector, too */

‎src/backend/commands/vacuum.c‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.379 2008/10/31 15:05:00 heikki Exp $
16+
* $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.380 2008/11/10 00:49:37 tgl Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -664,6 +664,11 @@ vacuum_set_xid_limits(int freeze_min_age, bool sharedRel,
664664
*pg_class would've been obsoleted. Of course, this only works for
665665
*fixed-size never-null columns, but these are.
666666
*
667+
*Note another assumption: that two VACUUMs/ANALYZEs on a table can't
668+
*run in parallel, nor can VACUUM/ANALYZE run in parallel with a
669+
*schema alteration such as adding an index, rule, or trigger. Otherwise
670+
*our updates of relhasindex etc might overwrite uncommitted updates.
671+
*
667672
*Another reason for doing it this way is that when we are in a lazy
668673
*VACUUM and have PROC_IN_VACUUM set, we mustn't do any updates ---
669674
*somebody vacuuming pg_class might think they could delete a tuple
@@ -673,9 +678,11 @@ vacuum_set_xid_limits(int freeze_min_age, bool sharedRel,
673678
*ANALYZE.
674679
*/
675680
void
676-
vac_update_relstats(Oidrelid,BlockNumbernum_pages,doublenum_tuples,
681+
vac_update_relstats(Relationrelation,
682+
BlockNumbernum_pages,doublenum_tuples,
677683
boolhasindex,TransactionIdfrozenxid)
678684
{
685+
Oidrelid=RelationGetRelid(relation);
679686
Relationrd;
680687
HeapTuplectup;
681688
Form_pg_classpgcform;
@@ -724,6 +731,18 @@ vac_update_relstats(Oid relid, BlockNumber num_pages, double num_tuples,
724731
}
725732
}
726733

734+
/* We also clear relhasrules and relhastriggers if needed */
735+
if (pgcform->relhasrules&&relation->rd_rules==NULL)
736+
{
737+
pgcform->relhasrules= false;
738+
dirty= true;
739+
}
740+
if (pgcform->relhastriggers&&relation->trigdesc==NULL)
741+
{
742+
pgcform->relhastriggers= false;
743+
dirty= true;
744+
}
745+
727746
/*
728747
* relfrozenxid should never go backward. Caller can pass
729748
* InvalidTransactionId if it has no new data.
@@ -1269,9 +1288,9 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt)
12691288
FreeSpaceMapVacuum(onerel);
12701289

12711290
/* update statistics in pg_class */
1272-
vac_update_relstats(RelationGetRelid(onerel),vacrelstats->rel_pages,
1273-
vacrelstats->rel_tuples,vacrelstats->hasindex,
1274-
FreezeLimit);
1291+
vac_update_relstats(onerel,
1292+
vacrelstats->rel_pages,vacrelstats->rel_tuples,
1293+
vacrelstats->hasindex,FreezeLimit);
12751294

12761295
/* report results to the stats collector, too */
12771296
pgstat_report_vacuum(RelationGetRelid(onerel),onerel->rd_rel->relisshared,
@@ -3315,7 +3334,7 @@ scan_index(Relation indrel, double num_tuples)
33153334
return;
33163335

33173336
/* now update statistics in pg_class */
3318-
vac_update_relstats(RelationGetRelid(indrel),
3337+
vac_update_relstats(indrel,
33193338
stats->num_pages,stats->num_index_tuples,
33203339
false,InvalidTransactionId);
33213340

@@ -3385,7 +3404,7 @@ vacuum_index(VacPageList vacpagelist, Relation indrel,
33853404
return;
33863405

33873406
/* now update statistics in pg_class */
3388-
vac_update_relstats(RelationGetRelid(indrel),
3407+
vac_update_relstats(indrel,
33893408
stats->num_pages,stats->num_index_tuples,
33903409
false,InvalidTransactionId);
33913410

‎src/backend/commands/vacuumlazy.c‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*
3030
*
3131
* IDENTIFICATION
32-
* $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.109 2008/10/31 15:05:00 heikki Exp $
32+
* $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.110 2008/11/10 00:49:37 tgl Exp $
3333
*
3434
*-------------------------------------------------------------------------
3535
*/
@@ -186,11 +186,9 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
186186
FreeSpaceMapVacuum(onerel);
187187

188188
/* Update statistics in pg_class */
189-
vac_update_relstats(RelationGetRelid(onerel),
190-
vacrelstats->rel_pages,
191-
vacrelstats->rel_tuples,
192-
vacrelstats->hasindex,
193-
FreezeLimit);
189+
vac_update_relstats(onerel,
190+
vacrelstats->rel_pages,vacrelstats->rel_tuples,
191+
vacrelstats->hasindex,FreezeLimit);
194192

195193
/* report results to the stats collector, too */
196194
pgstat_report_vacuum(RelationGetRelid(onerel),onerel->rd_rel->relisshared,
@@ -757,9 +755,8 @@ lazy_cleanup_index(Relation indrel,
757755
return;
758756

759757
/* now update statistics in pg_class */
760-
vac_update_relstats(RelationGetRelid(indrel),
761-
stats->num_pages,
762-
stats->num_index_tuples,
758+
vac_update_relstats(indrel,
759+
stats->num_pages,stats->num_index_tuples,
763760
false,InvalidTransactionId);
764761

765762
ereport(elevel,

‎src/backend/rewrite/rewriteRemove.c‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.73 2008/06/19 00:46:05 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.74 2008/11/10 00:49:37 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -22,9 +22,9 @@
2222
#include"catalog/pg_rewrite.h"
2323
#include"miscadmin.h"
2424
#include"rewrite/rewriteRemove.h"
25-
#include"rewrite/rewriteSupport.h"
2625
#include"utils/acl.h"
2726
#include"utils/fmgroids.h"
27+
#include"utils/inval.h"
2828
#include"utils/lsyscache.h"
2929
#include"utils/rel.h"
3030
#include"utils/syscache.h"
@@ -103,7 +103,6 @@ RemoveRewriteRuleById(Oid ruleOid)
103103
Relationevent_relation;
104104
HeapTupletuple;
105105
OideventRelationOid;
106-
boolhasMoreRules;
107106

108107
/*
109108
* Open the pg_rewrite relation.
@@ -127,17 +126,13 @@ RemoveRewriteRuleById(Oid ruleOid)
127126
elog(ERROR,"could not find tuple for rule %u",ruleOid);
128127

129128
/*
130-
* We had better grab AccessExclusiveLock so that we know no other rule
131-
* additions/deletions are going on for this relation.Else we cannot set
132-
* relhasrules correctly. Besides, we don't want to be changing the
133-
* ruleset while queries are executing on the rel.
129+
* We had better grab AccessExclusiveLock to ensure that no queries
130+
* are going on that might depend on this rule. (Note: a weaker lock
131+
* would suffice if it's not an ON SELECT rule.)
134132
*/
135133
eventRelationOid= ((Form_pg_rewrite)GETSTRUCT(tuple))->ev_class;
136134
event_relation=heap_open(eventRelationOid,AccessExclusiveLock);
137135

138-
hasMoreRules=event_relation->rd_rules!=NULL&&
139-
event_relation->rd_rules->numLocks>1;
140-
141136
/*
142137
* Now delete the pg_rewrite tuple for the rule
143138
*/
@@ -148,13 +143,10 @@ RemoveRewriteRuleById(Oid ruleOid)
148143
heap_close(RewriteRelation,RowExclusiveLock);
149144

150145
/*
151-
* Set pg_class 'relhasrules' field correctly for event relation.
152-
*
153-
* Important side effect: an SI notice is broadcast to force all backends
154-
* (including me!) to update relcache entries with the new rule set.
155-
* Therefore, must do this even if relhasrules is still true!
146+
* Issue shared-inval notice to force all backends (including me!) to
147+
* update relcache entries with the new rule set.
156148
*/
157-
SetRelationRuleStatus(eventRelationOid,hasMoreRules, false);
149+
CacheInvalidateRelcache(event_relation);
158150

159151
/* Close rel, but keep lock till commit... */
160152
heap_close(event_relation,NoLock);

‎src/backend/utils/cache/relcache.c‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.275 2008/11/09 21:24:32 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.276 2008/11/10 00:49:37 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -721,6 +721,17 @@ RelationBuildRuleLock(Relation relation)
721721
systable_endscan(rewrite_scan);
722722
heap_close(rewrite_desc,AccessShareLock);
723723

724+
/*
725+
* there might not be any rules (if relhasrules is out-of-date)
726+
*/
727+
if (numlocks==0)
728+
{
729+
relation->rd_rules=NULL;
730+
relation->rd_rulescxt=NULL;
731+
MemoryContextDelete(rulescxt);
732+
return;
733+
}
734+
724735
/*
725736
* form a RuleLock and insert into relation
726737
*/

‎src/include/commands/vacuum.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.80 2008/08/13 00:07:50 alvherre Exp $
10+
* $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.81 2008/11/10 00:49:37 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -130,7 +130,7 @@ extern void vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast,
130130
externvoidvac_open_indexes(Relationrelation,LOCKMODElockmode,
131131
int*nindexes,Relation**Irel);
132132
externvoidvac_close_indexes(intnindexes,Relation*Irel,LOCKMODElockmode);
133-
externvoidvac_update_relstats(Oidrelid,
133+
externvoidvac_update_relstats(Relationrelation,
134134
BlockNumbernum_pages,
135135
doublenum_tuples,
136136
boolhasindex,

0 commit comments

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