From 776af716312045ed75ccc2dd4aa4b8f637d889eb Mon Sep 17 00:00:00 2001
From: John Esmet <john.esmet@gmail.com>
Date: Tue, 3 Jun 2014 13:03:57 -0400
Subject: [PATCH] FT-262 Rename thisnodename or nodename to blocknum
---
ft/ft-cachetable-wrappers.cc | 6 ++--
ft/ft-flusher.cc | 26 ++++++++--------
ft/ft-internal.h | 4 +--
ft/ft-node-deserialize.cc | 2 +-
ft/ft-ops.cc | 34 ++++++++++-----------
ft/ft-test-helpers.cc | 4 +--
ft/ft-verify.cc | 4 +--
ft/ft_node-serialize.cc | 6 ++--
ft/node.cc | 6 ++--
ft/node.h | 4 +--
ft/tests/ft-bfe-query.cc | 2 +-
ft/tests/ft-clock-test.cc | 4 +--
ft/tests/ft-serialize-benchmark.cc | 4 +--
ft/tests/ft-serialize-test.cc | 28 ++++++++---------
ft/tests/make-tree.cc | 2 +-
ft/tests/mempool-115.cc | 2 +-
ft/tests/msnfilter.cc | 2 +-
ft/tests/test3884.cc | 2 +-
ft/tests/test_rightmost_leaf_split_merge.cc | 2 +-
ft/tests/verify-bad-msn.cc | 2 +-
ft/tests/verify-bad-pivots.cc | 2 +-
ft/tests/verify-dup-in-leaf.cc | 2 +-
ft/tests/verify-dup-pivots.cc | 2 +-
ft/tests/verify-misrouted-msgs.cc | 2 +-
ft/tests/verify-unsorted-leaf.cc | 2 +-
ft/tests/verify-unsorted-pivots.cc | 2 +-
ft/tokuftdump.cc | 2 +-
27 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/ft/ft-cachetable-wrappers.cc b/ft/ft-cachetable-wrappers.cc
index 14d6e874d1b..8b4bb4bacb4 100644
--- a/ft/ft-cachetable-wrappers.cc
+++ b/ft/ft-cachetable-wrappers.cc
@@ -409,15 +409,15 @@ void toku_ftnode_swap_pair_values(FTNODE a, FTNODE b)
// Effect: Swap the blocknum, fullhash, and PAIR for for a and b
// Requires: Both nodes are pinned
{
- BLOCKNUM tmp_blocknum = a->thisnodename;
+ BLOCKNUM tmp_blocknum = a->blocknum;
uint32_t tmp_fullhash = a->fullhash;
PAIR tmp_pair = a->ct_pair;
- a->thisnodename = b->thisnodename;
+ a->blocknum = b->blocknum;
a->fullhash = b->fullhash;
a->ct_pair = b->ct_pair;
- b->thisnodename = tmp_blocknum;
+ b->blocknum = tmp_blocknum;
b->fullhash = tmp_fullhash;
b->ct_pair = tmp_pair;
diff --git a/ft/ft-flusher.cc b/ft/ft-flusher.cc
index 2b51c55f040..e1a455b983c 100644
--- a/ft/ft-flusher.cc
+++ b/ft/ft-flusher.cc
@@ -606,21 +606,21 @@ handle_split_of_child(
memset(&node->bp[childnum+1],0,sizeof(node->bp[0]));
node->n_children++;
- paranoid_invariant(BP_BLOCKNUM(node, childnum).b==childa->thisnodename.b); // use the same child
+ paranoid_invariant(BP_BLOCKNUM(node, childnum).b==childa->blocknum.b); // use the same child
// We never set the rightmost blocknum to be the root.
// Instead, we wait for the root to split and let promotion initialize the rightmost
// blocknum to be the first non-root leaf node on the right extreme to recieve an insert.
invariant(ft->h->root_blocknum.b != ft->rightmost_blocknum.b);
- if (childa->thisnodename.b == ft->rightmost_blocknum.b) {
+ if (childa->blocknum.b == ft->rightmost_blocknum.b) {
// The rightmost leaf (a) split into (a) and (b). We want (b) to swap pair values
// with (a), now that it is the new rightmost leaf. This keeps the rightmost blocknum
// constant, the same the way we keep the root blocknum constant.
toku_ftnode_swap_pair_values(childa, childb);
- BP_BLOCKNUM(node, childnum) = childa->thisnodename;
+ BP_BLOCKNUM(node, childnum) = childa->blocknum;
}
- BP_BLOCKNUM(node, childnum+1) = childb->thisnodename;
+ BP_BLOCKNUM(node, childnum+1) = childb->blocknum;
BP_WORKDONE(node, childnum+1) = 0;
BP_STATE(node,childnum+1) = PT_AVAIL;
@@ -1120,8 +1120,8 @@ static void bring_node_fully_into_memory(FTNODE node, FT ft) {
toku_ftnode_pf_callback,
&bfe,
ft->cf,
- node->thisnodename,
- toku_cachetable_hash(ft->cf, node->thisnodename)
+ node->blocknum,
+ toku_cachetable_hash(ft->cf, node->blocknum)
);
}
}
@@ -1143,7 +1143,7 @@ flush_this_child(
bring_node_fully_into_memory(child, h);
toku_ftnode_assert_fully_in_memory(child);
paranoid_invariant(node->height>0);
- paranoid_invariant(child->thisnodename.b!=0);
+ paranoid_invariant(child->blocknum.b!=0);
// VERIFY_NODE does not work off client thread as of now
//VERIFY_NODE(t, child);
node->dirty = 1;
@@ -1504,13 +1504,13 @@ ft_merge_child(
REALLOC_N(node->n_children-1, node->childkeys);
// Handle a merge of the rightmost leaf node.
- if (did_merge && childb->thisnodename.b == h->rightmost_blocknum.b) {
- invariant(childb->thisnodename.b != h->h->root_blocknum.b);
+ if (did_merge && childb->blocknum.b == h->rightmost_blocknum.b) {
+ invariant(childb->blocknum.b != h->h->root_blocknum.b);
toku_ftnode_swap_pair_values(childa, childb);
- BP_BLOCKNUM(node, childnuma) = childa->thisnodename;
+ BP_BLOCKNUM(node, childnuma) = childa->blocknum;
}
- paranoid_invariant(BP_BLOCKNUM(node, childnuma).b == childa->thisnodename.b);
+ paranoid_invariant(BP_BLOCKNUM(node, childnuma).b == childa->blocknum.b);
childa->dirty = 1; // just to make sure
childb->dirty = 1; // just to make sure
} else {
@@ -1610,7 +1610,7 @@ void toku_ft_flush_some_child(FT ft, FTNODE parent, struct flusher_advice *fa)
// the parent before finishing reading in the entire child node.
bool may_child_be_reactive = ft_ftnode_may_be_reactive(ft, child);
- paranoid_invariant(child->thisnodename.b!=0);
+ paranoid_invariant(child->blocknum.b!=0);
// only do the following work if there is a flush to perform
if (toku_bnc_n_entries(BNC(parent, childnum)) > 0 || parent->height == 1) {
@@ -1914,7 +1914,7 @@ toku_ftnode_cleaner_callback(
void *extraargs)
{
FTNODE node = (FTNODE) ftnode_pv;
- invariant(node->thisnodename.b == blocknum.b);
+ invariant(node->blocknum.b == blocknum.b);
invariant(node->fullhash == fullhash);
invariant(node->height > 0); // we should never pick a leaf node (for now at least)
FT h = (FT) extraargs;
diff --git a/ft/ft-internal.h b/ft/ft-internal.h
index 54574f56786..7d1725a7d0a 100644
--- a/ft/ft-internal.h
+++ b/ft/ft-internal.h
@@ -302,8 +302,8 @@ PAIR_ATTR make_invalid_pair_attr(void);
// Cachetable callbacks for ftnodes.
void toku_ftnode_clone_callback(void* value_data, void** cloned_value_data, long* clone_size, PAIR_ATTR* new_attr, bool for_checkpoint, void* write_extraargs);
void toku_ftnode_checkpoint_complete_callback(void *value_data);
-void toku_ftnode_flush_callback (CACHEFILE cachefile, int fd, BLOCKNUM nodename, void *ftnode_v, void** UU(disk_data), void *extraargs, PAIR_ATTR size, PAIR_ATTR* new_size, bool write_me, bool keep_me, bool for_checkpoint, bool is_clone);
-int toku_ftnode_fetch_callback (CACHEFILE cachefile, PAIR p, int fd, BLOCKNUM nodename, uint32_t fullhash, void **ftnode_pv, void** UU(disk_data), PAIR_ATTR *sizep, int*dirty, void*extraargs);
+void toku_ftnode_flush_callback (CACHEFILE cachefile, int fd, BLOCKNUM blocknum, void *ftnode_v, void** UU(disk_data), void *extraargs, PAIR_ATTR size, PAIR_ATTR* new_size, bool write_me, bool keep_me, bool for_checkpoint, bool is_clone);
+int toku_ftnode_fetch_callback (CACHEFILE cachefile, PAIR p, int fd, BLOCKNUM blocknum, uint32_t fullhash, void **ftnode_pv, void** UU(disk_data), PAIR_ATTR *sizep, int*dirty, void*extraargs);
void toku_ftnode_pe_est_callback(void* ftnode_pv, void* disk_data, long* bytes_freed_estimate, enum partial_eviction_cost *cost, void* write_extraargs);
int toku_ftnode_pe_callback(void *ftnode_pv, PAIR_ATTR old_attr, void *extraargs,
void (*finalize)(PAIR_ATTR new_attr, void *extra), void *finalize_extra);
diff --git a/ft/ft-node-deserialize.cc b/ft/ft-node-deserialize.cc
index a5cbfa1511d..500b7960875 100644
--- a/ft/ft-node-deserialize.cc
+++ b/ft/ft-node-deserialize.cc
@@ -111,7 +111,7 @@ void
initialize_ftnode(FTNODE node, BLOCKNUM blocknum)
{
node->fullhash = 0xDEADBEEF; // <CER> Is this 'spoof' ok?
- node->thisnodename = blocknum;
+ node->blocknum = blocknum;
node->dirty = 0;
node->bp = NULL;
// <CER> Can we use this initialization as a correctness assert in
diff --git a/ft/ft-ops.cc b/ft/ft-ops.cc
index 7aa9aa6ed74..c699e2c8e9a 100644
--- a/ft/ft-ops.cc
+++ b/ft/ft-ops.cc
@@ -713,7 +713,7 @@ void toku_ftnode_clone_callback(
cloned_node->oldest_referenced_xid_known = node->oldest_referenced_xid_known;
cloned_node->max_msn_applied_to_node_on_disk = node->max_msn_applied_to_node_on_disk;
cloned_node->flags = node->flags;
- cloned_node->thisnodename = node->thisnodename;
+ cloned_node->blocknum = node->blocknum;
cloned_node->layout_version = node->layout_version;
cloned_node->layout_version_original = node->layout_version_original;
cloned_node->layout_version_read_from_disk = node->layout_version_read_from_disk;
@@ -756,7 +756,7 @@ void toku_ftnode_clone_callback(
void toku_ftnode_flush_callback(
CACHEFILE UU(cachefile),
int fd,
- BLOCKNUM nodename,
+ BLOCKNUM blocknum,
void *ftnode_v,
void** disk_data,
void *extraargs,
@@ -771,7 +771,7 @@ void toku_ftnode_flush_callback(
FT h = (FT) extraargs;
FTNODE ftnode = (FTNODE) ftnode_v;
FTNODE_DISK_DATA* ndd = (FTNODE_DISK_DATA*)disk_data;
- assert(ftnode->thisnodename.b==nodename.b);
+ assert(ftnode->blocknum.b == blocknum.b);
int height = ftnode->height;
if (write_me) {
toku_ftnode_assert_fully_in_memory(ftnode);
@@ -784,7 +784,7 @@ void toku_ftnode_flush_callback(
toku_ftnode_update_disk_stats(ftnode, h, for_checkpoint);
}
}
- int r = toku_serialize_ftnode_to(fd, ftnode->thisnodename, ftnode, ndd, !is_clone, h, for_checkpoint);
+ int r = toku_serialize_ftnode_to(fd, ftnode->blocknum, ftnode, ndd, !is_clone, h, for_checkpoint);
assert_zero(r);
ftnode->layout_version_read_from_disk = FT_LAYOUT_VERSION;
}
@@ -835,7 +835,7 @@ toku_ft_status_update_pivot_fetch_reason(struct ftnode_fetch_extra *bfe)
}
}
-int toku_ftnode_fetch_callback (CACHEFILE UU(cachefile), PAIR p, int fd, BLOCKNUM nodename, uint32_t fullhash,
+int toku_ftnode_fetch_callback (CACHEFILE UU(cachefile), PAIR p, int fd, BLOCKNUM blocknum, uint32_t fullhash,
void **ftnode_pv, void** disk_data, PAIR_ATTR *sizep, int *dirtyp, void *extraargs) {
assert(extraargs);
assert(*ftnode_pv == NULL);
@@ -845,7 +845,7 @@ int toku_ftnode_fetch_callback (CACHEFILE UU(cachefile), PAIR p, int fd, BLOCKNU
// deserialize the node, must pass the bfe in because we cannot
// evaluate what piece of the the node is necessary until we get it at
// least partially into memory
- int r = toku_deserialize_ftnode_from(fd, nodename, fullhash, node, ndd, bfe);
+ int r = toku_deserialize_ftnode_from(fd, blocknum, fullhash, node, ndd, bfe);
if (r != 0) {
if (r == TOKUDB_BAD_CHECKSUM) {
fprintf(stderr,
@@ -1497,7 +1497,7 @@ ft_init_new_root(FT ft, FTNODE oldroot, FTNODE *newrootp)
{
FTNODE newroot;
- BLOCKNUM old_blocknum = oldroot->thisnodename;
+ BLOCKNUM old_blocknum = oldroot->blocknum;
uint32_t old_fullhash = oldroot->fullhash;
int new_height = oldroot->height+1;
@@ -1637,7 +1637,7 @@ static void inject_message_in_locked_node(
// verify that msn of latest message was captured in root node
paranoid_invariant(msg->msn.msn == node->max_msn_applied_to_node_on_disk.msn);
- if (node->thisnodename.b == ft->rightmost_blocknum.b) {
+ if (node->blocknum.b == ft->rightmost_blocknum.b) {
if (ft->seqinsert_score < FT_SEQINSERT_SCORE_THRESHOLD) {
// we promoted to the rightmost leaf node and the seqinsert score has not yet saturated.
toku_sync_fetch_and_add(&ft->seqinsert_score, 1);
@@ -1684,7 +1684,7 @@ static bool process_maybe_reactive_child(FT ft, FTNODE parent, FTNODE child, int
case RE_FISSIBLE:
{
// We only have a read lock on the parent. We need to drop both locks, and get write locks.
- BLOCKNUM parent_blocknum = parent->thisnodename;
+ BLOCKNUM parent_blocknum = parent->blocknum;
uint32_t parent_fullhash = toku_cachetable_hash(ft->cf, parent_blocknum);
int parent_height = parent->height;
int parent_n_children = parent->n_children;
@@ -1738,7 +1738,7 @@ static bool process_maybe_reactive_child(FT ft, FTNODE parent, FTNODE child, int
}
int parent_height = parent->height;
- BLOCKNUM parent_blocknum = parent->thisnodename;
+ BLOCKNUM parent_blocknum = parent->blocknum;
uint32_t parent_fullhash = toku_cachetable_hash(ft->cf, parent_blocknum);
toku_unpin_ftnode_read_only(ft, child);
toku_unpin_ftnode_read_only(ft, parent);
@@ -1876,8 +1876,8 @@ static void push_something_in_subtree(
// because promotion would not chose to inject directly into this leaf
// otherwise. We explicitly skip the root node because then we don't have
// to worry about changing the rightmost blocknum when the root splits.
- if (subtree_root->height == 0 && loc == RIGHT_EXTREME && subtree_root->thisnodename.b != ft->h->root_blocknum.b) {
- ft_set_or_verify_rightmost_blocknum(ft, subtree_root->thisnodename);
+ if (subtree_root->height == 0 && loc == RIGHT_EXTREME && subtree_root->blocknum.b != ft->h->root_blocknum.b) {
+ ft_set_or_verify_rightmost_blocknum(ft, subtree_root->blocknum);
}
inject_message_in_locked_node(ft, subtree_root, target_childnum, msg, flow_deltas, gc_info);
} else {
@@ -1967,7 +1967,7 @@ static void push_something_in_subtree(
paranoid_invariant_notnull(child);
if (!just_did_split_or_merge) {
- BLOCKNUM subtree_root_blocknum = subtree_root->thisnodename;
+ BLOCKNUM subtree_root_blocknum = subtree_root->blocknum;
uint32_t subtree_root_fullhash = toku_cachetable_hash(ft->cf, subtree_root_blocknum);
const bool did_split_or_merge = process_maybe_reactive_child(ft, subtree_root, child, childnum, loc);
if (did_split_or_merge) {
@@ -2003,7 +2003,7 @@ static void push_something_in_subtree(
{
// Right now we have a read lock on subtree_root, but we want
// to inject into it so we get a write lock instead.
- BLOCKNUM subtree_root_blocknum = subtree_root->thisnodename;
+ BLOCKNUM subtree_root_blocknum = subtree_root->blocknum;
uint32_t subtree_root_fullhash = toku_cachetable_hash(ft->cf, subtree_root_blocknum);
toku_unpin_ftnode_read_only(ft, subtree_root);
switch (depth) {
@@ -2318,7 +2318,7 @@ static int ft_maybe_insert_into_rightmost_leaf(FT ft, DBT *key, DBT *val, XIDS m
// The rightmost blocknum never chances once it is initialized to something
// other than null. Verify that the pinned node has the correct blocknum.
- invariant(rightmost_leaf->thisnodename.b == rightmost_blocknum.b);
+ invariant(rightmost_leaf->blocknum.b == rightmost_blocknum.b);
// If the rightmost leaf is reactive, bail out out and let the normal promotion pass
// take care of it. This also ensures that if any of our ancestors are reactive,
@@ -3460,9 +3460,9 @@ ft_search_node (
);
static int
-ftnode_fetch_callback_and_free_bfe(CACHEFILE cf, PAIR p, int fd, BLOCKNUM nodename, uint32_t fullhash, void **ftnode_pv, void** UU(disk_data), PAIR_ATTR *sizep, int *dirtyp, void *extraargs)
+ftnode_fetch_callback_and_free_bfe(CACHEFILE cf, PAIR p, int fd, BLOCKNUM blocknum, uint32_t fullhash, void **ftnode_pv, void** UU(disk_data), PAIR_ATTR *sizep, int *dirtyp, void *extraargs)
{
- int r = toku_ftnode_fetch_callback(cf, p, fd, nodename, fullhash, ftnode_pv, disk_data, sizep, dirtyp, extraargs);
+ int r = toku_ftnode_fetch_callback(cf, p, fd, blocknum, fullhash, ftnode_pv, disk_data, sizep, dirtyp, extraargs);
struct ftnode_fetch_extra *CAST_FROM_VOIDP(ffe, extraargs);
destroy_bfe_for_prefetch(ffe);
toku_free(ffe);
diff --git a/ft/ft-test-helpers.cc b/ft/ft-test-helpers.cc
index 68dd5cd408a..43d6e188113 100644
--- a/ft/ft-test-helpers.cc
+++ b/ft/ft-test-helpers.cc
@@ -134,7 +134,7 @@ int toku_testsetup_leaf(FT_HANDLE ft_handle, BLOCKNUM *blocknum, int n_children,
node->totalchildkeylens += keylens[i];
}
- *blocknum = node->thisnodename;
+ *blocknum = node->blocknum;
toku_unpin_ftnode(ft_handle->ft, node);
return 0;
}
@@ -153,7 +153,7 @@ int toku_testsetup_nonleaf (FT_HANDLE ft_handle, int height, BLOCKNUM *blocknum,
toku_memdup_dbt(&node->childkeys[i], keys[i], keylens[i]);
node->totalchildkeylens += keylens[i];
}
- *blocknum = node->thisnodename;
+ *blocknum = node->blocknum;
toku_unpin_ftnode(ft_handle->ft, node);
return 0;
}
diff --git a/ft/ft-verify.cc b/ft/ft-verify.cc
index 62591ba804b..df7c637e0cd 100644
--- a/ft/ft-verify.cc
+++ b/ft/ft-verify.cc
@@ -397,7 +397,7 @@ toku_verify_ftnode_internal(FT_HANDLE ft_handle,
{
int result=0;
MSN this_msn;
- BLOCKNUM blocknum = node->thisnodename;
+ BLOCKNUM blocknum = node->blocknum;
//printf("%s:%d pin %p\n", __FILE__, __LINE__, node_v);
toku_ftnode_assert_fully_in_memory(node);
@@ -440,7 +440,7 @@ toku_verify_ftnode_internal(FT_HANDLE ft_handle,
int r = bnc->msg_buffer.iterate(verify_msg);
if (r != 0) { result = r; goto done; }
- struct verify_message_tree_extra extra = { .msg_buffer = &bnc->msg_buffer, .broadcast = false, .is_fresh = true, .i = i, .verbose = verbose, .blocknum = node->thisnodename, .keep_going_on_failure = keep_going_on_failure, .messages_have_been_moved = messages_have_been_moved };
+ struct verify_message_tree_extra extra = { .msg_buffer = &bnc->msg_buffer, .broadcast = false, .is_fresh = true, .i = i, .verbose = verbose, .blocknum = node->blocknum, .keep_going_on_failure = keep_going_on_failure, .messages_have_been_moved = messages_have_been_moved };
r = bnc->fresh_message_tree.iterate<struct verify_message_tree_extra, verify_message_tree>(&extra);
if (r != 0) { result = r; goto done; }
extra.is_fresh = false;
diff --git a/ft/ft_node-serialize.cc b/ft/ft_node-serialize.cc
index 330c65d7a6d..e62aac4a291 100644
--- a/ft/ft_node-serialize.cc
+++ b/ft/ft_node-serialize.cc
@@ -1360,7 +1360,7 @@ setup_partitions_using_bfe(FTNODE node,
//
// setup memory needed for the node
//
- //printf("node height %d, blocknum %" PRId64 ", type %d lc %d rc %d\n", node->height, node->thisnodename.b, bfe->type, lc, rc);
+ //printf("node height %d, blocknum %" PRId64 ", type %d lc %d rc %d\n", node->height, node->blocknum.b, bfe->type, lc, rc);
for (int i = 0; i < node->n_children; i++) {
BP_INIT_UNTOUCHED_CLOCK(node,i);
if (data_in_memory) {
@@ -1496,7 +1496,7 @@ static FTNODE alloc_ftnode_for_deserialize(uint32_t fullhash, BLOCKNUM blocknum)
// Effect: Allocate an FTNODE and fill in the values that are not read from
FTNODE XMALLOC(node);
node->fullhash = fullhash;
- node->thisnodename = blocknum;
+ node->blocknum = blocknum;
node->dirty = 0;
node->bp = nullptr;
node->oldest_referenced_xid_known = TXNID_NONE;
@@ -2346,7 +2346,7 @@ toku_deserialize_bp_from_disk(FTNODE node, FTNODE_DISK_DATA ndd, int childnum, i
DISKOFF node_offset, total_node_disk_size;
toku_translate_blocknum_to_offset_size(
bfe->h->blocktable,
- node->thisnodename,
+ node->blocknum,
&node_offset,
&total_node_disk_size
);
diff --git a/ft/node.cc b/ft/node.cc
index 7e9334a1cec..db802227e08 100644
--- a/ft/node.cc
+++ b/ft/node.cc
@@ -97,13 +97,13 @@ PATENT RIGHTS GRANT:
// Effect: Fill in N as an empty ftnode.
// TODO: Rename toku_ftnode_create
-void toku_initialize_empty_ftnode(FTNODE n, BLOCKNUM nodename, int height, int num_children, int layout_version, unsigned int flags) {
+void toku_initialize_empty_ftnode(FTNODE n, BLOCKNUM blocknum, int height, int num_children, int layout_version, unsigned int flags) {
paranoid_invariant(layout_version != 0);
paranoid_invariant(height >= 0);
n->max_msn_applied_to_node_on_disk = ZERO_MSN; // correct value for root node, harmless for others
n->flags = flags;
- n->thisnodename = nodename;
+ n->blocknum = blocknum;
n->layout_version = layout_version;
n->layout_version_original = layout_version;
n->layout_version_read_from_disk = layout_version;
@@ -1126,7 +1126,7 @@ long toku_bnc_memory_used(NONLEAF_CHILDINFO bnc) {
static void
init_childinfo(FTNODE node, int childnum, FTNODE child) {
- BP_BLOCKNUM(node,childnum) = child->thisnodename;
+ BP_BLOCKNUM(node,childnum) = child->blocknum;
BP_STATE(node,childnum) = PT_AVAIL;
BP_WORKDONE(node, childnum) = 0;
set_BNC(node, childnum, toku_create_empty_nl());
diff --git a/ft/node.h b/ft/node.h
index 82155334c4a..30f497c3612 100644
--- a/ft/node.h
+++ b/ft/node.h
@@ -96,7 +96,7 @@ PATENT RIGHTS GRANT:
struct ftnode {
MSN max_msn_applied_to_node_on_disk; // max_msn_applied that will be written to disk
unsigned int flags;
- BLOCKNUM thisnodename; // Which block number is this node?
+ BLOCKNUM blocknum; // Which block number is this node?
int layout_version; // What version of the data structure?
int layout_version_original; // different (<) from layout_version if upgraded from a previous version (useful for debugging)
int layout_version_read_from_disk; // transient, not serialized to disk, (useful for debugging)
@@ -240,7 +240,7 @@ BASEMENTNODE toku_detach_bn(FTNODE node, int childnum);
void toku_ftnode_update_disk_stats(FTNODE ftnode, FT ft, bool for_checkpoint);
void toku_ftnode_clone_partitions(FTNODE node, FTNODE cloned_node);
-void toku_initialize_empty_ftnode(FTNODE node, BLOCKNUM nodename, int height, int num_children,
+void toku_initialize_empty_ftnode(FTNODE node, BLOCKNUM blocknum, int height, int num_children,
int layout_version, unsigned int flags);
int toku_ftnode_which_child(FTNODE node, const DBT *k,
diff --git a/ft/tests/ft-bfe-query.cc b/ft/tests/ft-bfe-query.cc
index 8759732a76e..4b9da2a8270 100644
--- a/ft/tests/ft-bfe-query.cc
+++ b/ft/tests/ft-bfe-query.cc
@@ -372,7 +372,7 @@ test_prefetching(void) {
// source_ft.fd=fd;
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 1;
diff --git a/ft/tests/ft-clock-test.cc b/ft/tests/ft-clock-test.cc
index 6af8e797431..5c0d308cfab 100644
--- a/ft/tests/ft-clock-test.cc
+++ b/ft/tests/ft-clock-test.cc
@@ -311,7 +311,7 @@ test_serialize_nonleaf(void) {
sn.max_msn_applied_to_node_on_disk.msn = 0;
char *hello_string;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 1;
@@ -411,7 +411,7 @@ test_serialize_leaf(void) {
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 0;
diff --git a/ft/tests/ft-serialize-benchmark.cc b/ft/tests/ft-serialize-benchmark.cc
index 285ee64e8a3..6ee9b7f89f9 100644
--- a/ft/tests/ft-serialize-benchmark.cc
+++ b/ft/tests/ft-serialize-benchmark.cc
@@ -144,7 +144,7 @@ test_serialize_leaf(int valsize, int nelts, double entropy, int ser_runs, int de
sn->max_msn_applied_to_node_on_disk.msn = 0;
sn->flags = 0x11223344;
- sn->thisnodename.b = 20;
+ sn->blocknum.b = 20;
sn->layout_version = FT_LAYOUT_VERSION;
sn->layout_version_original = FT_LAYOUT_VERSION;
sn->height = 0;
@@ -299,7 +299,7 @@ test_serialize_nonleaf(int valsize, int nelts, double entropy, int ser_runs, int
// source_ft.fd=fd;
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 1;
diff --git a/ft/tests/ft-serialize-test.cc b/ft/tests/ft-serialize-test.cc
index 95e5f70919a..0c8e29df4dd 100644
--- a/ft/tests/ft-serialize-test.cc
+++ b/ft/tests/ft-serialize-test.cc
@@ -271,7 +271,7 @@ test_serialize_leaf_check_msn(enum ftnode_verify_type bft, bool do_clone) {
sn.max_msn_applied_to_node_on_disk = PRESERIALIZE_MSN_ON_DISK;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 0;
@@ -330,7 +330,7 @@ test_serialize_leaf_check_msn(enum ftnode_verify_type bft, bool do_clone) {
setup_dn(bft, fd, ft_h, &dn, &dest_ndd);
- assert(dn->thisnodename.b==20);
+ assert(dn->blocknum.b==20);
assert(dn->layout_version ==FT_LAYOUT_VERSION);
assert(dn->layout_version_original ==FT_LAYOUT_VERSION);
@@ -405,7 +405,7 @@ test_serialize_leaf_with_large_pivots(enum ftnode_verify_type bft, bool do_clone
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 0;
@@ -471,7 +471,7 @@ test_serialize_leaf_with_large_pivots(enum ftnode_verify_type bft, bool do_clone
setup_dn(bft, fd, ft_h, &dn, &dest_ndd);
- assert(dn->thisnodename.b==20);
+ assert(dn->blocknum.b==20);
assert(dn->layout_version ==FT_LAYOUT_VERSION);
assert(dn->layout_version_original ==FT_LAYOUT_VERSION);
@@ -546,7 +546,7 @@ test_serialize_leaf_with_many_rows(enum ftnode_verify_type bft, bool do_clone) {
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 0;
@@ -606,7 +606,7 @@ test_serialize_leaf_with_many_rows(enum ftnode_verify_type bft, bool do_clone) {
setup_dn(bft, fd, ft_h, &dn, &dest_ndd);
- assert(dn->thisnodename.b==20);
+ assert(dn->blocknum.b==20);
assert(dn->layout_version ==FT_LAYOUT_VERSION);
assert(dn->layout_version_original ==FT_LAYOUT_VERSION);
@@ -687,7 +687,7 @@ test_serialize_leaf_with_large_rows(enum ftnode_verify_type bft, bool do_clone)
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 0;
@@ -750,7 +750,7 @@ test_serialize_leaf_with_large_rows(enum ftnode_verify_type bft, bool do_clone)
setup_dn(bft, fd, ft_h, &dn, &dest_ndd);
- assert(dn->thisnodename.b==20);
+ assert(dn->blocknum.b==20);
assert(dn->layout_version ==FT_LAYOUT_VERSION);
assert(dn->layout_version_original ==FT_LAYOUT_VERSION);
@@ -831,7 +831,7 @@ test_serialize_leaf_with_empty_basement_nodes(enum ftnode_verify_type bft, bool
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 0;
@@ -893,7 +893,7 @@ test_serialize_leaf_with_empty_basement_nodes(enum ftnode_verify_type bft, bool
setup_dn(bft, fd, ft_h, &dn, &dest_ndd);
- assert(dn->thisnodename.b==20);
+ assert(dn->blocknum.b==20);
assert(dn->layout_version ==FT_LAYOUT_VERSION);
assert(dn->layout_version_original ==FT_LAYOUT_VERSION);
@@ -966,7 +966,7 @@ test_serialize_leaf_with_multiple_empty_basement_nodes(enum ftnode_verify_type b
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 0;
@@ -1022,7 +1022,7 @@ test_serialize_leaf_with_multiple_empty_basement_nodes(enum ftnode_verify_type b
setup_dn(bft, fd, ft_h, &dn, &dest_ndd);
- assert(dn->thisnodename.b==20);
+ assert(dn->blocknum.b==20);
assert(dn->layout_version ==FT_LAYOUT_VERSION);
assert(dn->layout_version_original ==FT_LAYOUT_VERSION);
@@ -1076,7 +1076,7 @@ test_serialize_nonleaf(enum ftnode_verify_type bft, bool do_clone) {
// source_ft.fd=fd;
sn.max_msn_applied_to_node_on_disk.msn = 0;
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 1;
@@ -1147,7 +1147,7 @@ test_serialize_nonleaf(enum ftnode_verify_type bft, bool do_clone) {
setup_dn(bft, fd, ft_h, &dn, &dest_ndd);
- assert(dn->thisnodename.b==20);
+ assert(dn->blocknum.b==20);
assert(dn->layout_version ==FT_LAYOUT_VERSION);
assert(dn->layout_version_original ==FT_LAYOUT_VERSION);
diff --git a/ft/tests/make-tree.cc b/ft/tests/make-tree.cc
index 50351fd7959..7ebfd28b275 100644
--- a/ft/tests/make-tree.cc
+++ b/ft/tests/make-tree.cc
@@ -222,7 +222,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) {
FTNODE newroot = make_tree(ft, height, fanout, nperleaf, &seq, &minkey, &maxkey);
// set the new root to point to the new tree
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
ft->ft->h->max_msn_in_ft = last_dummymsn(); // capture msn of last message injected into tree
diff --git a/ft/tests/mempool-115.cc b/ft/tests/mempool-115.cc
index 0f44cf39da1..07a97f9e49a 100644
--- a/ft/tests/mempool-115.cc
+++ b/ft/tests/mempool-115.cc
@@ -149,7 +149,7 @@ class bndata_bugfix_test {
// just copy this code from a previous test
// don't care what it does, just want to get a node up and running
sn.flags = 0x11223344;
- sn.thisnodename.b = 20;
+ sn.blocknum.b = 20;
sn.layout_version = FT_LAYOUT_VERSION;
sn.layout_version_original = FT_LAYOUT_VERSION;
sn.height = 0;
diff --git a/ft/tests/msnfilter.cc b/ft/tests/msnfilter.cc
index e6eb8038792..1ab13f745e7 100644
--- a/ft/tests/msnfilter.cc
+++ b/ft/tests/msnfilter.cc
@@ -213,7 +213,7 @@ test_msnfilter(int do_verify) {
FTNODE newroot = make_node(ft, 0);
// set the new root to point to the new tree
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
// KLUDGE: Unpin the new root so toku_ft_lookup() can pin it. (Pin lock is no longer a recursive
// mutex.) Just leaving it unpinned for this test program works because it is the only
diff --git a/ft/tests/test3884.cc b/ft/tests/test3884.cc
index cb3914529ea..c18a29d0676 100644
--- a/ft/tests/test3884.cc
+++ b/ft/tests/test3884.cc
@@ -154,7 +154,7 @@ static void
setup_ftnode_header(struct ftnode *node)
{
node->flags = 0x11223344;
- node->thisnodename.b = 20;
+ node->blocknum.b = 20;
node->layout_version = FT_LAYOUT_VERSION;
node->layout_version_original = FT_LAYOUT_VERSION;
node->height = 0;
diff --git a/ft/tests/test_rightmost_leaf_split_merge.cc b/ft/tests/test_rightmost_leaf_split_merge.cc
index 49621d79328..4394217bfc6 100644
--- a/ft/tests/test_rightmost_leaf_split_merge.cc
+++ b/ft/tests/test_rightmost_leaf_split_merge.cc
@@ -149,7 +149,7 @@ static void test_split_merge(void) {
toku_cachetable_hash(ft->cf, ft->h->root_blocknum),
&bfe, PL_WRITE_EXPENSIVE, &root_node, true);
// root blocknum should be consistent
- invariant(root_node->thisnodename.b == ft->h->root_blocknum.b);
+ invariant(root_node->blocknum.b == ft->h->root_blocknum.b);
// root should have split at least once, and it should now be at height 1
invariant(root_node->n_children > 1);
invariant(root_node->height == 1);
diff --git a/ft/tests/verify-bad-msn.cc b/ft/tests/verify-bad-msn.cc
index 99a70b40f37..74a5d07efc8 100644
--- a/ft/tests/verify-bad-msn.cc
+++ b/ft/tests/verify-bad-msn.cc
@@ -225,7 +225,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) {
FTNODE newroot = make_tree(ft, height, fanout, nperleaf, &seq, &minkey, &maxkey);
// set the new root to point to the new tree
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
// Create bad tree (don't do following):
// newroot->max_msn_applied_to_node = last_dummymsn(); // capture msn of last message injected into tree
diff --git a/ft/tests/verify-bad-pivots.cc b/ft/tests/verify-bad-pivots.cc
index 6d1ebfa85a6..aac0cbd8ed2 100644
--- a/ft/tests/verify-bad-pivots.cc
+++ b/ft/tests/verify-bad-pivots.cc
@@ -195,7 +195,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) {
FTNODE newroot = make_tree(ft, height, fanout, nperleaf, &seq, &minkey, &maxkey);
// discard the old root block
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
// unpin the new root
toku_unpin_ftnode(ft->ft, newroot);
diff --git a/ft/tests/verify-dup-in-leaf.cc b/ft/tests/verify-dup-in-leaf.cc
index 9806c6063a0..510a3ce1de0 100644
--- a/ft/tests/verify-dup-in-leaf.cc
+++ b/ft/tests/verify-dup-in-leaf.cc
@@ -155,7 +155,7 @@ test_dup_in_leaf(int do_verify) {
populate_leaf(newroot, htonl(2), 2);
// set the new root to point to the new tree
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
// unpin the new root
toku_unpin_ftnode(ft->ft, newroot);
diff --git a/ft/tests/verify-dup-pivots.cc b/ft/tests/verify-dup-pivots.cc
index c0766a4d035..e2cb20f105d 100644
--- a/ft/tests/verify-dup-pivots.cc
+++ b/ft/tests/verify-dup-pivots.cc
@@ -199,7 +199,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) {
// discard the old root block
// set the new root to point to the new tree
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
// unpin the new root
toku_unpin_ftnode(ft->ft, newroot);
diff --git a/ft/tests/verify-misrouted-msgs.cc b/ft/tests/verify-misrouted-msgs.cc
index 556aaa31522..1a6fa852ecb 100644
--- a/ft/tests/verify-misrouted-msgs.cc
+++ b/ft/tests/verify-misrouted-msgs.cc
@@ -211,7 +211,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) {
// discard the old root block
// set the new root to point to the new tree
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
// unpin the new root
toku_unpin_ftnode(ft->ft, newroot);
diff --git a/ft/tests/verify-unsorted-leaf.cc b/ft/tests/verify-unsorted-leaf.cc
index 6933606afd2..d1178c1d8f0 100644
--- a/ft/tests/verify-unsorted-leaf.cc
+++ b/ft/tests/verify-unsorted-leaf.cc
@@ -156,7 +156,7 @@ test_dup_in_leaf(int do_verify) {
populate_leaf(newroot, htonl(1), 2);
// set the new root to point to the new tree
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
// unpin the new root
toku_unpin_ftnode(ft->ft, newroot);
diff --git a/ft/tests/verify-unsorted-pivots.cc b/ft/tests/verify-unsorted-pivots.cc
index eae84382da3..3367cb9af8d 100644
--- a/ft/tests/verify-unsorted-pivots.cc
+++ b/ft/tests/verify-unsorted-pivots.cc
@@ -195,7 +195,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) {
FTNODE newroot = make_tree(ft, height, fanout, nperleaf, &seq, &minkey, &maxkey);
// discard the old root block
- toku_ft_set_new_root_blocknum(ft->ft, newroot->thisnodename);
+ toku_ft_set_new_root_blocknum(ft->ft, newroot->blocknum);
// unpin the new root
toku_unpin_ftnode(ft->ft, newroot);
diff --git a/ft/tokuftdump.cc b/ft/tokuftdump.cc
index f2028b24280..04b7df280dc 100644
--- a/ft/tokuftdump.cc
+++ b/ft/tokuftdump.cc
@@ -239,7 +239,7 @@ static void dump_node(int fd, BLOCKNUM blocknum, FT h) {
printf(" disksize =%" PRId64 "\n", disksize);
printf(" serialize_size =%u\n", toku_serialize_ftnode_size(n));
printf(" flags =%u\n", n->flags);
- printf(" thisnodename=%" PRId64 "\n", n->thisnodename.b);
+ printf(" blocknum=%" PRId64 "\n", n->blocknum.b);
//printf(" log_lsn =%lld\n", n->log_lsn.lsn); // The log_lsn is a memory-only value.
printf(" height =%d\n", n->height);
printf(" layout_version=%d\n", n->layout_version);
--
2.30.9