From d6723f2cfbe98e9837948336420f283312c91b51 Mon Sep 17 00:00:00 2001 From: Matthias van de Meent Date: Thu, 7 Jan 2021 16:51:30 +0100 Subject: [PATCH v2 2/5] 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 ++-- src/test/regress/expected/rules.out | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index dc998bc5f7..940e9dcee4 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -6565,19 +6565,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_excluded bigint + tuples_excluded bigint - Number of lines not processed because they were excluded by the + Number of tuples not processed because they were excluded 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 a9bd983419..e7e227792c 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -1131,8 +1131,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_excluded + S.param3 AS tuples_processed, + S.param4 AS tuples_excluded 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 86e6a422e2..fb3c7e2c0c 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_EXCLUDED, ++excluded); + pgstat_progress_update_param(PROGRESS_COPY_TUPLES_EXCLUDED, ++excluded); continue; } } @@ -1111,7 +1111,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 e6f6545033..8b2b188bd5 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_EXCLUDED 3 +#define PROGRESS_COPY_TUPLES_PROCESSED 2 +#define PROGRESS_COPY_TUPLES_EXCLUDED 3 #endif diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 25a863627e..970f6909c2 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -1950,8 +1950,8 @@ pg_stat_progress_copy| SELECT s.pid, s.relid, s.param1 AS bytes_processed, s.param2 AS bytes_total, - s.param3 AS lines_processed, - s.param4 AS lines_excluded + s.param3 AS tuples_processed, + s.param4 AS tuples_excluded FROM (pg_stat_get_progress_info('COPY'::text) s(pid, datid, relid, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) LEFT JOIN pg_database d ON ((s.datid = d.oid))); pg_stat_progress_create_index| SELECT s.pid, -- 2.20.1