database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-18 17:41:14 +03:00
Code

Apply filters to dump files all the time in 002_pg_upgrade.pl

Browse Source 
This commit removes the restriction that would not apply filters to the
dumps used for comparison in the TAP test of pg_upgrade when using the
same base version for the old and new nodes.

The previous logic would fail on Windows if loading a dump while using
the same set of binaries for the old and new nodes, as the library
dependencies updated in the old dump would append CRLFs to the dump
file as it is treated as a text file.  The dump filtering logic replaces
all CRLFs (\r\n) by LFs (\n), which is able to prevent this issue.

When the old and new versions of the binaries are the same,
AdjustUpgrade removes all blank lines, removes version-based comments
generated by pg_dump and replaces CRLFs by LFs.

Reported-by: Alexander Lakhin
Discussion: https://postgr.es/m/60d434b9-53d9-9ea1-819b-efebdcf44e41@gmail.com
Backpatch-through: 15
This commit is contained in:
Michael Paquier 2023-12-06 09:55:05 +09:00
parent bc0a368dc5
commit f0b53daa2c
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/pg_upgrade/t/002_pg_upgrade.pl
View File

@ -364,15 +364,9 @@ push(@dump_command, '--extra-float-digits', '0')
if ($oldnode->pg_version < 12); if ($oldnode->pg_version < 12);
$newnode->command_ok(\@dump_command, 'dump after running pg_upgrade'); $newnode->command_ok(\@dump_command, 'dump after running pg_upgrade');
# No need to apply filters on the dumps if working on the same version # Filter the contents of the dumps.
# for the old and new nodes. my $dump1_filtered = filter_dump(1, $oldnode->pg_version, $dump1_file);
my $dump1_filtered = $dump1_file; my $dump2_filtered = filter_dump(0, $oldnode->pg_version, $dump2_file);
my $dump2_filtered = $dump2_file;
if ($oldnode->pg_version != $newnode->pg_version)
{
$dump1_filtered = filter_dump(1, $oldnode->pg_version, $dump1_file);
$dump2_filtered = filter_dump(0, $oldnode->pg_version, $dump2_file);
}
# Compare the two dumps, there should be no differences. # Compare the two dumps, there should be no differences.
my $compare_res = compare($dump1_filtered, $dump2_filtered); my $compare_res = compare($dump1_filtered, $dump2_filtered);