Skip to content

Commit cd63aa2

Browse files
committed
fix warnings
1 parent 8c1b0b7 commit cd63aa2

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

contrib/mmts/multimaster.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ MtmCheckClusterLock()
579579
} else {
580580
/* All lockers are synchronized their logs */
581581
/* Remove lock and mark them as receovered */
582-
elog(WARNING, "Complete recovery of %d nodes (node mask %lx)", dtm->nLockers, dtm->nodeLockerMask);
582+
elog(WARNING, "Complete recovery of %d nodes (node mask %llx)", dtm->nLockers, dtm->nodeLockerMask);
583583
Assert(dtm->walSenderLockerMask == 0);
584584
Assert((dtm->nodeLockerMask & dtm->disabledNodeMask) == dtm->nodeLockerMask);
585585
dtm->disabledNodeMask &= ~dtm->nodeLockerMask;
@@ -1814,7 +1814,7 @@ void MtmRefreshClusterStatus(bool nowait)
18141814

18151815
clique = MtmFindMaxClique(matrix, MtmNodes, &clique_size);
18161816
if (clique_size >= MtmNodes/2+1) { /* have quorum */
1817-
elog(WARNING, "Find clique %lx, disabledNodeMask %lx", clique, dtm->disabledNodeMask);
1817+
elog(WARNING, "Find clique %llx, disabledNodeMask %llx", clique, dtm->disabledNodeMask);
18181818
MtmLock(LW_EXCLUSIVE);
18191819
mask = ~clique & (((nodemask_t)1 << MtmNodes)-1) & ~dtm->disabledNodeMask; /* new disabled nodes mask */
18201820
for (i = 0; mask != 0; i++, mask >>= 1) {
@@ -1841,7 +1841,7 @@ void MtmRefreshClusterStatus(bool nowait)
18411841
MtmSwitchClusterMode(MTM_RECOVERY);
18421842
}
18431843
} else {
1844-
elog(WARNING, "Clique %lx has no quorum", clique);
1844+
elog(WARNING, "Clique %llx has no quorum", clique);
18451845
}
18461846
}
18471847

contrib/mmts/pglogical_apply.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,19 +466,16 @@ read_rel(StringInfo s, LOCKMODE mode)
466466
static void
467467
process_remote_commit(StringInfo in)
468468
{
469-
XLogRecPtr commit_lsn;
470-
XLogRecPtr end_lsn;
471-
TimestampTz commit_time;
472469
uint8 flags;
473470
const char *gid;
474471

475472
/* read flags */
476473
flags = pq_getmsgbyte(in);
477474

478475
/* read fields */
479-
commit_lsn = pq_getmsgint64(in);
480-
end_lsn = pq_getmsgint64(in);
481-
commit_time = pq_getmsgint64(in);
476+
pq_getmsgint64(in); /* commit_lsn */
477+
pq_getmsgint64(in); /* end_lsn */
478+
pq_getmsgint64(in); /* commit_time */
482479

483480
if (PGLOGICAL_XACT_EVENT(flags) != PGLOGICAL_COMMIT)
484481
gid = pq_getmsgstring(in);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy