diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/btree/bt_debug.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_debug.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/third_party/wiredtiger/src/btree/bt_debug.c b/src/third_party/wiredtiger/src/btree/bt_debug.c index fa7cff35e5f..9cc7cd2a824 100644 --- a/src/third_party/wiredtiger/src/btree/bt_debug.c +++ b/src/third_party/wiredtiger/src/btree/bt_debug.c @@ -131,7 +131,7 @@ __dmsg_wrapup(WT_DBG *ds) } /* Close any file we opened. */ - (void)__wt_fclose(session, &ds->fp, WT_FHANDLE_WRITE); + (void)__wt_fclose(&ds->fp, WT_FHANDLE_WRITE); } /* @@ -323,14 +323,23 @@ __wt_debug_disk( /* FALLTHROUGH */ case WT_PAGE_ROW_INT: case WT_PAGE_ROW_LEAF: - __dmsg(ds, ", entries %" PRIu32 "\n", dsk->u.entries); + __dmsg(ds, ", entries %" PRIu32, dsk->u.entries); break; case WT_PAGE_OVFL: - __dmsg(ds, ", datalen %" PRIu32 "\n", dsk->u.datalen); + __dmsg(ds, ", datalen %" PRIu32, dsk->u.datalen); break; WT_ILLEGAL_VALUE(session); } + if (F_ISSET(dsk, WT_PAGE_COMPRESSED)) + __dmsg(ds, ", compressed"); + if (F_ISSET(dsk, WT_PAGE_EMPTY_V_ALL)) + __dmsg(ds, ", empty-all"); + if (F_ISSET(dsk, WT_PAGE_EMPTY_V_NONE)) + __dmsg(ds, ", empty-none"); + + __dmsg(ds, ", generation %" PRIu64 "\n", dsk->write_gen); + switch (dsk->type) { case WT_PAGE_BLOCK_MANAGER: break; @@ -395,7 +404,7 @@ __debug_dsk_cell(WT_DBG *ds, const WT_PAGE_HEADER *dsk) } /* - * __debug_shape_info -- + * __debug_tree_shape_info -- * Pretty-print information about a page. */ static char * @@ -546,8 +555,7 @@ __debug_page(WT_DBG *ds, WT_PAGE *page, uint32_t flags) session = ds->session; /* Dump the page metadata. */ - WT_WITH_PAGE_INDEX(session, - ret = __debug_page_metadata(ds, page)); + WT_WITH_PAGE_INDEX(session, ret = __debug_page_metadata(ds, page)); WT_RET(ret); /* Dump the page. */ @@ -600,7 +608,7 @@ __debug_page_metadata(WT_DBG *ds, WT_PAGE *page) switch (page->type) { case WT_PAGE_COL_INT: __dmsg(ds, " recno %" PRIu64, page->pg_intl_recno); - pindex = WT_INTL_INDEX_COPY(page); + WT_INTL_INDEX_GET(session, page, pindex); entries = pindex->entries; break; case WT_PAGE_COL_FIX: @@ -612,7 +620,7 @@ __debug_page_metadata(WT_DBG *ds, WT_PAGE *page) entries = page->pg_var_entries; break; case WT_PAGE_ROW_INT: - pindex = WT_INTL_INDEX_COPY(page); + WT_INTL_INDEX_GET(session, page, pindex); entries = pindex->entries; break; case WT_PAGE_ROW_LEAF: @@ -789,7 +797,7 @@ __debug_page_row_int(WT_DBG *ds, WT_PAGE *page, uint32_t flags) WT_REF *ref; WT_SESSION_IMPL *session; size_t len; - uint8_t *p; + void *p; session = ds->session; |