summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/block/block_ext.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/third_party/wiredtiger/src/block/block_ext.c')
-rw-r--r--src/third_party/wiredtiger/src/block/block_ext.c77
1 files changed, 33 insertions, 44 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_ext.c b/src/third_party/wiredtiger/src/block/block_ext.c
index 0d3e7b54f17..8a4d2b08bef 100644
--- a/src/third_party/wiredtiger/src/block/block_ext.c
+++ b/src/third_party/wiredtiger/src/block/block_ext.c
@@ -486,9 +486,9 @@ __block_extend(
block->size += size;
WT_STAT_FAST_DATA_INCR(session, block_extension);
- WT_RET(__wt_verbose(session, WT_VERB_BLOCK,
+ __wt_verbose(session, WT_VERB_BLOCK,
"file extend %" PRIdMAX "B @ %" PRIdMAX,
- (intmax_t)size, (intmax_t)*offp));
+ (intmax_t)size, (intmax_t)*offp);
return (0);
}
@@ -552,21 +552,21 @@ append: WT_RET(__block_extend(session, block, offp, size));
/* If doing a partial allocation, adjust the record and put it back. */
if (ext->size > size) {
- WT_RET(__wt_verbose(session, WT_VERB_BLOCK,
+ __wt_verbose(session, WT_VERB_BLOCK,
"allocate %" PRIdMAX " from range %" PRIdMAX "-%"
PRIdMAX ", range shrinks to %" PRIdMAX "-%" PRIdMAX,
(intmax_t)size,
(intmax_t)ext->off, (intmax_t)(ext->off + ext->size),
(intmax_t)(ext->off + size),
- (intmax_t)(ext->off + size + ext->size - size)));
+ (intmax_t)(ext->off + size + ext->size - size));
ext->off += size;
ext->size -= size;
WT_RET(__block_ext_insert(session, &block->live.avail, ext));
} else {
- WT_RET(__wt_verbose(session, WT_VERB_BLOCK,
+ __wt_verbose(session, WT_VERB_BLOCK,
"allocate range %" PRIdMAX "-%" PRIdMAX,
- (intmax_t)ext->off, (intmax_t)(ext->off + ext->size)));
+ (intmax_t)ext->off, (intmax_t)(ext->off + ext->size));
__wt_block_ext_free(session, ext);
}
@@ -587,16 +587,17 @@ __wt_block_free(WT_SESSION_IMPL *session,
{
WT_DECL_RET;
wt_off_t offset;
- uint32_t cksum, size;
+ uint32_t checksum, size;
WT_UNUSED(addr_size);
WT_STAT_FAST_DATA_INCR(session, block_free);
/* Crack the cookie. */
- WT_RET(__wt_block_buffer_to_addr(block, addr, &offset, &size, &cksum));
+ WT_RET(
+ __wt_block_buffer_to_addr(block, addr, &offset, &size, &checksum));
- WT_RET(__wt_verbose(session, WT_VERB_BLOCK,
- "free %" PRIdMAX "/%" PRIdMAX, (intmax_t)offset, (intmax_t)size));
+ __wt_verbose(session, WT_VERB_BLOCK,
+ "free %" PRIdMAX "/%" PRIdMAX, (intmax_t)offset, (intmax_t)size);
#ifdef HAVE_DIAGNOSTIC
WT_RET(
@@ -922,8 +923,8 @@ __wt_block_extlist_merge(WT_SESSION_IMPL *session, WT_BLOCK *block,
WT_EXTLIST tmp;
u_int i;
- WT_RET(__wt_verbose(
- session, WT_VERB_BLOCK, "merging %s into %s", a->name, b->name));
+ __wt_verbose(
+ session, WT_VERB_BLOCK, "merging %s into %s", a->name, b->name);
/*
* Sometimes the list we are merging is much bigger than the other: if
@@ -1063,9 +1064,9 @@ __block_merge(WT_SESSION_IMPL *session, WT_BLOCK *block,
after = NULL;
}
if (before == NULL && after == NULL) {
- WT_RET(__wt_verbose(session, WT_VERB_BLOCK,
+ __wt_verbose(session, WT_VERB_BLOCK,
"%s: insert range %" PRIdMAX "-%" PRIdMAX,
- el->name, (intmax_t)off, (intmax_t)(off + size)));
+ el->name, (intmax_t)off, (intmax_t)(off + size));
return (__block_off_insert(session, el, off, size));
}
@@ -1081,12 +1082,12 @@ __block_merge(WT_SESSION_IMPL *session, WT_BLOCK *block,
WT_RET(__block_off_remove(
session, block, el, after->off, &ext));
- WT_RET(__wt_verbose(session, WT_VERB_BLOCK,
+ __wt_verbose(session, WT_VERB_BLOCK,
"%s: range grows from %" PRIdMAX "-%" PRIdMAX ", to %"
PRIdMAX "-%" PRIdMAX,
el->name,
(intmax_t)ext->off, (intmax_t)(ext->off + ext->size),
- (intmax_t)off, (intmax_t)(off + ext->size + size)));
+ (intmax_t)off, (intmax_t)(off + ext->size + size));
ext->off = off;
ext->size += size;
@@ -1099,13 +1100,13 @@ __block_merge(WT_SESSION_IMPL *session, WT_BLOCK *block,
WT_RET(__block_off_remove(
session, block, el, before->off, &ext));
- WT_RET(__wt_verbose(session, WT_VERB_BLOCK,
+ __wt_verbose(session, WT_VERB_BLOCK,
"%s: range grows from %" PRIdMAX "-%" PRIdMAX ", to %"
PRIdMAX "-%" PRIdMAX,
el->name,
(intmax_t)ext->off, (intmax_t)(ext->off + ext->size),
(intmax_t)ext->off,
- (intmax_t)(ext->off + ext->size + size)));
+ (intmax_t)(ext->off + ext->size + size));
ext->size += size;
}
@@ -1174,7 +1175,7 @@ __wt_block_extlist_read(WT_SESSION_IMPL *session,
WT_RET(__wt_scr_alloc(session, el->size, &tmp));
WT_ERR(__wt_block_read_off(
- session, block, tmp, el->offset, el->size, el->cksum));
+ session, block, tmp, el->offset, el->size, el->checksum));
#define WT_EXTLIST_READ(p, v) do { \
uint64_t _v; \
@@ -1245,8 +1246,7 @@ __wt_block_extlist_write(WT_SESSION_IMPL *session,
WT_DECL_RET;
WT_EXT *ext;
WT_PAGE_HEADER *dsk;
- size_t size;
- uint32_t entries;
+ size_t entries, size;
uint8_t *p;
WT_RET(__block_extlist_dump(session, block, el, "write"));
@@ -1258,7 +1258,7 @@ __wt_block_extlist_write(WT_SESSION_IMPL *session,
entries = el->entries + (additional == NULL ? 0 : additional->entries);
if (entries == 0) {
el->offset = WT_BLOCK_INVALID_OFFSET;
- el->cksum = el->size = 0;
+ el->checksum = el->size = 0;
return (0);
}
@@ -1310,8 +1310,8 @@ __wt_block_extlist_write(WT_SESSION_IMPL *session,
#endif
/* Write the extent list to disk. */
- WT_ERR(__wt_block_write_off(session,
- block, tmp, &el->offset, &el->size, &el->cksum, true, true));
+ WT_ERR(__wt_block_write_off(session, block,
+ tmp, &el->offset, &el->size, &el->checksum, true, true, true));
/*
* Remove the allocated blocks from the system's allocation list, extent
@@ -1320,9 +1320,9 @@ __wt_block_extlist_write(WT_SESSION_IMPL *session,
WT_TRET(__wt_block_off_remove_overlap(
session, block, &block->live.alloc, el->offset, el->size));
- WT_ERR(__wt_verbose(session, WT_VERB_BLOCK,
+ __wt_verbose(session, WT_VERB_BLOCK,
"%s written %" PRIdMAX "/%" PRIu32,
- el->name, (intmax_t)el->offset, el->size));
+ el->name, (intmax_t)el->offset, el->size);
err: __wt_scr_free(session, &tmp);
return (ret);
@@ -1337,7 +1337,7 @@ __wt_block_extlist_truncate(
WT_SESSION_IMPL *session, WT_BLOCK *block, WT_EXTLIST *el)
{
WT_EXT *ext, **astack[WT_SKIP_MAXDEPTH];
- wt_off_t orig, size;
+ wt_off_t size;
/*
* Check if the last available extent is at the end of the file, and if
@@ -1354,21 +1354,11 @@ __wt_block_extlist_truncate(
* the cached file size, and that can't happen until after the extent
* list removal succeeds.)
*/
- orig = block->size;
size = ext->off;
WT_RET(__block_off_remove(session, block, el, size, NULL));
- block->size = size;
- /*
- * Truncate the file. The truncate might fail, and that's OK, we simply
- * ignore those blocks.
- */
- WT_RET(__wt_verbose(session, WT_VERB_BLOCK,
- "truncate file from %" PRIdMAX " to %" PRIdMAX,
- (intmax_t)orig, (intmax_t)size));
- WT_RET_BUSY_OK(__wt_block_truncate(session, block, size));
-
- return (0);
+ /* Truncate the file. */
+ return (__wt_block_truncate(session, block, size));
}
/*
@@ -1445,12 +1435,12 @@ __block_extlist_dump(
tag, el->name, el->entries,
__wt_buf_set_size(session, el->bytes, true, t1)));
else
- WT_ERR(__wt_verbose(session, WT_VERB_BLOCK,
+ __wt_verbose(session, WT_VERB_BLOCK,
"%s extent list %s, %" PRIu32 " entries, %s bytes",
tag, el->name, el->entries,
- __wt_buf_set_size(session, el->bytes, true, t1)));
+ __wt_buf_set_size(session, el->bytes, true, t1));
- if (ret != 0 || el->entries == 0)
+ if (el->entries == 0)
goto done;
memset(sizes, 0, sizeof(sizes));
@@ -1476,8 +1466,7 @@ __block_extlist_dump(
if (block->verify_layout)
WT_ERR(__wt_msg(session, "%s", (char *)t1->data));
else
- WT_ERR(__wt_verbose(
- session, WT_VERB_BLOCK, "%s", (char *)t1->data));
+ __wt_verbose(session, WT_VERB_BLOCK, "%s", (char *)t1->data);
done: err:
__wt_scr_free(session, &t1);
View Lorry Controller Status