git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Add regression tests for pg_stat_progress_copy.tuples_skipped.

author Fujii Masao <fujii@postgresql.org>

Tue, 4 Mar 2025 14:56:49 +0000 (23:56 +0900)

committer Fujii Masao <fujii@postgresql.org>

Tue, 4 Mar 2025 14:56:49 +0000 (23:56 +0900)

This commit adds tests to verify that tuples_skipped in pg_stat_progress_copy
works as expected. While existing tests checked other fields, tuples_skipped
was previously untested.

This improves test coverage and ensures accurate tracking of skipped tuples.

Author: Jian He <jian.universality@gmail.com>
Reviewed-by: Fujii Masao <masao.fujii@gmail.com>
Reviewed-by: Josef Šimánek <josef.simanek@gmail.com>
Discussion: https://postgr.es/m/CACJufxFazq-bfyhiO0KBojR=yOr84E25Rqf6mHB0Ow0KPidkKw@mail.gmail.com

src/test/regress/expected/copy.out patch | blob | blame | history

src/test/regress/sql/copy.sql patch | blob | blame | history

diff --git a/src/test/regress/expected/copy.out b/src/test/regress/expected/copy.out

index e69e34c69b878a8588a588cabbfd6f7be3d1b1bf..06bae8c61aebe1bde0b32bb31cc90f123493b739 100644 (file)

--- a/src/test/regress/expected/copy.out

+++ b/src/test/regress/expected/copy.out

@@ -181,7 +181,8 @@ begin

bytes_processed > 0 as has_bytes_processed,

bytes_total > 0 as has_bytes_total,

tuples_processed,

- tuples_excluded

+ tuples_excluded,

+ tuples_skipped

from pg_stat_progress_copy

where pid = pg_backend_pid())

select into report (to_jsonb(r)) as value

@@ -197,13 +198,17 @@ create trigger check_after_tab_progress_reporting

execute function notice_after_tab_progress_reporting();

-- Generate COPY FROM report with PIPE.

copy tab_progress_reporting from stdin;

-INFO: progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "has_bytes_total": false, "tuples_excluded": 0, "tuples_processed": 3, "has_bytes_processed": true}

+INFO: progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 0, "has_bytes_total": false, "tuples_excluded": 0, "tuples_processed": 3, "has_bytes_processed": true}

-- Generate COPY FROM report with FILE, with some excluded tuples.

truncate tab_progress_reporting;

\set filename :abs_srcdir '/data/emp.data'

copy tab_progress_reporting from :'filename'

where (salary < 2000);

-INFO: progress: {"type": "FILE", "command": "COPY FROM", "relname": "tab_progress_reporting", "has_bytes_total": true, "tuples_excluded": 1, "tuples_processed": 2, "has_bytes_processed": true}

+INFO: progress: {"type": "FILE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 0, "has_bytes_total": true, "tuples_excluded": 1, "tuples_processed": 2, "has_bytes_processed": true}

+-- Generate COPY FROM report with PIPE, with some skipped tuples.

+copy tab_progress_reporting from stdin(on_error ignore);

+NOTICE: 2 rows were skipped due to data type incompatibility

+INFO: progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "tuples_skipped": 2, "has_bytes_total": false, "tuples_excluded": 0, "tuples_processed": 1, "has_bytes_processed": true}

drop trigger check_after_tab_progress_reporting on tab_progress_reporting;

drop function notice_after_tab_progress_reporting();

drop table tab_progress_reporting;

diff --git a/src/test/regress/sql/copy.sql b/src/test/regress/sql/copy.sql

index 895479d2d0fd09d8ba6993c72ef2bc1d5ee5b4b9..3009bdfdf898bf8488af7179564090c8445f99fe 100644 (file)

--- a/src/test/regress/sql/copy.sql

+++ b/src/test/regress/sql/copy.sql

@@ -193,7 +193,8 @@ begin