diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2025-03-29 10:30:08 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2025-03-29 10:43:57 +0100 |
| commit | a0ed19e0a9efe93b3b83d6e3fe8f77656be253a2 (patch) | |
| tree | 8c1040a46a47098d3fe5199530576a1a68acc20f /src/backend/utils/sort | |
| parent | a0a4601765b896079eb82a9d5cfa1f41154fcfdb (diff) | |
Use PRI?64 instead of "ll?" in format strings (continued).
Continuation of work started in commit 15a79c73, after initial trial.
Author: Thomas Munro <thomas.munro@gmail.com>
Discussion: https://postgr.es/m/b936d2fb-590d-49c3-a615-92c3a88c6c19%40eisentraut.org
Diffstat (limited to 'src/backend/utils/sort')
| -rw-r--r-- | src/backend/utils/sort/logtape.c | 16 | ||||
| -rw-r--r-- | src/backend/utils/sort/tuplesort.c | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c index 47e601ef62c..e529ceb8260 100644 --- a/src/backend/utils/sort/logtape.c +++ b/src/backend/utils/sort/logtape.c @@ -263,8 +263,8 @@ ltsWriteBlock(LogicalTapeSet *lts, int64 blocknum, const void *buffer) if (BufFileSeekBlock(lts->pfile, blocknum) != 0) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not seek to block %lld of temporary file", - (long long) blocknum))); + errmsg("could not seek to block %" PRId64 " of temporary file", + blocknum))); BufFileWrite(lts->pfile, buffer, BLCKSZ); /* Update nBlocksWritten, if we extended the file */ @@ -284,8 +284,8 @@ ltsReadBlock(LogicalTapeSet *lts, int64 blocknum, void *buffer) if (BufFileSeekBlock(lts->pfile, blocknum) != 0) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not seek to block %lld of temporary file", - (long long) blocknum))); + errmsg("could not seek to block %" PRId64 " of temporary file", + blocknum))); BufFileReadExact(lts->pfile, buffer, BLCKSZ); } @@ -1100,10 +1100,10 @@ LogicalTapeBackspace(LogicalTape *lt, size_t size) ltsReadBlock(lt->tapeSet, prev, lt->buffer); if (TapeBlockGetTrailer(lt->buffer)->next != lt->curBlockNumber) - elog(ERROR, "broken tape, next of block %lld is %lld, expected %lld", - (long long) prev, - (long long) (TapeBlockGetTrailer(lt->buffer)->next), - (long long) lt->curBlockNumber); + elog(ERROR, "broken tape, next of block %" PRId64 " is %" PRId64 ", expected %" PRId64, + prev, + TapeBlockGetTrailer(lt->buffer)->next, + lt->curBlockNumber); lt->nbytes = TapeBlockPayloadSize; lt->curBlockNumber = prev; diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index 2ef32d53a43..65ab83fff8b 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -918,13 +918,13 @@ tuplesort_free(Tuplesortstate *state) if (trace_sort) { if (state->tapeset) - elog(LOG, "%s of worker %d ended, %lld disk blocks used: %s", + elog(LOG, "%s of worker %d ended, %" PRId64 " disk blocks used: %s", SERIAL(state) ? "external sort" : "parallel external sort", - state->worker, (long long) spaceUsed, pg_rusage_show(&state->ru_start)); + state->worker, spaceUsed, pg_rusage_show(&state->ru_start)); else - elog(LOG, "%s of worker %d ended, %lld KB used: %s", + elog(LOG, "%s of worker %d ended, %" PRId64 " KB used: %s", SERIAL(state) ? "internal sort" : "unperformed parallel sort", - state->worker, (long long) spaceUsed, pg_rusage_show(&state->ru_start)); + state->worker, spaceUsed, pg_rusage_show(&state->ru_start)); } TRACE_POSTGRESQL_SORT_DONE(state->tapeset != NULL, spaceUsed); |