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

Commit4af3421

Browse files
committed
Get rid of rd_nblocks field in relcache entries. Turns out this was
costing us lots more to maintain than it was worth. On shared tablesit was of exactly zero benefit because we couldn't trust it to beup to date. On temp tables it sometimes saved an lseek, but not oftenenough to be worth getting excited about. And the real problem was thatwe forced an lseek on every relcache flush in order to update the field.So all in all it seems best to lose the complexity.
1 parent1fe11fa commit4af3421

File tree

14 files changed

+79
-162
lines changed

14 files changed

+79
-162
lines changed

‎contrib/pgstattuple/pgstattuple.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.14 2004/04/01 21:28:43 tgl Exp $
2+
* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.15 2004/05/08 19:09:24 tgl Exp $
33
*
44
* Copyright (c) 2001,2002Tatsuo Ishii
55
*
@@ -127,9 +127,10 @@ pgstattuple_real(Relation rel)
127127
*/
128128
attinmeta=TupleDescGetAttInMetadata(tupdesc);
129129

130-
nblocks=RelationGetNumberOfBlocks(rel);
131130
scan=heap_beginscan(rel,SnapshotAny,0,NULL);
132131

132+
nblocks=scan->rs_nblocks;/* # blocks to be scanned */
133+
133134
/* scan the relation */
134135
while ((tuple=heap_getnext(scan,ForwardScanDirection))!=NULL)
135136
{

‎src/backend/access/heap/heapam.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.165 2004/04/21 18:24:23 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.166 2004/05/08 19:09:24 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -73,12 +73,13 @@ static void
7373
initscan(HeapScanDescscan,ScanKeykey)
7474
{
7575
/*
76-
* Make sure we have up-to-date idea of number of blocks in relation.
76+
* Determine the number of blocks we have to scan.
77+
*
7778
* It is sufficient to do this once at scan start, since any tuples
7879
* added while the scan is in progress will be invisible to my
7980
* transaction anyway...
8081
*/
81-
scan->rs_rd->rd_nblocks=RelationGetNumberOfBlocks(scan->rs_rd);
82+
scan->rs_nblocks=RelationGetNumberOfBlocks(scan->rs_rd);
8283

8384
scan->rs_ctup.t_datamcxt=NULL;
8485
scan->rs_ctup.t_data=NULL;
@@ -113,12 +114,12 @@ heapgettup(Relation relation,
113114
Buffer*buffer,
114115
Snapshotsnapshot,
115116
intnkeys,
116-
ScanKeykey)
117+
ScanKeykey,
118+
BlockNumberpages)
117119
{
118120
ItemIdlpp;
119121
Pagedp;
120122
BlockNumberpage;
121-
BlockNumberpages;
122123
intlines;
123124
OffsetNumberlineoff;
124125
intlinesleft;
@@ -159,7 +160,7 @@ heapgettup(Relation relation,
159160
/*
160161
* return null immediately if relation is empty
161162
*/
162-
if ((pages=relation->rd_nblocks)==0)
163+
if (pages==0)
163164
{
164165
if (BufferIsValid(*buffer))
165166
ReleaseBuffer(*buffer);
@@ -832,7 +833,8 @@ heap_getnext(HeapScanDesc scan, ScanDirection direction)
832833
&(scan->rs_cbuf),
833834
scan->rs_snapshot,
834835
scan->rs_nkeys,
835-
scan->rs_key);
836+
scan->rs_key,
837+
scan->rs_nblocks);
836838

837839
if (scan->rs_ctup.t_data==NULL&& !BufferIsValid(scan->rs_cbuf))
838840
{
@@ -1992,7 +1994,8 @@ heap_restrpos(HeapScanDesc scan)
19921994
&(scan->rs_cbuf),
19931995
scan->rs_snapshot,
19941996
0,
1995-
NULL);
1997+
NULL,
1998+
scan->rs_nblocks);
19961999
}
19972000
}
19982001

‎src/backend/access/nbtree/nbtree.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.114 2004/04/21 18:24:26 tgl Exp $
15+
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.115 2004/05/08 19:09:24 tgl Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -802,12 +802,7 @@ btvacuumcleanup(PG_FUNCTION_ARGS)
802802
/*
803803
* Do the physical truncation.
804804
*/
805-
if (rel->rd_smgr==NULL)
806-
rel->rd_smgr=smgropen(rel->rd_node);
807-
new_pages=smgrtruncate(rel->rd_smgr,new_pages);
808-
rel->rd_nblocks=new_pages;/* update relcache
809-
* immediately */
810-
rel->rd_targblock=InvalidBlockNumber;
805+
RelationTruncate(rel,new_pages);
811806
num_pages=new_pages;
812807
}
813808
}

‎src/backend/catalog/heap.c

Lines changed: 5 additions & 13 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.263 2004/05/05 04:48:45 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.264 2004/05/08 19:09:24 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1979,12 +1979,8 @@ RelationTruncateIndexes(Oid heapId)
19791979
*/
19801980
DropRelationBuffers(currentIndex);
19811981

1982-
/* Now truncate the actual data and set blocks to zero */
1983-
if (currentIndex->rd_smgr==NULL)
1984-
currentIndex->rd_smgr=smgropen(currentIndex->rd_node);
1985-
smgrtruncate(currentIndex->rd_smgr,0);
1986-
currentIndex->rd_nblocks=0;
1987-
currentIndex->rd_targblock=InvalidBlockNumber;
1982+
/* Now truncate the actual data */
1983+
RelationTruncate(currentIndex,0);
19881984

19891985
/* Initialize the index and rebuild */
19901986
index_build(heapRelation,currentIndex,indexInfo);
@@ -2028,12 +2024,8 @@ heap_truncate(Oid rid)
20282024
*/
20292025
DropRelationBuffers(rel);
20302026

2031-
/* Now truncate the actual data and set blocks to zero */
2032-
if (rel->rd_smgr==NULL)
2033-
rel->rd_smgr=smgropen(rel->rd_node);
2034-
smgrtruncate(rel->rd_smgr,0);
2035-
rel->rd_nblocks=0;
2036-
rel->rd_targblock=InvalidBlockNumber;
2027+
/* Now truncate the actual data */
2028+
RelationTruncate(rel,0);
20372029

20382030
/* If this relation has indexes, truncate the indexes too */
20392031
RelationTruncateIndexes(rid);

‎src/backend/catalog/index.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.230 2004/05/0800:34:49 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.231 2004/05/0819:09:24 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1702,12 +1702,8 @@ reindex_index(Oid indexId)
17021702
*/
17031703
DropRelationBuffers(iRel);
17041704

1705-
/* Now truncate the actual data and set blocks to zero */
1706-
if (iRel->rd_smgr==NULL)
1707-
iRel->rd_smgr=smgropen(iRel->rd_node);
1708-
smgrtruncate(iRel->rd_smgr,0);
1709-
iRel->rd_nblocks=0;
1710-
iRel->rd_targblock=InvalidBlockNumber;
1705+
/* Now truncate the actual data */
1706+
RelationTruncate(iRel,0);
17111707
}
17121708
else
17131709
{

‎src/backend/commands/analyze.c

Lines changed: 10 additions & 9 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.70 2004/02/15 21:01:39 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.71 2004/05/08 19:09:24 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -388,15 +388,15 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt)
388388

389389
/*
390390
* If we are running a standalone ANALYZE, update pages/tuples stats
391-
* in pg_class. Wehave the accurate page count fromheap_beginscan,
391+
* in pg_class. Weknow the accurate page count fromthe smgr,
392392
* but only an approximate number of tuples; therefore, if we are part
393393
* of VACUUM ANALYZE do *not* overwrite the accurate count already
394394
* inserted by VACUUM. The same consideration applies to indexes.
395395
*/
396396
if (!vacstmt->vacuum)
397397
{
398398
vac_update_relstats(RelationGetRelid(onerel),
399-
onerel->rd_nblocks,
399+
RelationGetNumberOfBlocks(onerel),
400400
totalrows,
401401
hasindex);
402402
for (ind=0;ind<nindexes;ind++)
@@ -657,6 +657,7 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
657657
{
658658
intnumrows=0;
659659
HeapScanDescscan;
660+
BlockNumbertotalblocks;
660661
HeapTupletuple;
661662
ItemPointerlasttuple;
662663
BlockNumberlastblock,
@@ -673,6 +674,7 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
673674
* Do a simple linear scan until we reach the target number of rows.
674675
*/
675676
scan=heap_beginscan(onerel,SnapshotNow,0,NULL);
677+
totalblocks=scan->rs_nblocks;/* grab current relation size */
676678
while ((tuple=heap_getnext(scan,ForwardScanDirection))!=NULL)
677679
{
678680
rows[numrows++]=heap_copytuple(tuple);
@@ -693,7 +695,7 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
693695
ereport(elevel,
694696
(errmsg("\"%s\": %u pages, %d rows sampled, %.0f estimated total rows",
695697
RelationGetRelationName(onerel),
696-
onerel->rd_nblocks,numrows,*totalrows)));
698+
totalblocks,numrows,*totalrows)));
697699

698700
returnnumrows;
699701
}
@@ -772,10 +774,9 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
772774
pageloop:;
773775

774776
/*
775-
* Have we fallen off the end of the relation?(We rely on
776-
* heap_beginscan to have updated rd_nblocks.)
777+
* Have we fallen off the end of the relation?
777778
*/
778-
if (targblock >=onerel->rd_nblocks)
779+
if (targblock >=totalblocks)
779780
break;
780781

781782
/*
@@ -841,15 +842,15 @@ pageloop:;
841842
/*
842843
* Estimate total number of valid rows in relation.
843844
*/
844-
*totalrows=floor((double)onerel->rd_nblocks*tuplesperpage+0.5);
845+
*totalrows=floor((double)totalblocks*tuplesperpage+0.5);
845846

846847
/*
847848
* Emit some interesting relation info
848849
*/
849850
ereport(elevel,
850851
(errmsg("\"%s\": %u pages, %d rows sampled, %.0f estimated total rows",
851852
RelationGetRelationName(onerel),
852-
onerel->rd_nblocks,numrows,*totalrows)));
853+
totalblocks,numrows,*totalrows)));
853854

854855
returnnumrows;
855856
}

‎src/backend/commands/sequence.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.109 2004/04/06 16:39:30 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.110 2004/05/08 19:09:24 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -822,10 +822,6 @@ read_info(SeqTable elm, Relation rel, Buffer *buf)
822822
sequence_magic*sm;
823823
Form_pg_sequenceseq;
824824

825-
if (rel->rd_nblocks>1)
826-
elog(ERROR,"invalid number of blocks in sequence \"%s\"",
827-
RelationGetRelationName(rel));
828-
829825
*buf=ReadBuffer(rel,0);
830826
if (!BufferIsValid(*buf))
831827
elog(ERROR,"ReadBuffer failed");

‎src/backend/commands/vacuum.c

Lines changed: 3 additions & 11 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.274 2004/02/12 05:39:55 tgl Exp $
16+
* $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.275 2004/05/08 19:09:24 tgl Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -2522,11 +2522,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
25222522
/* truncate relation, if needed */
25232523
if (blkno<nblocks)
25242524
{
2525-
if (onerel->rd_smgr==NULL)
2526-
onerel->rd_smgr=smgropen(onerel->rd_node);
2527-
blkno=smgrtruncate(onerel->rd_smgr,blkno);
2528-
onerel->rd_nblocks=blkno;/* update relcache immediately */
2529-
onerel->rd_targblock=InvalidBlockNumber;
2525+
RelationTruncate(onerel,blkno);
25302526
vacrelstats->rel_pages=blkno;/* set new number of blocks */
25312527
}
25322528

@@ -2594,11 +2590,7 @@ vacuum_heap(VRelStats *vacrelstats, Relation onerel, VacPageList vacuum_pages)
25942590
(errmsg("\"%s\": truncated %u to %u pages",
25952591
RelationGetRelationName(onerel),
25962592
vacrelstats->rel_pages,relblocks)));
2597-
if (onerel->rd_smgr==NULL)
2598-
onerel->rd_smgr=smgropen(onerel->rd_node);
2599-
relblocks=smgrtruncate(onerel->rd_smgr,relblocks);
2600-
onerel->rd_nblocks=relblocks;/* update relcache immediately */
2601-
onerel->rd_targblock=InvalidBlockNumber;
2593+
RelationTruncate(onerel,relblocks);
26022594
vacrelstats->rel_pages=relblocks;/* set new number of
26032595
* blocks */
26042596
}

‎src/backend/commands/vacuumlazy.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*
3232
*
3333
* IDENTIFICATION
34-
* $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.39 2004/04/25 23:50:54 neilc Exp $
34+
* $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.40 2004/05/08 19:09:25 tgl Exp $
3535
*
3636
*-------------------------------------------------------------------------
3737
*/
@@ -738,11 +738,7 @@ lazy_truncate_heap(Relation onerel, LVRelStats *vacrelstats)
738738
/*
739739
* Do the physical truncation.
740740
*/
741-
if (onerel->rd_smgr==NULL)
742-
onerel->rd_smgr=smgropen(onerel->rd_node);
743-
new_rel_pages=smgrtruncate(onerel->rd_smgr,new_rel_pages);
744-
onerel->rd_nblocks=new_rel_pages;/* update relcache immediately */
745-
onerel->rd_targblock=InvalidBlockNumber;
741+
RelationTruncate(onerel,new_rel_pages);
746742
vacrelstats->rel_pages=new_rel_pages;/* save new number of
747743
* blocks */
748744

0 commit comments

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