hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common和contrib路径下存在格式化使用错误场景

Browse Source
This commit is contained in:
ytwx1993
2023-07-21 10:49:18 +08:00
parent 29d8cac3c1
commit cda13436de
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/pg_check_clog/pg_check_clog.cpp
View File

@ -103,7 +103,7 @@ static void parse_clog_file(const int segnum)
for (bit_index = 0; bit_index < 4; bit_index++) { for (bit_index = 0; bit_index < 4; bit_index++) {
bshift = TransactionIdToBIndex(xid) * CLOG_BITS_PER_XACT; bshift = TransactionIdToBIndex(xid) * CLOG_BITS_PER_XACT;
status = (*byteptr >> bshift) & CLOG_XACT_BITMASK; status = (*byteptr >> bshift) & CLOG_XACT_BITMASK;
fprintf(stdout, "xid %u, status: %s\n", xid, xid_status_name[status]); fprintf(stdout, "xid %lu, status: %s\n", xid, xid_status_name[status]);
xid++; xid++;
} }
@ -159,7 +159,7 @@ static void parse_single_xid(const TransactionId xid)
byteptr = buffer + byteno; byteptr = buffer + byteno;
status = (*byteptr >> bshift) & CLOG_XACT_BITMASK; status = (*byteptr >> bshift) & CLOG_XACT_BITMASK;
fprintf(stdout, "xid %u, status: %s\n", xid, xid_status_name[status]); fprintf(stdout, "xid %lu, status: %s\n", xid, xid_status_name[status]);
if (close(fd)) { if (close(fd)) {
fprintf(stderr, "file close error !\n"); fprintf(stderr, "file close error !\n");

4
contrib/pg_check_replslot/pg_check_replslot.cpp
View File

@ -199,7 +199,7 @@ static void show_slot(char* buffer, size_t size)
char lsn[64] = {0}; char lsn[64] = {0};
if (size != sizeof(ReplicationSlotOnDisk)) { if (size != sizeof(ReplicationSlotOnDisk)) {
fprintf(stderr, _("unexpected slot file size %d, expected %d\n"), (int)size, sizeof(ReplicationSlotOnDisk)); fprintf(stderr, _("unexpected slot file size %d, expected %lu\n"), (int)size, sizeof(ReplicationSlotOnDisk));
exit(1); exit(1);
} }
@ -237,7 +237,7 @@ static void show_slot(char* buffer, size_t size)
snprintf(lsn, 63, "%X/%X", (uint32)(slot.slotdata.restart_lsn >> 32), (uint32)slot.slotdata.restart_lsn); snprintf(lsn, 63, "%X/%X", (uint32)(slot.slotdata.restart_lsn >> 32), (uint32)slot.slotdata.restart_lsn);
fprintf(stderr, fprintf(stderr,
_("%-24s| %-12s| %-8u| %-8u| %-12s| %-12s\n"), _("%-24s| %-12s| %-8u| %-8lu| %-12s| %-12s\n"),
NameStr(slot.slotdata.name), NameStr(slot.slotdata.name),
(slot.slotdata.database == InvalidOid) ? "physical" : "logical", (slot.slotdata.database == InvalidOid) ? "physical" : "logical",
slot.slotdata.database, slot.slotdata.database,