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

Commit73c61a5

Browse files
vacuumlazy.c: Remove obsolete num_tuples field.
Commit49c9d9f unified VACUUM VERBOSE and autovacuum logging. Itneglected to remove an old vacrel field that was only used by the oldVACUUM VERBOSE, so remove it now.The previous num_tuples approach doesn't seem to have any real advantageover the approach VACUUM VERBOSE takes now (also the approach used bythe autovacuum logging code), which is to show new_rel_tuples.new_rel_tuples is the possibly-estimated total number of tuples left inthe table, whereas num_tuples meant the number of tuples encounteredduring the VACUUM operation, after pruning, without regard for tuplesfrom pages skipped via the visibility map.In passing, reorder a related vacrel field for consistency.
1 parent22eb12c commit73c61a5

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,9 @@ typedef struct LVRelState
213213
/* Counters that follow are only for scanned_pages */
214214
int64tuples_deleted;/* # deleted from table */
215215
int64lpdead_items;/* # deleted from indexes */
216+
int64live_tuples;/* # live tuples remaining */
216217
int64recently_dead_tuples;/* # dead, but not yet removable */
217218
int64missed_dead_tuples;/* # removable, but not removed */
218-
int64num_tuples;/* total number of nonremovable tuples */
219-
int64live_tuples;/* live tuples (reltuples estimate) */
220219
}LVRelState;
221220

222221
/*
@@ -816,10 +815,9 @@ lazy_scan_heap(LVRelState *vacrel, int nworkers)
816815
vacrel->num_index_scans=0;
817816
vacrel->tuples_deleted=0;
818817
vacrel->lpdead_items=0;
818+
vacrel->live_tuples=0;
819819
vacrel->recently_dead_tuples=0;
820820
vacrel->missed_dead_tuples=0;
821-
vacrel->num_tuples=0;
822-
vacrel->live_tuples=0;
823821

824822
vistest=GlobalVisTestFor(vacrel->rel);
825823

@@ -1572,9 +1570,8 @@ lazy_scan_prune(LVRelState *vacrel,
15721570
HTSV_Resultres;
15731571
inttuples_deleted,
15741572
lpdead_items,
1575-
recently_dead_tuples,
1576-
num_tuples,
1577-
live_tuples;
1573+
live_tuples,
1574+
recently_dead_tuples;
15781575
intnnewlpdead;
15791576
intnfrozen;
15801577
OffsetNumberdeadoffsets[MaxHeapTuplesPerPage];
@@ -1589,9 +1586,8 @@ lazy_scan_prune(LVRelState *vacrel,
15891586
/* Initialize (or reset) page-level counters */
15901587
tuples_deleted=0;
15911588
lpdead_items=0;
1592-
recently_dead_tuples=0;
1593-
num_tuples=0;
15941589
live_tuples=0;
1590+
recently_dead_tuples=0;
15951591

15961592
/*
15971593
* Prune all HOT-update chains in this page.
@@ -1788,8 +1784,7 @@ lazy_scan_prune(LVRelState *vacrel,
17881784
* Check tuple left behind after pruning to see if needs to be frozen
17891785
* now.
17901786
*/
1791-
num_tuples++;
1792-
prunestate->hastup= true;
1787+
prunestate->hastup= true;/* page won't be truncatable */
17931788
if (heap_prepare_freeze_tuple(tuple.t_data,
17941789
vacrel->relfrozenxid,
17951790
vacrel->relminmxid,
@@ -1928,9 +1923,8 @@ lazy_scan_prune(LVRelState *vacrel,
19281923
/* Finally, add page-local counts to whole-VACUUM counts */
19291924
vacrel->tuples_deleted+=tuples_deleted;
19301925
vacrel->lpdead_items+=lpdead_items;
1931-
vacrel->recently_dead_tuples+=recently_dead_tuples;
1932-
vacrel->num_tuples+=num_tuples;
19331926
vacrel->live_tuples+=live_tuples;
1927+
vacrel->recently_dead_tuples+=recently_dead_tuples;
19341928
}
19351929

19361930
/*
@@ -1963,7 +1957,6 @@ lazy_scan_noprune(LVRelState *vacrel,
19631957
OffsetNumberoffnum,
19641958
maxoff;
19651959
intlpdead_items,
1966-
num_tuples,
19671960
live_tuples,
19681961
recently_dead_tuples,
19691962
missed_dead_tuples;
@@ -1976,7 +1969,6 @@ lazy_scan_noprune(LVRelState *vacrel,
19761969
*recordfreespace= false;/* for now */
19771970

19781971
lpdead_items=0;
1979-
num_tuples=0;
19801972
live_tuples=0;
19811973
recently_dead_tuples=0;
19821974
missed_dead_tuples=0;
@@ -2031,7 +2023,6 @@ lazy_scan_noprune(LVRelState *vacrel,
20312023
vacrel->freeze_cutoffs_valid= false;
20322024
}
20332025

2034-
num_tuples++;
20352026
ItemPointerSet(&(tuple.t_self),blkno,offnum);
20362027
tuple.t_data= (HeapTupleHeader)PageGetItem(page,itemid);
20372028
tuple.t_len=ItemIdGetLength(itemid);
@@ -2096,7 +2087,6 @@ lazy_scan_noprune(LVRelState *vacrel,
20962087
* forever, for vanishingly little benefit.)
20972088
*/
20982089
*hastup= true;
2099-
num_tuples+=lpdead_items;
21002090
missed_dead_tuples+=lpdead_items;
21012091
}
21022092

@@ -2146,10 +2136,9 @@ lazy_scan_noprune(LVRelState *vacrel,
21462136
/*
21472137
* Finally, add relevant page-local counts to whole-VACUUM counts
21482138
*/
2139+
vacrel->live_tuples+=live_tuples;
21492140
vacrel->recently_dead_tuples+=recently_dead_tuples;
21502141
vacrel->missed_dead_tuples+=missed_dead_tuples;
2151-
vacrel->num_tuples+=num_tuples;
2152-
vacrel->live_tuples+=live_tuples;
21532142
if (missed_dead_tuples>0)
21542143
vacrel->missed_dead_pages++;
21552144

0 commit comments

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