• Fujii Masao's avatar
    Fix CLUSTER progress reporting of number of blocks scanned. · 3df51ca8
    Fujii Masao authored
    Previously pg_stat_progress_cluster view reported the current block
    number in heap scan as the number of heap blocks scanned (i.e.,
    heap_blks_scanned). This reported number could be incorrect when
    synchronize_seqscans is enabled, because it allowed the heap scan to
    start at block in middle. This could result in wraparounds in the
    heap_blks_scanned column when the heap scan wrapped around.
    This commit fixes the bug by calculating the number of blocks from
    the block that the heap scan starts at to the current block in scan,
    and reporting that number in the heap_blks_scanned column.
    
    Also, in pg_stat_progress_cluster view, previously heap_blks_scanned
    could not reach heap_blks_total at the end of heap scan phase
    if the last pages scanned were empty. This commit fixes the bug by
    manually updating heap_blks_scanned to the same value as
    heap_blks_total when the heap scan phase finishes.
    
    Back-patch to v12 where pg_stat_progress_cluster view was introduced.
    
    Reported-by: Matthias van de Meent
    Author: Matthias van de Meent
    Reviewed-by: Fujii Masao
    Discussion: https://postgr.es/m/CAEze2WjCBWSGkVfYag001Rc4+-nNLDpWM7QbyD6yPvuhKs-gYQ@mail.gmail.com
    3df51ca8
heapam_handler.c 74 KB