From e0c3218a0a6fe0daf05d628ef4b1af655baed6cf Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 19 Feb 2005 09:49:20 -0500 Subject: [svn-r10045] Purpose: New feature Description: Allow internal nodes in v2 B-tree to undergo 2->3 splits Platforms tested: FreeBSD 4.11 (sleipnir) Solaris 2.9 (shanti) --- src/H5B2.c | 109 ++++++++++++++++++++++++++++++++++++++++++--- test/btree2.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 225 insertions(+), 24 deletions(-) diff --git a/src/H5B2.c b/src/H5B2.c index 40c9923..f5f57a4 100644 --- a/src/H5B2.c +++ b/src/H5B2.c @@ -783,7 +783,11 @@ H5B2_split2(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ unsigned *middle_nrec; /* Pointer to middle child # of records */ uint8_t *left_native, *right_native; /* Pointers to left & right children's native records */ uint8_t *middle_native; /* Pointer to middle child's native records */ + H5B2_node_ptr_t *left_node_ptrs=NULL, *right_node_ptrs=NULL;/* Pointers to childs' node pointer info */ + H5B2_node_ptr_t *middle_node_ptrs=NULL;/* Pointers to childs' node pointer info */ H5B2_shared_t *shared; /* B-tree's shared info */ + int left_moved_nrec=0, right_moved_nrec=0; /* Number of records moved, for internal split */ + int middle_moved_nrec=0; /* Number of records moved, for internal split */ herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5B2_split2) @@ -801,13 +805,56 @@ H5B2_split2(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_ /* Check for the kind of B-tree node to split */ if(depth>1) { -HDfprintf(stderr,"%s: splitting internal node! (need to handle node_ptrs)\n",FUNC); -HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split nodes") + H5B2_internal_t *left_internal; /* Pointer to left internal node */ + H5B2_internal_t *middle_internal; /* Pointer to middle internal node */ + H5B2_internal_t *right_internal; /* Pointer to right internal node */ + + /* Setup information for unlocking child nodes */ + child_class = H5AC_BT2_INT; + left_addr = internal->node_ptrs[idx].addr; + right_addr = internal->node_ptrs[idx+2].addr; + + /* Lock left & right B-tree child nodes */ + if (NULL == (left_internal = H5AC_protect(f, dxpl_id, child_class, left_addr, &(internal->node_ptrs[idx].node_nrec), internal->shared, H5AC_WRITE))) + HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node") + if (NULL == (right_internal = H5AC_protect(f, dxpl_id, child_class, right_addr, &(internal->node_ptrs[idx+2].node_nrec), internal->shared, H5AC_WRITE))) + HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node") + + /* Create new empty "middle" internal node */ + internal->node_ptrs[idx+1].all_nrec=internal->node_ptrs[idx+1].node_nrec=0; + if(H5B2_create_internal(f, dxpl_id, internal->shared, &(internal->node_ptrs[idx+1]))<0) + HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new internal node") + + /* Setup information for unlocking middle child node */ + middle_addr = internal->node_ptrs[idx+1].addr; + + /* Lock "middle" internal node */ + if (NULL == (middle_internal = H5AC_protect(f, dxpl_id, child_class, middle_addr, &(internal->node_ptrs[idx+1].node_nrec), internal->shared, H5AC_WRITE))) + HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node") + + /* More setup for accessing child node information */ + left_child = left_internal; + middle_child = middle_internal; + right_child = right_internal; + left_nrec = &(left_internal->nrec); + middle_nrec = &(middle_internal->nrec); + right_nrec = &(right_internal->nrec); + left_native = left_internal->int_native; + middle_native = middle_internal->int_native; + right_native = right_internal->int_native; + left_node_ptrs = left_internal->node_ptrs; + middle_node_ptrs = middle_internal->node_ptrs; + right_node_ptrs = right_internal->node_ptrs; + + /* Mark child nodes as dirty now */ + left_internal->cache_info.is_dirty = TRUE; + middle_internal->cache_info.is_dirty = TRUE; + right_internal->cache_info.is_dirty = TRUE; } /* end if */ else { H5B2_leaf_t *left_leaf; /* Pointer to left leaf node */ - H5B2_leaf_t *right_leaf; /* Pointer to right leaf node */ H5B2_leaf_t *middle_leaf; /* Pointer to middle leaf node */ + H5B2_leaf_t *right_leaf; /* Pointer to right leaf node */ /* Setup information for unlocking child nodes */ child_class = H5AC_BT2_LEAF; @@ -877,6 +924,40 @@ HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split nodes") /* Copy record(s) from right node to proper location */ if(new_right_nrec<(*right_nrec-1)) HDmemcpy(H5B2_NAT_NREC(middle_native,shared,curr_middle_idx),H5B2_NAT_NREC(right_native,shared,0),shared->type->nrec_size*(*right_nrec-(new_right_nrec+1))); + + /* Copy node pointers from left and right nodes into middle node */ + if(depth>1) { + int moved_nrec; /* Total number of records moved, for internal redistrib */ + unsigned move_nptrs; /* Number of node pointers to move */ + unsigned u; /* Local index variable */ + + /* Start tracking the total number of records in middle node */ + middle_moved_nrec = new_middle_nrec; + + /* Copy node pointers from left node */ + move_nptrs = (*left_nrec-new_left_nrec); + HDmemcpy(&(middle_node_ptrs[0]),&(left_node_ptrs[new_left_nrec+1]),sizeof(H5B2_node_ptr_t)*move_nptrs); + + /* Count the number of records being moved from the left node */ + for(u=0, moved_nrec=0; unode_ptrs[idx].node_nrec = *left_nrec; + internal->node_ptrs[idx+1].node_nrec = *middle_nrec; + internal->node_ptrs[idx+2].node_nrec = *right_nrec; + + /* Update total # of records in child B-trees */ + if(depth>1) { + internal->node_ptrs[idx].all_nrec += left_moved_nrec; + internal->node_ptrs[idx+1].all_nrec = middle_moved_nrec; + internal->node_ptrs[idx+2].all_nrec += right_moved_nrec; + } /* end if */ + else { + internal->node_ptrs[idx].all_nrec = internal->node_ptrs[idx].node_nrec; + internal->node_ptrs[idx+1].all_nrec = internal->node_ptrs[idx+1].node_nrec; + internal->node_ptrs[idx+2].all_nrec = internal->node_ptrs[idx+2].node_nrec; + } /* end else */ + + /* Update # of records in parent node */ -/* Hmm, this value for 'all_rec' wont' be right for internal nodes... */ - internal->node_ptrs[idx].all_nrec = internal->node_ptrs[idx].node_nrec = *left_nrec; - internal->node_ptrs[idx+1].all_nrec = internal->node_ptrs[idx+1].node_nrec = *middle_nrec; - internal->node_ptrs[idx+2].all_nrec = internal->node_ptrs[idx+2].node_nrec = *right_nrec; internal->nrec++; /* Mark parent as dirty */ diff --git a/test/btree2.c b/test/btree2.c index 3a980d8..bdeb338 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -127,7 +127,7 @@ test_insert_basic(hid_t fapl) /* * Test inserting record into v2 B-tree */ - TESTING("B-tree insert - several records"); + TESTING("B-tree insert: several records"); record=42; if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, H5B2_TEST, bt2_addr, &record)<0) { H5_FAILED(); @@ -231,7 +231,7 @@ test_insert_split_root(hid_t fapl) /* * Test inserting many records into v2 B-tree */ - TESTING("B-tree insert - split root"); + TESTING("B-tree insert: split root"); for(u=0; ur)"); + TESTING("B-tree insert: redistribute 2 leaves in level 1 B-tree (l->r)"); /* Insert enough records to force root to split into 2 leaves */ for(u=0; ul)"); + TESTING("B-tree insert: redistribute 2 leaves in level 1 B-tree (r->l)"); /* Insert enough records to force root to split into 2 leaves */ for(u=0; ur)"); + TESTING("B-tree insert: split 2 leaves to 3 in level 1 B-tree (l->r)"); /* Insert enough records to force root to split into 2 leaves */ for(u=0; ul)"); + TESTING("B-tree insert: split 2 leaves to 3 in level 1 B-tree (r->l)"); /* Insert enough records to force root to split into 2 leaves */ for(u=0; u3 node split on left leaf */ for(u=0; u4 node split on middle leaf */ for(u=0; ul) in level 2 B-tree"); + TESTING("B-tree insert: redist. 2 internal (r->l) in level 2 B-tree"); /* Insert enough records to force root to split into 2 internal nodes */ /* Also forces right-most internal node to redistribute */ @@ -1161,7 +1161,7 @@ test_insert_level2_2internal_redistrib(hid_t fapl) PASSED(); - TESTING("B-tree insert - redist. 2 internal (l->r) in level 2 B-tree"); + TESTING("B-tree insert: redist. 2 internal (l->r) in level 2 B-tree"); /* Force left-most internal node to redistribute */ for(u=0; ul)"); + + /* Insert enough records to force root to split into 2 internal nodes */ + /* Also forces right-most internal node to split */ + for(u=0; u<(INSERT_SPLIT_ROOT_NREC*21); u++) { + record=u+(INSERT_SPLIT_ROOT_NREC*8); + if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, H5B2_TEST, bt2_addr, &record)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } + } + + PASSED(); + + TESTING("B-tree insert: split 2 internals to 3 in level 2 B-tree (l->r)"); + + /* Force left-most internal node to split */ + for(u=0; u