diff options
| -rw-r--r-- | src/conn/conn_cache_pool.c | 2 | ||||
| -rw-r--r-- | src/conn/conn_log.c | 3 | ||||
| -rw-r--r-- | src/include/extern.h | 2 | ||||
| -rw-r--r-- | src/lsm/lsm_merge.c | 4 | ||||
| -rw-r--r-- | src/lsm/lsm_tree.c | 8 | ||||
| -rw-r--r-- | src/session/session_api.c | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/src/conn/conn_cache_pool.c b/src/conn/conn_cache_pool.c index 025ffc79d77..15aed596cca 100644 --- a/src/conn/conn_cache_pool.c +++ b/src/conn/conn_cache_pool.c @@ -442,7 +442,7 @@ __cache_pool_adjust(uint64_t highest, uint64_t bump_threshold) read_pressure = cache->cp_current_evict / highest; WT_VERBOSE_RET(session, shared_cache, - "\t%"PRIu64", %"PRIu64", %d", + "\t%" PRIu64 ", %" PRIu64 ", %" PRIu32, entry->cache_size, read_pressure, cache->cp_skip_count); /* Allow to stabilize after changes. */ diff --git a/src/conn/conn_log.c b/src/conn/conn_log.c index 3103063040b..1997d96b864 100644 --- a/src/conn/conn_log.c +++ b/src/conn/conn_log.c @@ -97,7 +97,8 @@ __log_archive_server(void *arg) lsn = log->ckpt_lsn; lsn.offset = 0; WT_VERBOSE_ERR(session, log, - "log_archive: ckpt LSN %d,%" PRIu64, lsn.file, lsn.offset); + "log_archive: ckpt LSN %" PRIu32 ",%" PRIu64, + lsn.file, lsn.offset); /* * Main archive code. Get the list of all log files and * remove any earlier than the checkpoint LSN. diff --git a/src/include/extern.h b/src/include/extern.h index 4aa99ce7220..8a29cc65743 100644 --- a/src/include/extern.h +++ b/src/include/extern.h @@ -767,7 +767,7 @@ extern int __wt_lsm_tree_get(WT_SESSION_IMPL *session, WT_LSM_TREE **treep); extern void __wt_lsm_tree_release(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree); -extern int __wt_lsm_tree_switch( WT_SESSION_IMPL *session, +extern int __wt_lsm_tree_switch(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree); extern int __wt_lsm_tree_drop( WT_SESSION_IMPL *session, const char *name, diff --git a/src/lsm/lsm_merge.c b/src/lsm/lsm_merge.c index 477ed4bd6e3..57c82070fe8 100644 --- a/src/lsm/lsm_merge.c +++ b/src/lsm/lsm_merge.c @@ -186,8 +186,8 @@ __wt_lsm_merge( dest_id = WT_ATOMIC_ADD(lsm_tree->last, 1); WT_VERBOSE_RET(session, lsm, - "Merging chunks %d-%d into %d (%" PRIu64 " records)" - ", generation %d\n", + "Merging chunks %u-%u into %u (%" PRIu64 " records)" + ", generation %" PRIu32 "\n", start_chunk, end_chunk, dest_id, record_count, generation); WT_RET(__wt_calloc_def(session, 1, &chunk)); diff --git a/src/lsm/lsm_tree.c b/src/lsm/lsm_tree.c index a7829c6b842..e139626177a 100644 --- a/src/lsm/lsm_tree.c +++ b/src/lsm/lsm_tree.c @@ -636,8 +636,7 @@ __lsm_tree_throttle( * Switch to a new in-memory tree. */ int -__wt_lsm_tree_switch( - WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree) +__wt_lsm_tree_switch(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree) { WT_DECL_RET; WT_LSM_CHUNK *chunk; @@ -651,8 +650,9 @@ __wt_lsm_tree_switch( WT_ERR(__wt_realloc_def(session, &lsm_tree->chunk_alloc, lsm_tree->nchunks + 1, &lsm_tree->chunk)); - WT_VERBOSE_ERR(session, lsm, "Tree switch to: %d, throttle %d", - new_id, (int)lsm_tree->throttle_sleep); + WT_VERBOSE_ERR(session, lsm, + "Tree switch to: %" PRIu32 ", throttle %ld", + new_id, lsm_tree->throttle_sleep); WT_ERR(__wt_calloc_def(session, 1, &chunk)); chunk->id = new_id; diff --git a/src/session/session_api.c b/src/session/session_api.c index 7294d98fe2f..5a7d8abf297 100644 --- a/src/session/session_api.c +++ b/src/session/session_api.c @@ -837,7 +837,7 @@ __wt_open_session(WT_CONNECTION_IMPL *conn, int internal, break; if (i == conn->session_size) WT_ERR_MSG(session, WT_ERROR, - "only configured to support %d thread contexts", + "only configured to support %" PRIu32 " thread contexts", conn->session_size); /* |