v1-0001-file_fdw-Report-tuples-processed-and-skipped-for-.patch
text/plain
Filename: v1-0001-file_fdw-Report-tuples-processed-and-skipped-for-.patch
Type: text/plain
Part: 0
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: format-patch
Series: patch v1-0001
Subject: file_fdw: Report tuples processed and skipped for COPY progress.
| File | + | − |
|---|---|---|
| contrib/file_fdw/file_fdw.c | 16 | 0 |
From 9309195910d3b77614f330af8a80c38fcbc5c532 Mon Sep 17 00:00:00 2001 From: Fujii Masao <fujii@postgresql.org> Date: Thu, 3 Oct 2024 17:59:11 +0900 Subject: [PATCH v1] file_fdw: Report tuples processed and skipped for COPY progress. This commit enhances file_fdw to report the number of tuples processed and skipped (due to on_error = 'ignore') in the pg_stat_progress_copy view. These are shown in the tuples_processed and tuples_skipped columns, respectively. Previously, they were not reported while other columns like bytes_processed and bytes_total were updated. Discussion: https://postgr.es/m/bbddc7a0-b71a-4d54-9560-c90a26a06c48@oss.nttdata.com --- contrib/file_fdw/file_fdw.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c index 043204c3e7..6b6bf7ff18 100644 --- a/contrib/file_fdw/file_fdw.c +++ b/contrib/file_fdw/file_fdw.c @@ -25,6 +25,7 @@ #include "commands/copyfrom_internal.h" #include "commands/defrem.h" #include "commands/explain.h" +#include "commands/progress.h" #include "commands/vacuum.h" #include "foreign/fdwapi.h" #include "foreign/foreign.h" @@ -35,6 +36,7 @@ #include "optimizer/planmain.h" #include "optimizer/restrictinfo.h" #include "utils/acl.h" +#include "utils/backend_progress.h" #include "utils/memutils.h" #include "utils/rel.h" #include "utils/sampling.h" @@ -773,6 +775,10 @@ retry: */ cstate->escontext->error_occurred = false; + /* Report that this tuple was skipped due to ON_ERROR = ignore */ + pgstat_progress_update_param(PROGRESS_COPY_TUPLES_SKIPPED, + cstate->num_errors); + /* Switch back to original memory context */ MemoryContextSwitchTo(oldcontext); @@ -801,6 +807,9 @@ retry: /* Remove error callback. */ error_context_stack = errcallback.previous; + /* Update the processed tuple count for COPY progress reporting */ + pgstat_progress_incr_param(PROGRESS_COPY_TUPLES_PROCESSED, 1); + return slot; } @@ -1253,6 +1262,10 @@ file_acquire_sample_rows(Relation onerel, int elevel, */ cstate->escontext->error_occurred = false; + /* Report that this tuple was skipped due to ON_ERROR = ignore */ + pgstat_progress_update_param(PROGRESS_COPY_TUPLES_SKIPPED, + cstate->num_errors); + /* Repeat NextCopyFrom() until no soft error occurs */ continue; } @@ -1294,6 +1307,9 @@ file_acquire_sample_rows(Relation onerel, int elevel, } *totalrows += 1; + + /* Update the processed tuple count for COPY progress reporting */ + pgstat_progress_update_param(PROGRESS_COPY_TUPLES_PROCESSED, *totalrows); } /* Remove error callback. */ -- 2.45.2