From 8c071aa1757d3471af2868a6c300106241e7f6ed Mon Sep 17 00:00:00 2001 From: Matthias van de Meent Date: Thu, 7 Jan 2021 16:51:30 +0100 Subject: [PATCH v1 2/2] Rename lines* to tuples* in COPY progress reporting view This pulls the names of the columns in line with the other progress reporting views and the comments surrounding the code that updates the columns. It also makes it clear to the user that for the foreign data consumed or produced in the COPY command, the line count need not be related to these columns. --- doc/src/sgml/monitoring.sgml | 8 ++++---- src/backend/catalog/system_views.sql | 4 ++-- src/backend/commands/copyfrom.c | 4 ++-- src/backend/commands/copyto.c | 4 ++-- src/include/commands/progress.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index bf18ea23bd..f9b474ae0b 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -6492,19 +6492,19 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, - lines_processed bigint + tuples_processed bigint - Number of lines already processed by COPY command. + Number of tuples already processed by COPY command. - lines_filtered bigint + tuples_filtered bigint - Number of lines not processed due to being filtered by the + Number of tuples not processed due to being filtered by the WHERE clause of the COPY command. diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 83d62c5286..3e73b2435a 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -1124,8 +1124,8 @@ CREATE VIEW pg_stat_progress_copy AS S.relid AS relid, S.param1 AS bytes_processed, S.param2 AS bytes_total, - S.param3 AS lines_processed, - S.param4 AS lines_filtered + S.param3 AS tuples_processed, + S.param4 AS tuples_filtered FROM pg_stat_get_progress_info('COPY') AS S LEFT JOIN pg_database D ON S.datid = D.oid; diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c index 212f4c67d6..d3eedc4194 100644 --- a/src/backend/commands/copyfrom.c +++ b/src/backend/commands/copyfrom.c @@ -871,7 +871,7 @@ CopyFrom(CopyFromState cstate) if (!ExecQual(cstate->qualexpr, econtext)) { /* Report that this tuple was filtered out by the WHERE clause */ - pgstat_progress_update_param(PROGRESS_COPY_LINES_FILTERED, ++filtered); + pgstat_progress_update_param(PROGRESS_COPY_TUPLES_FILTERED, ++filtered); continue; } } @@ -1110,7 +1110,7 @@ CopyFrom(CopyFromState cstate) * for counting tuples inserted by an INSERT command. Update * progress of the COPY command as well. */ - pgstat_progress_update_param(PROGRESS_COPY_LINES_PROCESSED, ++processed); + pgstat_progress_update_param(PROGRESS_COPY_TUPLES_PROCESSED, ++processed); } } diff --git a/src/backend/commands/copyto.c b/src/backend/commands/copyto.c index e04ec1e331..9ffe7a6ee3 100644 --- a/src/backend/commands/copyto.c +++ b/src/backend/commands/copyto.c @@ -954,7 +954,7 @@ CopyTo(CopyToState cstate) CopyOneRowTo(cstate, slot); /* Increment amount of processed tuples and update the progress */ - pgstat_progress_update_param(PROGRESS_COPY_LINES_PROCESSED, ++processed); + pgstat_progress_update_param(PROGRESS_COPY_TUPLES_PROCESSED, ++processed); } ExecDropSingleTupleTableSlot(slot); @@ -1321,7 +1321,7 @@ copy_dest_receive(TupleTableSlot *slot, DestReceiver *self) CopyOneRowTo(cstate, slot); /* Increment amount of processed tuples and update the progress */ - pgstat_progress_update_param(PROGRESS_COPY_LINES_PROCESSED, ++myState->processed); + pgstat_progress_update_param(PROGRESS_COPY_TUPLES_PROCESSED, ++myState->processed); return true; } diff --git a/src/include/commands/progress.h b/src/include/commands/progress.h index eb0f4e70d6..31dfcc0094 100644 --- a/src/include/commands/progress.h +++ b/src/include/commands/progress.h @@ -136,7 +136,7 @@ /* Commands of PROGRESS_COPY */ #define PROGRESS_COPY_BYTES_PROCESSED 0 #define PROGRESS_COPY_BYTES_TOTAL 1 -#define PROGRESS_COPY_LINES_PROCESSED 2 -#define PROGRESS_COPY_LINES_FILTERED 3 +#define PROGRESS_COPY_TUPLES_PROCESSED 2 +#define PROGRESS_COPY_TUPLES_FILTERED 3 #endif -- 2.20.1