[svn-r28742] Description:

    Add 'update' operation to v2 B-trees, which will insert a new record, or
modify an existing one, depending on if the record exists or not.

Tested on:
    MacOSX/64 10.11.2 (amazon) w/serial & parallel
    (h5committest forthcoming)

12 files changed, 3089 insertions, 377 deletions

diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index 972fb0b..716ad4a 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -116,9 +116,7 @@ const H5B2_class_t H5A_BT2_NAME[1]={{  /* B-tree class information */
     H5A__dense_btree2_name_compare,     /* Record comparison callback */
     H5A__dense_btree2_name_encode,      /* Record encoding callback */
     H5A__dense_btree2_name_decode,      /* Record decoding callback */
-    H5A__dense_btree2_name_debug,       /* Record debugging callback */
-    NULL,                              /* Create debugging context */
-    NULL                               /* Destroy debugging context */
+    H5A__dense_btree2_name_debug        /* Record debugging callback */
 }};
 
 /* v2 B-tree class for indexing 'creation order' field of attributes */
@@ -132,9 +130,7 @@ const H5B2_class_t H5A_BT2_CORDER[1]={{ /* B-tree class information */
     H5A__dense_btree2_corder_compare,   /* Record comparison callback */
     H5A__dense_btree2_corder_encode,    /* Record encoding callback */
     H5A__dense_btree2_corder_decode,    /* Record decoding callback */
-    H5A__dense_btree2_corder_debug,     /* Record debugging callback */
-    NULL,                              /* Create debugging context */
-    NULL                               /* Destroy debugging context */
+    H5A__dense_btree2_corder_debug      /* Record debugging callback */
 }};
 
 
diff --git a/src/H5B2.c b/src/H5B2.c
index a171917..c105a93 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -86,6 +86,7 @@ extern const H5B2_class_t H5G_BT2_CORDER[1];
 extern const H5B2_class_t H5SM_INDEX[1];
 extern const H5B2_class_t H5A_BT2_NAME[1];
 extern const H5B2_class_t H5A_BT2_CORDER[1];
+extern const H5B2_class_t H5B2_TEST2[1];
 
 const H5B2_class_t *const H5B2_client_class_g[] = {
     H5B2_TEST,			/* 0 - H5B2_TEST_ID 			*/
@@ -98,6 +99,7 @@ const H5B2_class_t *const H5B2_client_class_g[] = {
     H5SM_INDEX,			/* 7 - H5B2_SOHM_INDEX_ID 		*/
     H5A_BT2_NAME,		/* 8 - H5B2_ATTR_DENSE_NAME_ID 		*/
     H5A_BT2_CORDER,		/* 9 - H5B2_ATTR_DENSE_CORDER_ID 	*/
+    H5B2_TEST2,			/* 10 - H5B2_TEST_ID 			*/
 };
 
 
@@ -282,36 +284,78 @@ H5B2_insert(H5B2_t *bt2, hid_t dxpl_id, void *udata)
     /* Get the v2 B-tree header */
     hdr = bt2->hdr;
 
+    /* Insert the record */
+    if(H5B2__insert_hdr(hdr, dxpl_id, udata) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5B2_insert() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2_update
+ *
+ * Purpose:	Insert or modify a record to the B-tree.
+ *		If the record exists already, it is modified as if H5B2_modify
+ *		was called).  If it doesn't exist, it is inserted as if
+ *		H5B2_insert was called.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Dec 23 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5B2_update(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op, void *op_data)
+{
+    H5B2_hdr_t	*hdr;           /* Pointer to the B-tree header */
+    H5B2_update_status_t status = H5B2_UPDATE_UNKNOWN;   /* Whether the record was inserted/modified */
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check arguments. */
+    HDassert(bt2);
+    HDassert(udata);
+
+    /* Set the shared v2 B-tree header's file context for this operation */
+    bt2->hdr->f = bt2->f;
+
+    /* Get the v2 B-tree header */
+    hdr = bt2->hdr;
+
     /* Check if the root node is allocated yet */
     if(!H5F_addr_defined(hdr->root.addr)) {
         /* Create root node as leaf node in B-tree */
         if(H5B2__create_leaf(hdr, dxpl_id, &(hdr->root)) < 0)
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create root node")
     } /* end if */
-    /* Check if we need to split the root node (equiv. to a 1->2 node split) */
-    else if(hdr->root.node_nrec == hdr->node_info[hdr->depth].split_nrec) {
-        /* Split root node */
-        if(H5B2__split_root(hdr, dxpl_id) < 0)
-            HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split root node")
-    } /* end if */
 
     /* Attempt to insert record into B-tree */
     if(hdr->depth > 0) {
-        if(H5B2__insert_internal(hdr, dxpl_id, hdr->depth, NULL, &hdr->root, H5B2_POS_ROOT, udata) < 0)
-            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree internal node")
+        if(H5B2__update_internal(hdr, dxpl_id, hdr->depth, NULL, &hdr->root, &status, H5B2_POS_ROOT, udata, op, op_data) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to update record in B-tree internal node")
     } /* end if */
     else {
-        if(H5B2__insert_leaf(hdr, dxpl_id, &hdr->root, H5B2_POS_ROOT, udata) < 0)
-            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree leaf node")
+        if(H5B2__update_leaf(hdr, dxpl_id, &hdr->root, &status, H5B2_POS_ROOT, udata, op, op_data) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to update record in B-tree leaf node")
     } /* end else */
 
-    /* Mark B-tree header as dirty */
-    if(H5B2__hdr_dirty(hdr) < 0)
-        HGOTO_ERROR(H5E_BTREE, H5E_CANTMARKDIRTY, FAIL, "unable to mark B-tree header dirty")
+    /* Sanity check */
+    HDassert(H5B2_UPDATE_UNKNOWN != status);
+
+    /* Use insert algorithm if nodes to leaf full */
+    if(H5B2_UPDATE_INSERT_CHILD_FULL == status)
+        if(H5B2__insert_hdr(hdr, dxpl_id, udata) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5B2_insert() */
+} /* H5B2_update() */
 
 
 /*-------------------------------------------------------------------------
@@ -1202,7 +1246,7 @@ H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op,
         /* Unlock current node */
         if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, leaf, leaf_flags) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
-    }
+    } /* end block */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index 73084d2..ddff9e9 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -92,7 +92,6 @@ H5B2__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     const H5B2_class_t *type, haddr_t obj_addr)
 {
     H5B2_hdr_t	*hdr = NULL;            /* B-tree header info */
-    void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
     unsigned    u;                      /* Local index variable */
     char        temp_str[128];          /* Temporary string, for formatting */
     herr_t      ret_value = SUCCEED;    /* Return value */
@@ -109,17 +108,9 @@ H5B2__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
     HDassert(type);
-    HDassert((type->crt_dbg_ctx && type->dst_dbg_ctx) ||
-        (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
-
-    /* Check for debugging context callback available */
-    if(type->crt_dbg_ctx)
-        /* Create debugging context */
-        if(NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
 
     /* Load the B-tree header  */
-    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, addr, dbg_ctx, H5AC__READ_ONLY_FLAG)))
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, addr, f, H5AC__READ_ONLY_FLAG)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
 
     /* Set file pointer for this B-tree operation */
@@ -171,8 +162,6 @@ H5B2__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     } /* end for */
 
 done:
-    if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
-        HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
     if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release v2 B-tree header")
 
@@ -199,7 +188,6 @@ H5B2__int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
 {
     H5B2_hdr_t	*hdr = NULL;            /* B-tree header */
     H5B2_internal_t	*internal = NULL;   /* B-tree internal node */
-    void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
     unsigned	u;                      /* Local index variable */
     char        temp_str[128];          /* Temporary string, for formatting */
     herr_t      ret_value=SUCCEED;      /* Return value */
@@ -215,21 +203,12 @@ H5B2__int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
     HDassert(type);
-    HDassert((type->crt_dbg_ctx && type->dst_dbg_ctx) ||
-        (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
     HDassert(H5F_addr_defined(hdr_addr));
     HDassert(H5F_addr_defined(obj_addr));
     HDassert(nrec > 0);
 
-    /* Check for debugging context callback available */
-    if(type->crt_dbg_ctx) {
-        /* Create debugging context */
-        if(NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
-    } /* end if */
-
     /* Load the B-tree header */
-    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, hdr_addr, dbg_ctx, H5AC__READ_ONLY_FLAG)))
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, hdr_addr, f, H5AC__READ_ONLY_FLAG)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load v2 B-tree header")
 
     /* Set file pointer for this B-tree operation */
@@ -279,7 +258,7 @@ H5B2__int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
         HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
                   temp_str);
         HDassert(H5B2_INT_NREC(internal, hdr, u));
-        (void)(type->debug)(stream, indent + 6, MAX (0, fwidth-6), H5B2_INT_NREC(internal, hdr, u), dbg_ctx);
+        (void)(type->debug)(stream, indent + 6, MAX (0, fwidth-6), H5B2_INT_NREC(internal, hdr, u), hdr->cb_ctx);
     } /* end for */
 
     /* Print final node pointer */
@@ -291,8 +270,6 @@ H5B2__int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
               internal->node_ptrs[u].addr);
 
 done:
-    if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
-        HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
     if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release v2 B-tree header")
     if(internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, addr, internal, H5AC__NO_FLAGS_SET) < 0)
@@ -321,7 +298,6 @@ H5B2__leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent
 {
     H5B2_hdr_t	*hdr = NULL;            /* B-tree header */
     H5B2_leaf_t	*leaf = NULL;           /* B-tree leaf node */
-    void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
     unsigned	u;                      /* Local index variable */
     char        temp_str[128];          /* Temporary string, for formatting */
     herr_t      ret_value = SUCCEED;    /* Return value */
@@ -337,20 +313,12 @@ H5B2__leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
     HDassert(type);
-    HDassert((type->crt_dbg_ctx && type->dst_dbg_ctx) ||
-        (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
     HDassert(H5F_addr_defined(hdr_addr));
     HDassert(H5F_addr_defined(obj_addr));
     HDassert(nrec > 0);
 
-    /* Check for debugging context callback available */
-    if(type->crt_dbg_ctx)
-        /* Create debugging context */
-        if(NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
-	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
-
     /* Load the B-tree header */
-    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, hdr_addr, dbg_ctx, H5AC__READ_ONLY_FLAG)))
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, hdr_addr, f, H5AC__READ_ONLY_FLAG)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect v2 B-tree header")
 
     /* Set file pointer for this B-tree operation */
@@ -391,12 +359,10 @@ H5B2__leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent
         HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
                   temp_str);
         HDassert(H5B2_LEAF_NREC(leaf, hdr, u));
-        (void)(type->debug)(stream, indent + 6, MAX (0, fwidth-6), H5B2_LEAF_NREC(leaf, hdr, u), dbg_ctx);
+        (void)(type->debug)(stream, indent + 6, MAX (0, fwidth-6), H5B2_LEAF_NREC(leaf, hdr, u), hdr->cb_ctx);
     } /* end for */
 
 done:
-    if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
-        HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
     if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
     if(leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, addr, leaf, H5AC__NO_FLAGS_SET) < 0)
diff --git a/src/H5B2int.c b/src/H5B2int.c
index b8c9634..363d903 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -1513,6 +1513,62 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5B2__insert_hdr
+ *
+ * Purpose:	Adds a new record to the B-tree.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Dec 23 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5B2__insert_hdr(H5B2_hdr_t *hdr, hid_t dxpl_id, void *udata)
+{
+    herr_t	ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_PACKAGE
+
+    /* Check arguments. */
+    HDassert(hdr);
+    HDassert(udata);
+
+    /* Check if the root node is allocated yet */
+    if(!H5F_addr_defined(hdr->root.addr)) {
+        /* Create root node as leaf node in B-tree */
+        if(H5B2__create_leaf(hdr, dxpl_id, &(hdr->root)) < 0)
+	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create root node")
+    } /* end if */
+    /* Check if we need to split the root node (equiv. to a 1->2 node split) */
+    else if(hdr->root.node_nrec == hdr->node_info[hdr->depth].split_nrec) {
+        /* Split root node */
+        if(H5B2__split_root(hdr, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split root node")
+    } /* end if */
+
+    /* Attempt to insert record into B-tree */
+    if(hdr->depth > 0) {
+        if(H5B2__insert_internal(hdr, dxpl_id, hdr->depth, NULL, &hdr->root, H5B2_POS_ROOT, udata) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree internal node")
+    } /* end if */
+    else {
+        if(H5B2__insert_leaf(hdr, dxpl_id, &hdr->root, H5B2_POS_ROOT, udata) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into B-tree leaf node")
+    } /* end else */
+
+    /* Mark B-tree header as dirty */
+    if(H5B2__hdr_dirty(hdr) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTMARKDIRTY, FAIL, "unable to mark B-tree header dirty")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5B2__insert_hdr() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5B2__insert_leaf
  *
  * Purpose:	Adds a new record to a B-tree leaf node.
@@ -1644,6 +1700,9 @@ H5B2__insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, uint16_t depth,
     if(NULL == (internal = H5B2__protect_internal(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, depth, H5AC__NO_FLAGS_SET)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
 
+    /* Sanity check number of records */
+    HDassert(internal->nrec == curr_node_ptr->node_nrec);
+
     /* Split or redistribute child node pointers, if necessary */
     {
         int         cmp;        /* Comparison value of records */
@@ -1755,6 +1814,348 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5B2__update_leaf
+ *
+ * Purpose:	Insert or modify a record in a B-tree leaf node.
+ *		If the record exists already, it is modified as if H5B2_modify
+ *		was called).  If it doesn't exist, it is inserted as if
+ *		H5B2_insert was called.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Dec 23 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5B2__update_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
+    H5B2_update_status_t *status, H5B2_nodepos_t curr_pos, void *udata,
+    H5B2_modify_t op, void *op_data)
+{
+    H5B2_leaf_t *leaf;                  /* Pointer to leaf node */
+    unsigned leaf_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting the leaf node */
+    int         cmp = -1;               /* Comparison value of records */
+    unsigned    idx;                    /* Location of record which matches key */
+    herr_t	ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_PACKAGE
+
+    /* Check arguments. */
+    HDassert(hdr);
+    HDassert(curr_node_ptr);
+    HDassert(H5F_addr_defined(curr_node_ptr->addr));
+
+    /* Lock current B-tree node */
+    if(NULL == (leaf = H5B2__protect_leaf(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, H5AC__NO_FLAGS_SET)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
+
+    /* Sanity check number of records */
+    HDassert(curr_node_ptr->all_nrec == curr_node_ptr->node_nrec);
+    HDassert(leaf->nrec == curr_node_ptr->node_nrec);
+
+    /* Check for inserting into empty leaf */
+    if(leaf->nrec == 0)
+        idx = 0;
+    else {
+        /* Find correct location to insert this record */
+        cmp = H5B2__locate_record(hdr->cls, leaf->nrec, hdr->nat_off, leaf->leaf_native, udata, &idx);
+
+        /* Check for inserting a record */
+        if(0 != cmp) {
+            /* Check if the leaf node is full */
+            if(curr_node_ptr->node_nrec == hdr->node_info[0].split_nrec) {
+                /* Indicate that the leaf is full, but we need to insert */
+                *status = H5B2_UPDATE_INSERT_CHILD_FULL;
+
+                /* Let calling routine handle insertion */
+                HGOTO_DONE(SUCCEED)
+            } /* end if */
+
+            /* Adjust index to leave room for record to insert */
+            if(cmp > 0)
+                idx++;
+
+            /* Make room for new record */
+            if(idx < leaf->nrec)
+                HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx + 1), H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size * (leaf->nrec - idx));
+        } /* end if */
+    } /* end else */
+
+    /* Check for modifying existing record */
+    if(0 == cmp) {
+        hbool_t changed = FALSE;        /* Whether the 'modify' callback changed the record */
+
+        /* Make callback for current record */
+        if((op)(H5B2_LEAF_NREC(leaf, hdr, idx), op_data, &changed) < 0) {
+            /* Make certain that the callback didn't modify the value if it failed */
+            HDassert(changed == FALSE);
+
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTMODIFY, FAIL, "'modify' callback failed for B-tree update operation")
+        } /* end if */
+
+        /* Mark the node as dirty if it changed */
+        leaf_flags |= (changed ? H5AC__DIRTIED_FLAG : 0);
+
+        /* Indicate that the record was modified */
+        *status = H5B2_UPDATE_MODIFY_DONE;
+    } /* end if */
+    else {
+        /* Must have a leaf node with enough space to insert a record now */
+        HDassert(curr_node_ptr->node_nrec < hdr->node_info[0].max_nrec);
+
+        /* Make callback to store record in native form */
+        if((hdr->cls->store)(H5B2_LEAF_NREC(leaf, hdr, idx), udata) < 0)
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into leaf node")
+
+        /* Mark the node as dirty if it changed */
+        leaf_flags |= H5AC__DIRTIED_FLAG;
+
+        /* Indicate that the record was inserted */
+        *status = H5B2_UPDATE_INSERT_DONE;
+
+        /* Update record count for node pointer to current node */
+        curr_node_ptr->all_nrec++;
+        curr_node_ptr->node_nrec++;
+
+        /* Update record count for current node */
+        leaf->nrec++;
+    } /* end else */
+
+    /* Check for new record being the min or max for the tree */
+    /* (Don't use 'else' for the idx check, to allow for root leaf node) */
+    if(H5B2_POS_MIDDLE != curr_pos) {
+        if(idx == 0) {
+            if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                if(hdr->min_native_rec == NULL)
+                    if(NULL == (hdr->min_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for v2 B-tree min record info")
+                HDmemcpy(hdr->min_native_rec, H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size);
+            } /* end if */
+        } /* end if */
+        if(idx == (unsigned)(leaf->nrec - 1)) {
+            if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos) {
+                if(hdr->max_native_rec == NULL)
+                    if(NULL == (hdr->max_native_rec = (uint8_t *)HDmalloc(hdr->cls->nrec_size)))
+                        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for v2 B-tree max record info")
+                HDmemcpy(hdr->max_native_rec, H5B2_LEAF_NREC(leaf, hdr, idx), hdr->cls->nrec_size);
+            } /* end if */
+        } /* end if */
+    } /* end if */
+
+done:
+    /* Release the B-tree leaf node */
+    if(leaf && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, leaf, leaf_flags) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release leaf B-tree node")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5B2__update_leaf() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2__update_internal
+ *
+ * Purpose:	Insert or modify a record in a B-tree leaf node.
+ *		If the record exists already, it is modified as if H5B2_modify
+ *		was called).  If it doesn't exist, it is inserted as if
+ *		H5B2_insert was called.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Dec 24 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5B2__update_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, uint16_t depth,
+    unsigned *parent_cache_info_flags_ptr, H5B2_node_ptr_t *curr_node_ptr,
+    H5B2_update_status_t *status, H5B2_nodepos_t curr_pos, void *udata,
+    H5B2_modify_t op, void *op_data)
+{
+    H5B2_internal_t *internal = NULL;   /* Pointer to internal node */
+    unsigned internal_flags = H5AC__NO_FLAGS_SET;
+    int         cmp;                    /* Comparison value of records */
+    unsigned    idx;                    /* Location of record which matches key */
+    H5B2_nodepos_t next_pos = H5B2_POS_MIDDLE;    /* Position of node */
+    herr_t	ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_PACKAGE
+
+    /* Check arguments. */
+    HDassert(hdr);
+    HDassert(depth > 0);
+    HDassert(curr_node_ptr);
+    HDassert(H5F_addr_defined(curr_node_ptr->addr));
+
+    /* Lock current B-tree node */
+    if(NULL == (internal = H5B2__protect_internal(hdr, dxpl_id, curr_node_ptr->addr, curr_node_ptr->node_nrec, depth, H5AC__NO_FLAGS_SET)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree internal node")
+
+    /* Sanity check number of records */
+    HDassert(internal->nrec == curr_node_ptr->node_nrec);
+
+    /* Locate node pointer for child */
+    cmp = H5B2__locate_record(hdr->cls, internal->nrec, hdr->nat_off, internal->int_native, udata, &idx);
+
+    /* Check for modifying existing record */
+    if(0 == cmp) {
+        hbool_t changed = FALSE;        /* Whether the 'modify' callback changed the record */
+
+        /* Make callback for current record */
+        if((op)(H5B2_INT_NREC(internal, hdr, idx), op_data, &changed) < 0) {
+            /* Make certain that the callback didn't modify the value if it failed */
+            HDassert(changed == FALSE);
+
+            HGOTO_ERROR(H5E_BTREE, H5E_CANTMODIFY, FAIL, "'modify' callback failed for B-tree update operation")
+        } /* end if */
+
+        /* Mark the node as dirty if it changed */
+        internal_flags |= (changed ? H5AC__DIRTIED_FLAG : 0);
+
+        /* Indicate that the record was modified */
+        *status = H5B2_UPDATE_MODIFY_DONE;
+    } /* end if */
+    else {
+        /* Adjust index to leave room for node to insert */
+        if(cmp > 0)
+            idx++;
+
+        /* Check if this node is left/right-most */
+        if(H5B2_POS_MIDDLE != curr_pos) {
+            if(idx == 0) {
+                if(H5B2_POS_LEFT == curr_pos || H5B2_POS_ROOT == curr_pos)
+                    next_pos = H5B2_POS_LEFT;
+            } /* end if */
+            else if(idx == internal->nrec) {
+                if(H5B2_POS_RIGHT == curr_pos || H5B2_POS_ROOT == curr_pos)
+                    next_pos = H5B2_POS_RIGHT;
+            } /* end else */
+        } /* end if */
+
+        /* Attempt to update record in child */
+        if(depth > 1) {
+            if(H5B2__update_internal(hdr, dxpl_id, (uint16_t)(depth - 1), &internal_flags, &internal->node_ptrs[idx], status, next_pos, udata, op, op_data) < 0)
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTUPDATE, FAIL, "unable to update record in internal B-tree node")
+        } /* end if */
+        else {
+            if(H5B2__update_leaf(hdr, dxpl_id, &internal->node_ptrs[idx], status, next_pos, udata, op, op_data) < 0)
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTUPDATE, FAIL, "unable to update record in leaf B-tree node")
+        } /* end else */
+
+        /* Take actions based on child's status report */
+        switch(*status) {
+            case H5B2_UPDATE_MODIFY_DONE:
+                /* No action */
+                break;
+
+            case H5B2_UPDATE_INSERT_DONE:
+                /* Mark node as dirty */
+                internal_flags |= H5AC__DIRTIED_FLAG;
+
+                /* Update total record count for node pointer to current node */
+                curr_node_ptr->all_nrec++;
+                break;
+
+            case H5B2_UPDATE_INSERT_CHILD_FULL:
+                /* Split/redistribute this node */
+                if(internal->nrec == hdr->node_info[depth].split_nrec) {
+                    hbool_t could_split = FALSE;        /* Whether the child node could split */
+
+#ifdef QAK
+HDfprintf(stderr, "%s: idx = %u, internal->nrec = %u\n", FUNC, idx, internal->nrec);
+HDfprintf(stderr, "%s: hdr->node_info[%u].split_nrec = %u\n", FUNC, (unsigned)depth, (unsigned)hdr->node_info[depth].split_nrec);
+HDfprintf(stderr, "%s: hdr->node_info[%u].split_nrec = %u\n", FUNC, (unsigned)(depth - 1), (unsigned)hdr->node_info[depth - 1].split_nrec);
+#endif /* QAK */
+                    if(idx == 0) {      /* Left-most child */
+#ifdef QAK
+HDfprintf(stderr, "%s: Left-most child\n", FUNC);
+HDfprintf(stderr, "%s: internal->node_ptrs[%u].node_nrec = %u\n", FUNC, (unsigned)idx, (unsigned)internal->node_ptrs[idx].node_nrec);
+HDfprintf(stderr, "%s: internal->node_ptrs[%u].node_nrec = %u\n", FUNC, (unsigned)(idx + 1), (unsigned)internal->node_ptrs[idx + 1].node_nrec);
+#endif /* QAK */
+                        /* Check for left-most child and its neighbor being close to full */
+                        if((internal->node_ptrs[idx].node_nrec + internal->node_ptrs[idx + 1].node_nrec)
+                                >= ((hdr->node_info[depth - 1].split_nrec * 2) - 1))
+                            could_split = TRUE;
+                    } /* end if */
+                    else if(idx == internal->nrec) { /* Right-most child */
+#ifdef QAK
+HDfprintf(stderr, "%s: Right-most child\n", FUNC);
+HDfprintf(stderr, "%s: internal->node_ptrs[%u].node_nrec = %u\n", FUNC, (unsigned)(idx - 1), (unsigned)internal->node_ptrs[idx - 1].node_nrec);
+HDfprintf(stderr, "%s: internal->node_ptrs[%u].node_nrec = %u\n", FUNC, (unsigned)idx, (unsigned)internal->node_ptrs[idx].node_nrec);
+#endif /* QAK */
+                        /* Check for right-most child and its neighbor being close to full */
+                        if((internal->node_ptrs[idx - 1].node_nrec + internal->node_ptrs[idx].node_nrec)
+                                >= ((hdr->node_info[depth - 1].split_nrec * 2) - 1))
+                            could_split = TRUE;
+                    } /* end else-if */
+                    else {              /* Middle child */
+#ifdef QAK
+HDfprintf(stderr, "%s: Middle child\n", FUNC);
+HDfprintf(stderr, "%s: internal->node_ptrs[%u].node_nrec = %u\n", FUNC, (unsigned)(idx - 1), (unsigned)internal->node_ptrs[idx - 1].node_nrec);
+HDfprintf(stderr, "%s: internal->node_ptrs[%u].node_nrec = %u\n", FUNC, (unsigned)idx, (unsigned)internal->node_ptrs[idx].node_nrec);
+HDfprintf(stderr, "%s: internal->node_ptrs[%u].node_nrec = %u\n", FUNC, (unsigned)(idx + 1), (unsigned)internal->node_ptrs[idx + 1].node_nrec);
+#endif /* QAK */
+                        /* Check for middle child and its left neighbor being close to full */
+                        if((internal->node_ptrs[idx - 1].node_nrec + internal->node_ptrs[idx].node_nrec)
+                                >= ((hdr->node_info[depth - 1].split_nrec * 2) - 1))
+                            could_split = TRUE;
+                        /* Check for middle child and its right neighbor being close to full */
+                        else if((internal->node_ptrs[idx].node_nrec + internal->node_ptrs[idx + 1].node_nrec)
+                                >= ((hdr->node_info[depth - 1].split_nrec * 2) - 1))
+                            could_split = TRUE;
+                    } /* end if */
+
+                    /* If this node is full and the child node insertion could
+                     *  cause a split, punt back up to caller, leaving the
+                     *  "insert child full" status.
+                     */
+                    if(could_split) {
+                        /* Release the internal B-tree node */
+                        if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, internal, internal_flags) < 0)
+                            HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
+                        internal = NULL;
+
+#ifdef QAK
+HDfprintf(stderr, "%s: Punting back to caller\n", FUNC);
+#endif /* QAK */
+                        /* Punt back to caller */
+                        HGOTO_DONE(SUCCEED);
+                    } /* end if */
+                } /* end if */
+
+                /* Release the internal B-tree node */
+                if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, internal, internal_flags) < 0)
+                    HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
+                internal = NULL;
+
+                /* Indicate that the record was inserted */
+                *status = H5B2_UPDATE_INSERT_DONE;
+
+                /* Dodge sideways into inserting a record into this node */
+                if(H5B2__insert_internal(hdr, dxpl_id, depth, parent_cache_info_flags_ptr, curr_node_ptr, curr_pos, udata) < 0)
+                    HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into internal B-tree node")
+                break;
+
+            case H5B2_UPDATE_UNKNOWN:
+            default:
+                HDassert(0 && "Invalid update status");
+                HGOTO_ERROR(H5E_BTREE, H5E_CANTUPDATE, FAIL, "invalid update status")
+        } /* end switch */
+    } /* end else */
+
+done:
+    /* Release the internal B-tree node */
+    if(internal && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, internal, internal_flags) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5B2__update_internal() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5B2__create_leaf
  *
  * Purpose:	Creates empty leaf node of a B-tree and update node pointer
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h
index f58850e..d6b6c04 100644
--- a/src/H5B2pkg.h
+++ b/src/H5B2pkg.h
@@ -228,6 +228,14 @@ typedef enum H5B2_nodepos_t {
     H5B2_POS_MIDDLE             /* Node is neither right or left-most in tree */
 } H5B2_nodepos_t;
 
+/* Update status */
+typedef enum H5B2_update_status_t {
+    H5B2_UPDATE_UNKNOWN,            /* Unknown update status (initial state) */
+    H5B2_UPDATE_MODIFY_DONE,        /* Update successfully modified existing record */
+    H5B2_UPDATE_INSERT_DONE,        /* Update inserted record successfully */
+    H5B2_UPDATE_INSERT_CHILD_FULL   /* Update will insert record, but child is full */
+} H5B2_update_status_t;
+
 /* Callback info for loading a free space header into the cache */
 typedef struct H5B2_hdr_cache_ud_t {
     H5F_t *f;                   /* File that v2 b-tree header is within */
@@ -252,7 +260,7 @@ typedef struct H5B2_leaf_cache_ud_t {
 
 #ifdef H5B2_TESTING
 /* Node information for testing */
-typedef struct {
+typedef struct H5B2_node_info_test_t {
     unsigned depth;             /* Depth of node */
     unsigned nrec;              /* Number of records in node */
 } H5B2_node_info_test_t;
@@ -281,6 +289,13 @@ H5FL_EXTERN(H5B2_leaf_t);
 /* Internal v2 B-tree testing class */
 #ifdef H5B2_TESTING
 H5_DLLVAR const H5B2_class_t H5B2_TEST[1];
+H5_DLLVAR const H5B2_class_t H5B2_TEST2[1];
+
+/* B-tree record for testing H5B2_TEST2 class */
+typedef struct H5B2_test_rec_t {
+    hsize_t key;        /* Key for record */
+    hsize_t val;        /* Value for record */
+} H5B2_test_rec_t;
 #endif /* H5B2_TESTING */
 
 /* Array of v2 B-tree client ID -> client class mappings */
@@ -327,12 +342,22 @@ H5_DLL herr_t H5B2__leaf_free(H5B2_leaf_t *l);
 H5_DLL herr_t H5B2__internal_free(H5B2_internal_t *i);
 
 /* Routines for inserting records */
+H5_DLL herr_t H5B2__insert_hdr(H5B2_hdr_t *hdr, hid_t dxpl_id, void *udata);
 H5_DLL herr_t H5B2__insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id,
     uint16_t depth, unsigned *parent_cache_info_flags_ptr,
     H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, void *udata);
 H5_DLL herr_t H5B2__insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id,
     H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, void *udata);
 
+/* Routines for update records */
+H5_DLL herr_t H5B2__update_internal(H5B2_hdr_t *hdr, hid_t dxpl_id,
+    uint16_t depth, unsigned *parent_cache_info_flags_ptr,
+    H5B2_node_ptr_t *curr_node_ptr, H5B2_update_status_t *status,
+    H5B2_nodepos_t curr_pos, void *udata, H5B2_modify_t op, void *op_data);
+H5_DLL herr_t H5B2__update_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id,
+    H5B2_node_ptr_t *curr_node_ptr, H5B2_update_status_t *status,
+    H5B2_nodepos_t curr_pos, void *udata, H5B2_modify_t op, void *op_data);
+
 /* Routines for iterating over nodes/records */
 H5_DLL herr_t H5B2__iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, uint16_t depth,
     const H5B2_node_ptr_t *curr_node, H5B2_operator_t op, void *op_data);
diff --git a/src/H5B2private.h b/src/H5B2private.h
index 9e3c2d7..ff94680 100644
--- a/src/H5B2private.h
+++ b/src/H5B2private.h
@@ -54,6 +54,7 @@ typedef enum H5B2_subid_t {
     H5B2_SOHM_INDEX_ID,         /* B-tree is an index for shared object header messages */
     H5B2_ATTR_DENSE_NAME_ID,    /* B-tree is for indexing 'name' field for "dense" attribute storage on objects */
     H5B2_ATTR_DENSE_CORDER_ID,  /* B-tree is for indexing 'creation order' field for "dense" attribute storage on objects */
+    H5B2_TEST2_ID,		/* Another B-tree is for testing (do not use for actual data) */
     H5B2_NUM_BTREE_ID           /* Number of B-tree IDs (must be last)  */
 } H5B2_subid_t;
 
@@ -94,8 +95,6 @@ struct H5B2_class_t {
     herr_t (*decode)(const uint8_t *raw, void *record, void *ctx);  	/* Decode record from disk storage form to native form */
     herr_t (*debug)(FILE *stream, int indent, int fwidth,    	/* Print a record for debugging */
         const void *record,  const void *ctx);
-    void *(*crt_dbg_ctx)(H5F_t *f, hid_t dxpl_id, haddr_t obj_addr); 	/* Create debugging context */
-    herr_t (*dst_dbg_ctx)(void *dbg_ctx);       /* Destroy debugging context */
 };
 
 /* v2 B-tree creation parameters */
@@ -140,6 +139,8 @@ H5_DLL herr_t H5B2_neighbor(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range,
     void *udata, H5B2_found_t op, void *op_data);
 H5_DLL herr_t H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata,
     H5B2_modify_t op, void *op_data);
+H5_DLL herr_t H5B2_update(H5B2_t *bt2, hid_t dxpl_id, void *udata,
+    H5B2_modify_t op, void *op_data);
 H5_DLL herr_t H5B2_remove(H5B2_t *b2, hid_t dxpl_id, void *udata,
     H5B2_remove_t op, void *op_data);
 H5_DLL herr_t H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id,
diff --git a/src/H5B2test.c b/src/H5B2test.c
index 87fddf7..e0c96fb 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -61,6 +61,7 @@ typedef struct H5B2_test_ctx_t {
 /* Local Prototypes */
 /********************/
 
+/* v2 B-tree driver callbacks for 'test' B-trees */
 static void *H5B2__test_crt_context(void *udata);
 static herr_t H5B2__test_dst_context(void *ctx);
 static herr_t H5B2__test_store(void *nrecord, const void *udata);
@@ -69,13 +70,21 @@ static herr_t H5B2__test_encode(uint8_t *raw, const void *nrecord, void *ctx);
 static herr_t H5B2__test_decode(const uint8_t *raw, void *nrecord, void *ctx);
 static herr_t H5B2__test_debug(FILE *stream, int indent, int fwidth,
     const void *record, const void *_udata);
-static void *H5B2__test_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
+
+/* v2 B-tree driver callbacks for 'test2' B-trees */
+static herr_t H5B2__test2_store(void *nrecord, const void *udata);
+static herr_t H5B2__test2_compare(const void *rec1, const void *rec2);
+static herr_t H5B2__test2_encode(uint8_t *raw, const void *nrecord, void *ctx);
+static herr_t H5B2__test2_decode(const uint8_t *raw, void *nrecord, void *ctx);
+static herr_t H5B2__test2_debug(FILE *stream, int indent, int fwidth,
+    const void *record, const void *_udata);
 
 
 /*********************/
 /* Package Variables */
 /*********************/
 
+/* Class structure for testing simple B-tree records */
 const H5B2_class_t H5B2_TEST[1]={{   /* B-tree class information */
     H5B2_TEST_ID,               /* Type of B-tree */
     "H5B2_TEST_ID",             /* Name of B-tree class */
@@ -86,9 +95,21 @@ const H5B2_class_t H5B2_TEST[1]={{   /* B-tree class information */
     H5B2__test_compare,          /* Record comparison callback */
     H5B2__test_encode,           /* Record encoding callback */
     H5B2__test_decode,           /* Record decoding callback */
-    H5B2__test_debug,            /* Record debugging callback */
-    H5B2__test_crt_dbg_context,  /* Create debugging context */
-    H5B2__test_dst_context       /* Destroy debugging context */
+    H5B2__test_debug             /* Record debugging callback */
+}};
+
+/* Class structure for testing key/value B-tree records */
+const H5B2_class_t H5B2_TEST2[1]={{   /* B-tree class information */
+    H5B2_TEST2_ID,               /* Type of B-tree */
+    "H5B2_TEST2_ID",             /* Name of B-tree class */
+    sizeof(H5B2_test_rec_t),     /* Size of native record */
+    H5B2__test_crt_context,      /* Create client callback context */
+    H5B2__test_dst_context,      /* Destroy client callback context */
+    H5B2__test2_store,           /* Record storage callback */
+    H5B2__test2_compare,         /* Record comparison callback */
+    H5B2__test2_encode,          /* Record encoding callback */
+    H5B2__test2_decode,          /* Record decoding callback */
+    H5B2__test2_debug            /* Record debugging callback */
 }};
 
 
@@ -310,42 +331,139 @@ H5B2__test_debug(FILE *stream, int indent, int fwidth, const void *record,
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5B2__test_crt_dbg_context
+ * Function:	H5B2__test2_store
  *
- * Purpose:	Create context for debugging callback
+ * Purpose:	Store native information into record for B-tree
  *
- * Return:	Success:	non-NULL
- *		Failure:	NULL
+ * Return:	Success:	non-negative
+ *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *              Tuesday, December 1, 2009
+ *              Friday, December 25, 2015
  *
  *-------------------------------------------------------------------------
  */
-static void *
-H5B2__test_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr)
+static herr_t
+H5B2__test2_store(void *nrecord, const void *udata)
 {
-    H5B2_test_ctx_t *ctx;       /* Callback context structure */
-    void *ret_value = NULL;     /* Return value */
+    FUNC_ENTER_STATIC_NOERR
 
-    FUNC_ENTER_STATIC
+    *(H5B2_test_rec_t *)nrecord = *(const H5B2_test_rec_t *)udata;
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5B2__test2_store() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2__test2_compare
+ *
+ * Purpose:	Compare two native information records, according to some key
+ *
+ * Return:	<0 if rec1 < rec2
+ *              =0 if rec1 == rec2
+ *              >0 if rec1 > rec2
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 25, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2__test2_compare(const void *rec1, const void *rec2)
+{
+    FUNC_ENTER_STATIC_NOERR
+
+    FUNC_LEAVE_NOAPI((herr_t)(((const H5B2_test_rec_t *)rec1)->key - ((const H5B2_test_rec_t *)rec2)->key))
+} /* H5B2__test2_compare() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2__test2_encode
+ *
+ * Purpose:	Encode native information into raw form for storing on disk
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 25, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2__test2_encode(uint8_t *raw, const void *nrecord, void *_ctx)
+{
+    H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx;       /* Callback context structure */
+
+    FUNC_ENTER_STATIC_NOERR
 
     /* Sanity check */
-    HDassert(f);
+    HDassert(ctx);
 
-    /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5B2_test_ctx_t)))
-        HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate callback context")
+    H5F_ENCODE_LENGTH_LEN(raw, ((const H5B2_test_rec_t *)nrecord)->key, ctx->sizeof_size);
+    H5F_ENCODE_LENGTH_LEN(raw, ((const H5B2_test_rec_t *)nrecord)->val, ctx->sizeof_size);
 
-    /* Determine the size of addresses & lengths in the file */
-    ctx->sizeof_size = H5F_SIZEOF_SIZE(f);
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5B2__test2_encode() */
 
-    /* Set return value */
-    ret_value = ctx;
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2__test2_decode
+ *
+ * Purpose:	Decode raw disk form of record into native form
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 25, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2__test2_decode(const uint8_t *raw, void *nrecord, void *_ctx)
+{
+    H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx;       /* Callback context structure */
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5B2__test_crt_dbg_context() */
+    FUNC_ENTER_STATIC_NOERR
+
+    /* Sanity check */
+    HDassert(ctx);
+
+    H5F_DECODE_LENGTH_LEN(raw, ((H5B2_test_rec_t *)nrecord)->key, ctx->sizeof_size);
+    H5F_DECODE_LENGTH_LEN(raw, ((H5B2_test_rec_t *)nrecord)->val, ctx->sizeof_size);
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5B2__test2_decode() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2__test2_debug
+ *
+ * Purpose:	Debug native form of record
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 25, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2__test2_debug(FILE *stream, int indent, int fwidth, const void *record,
+    const void H5_ATTR_UNUSED *_udata)
+{
+    FUNC_ENTER_STATIC_NOERR
+
+    HDassert(record);
+
+    HDfprintf(stream, "%*s%-*s (%Hu, %Hu)\n", indent, "", fwidth, "Record:",
+        ((const H5B2_test_rec_t *)record)->key,
+        ((const H5B2_test_rec_t *)record)->val);
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5B2__test2_debug() */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Gbtree2.c b/src/H5Gbtree2.c
index b464930..1a99b12 100644
--- a/src/H5Gbtree2.c
+++ b/src/H5Gbtree2.c
@@ -114,9 +114,7 @@ const H5B2_class_t H5G_BT2_NAME[1]={{   /* B-tree class information */
     H5G_dense_btree2_name_compare,      /* Record comparison callback */
     H5G_dense_btree2_name_encode,       /* Record encoding callback */
     H5G_dense_btree2_name_decode,       /* Record decoding callback */
-    H5G_dense_btree2_name_debug,        /* Record debugging callback */
-    NULL,                               /* Create debugging context */
-    NULL                                /* Destroy debugging context */
+    H5G_dense_btree2_name_debug         /* Record debugging callback */
 }};
 
 /* v2 B-tree class for indexing 'creation order' field of links */
@@ -130,9 +128,7 @@ const H5B2_class_t H5G_BT2_CORDER[1]={{ /* B-tree class information */
     H5G_dense_btree2_corder_compare,    /* Record comparison callback */
     H5G_dense_btree2_corder_encode,     /* Record encoding callback */
     H5G_dense_btree2_corder_decode,     /* Record decoding callback */
-    H5G_dense_btree2_corder_debug,      /* Record debugging callback */
-    NULL,                               /* Create debugging context */
-    NULL                                /* Destroy debugging context */
+    H5G_dense_btree2_corder_debug       /* Record debugging callback */
 }};
 
 /*****************************/
diff --git a/src/H5HFbtree2.c b/src/H5HFbtree2.c
index d82de93..a79bf58 100644
--- a/src/H5HFbtree2.c
+++ b/src/H5HFbtree2.c
@@ -71,7 +71,6 @@ typedef struct H5HF_huge_bt2_ctx_t {
 /* Common callbacks */
 static void *H5HF__huge_bt2_crt_context(void *udata);
 static herr_t H5HF__huge_bt2_dst_context(void *ctx);
-static void *H5HF__huge_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 
 /* Callbacks for indirect objects */
 static herr_t H5HF__huge_bt2_indir_store(void *native, const void *udata);
@@ -127,9 +126,7 @@ const H5B2_class_t H5HF_HUGE_BT2_INDIR[1]={{ /* B-tree class information */
     H5HF__huge_bt2_indir_compare,           /* Record comparison callback */
     H5HF__huge_bt2_indir_encode,            /* Record encoding callback */
     H5HF__huge_bt2_indir_decode,            /* Record decoding callback */
-    H5HF__huge_bt2_indir_debug,             /* Record debugging callback */
-    H5HF__huge_bt2_crt_dbg_context,         /* Create debugging context */
-    H5HF__huge_bt2_dst_context              /* Destroy debugging context */
+    H5HF__huge_bt2_indir_debug              /* Record debugging callback */
 }};
 
 /* v2 B-tree class for indirectly accessed, filtered 'huge' objects */
@@ -143,9 +140,7 @@ const H5B2_class_t H5HF_HUGE_BT2_FILT_INDIR[1]={{ /* B-tree class information */
     H5HF__huge_bt2_filt_indir_compare,      /* Record comparison callback */
     H5HF__huge_bt2_filt_indir_encode,       /* Record encoding callback */
     H5HF__huge_bt2_filt_indir_decode,       /* Record decoding callback */
-    H5HF__huge_bt2_filt_indir_debug,        /* Record debugging callback */
-    H5HF__huge_bt2_crt_dbg_context,         /* Create debugging context */
-    H5HF__huge_bt2_dst_context              /* Destroy debugging context */
+    H5HF__huge_bt2_filt_indir_debug         /* Record debugging callback */
 }};
 
 /* v2 B-tree class for directly accessed 'huge' objects */
@@ -159,9 +154,7 @@ const H5B2_class_t H5HF_HUGE_BT2_DIR[1]={{  /* B-tree class information */
     H5HF__huge_bt2_dir_compare,             /* Record comparison callback */
     H5HF__huge_bt2_dir_encode,              /* Record encoding callback */
     H5HF__huge_bt2_dir_decode,              /* Record decoding callback */
-    H5HF__huge_bt2_dir_debug,               /* Record debugging callback */
-    H5HF__huge_bt2_crt_dbg_context,         /* Create debugging context */
-    H5HF__huge_bt2_dst_context              /* Destroy debugging context */
+    H5HF__huge_bt2_dir_debug                /* Record debugging callback */
 }};
 
 /* v2 B-tree class for directly accessed, filtered 'huge' objects */
@@ -175,9 +168,7 @@ const H5B2_class_t H5HF_HUGE_BT2_FILT_DIR[1]={{ /* B-tree class information */
     H5HF__huge_bt2_filt_dir_compare,        /* Record comparison callback */
     H5HF__huge_bt2_filt_dir_encode,         /* Record encoding callback */
     H5HF__huge_bt2_filt_dir_decode,         /* Record decoding callback */
-    H5HF__huge_bt2_filt_dir_debug,          /* Record debugging callback */
-    H5HF__huge_bt2_crt_dbg_context,         /* Create debugging context */
-    H5HF__huge_bt2_dst_context              /* Destroy debugging context */
+    H5HF__huge_bt2_filt_dir_debug           /* Record debugging callback */
 }};
 
 /*****************************/
@@ -270,46 +261,6 @@ H5HF__huge_bt2_dst_context(void *_ctx)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5HF__huge_bt2_crt_dbg_context
- *
- * Purpose:	Create context for debugging callback
- *
- * Return:	Success:	non-NULL
- *		Failure:	NULL
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, December 1, 2009
- *
- *-------------------------------------------------------------------------
- */
-static void *
-H5HF__huge_bt2_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr)
-{
-    H5HF_huge_bt2_ctx_t *ctx;   /* Callback context structure */
-    void *ret_value = NULL;     /* Return value */
-
-    FUNC_ENTER_STATIC
-
-    /* Sanity check */
-    HDassert(f);
-
-    /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5HF_huge_bt2_ctx_t)))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate callback context")
-
-    /* Determine the size of addresses & lengths in the file */
-    ctx->sizeof_addr = H5F_SIZEOF_ADDR(f);
-    ctx->sizeof_size = H5F_SIZEOF_SIZE(f);
-
-    /* Set return value */
-    ret_value = ctx;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5HF__huge_bt2_crt_dbg_context() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5HF__huge_bt2_indir_found
  *
  * Purpose:	Retrieve record for indirectly accessed 'huge' object, when
diff --git a/src/H5SMbtree2.c b/src/H5SMbtree2.c
index e533ae8..0110c1e 100644
--- a/src/H5SMbtree2.c
+++ b/src/H5SMbtree2.c
@@ -50,7 +50,6 @@ static herr_t H5SM__bt2_dst_context(void *ctx);
 static herr_t H5SM__bt2_store(void *native, const void *udata);
 static herr_t H5SM__bt2_debug(FILE *stream, int indent, int fwidth,
     const void *record, const void *_udata);
-static void *H5SM__bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 
 
 /*****************************/
@@ -67,9 +66,7 @@ const H5B2_class_t H5SM_INDEX[1]={{   /* B-tree class information */
     H5SM__message_compare,            /* Record comparison callback */
     H5SM__message_encode,             /* Record encoding callback */
     H5SM__message_decode,             /* Record decoding callback */
-    H5SM__bt2_debug,                  /* Record debugging callback */
-    H5SM__bt2_crt_dbg_context,	      /* Create debugging context */
-    H5SM__bt2_dst_context 	      /* Destroy debugging context */
+    H5SM__bt2_debug                   /* Record debugging callback */
 }};
 
 
@@ -218,45 +215,6 @@ H5SM__bt2_debug(FILE *stream, int indent, int fwidth,
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5SM__bt2_crt_dbg_context
- *
- * Purpose:	Create context for debugging callback
- *
- * Return:	Success:	non-NULL
- *		Failure:	NULL
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, December 1, 2009
- *
- *-------------------------------------------------------------------------
- */
-static void *
-H5SM__bt2_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr)
-{
-    H5SM_bt2_ctx_t *ctx;        /* Callback context structure */
-    void *ret_value = NULL;     /* Return value */
-
-    FUNC_ENTER_STATIC
-
-    /* Sanity check */
-    HDassert(f);
-
-    /* Allocate callback context */
-    if(NULL == (ctx = H5FL_MALLOC(H5SM_bt2_ctx_t)))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "can't allocate callback context")
-
-    /* Determine the size of addresses & lengths in the file */
-    ctx->sizeof_addr = H5F_SIZEOF_ADDR(f);
-
-    /* Set return value */
-    ret_value = ctx;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5SM__bt2_crt_dbg_context() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5SM_bt2_convert_to_list_op
  *
  * Purpose:	An H5B2_remove_t callback function to convert a SOHM
diff --git a/test/btree2.c b/test/btree2.c
index 7a2432c..04c94fd 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -36,8 +36,11 @@ const char *FILENAME[] = {
 };
 
 #define INSERT_SPLIT_ROOT_NREC  63
-#define INSERT_MANY             (1000*1000)
-#define FIND_MANY               (INSERT_MANY/100)
+#define INSERT_SPLIT_ROOT_NREC_REC  64
+#define INSERT_MANY             (1000 * 1000)
+#define INSERT_MANY_REC         (2600 * 1000)
+#define FIND_MANY               (INSERT_MANY / 100)
+#define FIND_MANY_REC           (INSERT_MANY_REC / 100)
 #define FIND_NEIGHBOR           2000
 #define DELETE_SMALL            20
 #define DELETE_MEDIUM           200
@@ -63,7 +66,7 @@ typedef struct bt2_test_param_t {
  *-------------------------------------------------------------------------
  */
 static int
-init_cparam(H5B2_create_t *cparam)
+init_cparam(H5B2_create_t *cparam, H5B2_create_t *cparam2)
 {
     /* Wipe out background */
     HDmemset(cparam, 0, sizeof(*cparam));
@@ -75,6 +78,16 @@ init_cparam(H5B2_create_t *cparam)
     cparam->split_percent = 100;
     cparam->merge_percent = 40;
 
+    /* Wipe out background */
+    HDmemset(cparam2, 0, sizeof(*cparam2));
+
+    /* General parameters */
+    cparam2->cls = H5B2_TEST2;
+    cparam2->node_size = (size_t)1024;
+    cparam2->rrec_size = (size_t)16;
+    cparam2->split_percent = 100;
+    cparam2->merge_percent = 40;
+
     return(0);
 } /* init_cparam() */
 
@@ -154,6 +167,47 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	reopen_file
+ *
+ * Purpose:	Re-open the file
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, December 28, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+reopen_file(hid_t *file, H5F_t **f, hid_t fapl)
+{
+    char	filename[1024];         /* Filename to use */
+
+    /* Set the filename to use for this test (dependent on fapl) */
+    h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
+
+    /* Create the file to work on */
+    if((*file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+        TEST_ERROR
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (*f = (H5F_t *)H5I_object(*file)))
+        STACK_ERROR
+
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(*f) < 0)
+        STACK_ERROR
+
+    /* Success */
+    return(0);
+
+error:
+    return(-1);
+} /* end create_file() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	reopen_btree
  *
  * Purpose:	Perform common "re-open" operations on B-tree for testing
@@ -237,11 +291,11 @@ error:
  *-------------------------------------------------------------------------
  */
 static int
-check_node_depth(H5B2_t *bt2, hid_t dxpl, hsize_t record, unsigned depth)
+check_node_depth(H5B2_t *bt2, hid_t dxpl, void *record, unsigned depth)
 {
     int         rec_depth;              /* Depth of record in B-tree */
 
-    if((rec_depth = H5B2_get_node_depth_test(bt2, dxpl, &record)) < 0)
+    if((rec_depth = H5B2_get_node_depth_test(bt2, dxpl, record)) < 0)
         FAIL_STACK_ERROR
     if((unsigned)rec_depth != depth)
         TEST_ERROR
@@ -285,7 +339,7 @@ check_node_info(H5B2_t *bt2, hid_t dxpl, hsize_t record,
 
 error:
     return(-1);
-} /* end check_node_depth() */
+} /* end check_node_info() */
 
 
 /*-------------------------------------------------------------------------
@@ -294,7 +348,6 @@ error:
  * Purpose:	v2 B-tree iterator callback
  *
  * Return:	Success:	0
- *
  *		Failure:	1
  *
  * Programmer:	Quincey Koziol
@@ -317,12 +370,41 @@ iter_cb(const void *_record, void *_op_data)
 
 
 /*-------------------------------------------------------------------------
+ * Function:	iter_rec_cb
+ *
+ * Purpose:	v2 B-tree iterator callback for H5B2_test_rec_t records
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 25, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+iter_rec_cb(const void *_record, void *_op_data)
+{
+    const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record;
+    H5B2_test_rec_t *idx = (H5B2_test_rec_t *)_op_data;
+
+    if(record->key != idx->key)
+        return(H5_ITER_ERROR);
+    if(record->val != idx->val)
+        return(H5_ITER_ERROR);
+
+    idx->key++;
+    idx->val += 2;
+    return(H5_ITER_CONT);
+} /* end iter_rec_cb() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	find_cb
  *
  * Purpose:	v2 B-tree find callback
  *
  * Return:	Success:	TRUE/FALSE
- *
  *		Failure:	FAIL
  *
  * Programmer:	Quincey Koziol
@@ -344,6 +426,33 @@ find_cb(const void *_record, void *_op_data)
 
 
 /*-------------------------------------------------------------------------
+ * Function:	find_rec_cb
+ *
+ * Purpose:	v2 B-tree find callback for H5B2_test_rec_t records
+ *
+ * Return:	Success:	TRUE/FALSE
+ *		Failure:	FAIL
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 25, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+find_rec_cb(const void *_record, void *_op_data)
+{
+    const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record;
+    H5B2_test_rec_t *search = (H5B2_test_rec_t *)_op_data;
+
+    if(record->key != search->key)
+        return(FALSE);
+
+    search->val = record->val;
+    return(TRUE);
+} /* end find_rec_cb() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	find_dec_cb
  *
  * Purpose:	v2 B-tree find callback for indexing in decreasing order
@@ -372,6 +481,34 @@ find_dec_cb(const void *_record, void *_op_data)
 
 
 /*-------------------------------------------------------------------------
+ * Function:	index_rec_cb
+ *
+ * Purpose:	v2 B-tree index callback for H5B2_test_rec_t records
+ *
+ * Return:	Success:	TRUE/FALSE
+ *		Failure:	FAIL
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 25, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+index_rec_cb(const void *_record, void *_op_data)
+{
+    const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record;
+    H5B2_test_rec_t *search = (H5B2_test_rec_t *)_op_data;
+
+    HDassert(record);
+    HDassert(search);
+
+    search->key = record->key;
+    search->val = record->val;
+    return(TRUE);
+} /* end index_rec_cb() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	neighbor_cb
  *
  * Purpose:	v2 B-tree neighbor callback
@@ -425,6 +562,57 @@ modify_cb(void *_record, void *_op_data, hbool_t *changed)
 
 
 /*-------------------------------------------------------------------------
+ * Function:	modify_rec_cb
+ *
+ * Purpose:	v2 B-tree modify callback for H5B2_test_rec_t records
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 25, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+modify_rec_cb(void *_record, void *_op_data, hbool_t *changed)
+{
+    H5B2_test_rec_t *record = (H5B2_test_rec_t *)_record;
+    H5B2_test_rec_t *modify = (H5B2_test_rec_t *)_op_data;
+
+    HDassert(record->key == modify->key);
+    record->val = modify->val;
+    *changed = TRUE;
+
+    return(0);
+} /* end modify_rec_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	no_modify_cb
+ *
+ * Purpose:	v2 B-tree modify callback for updates which shouldn't change
+ *		the record (ie. inserting not modifying)
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, December 23, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+no_modify_cb(void H5_ATTR_UNUSED *_record, void H5_ATTR_UNUSED *_op_data,
+    hbool_t *changed)
+{
+    *changed = FALSE;
+
+    return(1);
+} /* end no_modify_cb() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	remove_cb
  *
  * Purpose:	v2 B-tree remove callback
@@ -717,7 +905,8 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC - 1);
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)0) < 0)
+    record = (hsize_t)33;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -734,7 +923,8 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)1) < 0)
+    record = (hsize_t)33;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -755,7 +945,8 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC + 2);
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)1) < 0)
+    record = (hsize_t)33;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -889,7 +1080,8 @@ test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)INSERT_SPLIT_ROOT_NREC, (unsigned)1) < 0)
+    record = (hsize_t)INSERT_SPLIT_ROOT_NREC;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -909,7 +1101,8 @@ test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC + (INSERT_SPLIT_ROOT_NREC / 2) + 1);
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)((INSERT_SPLIT_ROOT_NREC / 2) + (INSERT_SPLIT_ROOT_NREC / 4) + 1), (unsigned)1) < 0)
+    record = (hsize_t)((INSERT_SPLIT_ROOT_NREC / 2) + (INSERT_SPLIT_ROOT_NREC / 4) + 1);
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Close the v2 B-tree */
@@ -940,7 +1133,8 @@ test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)(INSERT_SPLIT_ROOT_NREC / 2), (unsigned)1) < 0)
+    record = (hsize_t)(INSERT_SPLIT_ROOT_NREC / 2);
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -959,7 +1153,8 @@ test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC + (INSERT_SPLIT_ROOT_NREC / 2) + 1;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)((INSERT_SPLIT_ROOT_NREC / 2) + (INSERT_SPLIT_ROOT_NREC / 4) + 1), (unsigned)1) < 0)
+    record = (hsize_t)((INSERT_SPLIT_ROOT_NREC / 2) + (INSERT_SPLIT_ROOT_NREC / 4) + 1);
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Close the v2 B-tree */
@@ -1041,7 +1236,7 @@ test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = INSERT_SPLIT_ROOT_NREC + (INSERT_SPLIT_ROOT_NREC / 2);
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1061,10 +1256,10 @@ test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 31;
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 63;
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Close the v2 B-tree */
@@ -1096,7 +1291,7 @@ test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = (INSERT_SPLIT_ROOT_NREC / 2);
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1115,9 +1310,11 @@ test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = 2 * INSERT_SPLIT_ROOT_NREC;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)62, (unsigned)1) < 0)
+    record = 62;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0)
+    record = 94;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Close the v2 B-tree */
@@ -1202,7 +1399,7 @@ test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = (2 * INSERT_SPLIT_ROOT_NREC);
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1222,10 +1419,10 @@ test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = (INSERT_SPLIT_ROOT_NREC / 2);
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = (INSERT_SPLIT_ROOT_NREC + (INSERT_SPLIT_ROOT_NREC / 2) + 1);
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1244,9 +1441,11 @@ test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (2 * INSERT_SPLIT_ROOT_NREC) + (INSERT_SPLIT_ROOT_NREC / 2) + 1;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)52, (unsigned)1) < 0)
+    record = 52;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)105, (unsigned)1) < 0)
+    record = 105;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1343,7 +1542,7 @@ test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = (2 * INSERT_SPLIT_ROOT_NREC) + (INSERT_SPLIT_ROOT_NREC / 2);
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1362,11 +1561,14 @@ test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = 3 * INSERT_SPLIT_ROOT_NREC;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)62, (unsigned)1) < 0)
+    record = 62;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0)
+    record = 94;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)126, (unsigned)1) < 0)
+    record = 126;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1464,7 +1666,8 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + 1;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)948, (unsigned)2) < 0)
+    record = 948;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1513,7 +1716,8 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam,
         FAIL_STACK_ERROR
 
     /* Check with B-tree */
-    if(check_node_depth(bt2, dxpl, (hsize_t)948, (unsigned)2) < 0)
+    record = 948;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
 
     /* Attempt to find existant record in internal node of level-2 B-tree */
@@ -1522,7 +1726,8 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam,
         FAIL_STACK_ERROR
 
     /* Check with B-tree */
-    if(check_node_depth(bt2, dxpl, (hsize_t)505, (unsigned)1) < 0)
+    record = 505;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Attempt to find existant record in leaf of level-2 B-tree */
@@ -1531,7 +1736,8 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam,
         FAIL_STACK_ERROR
 
     /* Check with B-tree */
-    if(check_node_depth(bt2, dxpl, (hsize_t)555, (unsigned)0) < 0)
+    record = 555;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Attempt to index non-existant record in level-2 B-tree */
@@ -1642,11 +1848,14 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2);
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0)
+    record = 1008;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1859, (unsigned)1) < 0)
+    record = 1859;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1921, (unsigned)0) < 0)
+    record = 1921;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1663,11 +1872,14 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2) + 1;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0)
+    record = 1008;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1875, (unsigned)1) < 0)
+    record = 1875;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1922, (unsigned)0) < 0)
+    record = 1922;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     PASSED();
@@ -1683,11 +1895,14 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2) + 1;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0)
+    record = 1008;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0)
+    record = 94;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)32, (unsigned)0) < 0)
+    record = 32;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Add more records to left-most leaf, to force a 2->1 split and then a
@@ -1704,11 +1919,14 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + 1;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0)
+    record = 1008;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)47, (unsigned)1) < 0)
+    record = 47;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)0, (unsigned)0) < 0)
+    record = 0;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     PASSED();
@@ -1724,13 +1942,17 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + 1;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) /* Record in root node */
+    record = 1008;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0) /* Record in root node */
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)535, (unsigned)1) < 0) /* Record in middle node before insertion point */
+    record = 535;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0) /* Record in middle node before insertion point */
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)630, (unsigned)1) < 0) /* Record in middle node after insertion point */
+    record = 630;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0) /* Record in middle node after insertion point */
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)568, (unsigned)0) < 0) /* Record in leaf node just after insertion point */
+    record = 568;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0) /* Record in leaf node just after insertion point */
         TEST_ERROR
 
     /* Add more records to middle leaf, to force a split and a 3 node redistribution on middle leaf */
@@ -1745,13 +1967,17 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + (INSERT_SPLIT_ROOT_NREC / 2) + 2;
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) /* Record in root node */
+    record = 1008;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0) /* Record in root node */
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)524, (unsigned)1) < 0) /* Record in middle node before insertion point */
+    record = 524;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0) /* Record in middle node before insertion point */
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)577, (unsigned)1) < 0) /* Record in middle node after insertion point */
+    record = 577;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0) /* Record in middle node after insertion point */
         TEST_ERROR
-    if(check_node_depth(bt2, dxpl, (hsize_t)568, (unsigned)0) < 0) /* Record in leaf node just after insertion point */
+    record = 568;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0) /* Record in leaf node just after insertion point */
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1851,13 +2077,13 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 946;       /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 1797;       /* Right-most record in right internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 1859;      /* Right-most record in right-most leaf */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -1877,16 +2103,16 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 946;       /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 1828;      /* Next-to-right-most record in right-most internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 1860;      /* Right-most record in right-most internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 1891;      /* Right-most record in right-most leaf */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     PASSED();
@@ -1903,13 +2129,13 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 946;       /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 63;        /* Left-most record in left-most internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 1;        /* Left-most record in left-most leaf */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Add another record to left-most leaf, to force a 1->2 node split on left leaf */
@@ -1923,16 +2149,16 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 946;       /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 63;        /* Left-most record in left-most internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 32;        /* Left-most record in left internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 0;        /* Left-most record in left-most leaf */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     PASSED();
@@ -1949,16 +2175,16 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 946;       /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 504;       /* Record in internal node just before insertion point */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 568;       /* Record in internal node just after insertion point */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 506;       /* Record in leaf node just after insertion point */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Add another record to middle leaf, to force a node split on middle leaf */
@@ -1972,19 +2198,19 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 946;       /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 504;       /* Left-most record of split in left internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 537;       /* Middle record of split in left internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 568;       /* Right-most record of split in left internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 506;       /* Record in leaf node just after insertion point */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2081,13 +2307,13 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1318;      /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3114;      /* Right-most record in right internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 3145;      /* Right-most record in right leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2105,13 +2331,13 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1822;      /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3114;      /* Right-most record in right internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 3146;      /* Right-most record in right leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     PASSED();
@@ -2128,13 +2354,13 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1822;      /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 436;      /* Left-most record in left internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 374;      /* Left-most record in left leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Force left-most internal node to redistribute */
@@ -2150,13 +2376,13 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1570;      /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 61;      /* Left-most record in left internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 0;      /* Left-most record in left leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2253,13 +2479,13 @@ test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 2759;      /* Record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 4555;      /* Right-most record in right internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 4586;      /* Right-most record in right leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2277,16 +2503,16 @@ test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 2759;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3704;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 4555;      /* Right-most record in right internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 4387;      /* Right-most record in right leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     PASSED();
@@ -2303,13 +2529,13 @@ test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 2759;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 932;      /* Left-most record in left internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 870;      /* Left-most record in left leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Force left-most internal node to split */
@@ -2325,16 +2551,16 @@ test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 870;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 1814;      /* Next-to-left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 61;      /* Left-most record in left internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 0;      /* Left-most record in left leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2436,19 +2662,19 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3703;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 2267;      /* Record to left of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 3199;      /* Record to right of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 3137;      /* Record just above insertion point in leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2468,19 +2694,19 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3703;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3104;      /* Record to left of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 3137;      /* Record to right of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 3135;      /* Record just above insertion point in leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2498,21 +2724,21 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1574;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3104;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
 #ifdef NONE
     record = 2862;      /* Record to left of insertion point in right internal node (now) */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 #endif /* NONE */
     record = 3137;      /* Record to right of insertion point in right internal node (now) */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 3135;      /* Record just above insertion point in leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2619,19 +2845,19 @@ test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3703;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 1952;      /* Record to left of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 2884;      /* Record to right of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 2822;      /* Record just after insertion point in leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Insert records to fill up middle internal node */
@@ -2647,19 +2873,19 @@ test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3703;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 2789;      /* Record to left of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 2822;      /* Record to right of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 2823;      /* Record just above insertion point in leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2677,24 +2903,24 @@ test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam,
     if(check_stats(bt2, &bt2_stat) < 0)
         TEST_ERROR
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 2789;      /* Middle record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     record = 3703;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
 #ifdef NONE
     record = 3049;      /* Record to left of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 #endif /* NONE */
     record = 2822;      /* Record to right of insertion point in middle internal node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 2823;      /* Record just above insertion point in leaf node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     /* Check for closing & re-opening the B-tree */
@@ -2967,6 +3193,2019 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	test_update_basic
+ *
+ * Purpose:	Basic tests for the v2 B-tree update operation
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, December 23, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_update_basic(hid_t fapl, const H5B2_create_t *cparam,
+    const bt2_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+    H5B2_test_rec_t record;             /* Record to insert into tree */
+    H5B2_test_rec_t modify;             /* Modified value */
+    H5B2_test_rec_t find;               /* Record to find */
+    herr_t      ret;                    /* Generic error return value */
+
+    /* Create the file for the test */
+    if(create_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /*
+     * Test insert record into empty v2 B-tree
+     */
+    TESTING("B-tree update: inserting first record in empty B-tree");
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    record.key = 42;
+    record.val = 72;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Attempt to find non-existant record in B-tree with 1 record */
+    /* (Should not be found, but not fail) */
+    find.key = 10;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        FAIL_STACK_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Try again with NULL 'op' */
+    /* (Should not be found, but not fail) */
+    if(H5B2_find(bt2, dxpl, &find, NULL, NULL) != FALSE)
+        FAIL_STACK_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to find existant record in B-tree with 1 record */
+    find.key = 42;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != 72)
+        TEST_ERROR
+
+    /* Try again with NULL 'op' */
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, NULL, NULL) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to index non-existant record in B-tree with 1 record */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Attempt to index existing record in B-tree with 1 record */
+    find.key = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 42)
+        TEST_ERROR
+    if(find.val != 72)
+        TEST_ERROR
+
+    PASSED();
+
+
+    /*
+     * Test update only record into v2 B-tree
+     */
+    TESTING("B-tree update: update only record in B-tree");
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    modify.key = 42;
+    modify.val = 43;
+    if(H5B2_update(bt2, dxpl, &modify, modify_rec_cb, &modify) < 0)
+        FAIL_STACK_ERROR
+
+    /* Attempt to find non-existant record in B-tree with 1 record */
+    /* (Should not be found, but not fail) */
+    find.key = 10;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        FAIL_STACK_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Try again with NULL 'op' */
+    /* (Should not be found, but not fail) */
+    if(H5B2_find(bt2, dxpl, &find, NULL, NULL) != FALSE)
+        FAIL_STACK_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to find modified record in B-tree with 1 record */
+    find.key = 42;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != 43)
+        TEST_ERROR
+
+    /* Try again with NULL 'op' */
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, NULL, NULL) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to index non-existant record in B-tree with 1 record */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Attempt to index existing record in B-tree with 1 record */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 42)
+        TEST_ERROR
+    if(find.val != 43)
+        TEST_ERROR
+
+    PASSED();
+
+
+    /*
+     * Test inserting more records into v2 B-tree
+     */
+    TESTING("B-tree update: insert several records");
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /*
+     * Test inserting second record into v2 B-tree, before all other records
+     */
+    record.key = 34;
+    record.val = 11;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /*
+     * Test inserting third record into v2 B-tree, after all other records
+     */
+    record.key = 56;
+    record.val = 12;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /*
+     * Test inserting fourth record into v2 B-tree, in the middle of other records
+     */
+    record.key = 38;
+    record.val = 13;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Attempt to find non-existant record in level-0 B-tree with several records */
+    /* (Should not be found, but not fail) */
+    find.key = 10;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        TEST_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to find existant record in level-0 B-tree with several records */
+    find.key = 56;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        TEST_ERROR
+    if(find.val != 12)
+        TEST_ERROR
+
+    /* Attempt to index non-existant record in B-tree with several records */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Attempt to index existing record in B-tree with several records */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, index_rec_cb, &find) < 0)
+        TEST_ERROR
+    if(find.key != 34)
+        TEST_ERROR
+    if(find.val != 11)
+        TEST_ERROR
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1, index_rec_cb, &find) < 0)
+        TEST_ERROR
+    if(find.key != 38)
+        TEST_ERROR
+    if(find.val != 13)
+        TEST_ERROR
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)2, index_rec_cb, &find) < 0)
+        TEST_ERROR
+    if(find.key != 42)
+        TEST_ERROR
+    if(find.val != 43)
+        TEST_ERROR
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)3, index_rec_cb, &find) < 0)
+        TEST_ERROR
+    if(find.key != 56)
+        TEST_ERROR
+    if(find.val != 12)
+        TEST_ERROR
+
+    PASSED();
+
+
+    /*
+     * Test updating all existing records in v2 B-tree
+     */
+    TESTING("B-tree update: update several records");
+
+    record.key = 34;
+    modify.key = 34;
+    modify.val = 21;
+    if(H5B2_update(bt2, dxpl, &record, modify_rec_cb, &modify) < 0)
+        FAIL_STACK_ERROR
+    record.key = 38;
+    modify.key = 38;
+    modify.val = 23;
+    if(H5B2_update(bt2, dxpl, &record, modify_rec_cb, &modify) < 0)
+        FAIL_STACK_ERROR
+    record.key = 42;
+    modify.key = 42;
+    modify.val = 24;
+    if(H5B2_update(bt2, dxpl, &record, modify_rec_cb, &modify) < 0)
+        FAIL_STACK_ERROR
+    record.key = 56;
+    modify.key = 56;
+    modify.val = 22;
+    if(H5B2_update(bt2, dxpl, &record, modify_rec_cb, &modify) < 0)
+        FAIL_STACK_ERROR
+
+    /* Attempt to find non-existant record in level-0 B-tree with several records */
+    /* (Should not be found, but not fail) */
+    find.key = 41;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        TEST_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to find existant record in level-0 B-tree with several record */
+    find.key = 56;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        TEST_ERROR
+    if(find.val != 22)
+        TEST_ERROR
+
+    /* Attempt to index non-existant record in B-tree with several records */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Attempt to index existing record in B-tree with several records */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, index_rec_cb, &find) < 0)
+        TEST_ERROR
+    if(find.key != 34)
+        TEST_ERROR
+    if(find.val != 21)
+        TEST_ERROR
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1, index_rec_cb, &find) < 0)
+        TEST_ERROR
+    if(find.key != 38)
+        TEST_ERROR
+    if(find.val != 23)
+        TEST_ERROR
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)2, index_rec_cb, &find) < 0)
+        TEST_ERROR
+    if(find.key != 42)
+        TEST_ERROR
+    if(find.val != 24)
+        TEST_ERROR
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)3, index_rec_cb, &find) < 0)
+        TEST_ERROR
+    if(find.key != 56)
+        TEST_ERROR
+    if(find.val != 22)
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close the file */
+    if(H5Fclose(file) < 0)
+        TEST_ERROR
+
+    PASSED();
+
+
+    /* All tests passed */
+    return(0);
+
+error:
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return(1);
+} /* test_update_basic() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_update_split_root
+ *
+ * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ *              records to split the root node and force the tree to depth 1.
+ *              It also continues to add a few more records to each of the
+ *              left and right leaf nodes after the split
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, December 23, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_update_split_root(hid_t fapl, const H5B2_create_t *cparam,
+    const bt2_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+    H5B2_test_rec_t record;             /* Record to insert into tree */
+    H5B2_test_rec_t modify;             /* Modified value */
+    H5B2_test_rec_t find;               /* Record to find */
+    H5B2_test_rec_t idx;                /* Index within B-tree, for iterator */
+    H5B2_stat_t bt2_stat;               /* Statistics about B-tree created */
+    unsigned    u;                      /* Local index variable */
+    herr_t      ret;                    /* Generic error return value */
+
+    /*
+     * Test inserting enough records into v2 B-tree to split the root node
+     */
+    TESTING("B-tree update: split root");
+
+    /* Create the file for the test */
+    if(create_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert records to fill root leaf node */
+    for(u = 0; u < (INSERT_SPLIT_ROOT_NREC_REC - 1); u++) {
+        record.key = u + 2;
+        record.val = u * 2 + 4;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 0;
+    bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC_REC - 1);
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 33;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Insert record to split root leaf node */
+    record.key = INSERT_SPLIT_ROOT_NREC_REC + 1;
+    record.val = (INSERT_SPLIT_ROOT_NREC_REC - 1) * 2 + 4;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 33;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    idx.key = 2;
+    idx.val = 4;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &idx) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(idx.key != (INSERT_SPLIT_ROOT_NREC_REC + 2))
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Modify all records */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u + 2;
+        modify.key = u + 2;
+        modify.val = u * 2 + 5;
+        if(H5B2_update(bt2, dxpl, &record, modify_rec_cb, &modify) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 33;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    idx.key = 2;
+    idx.val = 5;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &idx) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(idx.key != (INSERT_SPLIT_ROOT_NREC_REC + 2))
+        TEST_ERROR
+
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Insert a couple more records, on the left side of the B-tree */
+    record.key = 0;
+    record.val = 1;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+    record.key = 1;
+    record.val = 3;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC_REC + 2);
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 33;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    idx.key = 0;
+    idx.val = 1;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &idx) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(idx.key != (INSERT_SPLIT_ROOT_NREC_REC + 2))
+        TEST_ERROR
+
+    /* Attempt to find non-existant record in level-1 B-tree */
+    /* (Should not be found, but not fail) */
+    find.key = 800;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        TEST_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to find existant record in root of level-1 B-tree */
+    find.key = 33;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.key != 33)
+        TEST_ERROR
+    if(find.val != 67)
+        TEST_ERROR
+
+    /* Attempt to find existant record in leaf of level-1 B-tree */
+    find.key = 56;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.key != 56)
+        TEST_ERROR
+    if(find.val != 113)
+        TEST_ERROR
+
+    /* Attempt to index non-existant record in level-1 B-tree */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC + 2), index_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Attempt to index existing record in root of level-1 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)33, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 33)
+        TEST_ERROR
+    if(find.val != 67)
+        TEST_ERROR
+
+    /* Attempt to index existing record in left leaf of level-1 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 0)
+        TEST_ERROR
+    if(find.val != 1)
+        TEST_ERROR
+
+    /* Attempt to index existing record in right leaf of level-1 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)50, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 50)
+        TEST_ERROR
+    if(find.val != 101)
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    if(H5Fclose(file) < 0)
+        TEST_ERROR
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* test_update_split_root() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_update_level1_2leaf_redistrib
+ *
+ * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ *              records to split the root node and force the tree to depth 1.
+ *              It continues to add a more records to the each of the
+ *              left and right leaf nodes after the split to force a 2 node
+ *              redistribution
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, December 26, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_update_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
+    const bt2_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+    H5B2_test_rec_t record;             /* Record to insert into tree */
+    H5B2_stat_t bt2_stat;               /* Statistics about B-tree created */
+    unsigned    u;                      /* Local index variable */
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: redistribute 2 leaves in level 1 B-tree (l->r)");
+
+    /* Create the file for the test */
+    if(create_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 leaves */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u + (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1;
+        record.val = u + (INSERT_SPLIT_ROOT_NREC_REC / 2) + 10;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+
+    /* Force redistribution from left node into right node */
+    for(u = 0; u < (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1; u++) {
+        record.key = u;
+        record.val = u + 9;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC_REC + (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1);
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC / 2) + (INSERT_SPLIT_ROOT_NREC_REC / 4);
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    PASSED();
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: redistribute 2 leaves in level 1 B-tree (r->l)");
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 leaves */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u;
+        record.val = u + 9;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC / 2) - 1;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Force redistribution from left node into right node */
+    for(u = 0; u < (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1; u++) {
+        record.key = u + INSERT_SPLIT_ROOT_NREC_REC;
+        record.val = u + INSERT_SPLIT_ROOT_NREC_REC + 9;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC + (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC / 2) + (INSERT_SPLIT_ROOT_NREC_REC / 4) - 1;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close file */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* test_update_level1_2leaf_redistrib() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_update_level1_side_split
+ *
+ * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ *              records to split the root node and force the tree to depth 1.
+ *              It continues to add a more records to the each of the
+ *              left and right leaf nodes after the split to force a 2 node
+ *              split, adding another node to the B-tree
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, December 26, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_update_level1_side_split(hid_t fapl, const H5B2_create_t *cparam,
+    const bt2_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+    H5B2_test_rec_t record;             /* Record to insert into tree */
+    H5B2_stat_t bt2_stat;               /* Statistics about B-tree created */
+    unsigned    u;                      /* Local index variable */
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: split side leaf into 2 leaves in level 1 B-tree (l->r)");
+
+    /* Create the file for the test */
+    if(create_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 leaves */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u + INSERT_SPLIT_ROOT_NREC_REC;
+        record.val = u + INSERT_SPLIT_ROOT_NREC_REC + 10;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = INSERT_SPLIT_ROOT_NREC_REC + (INSERT_SPLIT_ROOT_NREC_REC / 2) - 1;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Force left node to split */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u;
+        record.val = u + 10;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = 2 * INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 31;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+    record.key = 64;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    PASSED();
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: split side leaf into 2 leaves in level 1 B-tree (r->l)");
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 leaves */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u;
+        record.val = u + 10;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC / 2) - 1;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Force right node to split */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u + INSERT_SPLIT_ROOT_NREC_REC;
+        record.val = u + INSERT_SPLIT_ROOT_NREC_REC + 10;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = 2 * INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 63;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+    record.key = 95;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close file */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* test_update_level1_side_split() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_update_level1_3leaf_redistrib
+ *
+ * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ *              records to split the root node and force the tree to depth 1.
+ *              It continues to add a more records to the each of the
+ *              left and right leaf nodes after the split to force a 2 node
+ *              split, adding another node to the B-tree, then continues to
+ *              add records until a 3 node redistribution occurs
+ *
+ * Return:	Success:	0
+ *
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, December 26, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_update_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam,
+    const bt2_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+    H5B2_test_rec_t record;             /* Record to insert into tree */
+    H5B2_test_rec_t idx;                /* Index within B-tree, for iterator */
+    H5B2_stat_t bt2_stat;               /* Statistics about B-tree created */
+    unsigned    u;                      /* Local index variable */
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: redistribute 3 leaves in level 1 B-tree");
+
+    /* Create the file for the test */
+    if(create_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 leaves */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u + (INSERT_SPLIT_ROOT_NREC_REC + (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1);
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = (2 * INSERT_SPLIT_ROOT_NREC_REC);
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Force left node to split */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u;
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = 2 * INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC / 2) - 1;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+    record.key = INSERT_SPLIT_ROOT_NREC_REC + (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Insert records to force middle node to redistribute */
+    for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC_REC / 2) + 1); u++) {
+        record.key = u + INSERT_SPLIT_ROOT_NREC_REC;
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = (2 * INSERT_SPLIT_ROOT_NREC_REC) + (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 52;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+    record.key = 107;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    idx.key = 0;
+    idx.val = 0;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &idx) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(idx.key != ((INSERT_SPLIT_ROOT_NREC_REC * 2) + (INSERT_SPLIT_ROOT_NREC_REC / 2) + 1))
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close file */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* test_update_level1_3leaf_redistrib() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_update_level1_middle_split
+ *
+ * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ *              records to split the root node and force the tree to depth 1.
+ *              It continues to add a more records to the each of the
+ *              left and right leaf nodes after the split to force a 2 node
+ *              split, adding another node to the B-tree, then continues to
+ *              add records until a 3 node split occurs
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, December 26, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_update_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam,
+    const bt2_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+    H5B2_test_rec_t record;             /* Record to insert into tree */
+    H5B2_stat_t bt2_stat;               /* Statistics about B-tree created */
+    H5B2_test_rec_t idx;                /* Index within B-tree, for iterator */
+    unsigned    u;                      /* Local index variable */
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: split middle leaf into 2 leaves in level 1 B-tree");
+
+    /* Create the file for the test */
+    if(create_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 leaves */
+    for(u = 0; u < INSERT_SPLIT_ROOT_NREC_REC; u++) {
+        record.key = u + (INSERT_SPLIT_ROOT_NREC_REC * 2);
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = (2 * INSERT_SPLIT_ROOT_NREC_REC) + (INSERT_SPLIT_ROOT_NREC_REC / 2) - 1;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Force split from left node into right node */
+    for(u = 0; u < (INSERT_SPLIT_ROOT_NREC_REC * 2); u++) {
+        record.key = u;
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 1;
+    bt2_stat.nrecords = 3 * INSERT_SPLIT_ROOT_NREC_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 63;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+    record.key = 95;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+    record.key = 128;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    idx.key = 0;
+    idx.val = 0;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &idx) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(idx.key != (INSERT_SPLIT_ROOT_NREC_REC * 3))
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close file */
+    if(H5Fclose(file) < 0)
+        STACK_ERROR
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* test_update_level1_middle_split() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_update_make_level2
+ *
+ * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ *              records to make a level 2 B-tree
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, December 26, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam,
+    const bt2_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+    H5B2_test_rec_t record;             /* Record to insert into tree */
+    H5B2_test_rec_t find;               /* Record to find */
+    H5B2_test_rec_t idx;                /* Index within B-tree, for iterator */
+    H5B2_stat_t bt2_stat;               /* Statistics about B-tree created */
+    unsigned    u;                      /* Local index variable */
+    herr_t      ret;                    /* Generic error return value */
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: make level 2 B-tree (l->r)");
+
+    /* Create the file for the test */
+    if(create_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 internal nodes */
+    for(u = 0; u < (INSERT_SPLIT_ROOT_NREC_REC * 9); u++) {
+        record.key = u + 2;  /* Leave a gap for later insertion */
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+    for(; u < (INSERT_SPLIT_ROOT_NREC_REC * 41); u++) {
+        record.key = u + 4;  /* Leave a gap for later insertion */
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 2;
+    bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC_REC * 41);
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 1347;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Add some extra records to left-most leaf */
+    record.key = 0;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+    record.key = 1;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Add some extra records to middle leaf */
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC * 9) + 2;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC * 9) + 3;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    idx.key = 0;
+    idx.val = 0;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &idx) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(idx.key != ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 4))
+        TEST_ERROR
+
+    /* Attempt to find non-existant record in level-2 B-tree */
+    /* (Should not be found, but not fail) */
+    find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        TEST_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to find existant record in root of level-2 B-tree */
+    find.key = 1347;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (1347 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 1347;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
+        TEST_ERROR
+
+    /* Attempt to find existant record in internal node of level-2 B-tree */
+    find.key = 513;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (513 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 513;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Attempt to find existant record in leaf of level-2 B-tree */
+    find.key = 555;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (555 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 555;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
+        TEST_ERROR
+
+    /* Attempt to index non-existant record in level-2 B-tree */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Attempt to index existing record in root of level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1347, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 1347)
+        TEST_ERROR
+    if(find.val != (1347 * 2))
+        TEST_ERROR
+
+    /* Attempt to index existing record in internal node of level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)513, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 513)
+        TEST_ERROR
+    if(find.val != (513 * 2))
+        TEST_ERROR
+
+    /* Attempt to index existing record in leaf of level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)555, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 555)
+        TEST_ERROR
+    if(find.val != (555 * 2))
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    PASSED();
+
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: make level 2 B-tree (r->l)");
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 internal nodes */
+    for(u = 0; u < (INSERT_SPLIT_ROOT_NREC_REC * 9); u++) {
+        record.key = ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 1) - u;
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+    for(; u < (INSERT_SPLIT_ROOT_NREC_REC * 41); u++) {
+        record.key = ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 1) - (u +2); /* Leave a gap for later insertion */
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 2;
+    bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC_REC * 41);
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 1344;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Add some extra records to right-most leaf */
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC * 41) + 2;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC * 41) + 3;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Add some extra records to middle leaf */
+    record.key = ((INSERT_SPLIT_ROOT_NREC_REC * 41) - (INSERT_SPLIT_ROOT_NREC_REC * 9));
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+    record.key = ((INSERT_SPLIT_ROOT_NREC_REC * 41) - (INSERT_SPLIT_ROOT_NREC_REC * 9)) + 1;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    idx.key = 0;
+    idx.val = 0;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &idx) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(idx.key != ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 4))
+        TEST_ERROR
+
+    /* Attempt to find non-existant record in level-2 B-tree */
+    /* (Should not be found, but not fail) */
+    find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        TEST_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to find existant record in root of level-2 B-tree */
+    find.key = 1344;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (1344 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 1344;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
+        TEST_ERROR
+
+    /* Attempt to find existant record in internal node of level-2 B-tree */
+    find.key = 512;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (512 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 512;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Attempt to find existant record in leaf of level-2 B-tree */
+    find.key = 555;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (555 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 555;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
+        TEST_ERROR
+
+    /* Attempt to index non-existant record in level-2 B-tree */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Attempt to index existing record in root of level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1344, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 1344)
+        TEST_ERROR
+    if(find.val != (1344 * 2))
+        TEST_ERROR
+
+    /* Attempt to index existing record in internal node of level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)512, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 512)
+        TEST_ERROR
+    if(find.val != (512 * 2))
+        TEST_ERROR
+
+    /* Attempt to index existing record in leaf of level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)555, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 555)
+        TEST_ERROR
+    if(find.val != (555 * 2))
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    PASSED();
+
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: make level 2 B-tree (l+r->middle)");
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert enough records to force root to split into 2 internal nodes */
+    for(u = 0; u < (INSERT_SPLIT_ROOT_NREC_REC * 9); u++) {
+        record.key = ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 3) - u;
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+    for(; u < (INSERT_SPLIT_ROOT_NREC_REC * 41); u++) {
+        record.key = u - ((INSERT_SPLIT_ROOT_NREC_REC * 9) - 2);  /* Leave a gap for later insertion */
+        record.val = record.key * 2;
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 2;
+    bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC_REC * 41);
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+    record.key = 1345;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Add some extra records to right-most leaf */
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC * 41) + 4;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+    record.key = (INSERT_SPLIT_ROOT_NREC_REC * 41) + 5;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Add some extra records to middle leaf */
+    record.key = ((INSERT_SPLIT_ROOT_NREC_REC * 41) - (INSERT_SPLIT_ROOT_NREC_REC * 9)) + 2;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+    record.key = ((INSERT_SPLIT_ROOT_NREC_REC * 41) - (INSERT_SPLIT_ROOT_NREC_REC * 9)) + 3;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Add some extra records to left-most leaf */
+    record.key = 0;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+    record.key = 1;
+    record.val = record.key * 2;
+    if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+        FAIL_STACK_ERROR
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    idx.key = 0;
+    idx.val = 0;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &idx) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(idx.key != ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 6))
+        TEST_ERROR
+
+    /* Attempt to find non-existant record in level-2 B-tree */
+    /* (Should not be found, but not fail) */
+    find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        TEST_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Attempt to find existant record in root of level-2 B-tree */
+    find.key = 1345;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (1345 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 1345;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
+        TEST_ERROR
+
+    /* Attempt to find existant record in internal node of level-2 B-tree */
+    find.key = 513;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (513 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 513;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
+        TEST_ERROR
+
+    /* Attempt to find existant record in leaf of level-2 B-tree */
+    find.key = 555;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+        FAIL_STACK_ERROR
+    if(find.val != (555 * 2))
+        TEST_ERROR
+
+    /* Check with B-tree */
+    record.key = 555;
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
+        TEST_ERROR
+
+    /* Attempt to index non-existant record in level-2 B-tree */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Attempt to index existing record in level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1345, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 1345)
+        TEST_ERROR
+    if(find.val != (1345 * 2))
+        TEST_ERROR
+
+    /* Attempt to index existing record in internal node of level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)513, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 513)
+        TEST_ERROR
+    if(find.val != (513 * 2))
+        TEST_ERROR
+
+    /* Attempt to index existing record in leaf of level-2 B-tree */
+    find.key = (hsize_t)-1;
+    find.val = (hsize_t)-1;
+    if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)555, index_rec_cb, &find) < 0)
+        FAIL_STACK_ERROR
+    if(find.key != 555)
+        TEST_ERROR
+    if(find.val != (555 * 2))
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close file */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* test_update_make_level2() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_update_lots
+ *
+ * Purpose:	Basic tests for the B-tree v2 code.  This test inserts many
+ *              records in random order, enough to make at a level 4 B-tree.
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Sunday, December 27, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_update_lots(hid_t fapl, const H5B2_create_t *cparam,
+    const bt2_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+    time_t      curr_time;              /* Current time, for seeding random number generator */
+    H5B2_test_rec_t *records;           /* Record #'s for random insertion */
+    H5B2_test_rec_t record;             /* Record to insert into tree */
+    H5B2_test_rec_t modify;             /* Modified value */
+    H5B2_test_rec_t find;               /* Record to find */
+    H5B2_test_rec_t iter;               /* Index within B-tree, for iterator */
+    H5B2_stat_t bt2_stat;               /* Statistics about B-tree created */
+    hsize_t     nrec;                   /* Number of records in B-tree */
+    unsigned    u;                      /* Local index variable */
+    herr_t      ret;                    /* Generic error return value */
+
+    /* Initialize random number seed */
+    curr_time = HDtime(NULL);
+#ifdef QAK
+curr_time = 1451342093;
+HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
+#endif /* QAK */
+    HDsrandom((unsigned)curr_time);
+
+    /*
+     * Test inserting many records into v2 B-tree
+     */
+    TESTING("B-tree update: create random level 4 B-tree");
+
+    /* Allocate space for the records */
+    if(NULL == (records = (H5B2_test_rec_t *)HDmalloc(sizeof(H5B2_test_rec_t) * INSERT_MANY_REC)))
+        TEST_ERROR
+
+    /* Initialize record #'s */
+    for(u = 0; u < INSERT_MANY_REC; u++) {
+        records[u].key = u;
+        records[u].val = u * 2;
+    } /* end for */
+
+    /* Shuffle record #'s */
+    for(u = 0; u < INSERT_MANY_REC; u++) {
+        H5B2_test_rec_t temp_rec;       /* Temporary record */
+        unsigned swap_idx;              /* Location to swap with when shuffling */
+
+        swap_idx = ((unsigned)HDrandom() % (INSERT_MANY_REC - u)) + u;
+        temp_rec = records[u];
+        records[u] = records[swap_idx];
+        records[swap_idx] = temp_rec;
+    } /* end for */
+
+    /* Create the file for the test */
+    if(create_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Insert random records */
+    for(u = 0; u < INSERT_MANY_REC; u++) {
+        record = records[u];
+        if(H5B2_update(bt2, dxpl, &record, no_modify_cb, NULL) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Check up on B-tree */
+    bt2_stat.depth = 4;
+    bt2_stat.nrecords = INSERT_MANY_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close file */
+    if(H5Fclose(file) < 0)
+        STACK_ERROR
+    file = -1;
+
+    /* Re-open the file for the test */
+    if(reopen_file(&file, &f, fapl) < 0)
+        TEST_ERROR
+
+    /* Re-open v2 B-tree */
+    if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
+        FAIL_STACK_ERROR
+
+    /* Check up on B-tree after re-open */
+    bt2_stat.depth = 4;
+    bt2_stat.nrecords = INSERT_MANY_REC;
+    if(check_stats(bt2, &bt2_stat) < 0)
+        TEST_ERROR
+
+    /* Iterate over B-tree to check records have been inserted correctly */
+    iter.key = 0;
+    iter.val = 0;
+    if(H5B2_iterate(bt2, dxpl, iter_rec_cb, &iter) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the index is correct */
+    if(iter.key != INSERT_MANY_REC)
+        TEST_ERROR
+
+    /* Attempt to find non-existant record in level-4 B-tree */
+    /* (Should not be found, but not fail) */
+    find.key = INSERT_MANY_REC * 2;
+    find.val = (hsize_t)-1;
+    if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != FALSE)
+        TEST_ERROR
+    if(find.val != (hsize_t)-1)
+        TEST_ERROR
+
+    /* Find random records */
+    for(u = 0; u < FIND_MANY_REC; u++) {
+        /* Pick random record */
+        find.key = (hsize_t)(HDrandom() % INSERT_MANY_REC);
+        find.val = (hsize_t)-1;
+
+        /* Attempt to find existant record in level-4 B-tree */
+        if(H5B2_find(bt2, dxpl, &find, find_rec_cb, &find) != TRUE)
+            FAIL_STACK_ERROR
+        if(find.val != (find.key * 2))
+            TEST_ERROR
+    } /* end for */
+
+    /* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+    H5E_BEGIN_TRY {
+	ret = H5B2_index(bt2, dxpl, H5_ITER_DEC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
+    } H5E_END_TRY;
+    /* Should fail */
+    if(ret != FAIL)
+        TEST_ERROR
+
+    /* Find random records */
+    for(u = 0; u < FIND_MANY_REC; u++) {
+        hsize_t idx;    /* Record index */
+
+        /* Pick random record */
+        idx = (hsize_t)(HDrandom() % INSERT_MANY_REC);
+
+        /* Reset find record */
+        find.key = (hsize_t)-1;
+        find.val = (hsize_t)-1;
+
+        /* Attempt to find existant record in level-4 B-tree */
+        /* (in increasing order) */
+        if(H5B2_index(bt2, dxpl, H5_ITER_INC, idx, index_rec_cb, &find) < 0)
+            FAIL_STACK_ERROR
+        if(find.key != idx)
+            TEST_ERROR
+        if(find.val != (find.key * 2))
+            TEST_ERROR
+
+        /* Reset find record */
+        find.key = (hsize_t)-1;
+        find.val = (hsize_t)-1;
+
+        /* Attempt to find existant record in level-4 B-tree */
+        /* (in decreasing order) */
+        if(H5B2_index(bt2, dxpl, H5_ITER_DEC, idx, index_rec_cb, &find) < 0)
+            FAIL_STACK_ERROR
+        if(find.key != (INSERT_MANY_REC - (idx + 1)))
+            TEST_ERROR
+        if(find.val != (find.key * 2))
+            TEST_ERROR
+    } /* end for */
+
+    PASSED();
+
+    TESTING("B-tree update: update record in level 4 B-tree");
+
+    /* Check for closing & re-opening the B-tree */
+    if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0)
+        TEST_ERROR
+
+    record.key = INSERT_MANY_REC / 2;
+    modify.key = INSERT_MANY_REC / 2;
+    modify.val = record.key * 3;
+    if(H5B2_update(bt2, dxpl, &record, modify_rec_cb, &modify) < 0)
+        FAIL_STACK_ERROR
+
+    /* Query the number of records in the B-tree */
+    if(H5B2_get_nrec(bt2, &nrec) < 0)
+        FAIL_STACK_ERROR
+
+    /* Make certain that the # of records is correct */
+    if(nrec != INSERT_MANY_REC)
+        TEST_ERROR
+
+    /* Close the v2 B-tree */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close file */
+    if(H5Fclose(file) < 0)
+        TEST_ERROR
+
+    PASSED();
+
+    HDfree(records);
+
+    return 0;
+
+error:
+    HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+	H5Fclose(file);
+    } H5E_END_TRY;
+    HDfree(records);
+
+    return 1;
+} /* test_update_lots() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	test_remove_basic
  *
  * Purpose:	Basic tests for the B-tree v2 code
@@ -3365,13 +5604,13 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check up on B-tree */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 94;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = (INSERT_SPLIT_ROOT_NREC * 2) - 2;
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     rrecord = 0;
@@ -3384,10 +5623,10 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Make certain that the leaf nodes didn't redistribute */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 94;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Query the number of records in the B-tree */
@@ -3409,7 +5648,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check up on B-tree */
     record = 0;
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     rrecord = 1;
@@ -3422,10 +5661,10 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Make certain that the leaf nodes didn't redistribute */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 94;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Query the number of records in the B-tree */
@@ -3447,7 +5686,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check up on B-tree */
     record = INSERT_SPLIT_ROOT_NREC;
-    if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)0) < 0)
         TEST_ERROR
 
     rrecord = 0;
@@ -3460,10 +5699,10 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Make certain that the leaf nodes didn't redistribute */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 94;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Query the number of records in the B-tree */
@@ -3545,10 +5784,10 @@ test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 94;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Query the number of records in the B-tree */
@@ -3593,10 +5832,10 @@ test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 90;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     PASSED();
@@ -3629,10 +5868,10 @@ test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 64;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 90;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     PASSED();
@@ -3665,10 +5904,10 @@ test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 64;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 91;      /* Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
 
     /* Close the v2 B-tree */
@@ -3742,7 +5981,7 @@ test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -3815,7 +6054,7 @@ test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -3921,7 +6160,7 @@ test_remove_level1_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -4047,13 +6286,13 @@ test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 125;      /* Center-Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 188;      /* Center-Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 4;
@@ -4093,13 +6332,13 @@ test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 125;      /* Center-Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 188;      /* Center-Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 4;
@@ -4139,13 +6378,13 @@ test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 63;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 125;      /* Center-Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 188;      /* Center-Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 4;
@@ -4181,13 +6420,13 @@ test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 63;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 126;      /* Center-Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     record = 188;      /* Center-Right record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 4;
@@ -4274,7 +6513,7 @@ test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -4335,7 +6574,7 @@ test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -4422,7 +6661,7 @@ test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -4483,7 +6722,7 @@ test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar
 
     /* Check record values in root of B-tree */
     record = 39;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -4570,7 +6809,7 @@ test_remove_level1_promote_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -4715,7 +6954,7 @@ test_remove_level1_promote_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 62;      /* Left-most record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)1) < 0)
         TEST_ERROR
     ninfo.depth = 1;
     ninfo.nrec = 2;
@@ -4999,7 +7238,7 @@ test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -5285,7 +7524,7 @@ test_remove_level2_promote_2internal_redistrib(hid_t fapl, const H5B2_create_t *
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -5435,7 +7674,7 @@ test_remove_level2_promote_3internal_redistrib(hid_t fapl, const H5B2_create_t *
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -5585,7 +7824,7 @@ test_remove_level2_promote_2internal_merge(hid_t fapl, const H5B2_create_t *cpar
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -5736,7 +7975,7 @@ test_remove_level2_promote_3internal_merge(hid_t fapl, const H5B2_create_t *cpar
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -5887,7 +8126,7 @@ test_remove_level2_2internal_merge_left(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -6013,7 +8252,7 @@ test_remove_level2_2internal_merge_right(hid_t fapl, const H5B2_create_t *cparam
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -6139,7 +8378,7 @@ test_remove_level2_3internal_merge(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -6266,7 +8505,7 @@ test_remove_level2_collapse_right(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     record = 1889;      /* Left record in root node */
-    if(check_node_depth(bt2, dxpl, record, (unsigned)2) < 0)
+    if(check_node_depth(bt2, dxpl, &record, (unsigned)2) < 0)
         TEST_ERROR
     ninfo.depth = 2;
     ninfo.nrec = 2;
@@ -7750,7 +9989,7 @@ error:
 int
 main(void)
 {
-    H5B2_create_t cparam;               /* Creation parameters for v2 B-tree */
+    H5B2_create_t cparam, cparam2;      /* Creation parameters for v2 B-tree */
     bt2_test_param_t tparam;            /* Test parameters for v2 B-tree */
     hid_t	fapl = -1;              /* File access property list for data files */
     unsigned	nerrors = 0;            /* Cumulative error count */
@@ -7770,8 +10009,7 @@ main(void)
         printf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Initialize v2 B-tree creation parameters */
-    init_cparam(&cparam);
-
+    init_cparam(&cparam, &cparam2);
 
     /* Loop over re-opening B-tree during tests */
     for(reopen = FALSE; reopen <= TRUE; reopen++) {
@@ -7785,7 +10023,7 @@ main(void)
         } /* end else */
 
         /* Test B-tree record insertion */
-        /* Iteration, find & index routines tested in these routines as well */
+        /* (Iteration, find & index routines exercised in these routines as well) */
         nerrors += test_insert_basic(fapl, &cparam, &tparam);
         nerrors += test_insert_split_root(fapl, &cparam, &tparam);
         nerrors += test_insert_level1_2leaf_redistrib(fapl, &cparam, &tparam);
@@ -7804,6 +10042,20 @@ main(void)
         else
             nerrors += test_insert_lots(fapl, &cparam, &tparam);
 
+        /* Test B-tree record update (ie. insert/modify) */
+        /* (Iteration, find & index routines exercised in these routines as well) */
+        nerrors += test_update_basic(fapl, &cparam2, &tparam);
+        nerrors += test_update_split_root(fapl, &cparam2, &tparam);
+        nerrors += test_update_level1_2leaf_redistrib(fapl, &cparam2, &tparam);
+        nerrors += test_update_level1_side_split(fapl, &cparam2, &tparam);
+        nerrors += test_update_level1_3leaf_redistrib(fapl, &cparam2, &tparam);
+        nerrors += test_update_level1_middle_split(fapl, &cparam2, &tparam);
+        nerrors += test_update_make_level2(fapl, &cparam2, &tparam);
+        if(ExpressMode > 1)
+            printf("***Express test mode on.  test_update_lots skipped\n");
+        else
+            nerrors += test_update_lots(fapl, &cparam2, &tparam);
+
         /* Test B-tree record removal */
         /* Querying the number of records routine also tested in these routines as well */
         nerrors += test_remove_basic(fapl, &cparam, &tparam);
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index 480450d..817f583 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -121,6 +121,10 @@ get_H5B2_class(const uint8_t *sig)
             cls = H5A_BT2_CORDER;
             break;
 
+        case H5B2_TEST2_ID:
+            cls = H5B2_TEST2;
+            break;
+
         case H5B2_NUM_BTREE_ID:
         default:
             HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));