Skip to content

Commit 990d67a

Browse files
author
Arthur Zakirov
committed
Use *_FILE_CRC32 macroses instead of *_TRADITIONAL_CRC32
1 parent 640d1c9 commit 990d67a

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/backup.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ remote_copy_file(PGconn *conn, pgFile* file)
307307
to_path, strerror(errno_tmp));
308308
}
309309

310-
INIT_TRADITIONAL_CRC32(file->crc);
310+
INIT_FILE_CRC32(false, file->crc);
311311

312312
/* read from stream and write to backup file */
313313
while (1)
@@ -333,14 +333,14 @@ remote_copy_file(PGconn *conn, pgFile* file)
333333
{
334334
write_buffer_size = Min(row_length, sizeof(buf));
335335
memcpy(buf, copybuf, write_buffer_size);
336-
COMP_TRADITIONAL_CRC32(file->crc, buf, write_buffer_size);
336+
COMP_FILE_CRC32(false, file->crc, buf, write_buffer_size);
337337

338338
/* TODO calc checksum*/
339339
if (fwrite(buf, 1, write_buffer_size, out) != write_buffer_size)
340340
{
341341
errno_tmp = errno;
342342
/* oops */
343-
FIN_TRADITIONAL_CRC32(file->crc);
343+
FIN_FILE_CRC32(false, file->crc);
344344
fclose(out);
345345
PQfinish(conn);
346346
elog(ERROR, "cannot write to \"%s\": %s", to_path,
@@ -364,7 +364,7 @@ remote_copy_file(PGconn *conn, pgFile* file)
364364
}
365365

366366
file->write_size = (int64) file->read_size;
367-
FIN_TRADITIONAL_CRC32(file->crc);
367+
FIN_FILE_CRC32(false, file->crc);
368368

369369
fclose(out);
370370
}

src/data.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ compress_and_backup_page(pgFile *file, BlockNumber blknum,
487487
blknum, header.compressed_size, write_buffer_size); */
488488

489489
/* Update CRC */
490-
COMP_TRADITIONAL_CRC32(*crc, write_buffer, write_buffer_size);
490+
COMP_FILE_CRC32(false, *crc, write_buffer, write_buffer_size);
491491

492492
/* write data page */
493493
if(fwrite(write_buffer, 1, write_buffer_size, out) != write_buffer_size)
@@ -547,13 +547,13 @@ backup_data_file(backup_files_arg* arguments,
547547
/* reset size summary */
548548
file->read_size = 0;
549549
file->write_size = 0;
550-
INIT_TRADITIONAL_CRC32(file->crc);
550+
INIT_FILE_CRC32(false, file->crc);
551551

552552
/* open backup mode file for read */
553553
in = fopen(file->path, PG_BINARY_R);
554554
if (in == NULL)
555555
{
556-
FIN_TRADITIONAL_CRC32(file->crc);
556+
FIN_FILE_CRC32(false, file->crc);
557557

558558
/*
559559
* If file is not found, this is not en error.
@@ -658,7 +658,7 @@ backup_data_file(backup_files_arg* arguments,
658658
to_path, strerror(errno));
659659
fclose(in);
660660

661-
FIN_TRADITIONAL_CRC32(file->crc);
661+
FIN_FILE_CRC32(false, file->crc);
662662

663663
/*
664664
* If we have pagemap then file in the backup can't be a zero size.
@@ -927,7 +927,7 @@ copy_file(const char *from_root, const char *to_root, pgFile *file)
927927
struct stat st;
928928
pg_crc32 crc;
929929

930-
INIT_TRADITIONAL_CRC32(crc);
930+
INIT_FILE_CRC32(false, crc);
931931

932932
/* reset size summary */
933933
file->read_size = 0;
@@ -937,7 +937,7 @@ copy_file(const char *from_root, const char *to_root, pgFile *file)
937937
in = fopen(file->path, PG_BINARY_R);
938938
if (in == NULL)
939939
{
940-
FIN_TRADITIONAL_CRC32(crc);
940+
FIN_FILE_CRC32(false, crc);
941941
file->crc = crc;
942942

943943
/* maybe deleted, it's not error */
@@ -986,7 +986,7 @@ copy_file(const char *from_root, const char *to_root, pgFile *file)
986986
strerror(errno_tmp));
987987
}
988988
/* update CRC */
989-
COMP_TRADITIONAL_CRC32(crc, buf, read_len);
989+
COMP_FILE_CRC32(false, crc, buf, read_len);
990990

991991
file->read_size += read_len;
992992
}
@@ -1013,14 +1013,14 @@ copy_file(const char *from_root, const char *to_root, pgFile *file)
10131013
strerror(errno_tmp));
10141014
}
10151015
/* update CRC */
1016-
COMP_TRADITIONAL_CRC32(crc, buf, read_len);
1016+
COMP_FILE_CRC32(false, crc, buf, read_len);
10171017

10181018
file->read_size += read_len;
10191019
}
10201020

10211021
file->write_size = (int64) file->read_size;
10221022
/* finish CRC calculation and store into pgFile */
1023-
FIN_TRADITIONAL_CRC32(crc);
1023+
FIN_FILE_CRC32(false, crc);
10241024
file->crc = crc;
10251025

10261026
/* update file permission */

0 commit comments

Comments
 (0)