summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2021-04-23 04:25:49 +0000
committerMichael Paquier2021-04-23 04:25:49 +0000
commit62aa2bb293148c13851484e63db4835e3c53147f (patch)
treef1df5f74a9a425291ca18cbb59a4a2d718a73e76
parentbb684c82f73316b88f9bcb321128a4347b5206fe (diff)
Remove use of [U]INT64_FORMAT in some translatable strings
%lld with (long long), or %llu with (unsigned long long) are more adapted. This is similar to 3286065. Author: Kyotaro Horiguchi Discussion: https://postgr.es/m/[email protected]
-rw-r--r--contrib/pg_prewarm/pg_prewarm.c8
-rw-r--r--src/backend/access/transam/xlogprefetch.c23
-rw-r--r--src/bin/pgbench/pgbench.c6
3 files changed, 18 insertions, 19 deletions
diff --git a/contrib/pg_prewarm/pg_prewarm.c b/contrib/pg_prewarm/pg_prewarm.c
index a855452936..48d0132a0d 100644
--- a/contrib/pg_prewarm/pg_prewarm.c
+++ b/contrib/pg_prewarm/pg_prewarm.c
@@ -126,8 +126,8 @@ pg_prewarm(PG_FUNCTION_ARGS)
if (first_block < 0 || first_block >= nblocks)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
- errmsg("starting block number must be between 0 and " INT64_FORMAT,
- nblocks - 1)));
+ errmsg("starting block number must be between 0 and %lld",
+ (long long) (nblocks - 1))));
}
if (PG_ARGISNULL(4))
last_block = nblocks - 1;
@@ -137,8 +137,8 @@ pg_prewarm(PG_FUNCTION_ARGS)
if (last_block < 0 || last_block >= nblocks)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
- errmsg("ending block number must be between 0 and " INT64_FORMAT,
- nblocks - 1)));
+ errmsg("ending block number must be between 0 and %lld",
+ (long long) (nblocks - 1))));
}
/* Now we're ready to do the real work. */
diff --git a/src/backend/access/transam/xlogprefetch.c b/src/backend/access/transam/xlogprefetch.c
index 9a6f17ca36..ae4585232b 100644
--- a/src/backend/access/transam/xlogprefetch.c
+++ b/src/backend/access/transam/xlogprefetch.c
@@ -358,20 +358,19 @@ XLogPrefetcherFree(XLogPrefetcher *prefetcher)
/* Log final statistics. */
ereport(LOG,
(errmsg("recovery finished prefetching at %X/%X; "
- "prefetch = " UINT64_FORMAT ", "
- "skip_hit = " UINT64_FORMAT ", "
- "skip_new = " UINT64_FORMAT ", "
- "skip_fpw = " UINT64_FORMAT ", "
- "skip_seq = " UINT64_FORMAT ", "
+ "prefetch = %llu, "
+ "skip_hit = %llu, "
+ "skip_new = %llu, "
+ "skip_fpw = %llu, "
+ "skip_seq = %llu, "
"avg_distance = %f, "
"avg_queue_depth = %f",
- (uint32) (prefetcher->reader->EndRecPtr << 32),
- (uint32) (prefetcher->reader->EndRecPtr),
- pg_atomic_read_u64(&SharedStats->prefetch),
- pg_atomic_read_u64(&SharedStats->skip_hit),
- pg_atomic_read_u64(&SharedStats->skip_new),
- pg_atomic_read_u64(&SharedStats->skip_fpw),
- pg_atomic_read_u64(&SharedStats->skip_seq),
+ LSN_FORMAT_ARGS(prefetcher->reader->EndRecPtr),
+ (unsigned long long) pg_atomic_read_u64(&SharedStats->prefetch),
+ (unsigned long long) pg_atomic_read_u64(&SharedStats->skip_hit),
+ (unsigned long long) pg_atomic_read_u64(&SharedStats->skip_new),
+ (unsigned long long) pg_atomic_read_u64(&SharedStats->skip_fpw),
+ (unsigned long long) pg_atomic_read_u64(&SharedStats->skip_seq),
SharedStats->avg_distance,
SharedStats->avg_queue_depth)));
hash_destroy(prefetcher->filter_table);
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index da1d9ec535..0827665997 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -5359,8 +5359,8 @@ parseScriptWeight(const char *option, char **script)
}
if (wtmp > INT_MAX || wtmp < 0)
{
- pg_log_fatal("weight specification out of range (0 .. %u): " INT64_FORMAT,
- INT_MAX, (int64) wtmp);
+ pg_log_fatal("weight specification out of range (0 .. %u): %lld",
+ INT_MAX, (long long) wtmp);
exit(1);
}
weight = wtmp;
@@ -5680,7 +5680,7 @@ set_random_seed(const char *seed)
}
if (seed != NULL)
- pg_log_info("setting random seed to " UINT64_FORMAT, iseed);
+ pg_log_info("setting random seed to %llu", (unsigned long long) iseed);
random_seed = iseed;
/* Fill base_random_sequence with low-order bits of seed */