diff options
Diffstat (limited to 'test/btree2.c')
| -rw-r--r-- | test/btree2.c | 4803 |
1 files changed, 2393 insertions, 2410 deletions
diff --git a/test/btree2.c b/test/btree2.c index fa56f24..cd03aa8 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -6,7 +6,7 @@ * This file is part of HDF5. The full HDF5 copyright notice, including * * terms governing use, modification, and redistribution, is contained in * * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * + * distribution tree, or in https://www.hdfgroup.org/licenses. * * If you do not have access to either file, you may request a copy from * * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -27,25 +27,21 @@ /* Other private headers that this test requires */ #include "H5Iprivate.h" -const char *FILENAME[] = { - "btree2", - NULL -}; +const char *FILENAME[] = {"btree2", NULL}; -#define INSERT_SPLIT_ROOT_NREC 63 -#define INSERT_MANY (1000*1000) -#define FIND_MANY (INSERT_MANY/100) -#define FIND_NEIGHBOR 2000 -#define DELETE_SMALL 20 -#define DELETE_MEDIUM 200 -#define DELETE_LARGE 2000 +#define INSERT_SPLIT_ROOT_NREC 63 +#define INSERT_MANY (1000 * 1000) +#define FIND_MANY (INSERT_MANY / 100) +#define FIND_NEIGHBOR 2000 +#define DELETE_SMALL 20 +#define DELETE_MEDIUM 200 +#define DELETE_LARGE 2000 /* Testing parameters */ typedef struct bt2_test_param_t { - hbool_t reopen_btree; /* Whether to re-open the B-tree during the test */ + hbool_t reopen_btree; /* Whether to re-open the B-tree during the test */ } bt2_test_param_t; - /*------------------------------------------------------------------------- * Function: init_cparam * @@ -66,16 +62,15 @@ init_cparam(H5B2_create_t *cparam) HDmemset(cparam, 0, sizeof(*cparam)); /* General parameters */ - cparam->cls = H5B2_TEST; - cparam->node_size = (size_t)512; - cparam->rrec_size = (size_t)8; + cparam->cls = H5B2_TEST; + cparam->node_size = (size_t)512; + cparam->rrec_size = (size_t)8; cparam->split_percent = 100; cparam->merge_percent = 40; - return(0); + return (0); } /* init_cparam() */ - /*------------------------------------------------------------------------- * Function: create_file * @@ -92,27 +87,26 @@ init_cparam(H5B2_create_t *cparam) static int create_file(hid_t *file, H5F_t **f, hid_t fapl) { - char filename[1024]; /* Filename to use */ + 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 = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((*file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Get a pointer to the internal file object */ - if(NULL == (*f = (H5F_t *)H5I_object(*file))) + if (NULL == (*f = (H5F_t *)H5I_object(*file))) STACK_ERROR /* Success */ - return(0); + return (0); error: - return(-1); + return (-1); } /* end create_file() */ - /*------------------------------------------------------------------------- * Function: create_btree * @@ -127,25 +121,23 @@ error: *------------------------------------------------------------------------- */ static int -create_btree(H5F_t *f, hid_t dxpl, const H5B2_create_t *cparam, - H5B2_t **bt2, haddr_t *bt2_addr) +create_btree(H5F_t *f, hid_t dxpl, const H5B2_create_t *cparam, H5B2_t **bt2, haddr_t *bt2_addr) { /* Create the v2 B-tree & get its address */ - if(NULL == (*bt2 = H5B2_create(f, dxpl, cparam, f))) + if (NULL == (*bt2 = H5B2_create(f, dxpl, cparam, f))) FAIL_STACK_ERROR - if(H5B2_get_addr(*bt2, bt2_addr/*out*/) < 0) + if (H5B2_get_addr(*bt2, bt2_addr /*out*/) < 0) FAIL_STACK_ERROR - if(!H5F_addr_defined(*bt2_addr)) + if (!H5F_addr_defined(*bt2_addr)) FAIL_STACK_ERROR /* Success */ - return(0); + return (0); error: - return(-1); + return (-1); } /* end create_btree() */ - /*------------------------------------------------------------------------- * Function: reopen_btree * @@ -160,28 +152,26 @@ error: *------------------------------------------------------------------------- */ static int -reopen_btree(H5F_t *f, hid_t dxpl, H5B2_t **bt2, haddr_t bt2_addr, - const bt2_test_param_t *tparam) +reopen_btree(H5F_t *f, hid_t dxpl, H5B2_t **bt2, haddr_t bt2_addr, const bt2_test_param_t *tparam) { /* Check for closing & re-opening the B-tree */ - if(tparam->reopen_btree) { + if (tparam->reopen_btree) { /* Close (empty) v2 B-tree */ - if(H5B2_close(*bt2, dxpl) < 0) + if (H5B2_close(*bt2, dxpl) < 0) FAIL_STACK_ERROR /* Re-open v2 B-tree */ - if(NULL == (*bt2 = H5B2_open(f, dxpl, bt2_addr, f))) + if (NULL == (*bt2 = H5B2_open(f, dxpl, bt2_addr, f))) FAIL_STACK_ERROR } /* end if */ /* Success */ - return(0); + return (0); error: - return(-1); + return (-1); } /* end reopen_btree() */ - /*------------------------------------------------------------------------- * Function: check_stats * @@ -198,24 +188,23 @@ error: static int check_stats(H5B2_t *bt2, const H5B2_stat_t *expected) { - H5B2_stat_t actual; /* Actual stats retrieved about v2 B-tree */ + H5B2_stat_t actual; /* Actual stats retrieved about v2 B-tree */ /* Get current stats */ - if(H5B2_stat_info(bt2, &actual) < 0) + if (H5B2_stat_info(bt2, &actual) < 0) FAIL_STACK_ERROR - if(actual.depth != expected->depth) + if (actual.depth != expected->depth) TEST_ERROR - if(actual.nrecords != expected->nrecords) + if (actual.nrecords != expected->nrecords) TEST_ERROR /* Success */ - return(0); + return (0); error: - return(-1); + return (-1); } /* end check_stats() */ - /*------------------------------------------------------------------------- * Function: check_node_depth * @@ -232,21 +221,20 @@ error: static int check_node_depth(H5B2_t *bt2, hid_t dxpl, hsize_t record, unsigned depth) { - int rec_depth; /* Depth of record in B-tree */ + 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) + if ((unsigned)rec_depth != depth) TEST_ERROR /* Success */ - return(0); + return (0); error: - return(-1); + return (-1); } /* end check_node_depth() */ - /*------------------------------------------------------------------------- * Function: check_node_info * @@ -261,26 +249,24 @@ error: *------------------------------------------------------------------------- */ static int -check_node_info(H5B2_t *bt2, hid_t dxpl, hsize_t record, - H5B2_node_info_test_t *ninfo) +check_node_info(H5B2_t *bt2, hid_t dxpl, hsize_t record, H5B2_node_info_test_t *ninfo) { - H5B2_node_info_test_t rec_ninfo; /* Node info for record in B-tree */ + H5B2_node_info_test_t rec_ninfo; /* Node info for record in B-tree */ - if(H5B2_get_node_info_test(bt2, dxpl, &record, &rec_ninfo) < 0) + if (H5B2_get_node_info_test(bt2, dxpl, &record, &rec_ninfo) < 0) FAIL_STACK_ERROR - if(rec_ninfo.depth != ninfo->depth) + if (rec_ninfo.depth != ninfo->depth) TEST_ERROR - if(rec_ninfo.nrec != ninfo->nrec) + if (rec_ninfo.nrec != ninfo->nrec) TEST_ERROR /* Success */ - return(0); + return (0); error: - return(-1); + return (-1); } /* end check_node_depth() */ - /*------------------------------------------------------------------------- * Function: iter_cb * @@ -299,16 +285,15 @@ static int iter_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t *idx = (hsize_t *)_op_data; + hsize_t * idx = (hsize_t *)_op_data; - if(*record != *idx) - return(H5_ITER_ERROR); + if (*record != *idx) + return (H5_ITER_ERROR); (*idx)++; - return(H5_ITER_CONT); + return (H5_ITER_CONT); } /* end iter_cb() */ - /*------------------------------------------------------------------------- * Function: find_cb * @@ -327,15 +312,14 @@ static int find_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t *search = (hsize_t *)_op_data; + hsize_t * search = (hsize_t *)_op_data; - if(*record != *search) - return(FALSE); + if (*record != *search) + return (FALSE); - return(TRUE); + return (TRUE); } /* end find_cb() */ - /*------------------------------------------------------------------------- * Function: find_dec_cb * @@ -355,15 +339,14 @@ static int find_dec_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t *search = (hsize_t *)_op_data; + hsize_t * search = (hsize_t *)_op_data; - if(*record != (INSERT_MANY - (*search + 1))) - return(-1); + if (*record != (INSERT_MANY - (*search + 1))) + return (-1); - return(0); + return (0); } /* end find_dec_cb() */ - /*------------------------------------------------------------------------- * Function: neighbor_cb * @@ -382,14 +365,13 @@ static int neighbor_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t *search = (hsize_t *)_op_data; + hsize_t * search = (hsize_t *)_op_data; *search = *record; - return(0); + return (0); } /* end neighbor_cb() */ - /*------------------------------------------------------------------------- * Function: modify_cb * @@ -410,13 +392,12 @@ modify_cb(void *_record, void *_op_data, hbool_t *changed) hsize_t *record = (hsize_t *)_record; hsize_t *modify = (hsize_t *)_op_data; - *record = *modify; + *record = *modify; *changed = TRUE; - return(0); + return (0); } /* end modify_cb() */ - /*------------------------------------------------------------------------- * Function: remove_cb * @@ -434,15 +415,14 @@ modify_cb(void *_record, void *_op_data, hbool_t *changed) static int remove_cb(const void *_record, void *_op_data) { - const hsize_t *record = (const hsize_t *)_record; - hsize_t *rrecord = (hsize_t *)_op_data; + const hsize_t *record = (const hsize_t *)_record; + hsize_t * rrecord = (hsize_t *)_op_data; *rrecord = *record; - return(0); + return (0); } /* end remove_cb() */ - /*------------------------------------------------------------------------- * Function: test_insert_basic * @@ -457,17 +437,16 @@ remove_cb(const void *_record, void *_op_data) *------------------------------------------------------------------------- */ static unsigned -test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t idx; /* Index within B-tree, for iterator */ - herr_t ret; /* Generic error return value */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t idx; /* Index within B-tree, for iterator */ + herr_t ret; /* Generic error return value */ /* * Test v2 B-tree creation @@ -475,11 +454,11 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree creation"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR PASSED(); @@ -490,29 +469,28 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree iteration: empty B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to iterate over a B-tree with no records */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index hasn't changed */ - if(idx != 0) + if (idx != 0) TEST_ERROR /* Attempt to find record in B-tree with no records */ idx = 0; - if(H5B2_find(bt2, dxpl, &idx, find_cb, NULL) != FALSE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, NULL) != FALSE) TEST_ERROR /* Attempt to index record in B-tree with no records */ idx = 0; - H5E_BEGIN_TRY { - ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, find_cb, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, find_cb, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR PASSED(); @@ -523,45 +501,44 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: first record"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR record = 42; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Attempt to find non-existant record in B-tree with 1 record */ /* (Should not be found, but not fail) */ idx = 41; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) TEST_ERROR /* Try again with NULL 'op' */ /* (Should not be found, but not fail) */ - if(H5B2_find(bt2, dxpl, &idx, NULL, NULL) != FALSE) + if (H5B2_find(bt2, dxpl, &idx, NULL, NULL) != FALSE) TEST_ERROR /* Attempt to find existant record in B-tree with 1 record */ idx = 42; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) TEST_ERROR /* Try again with NULL 'op' */ - if(H5B2_find(bt2, dxpl, &idx, NULL, NULL) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, NULL, NULL) != TRUE) TEST_ERROR /* Attempt to index non-existant record in B-tree with 1 record */ idx = 0; - H5E_BEGIN_TRY { - ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1, find_cb, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1, find_cb, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR /* Attempt to index existing record in B-tree with 1 record */ idx = 42; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, find_cb, &idx) < 0) TEST_ERROR PASSED(); @@ -572,88 +549,88 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: several records"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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 = 34; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* * Test inserting third record into v2 B-tree, after all other records */ record = 56; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* * Test inserting fourth record into v2 B-tree, in the middle of other records */ record = 38; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 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) */ idx = 41; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) TEST_ERROR /* Attempt to find existant record in level-0 B-tree with several record */ idx = 56; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) TEST_ERROR /* Attempt to index non-existant record in B-tree with several records */ idx = 0; - H5E_BEGIN_TRY { - ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)4, find_cb, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)4, find_cb, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR /* Attempt to index existing record in B-tree with several records */ idx = 34; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, find_cb, &idx) < 0) TEST_ERROR idx = 38; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)1, find_cb, &idx) < 0) TEST_ERROR idx = 42; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)2, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)2, find_cb, &idx) < 0) TEST_ERROR idx = 56; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)3, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)3, find_cb, &idx) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close the file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); /* All tests passed */ - return(0); + return (0); error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; - return(1); + H5Fclose(file); + } + H5E_END_TRY; + return (1); } /* test_insert_basic() */ - /*------------------------------------------------------------------------- * Function: test_insert_split_root * @@ -671,19 +648,18 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_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 */ - hsize_t record; /* Record to insert into tree */ - hsize_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 */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_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 @@ -691,126 +667,126 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: split root"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + 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 - 1); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC - 1); u++) { record = u + 2; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 0; + bt2_stat.depth = 0; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC - 1); - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)0) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)0) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert record to split root leaf node */ record = INSERT_SPLIT_ROOT_NREC + 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)1) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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 = 0; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR record = 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC + 2); - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)33, (unsigned)1) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != (INSERT_SPLIT_ROOT_NREC + 2)) + if (idx != (INSERT_SPLIT_ROOT_NREC + 2)) TEST_ERROR /* Attempt to find non-existant record in level-1 B-tree */ /* (Should not be found, but not fail) */ idx = INSERT_SPLIT_ROOT_NREC + 10; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) TEST_ERROR /* Attempt to find existant record in root of level-1 B-tree */ idx = 33; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) FAIL_STACK_ERROR /* Attempt to find existant record in leaf of level-1 B-tree */ idx = 56; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) FAIL_STACK_ERROR /* Attempt to index non-existant record in level-1 B-tree */ idx = 0; - H5E_BEGIN_TRY { - ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC+2), find_cb, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC + 2), find_cb, NULL); + } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR /* Attempt to index existing record in root of level-1 B-tree */ idx = 33; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)33, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)33, find_cb, &idx) < 0) FAIL_STACK_ERROR /* Attempt to index existing record in left leaf of level-1 B-tree */ idx = 0; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)0, find_cb, &idx) < 0) FAIL_STACK_ERROR /* Attempt to index existing record in right leaf of level-1 B-tree */ idx = 50; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)50, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)50, find_cb, &idx) < 0) FAIL_STACK_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -818,15 +794,16 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_split_root() */ - /*------------------------------------------------------------------------- * Function: test_insert_level1_2leaf_redistrib * @@ -845,17 +822,16 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - unsigned u; /* Local index variable */ + 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 */ + hsize_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 @@ -863,50 +839,51 @@ test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: redistribute 2 leaves in level 1 B-tree (l->r)"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + 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; u++) { - record = u + (INSERT_SPLIT_ROOT_NREC/2) + 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { + record = u + (INSERT_SPLIT_ROOT_NREC / 2) + 1; + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)INSERT_SPLIT_ROOT_NREC, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)INSERT_SPLIT_ROOT_NREC, (unsigned)1) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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 / 2) + 1; u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC / 2) + 1; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC + (INSERT_SPLIT_ROOT_NREC / 2) + 1); - if(check_stats(bt2, &bt2_stat) < 0) + 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) + if (check_node_depth(bt2, dxpl, + (hsize_t)((INSERT_SPLIT_ROOT_NREC / 2) + (INSERT_SPLIT_ROOT_NREC / 4) + 1), + (unsigned)1) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; @@ -918,50 +895,52 @@ test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: 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) + 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; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + if (check_node_depth(bt2, dxpl, (hsize_t)(INSERT_SPLIT_ROOT_NREC / 2), (unsigned)1) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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 / 2) + 1; u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC / 2) + 1; u++) { record = u + INSERT_SPLIT_ROOT_NREC; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC + (INSERT_SPLIT_ROOT_NREC / 2) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + if (check_node_depth(bt2, dxpl, + (hsize_t)((INSERT_SPLIT_ROOT_NREC / 2) + (INSERT_SPLIT_ROOT_NREC / 4) + 1), + (unsigned)1) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); @@ -969,15 +948,16 @@ test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level1_2leaf_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_insert_level1_side_split * @@ -996,17 +976,16 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - unsigned u; /* Local index variable */ + 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 */ + hsize_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 @@ -1014,54 +993,54 @@ test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: 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) + 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) + 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; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u + INSERT_SPLIT_ROOT_NREC; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + 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 */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = 2 * INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + 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 */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; @@ -1073,53 +1052,53 @@ test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: 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) + 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; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + 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 */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u + INSERT_SPLIT_ROOT_NREC; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = 2 * INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)62, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)62, (unsigned)1) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); @@ -1127,15 +1106,16 @@ test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level1_side_split() */ - /*------------------------------------------------------------------------- * Function: test_insert_level1_3leaf_redistrib * @@ -1156,18 +1136,17 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ /* * Test inserting many records into v2 B-tree @@ -1175,93 +1154,93 @@ test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: redistribute 3 leaves in level 1 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + 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; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u + (INSERT_SPLIT_ROOT_NREC + (INSERT_SPLIT_ROOT_NREC / 2) + 1); - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + 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 */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = 2 * INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + 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 */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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 / 2) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC / 2) + 1); u++) { record = u + INSERT_SPLIT_ROOT_NREC; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = (2 * INSERT_SPLIT_ROOT_NREC) + (INSERT_SPLIT_ROOT_NREC / 2) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)52, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)52, (unsigned)1) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)105, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)105, (unsigned)1) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != ((INSERT_SPLIT_ROOT_NREC * 2) + (INSERT_SPLIT_ROOT_NREC / 2) + 1)) + if (idx != ((INSERT_SPLIT_ROOT_NREC * 2) + (INSERT_SPLIT_ROOT_NREC / 2) + 1)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); @@ -1269,15 +1248,16 @@ test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level1_3leaf_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_insert_level1_middle_split * @@ -1297,18 +1277,17 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ /* * Test inserting many records into v2 B-tree @@ -1316,72 +1295,72 @@ test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: split middle leaf into 2 leaves in level 1 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + 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; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u + (INSERT_SPLIT_ROOT_NREC * 2); - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + 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 */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + 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 * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 1; + bt2_stat.depth = 1; bt2_stat.nrecords = 3 * INSERT_SPLIT_ROOT_NREC; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)62, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)62, (unsigned)1) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)126, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)126, (unsigned)1) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != (INSERT_SPLIT_ROOT_NREC * 3)) + if (idx != (INSERT_SPLIT_ROOT_NREC * 3)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); @@ -1389,15 +1368,16 @@ test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level1_middle_split() */ - /*------------------------------------------------------------------------- * Function: test_insert_make_level2 * @@ -1413,19 +1393,18 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ - herr_t ret; /* Generic error return value */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ + herr_t ret; /* Generic error return value */ /* * Test inserting many records into v2 B-tree @@ -1433,131 +1412,132 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: make level 2 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + 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 * 9); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 9); u++) { record = u + 2; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ - for(; u < ((INSERT_SPLIT_ROOT_NREC * 29) + 1); u++) { + for (; u < ((INSERT_SPLIT_ROOT_NREC * 29) + 1); u++) { record = u + 4; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)948, (unsigned)2) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)948, (unsigned)2) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Add some extra records to left-most leaf */ record = 0; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR record = 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Add some extra records to middle leaf */ record = (INSERT_SPLIT_ROOT_NREC * 9) + 2; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR record = (INSERT_SPLIT_ROOT_NREC * 9) + 3; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != ((INSERT_SPLIT_ROOT_NREC * 29) + 5)) + if (idx != ((INSERT_SPLIT_ROOT_NREC * 29) + 5)) TEST_ERROR /* Attempt to find non-existant record in level-2 B-tree */ /* (Should not be found, but not fail) */ idx = INSERT_SPLIT_ROOT_NREC * 30; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) TEST_ERROR /* Attempt to find existant record in root of level-2 B-tree */ idx = 948; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) FAIL_STACK_ERROR /* Check with B-tree */ - if(check_node_depth(bt2, dxpl, (hsize_t)948, (unsigned)2) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)948, (unsigned)2) < 0) TEST_ERROR /* Attempt to find existant record in internal node of level-2 B-tree */ idx = 505; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) FAIL_STACK_ERROR /* Check with B-tree */ - if(check_node_depth(bt2, dxpl, (hsize_t)505, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)505, (unsigned)1) < 0) TEST_ERROR /* Attempt to find existant record in leaf of level-2 B-tree */ idx = 555; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) FAIL_STACK_ERROR /* Check with B-tree */ - if(check_node_depth(bt2, dxpl, (hsize_t)555, (unsigned)0) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)555, (unsigned)0) < 0) TEST_ERROR /* Attempt to index non-existant record in level-2 B-tree */ idx = 0; - H5E_BEGIN_TRY { - ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC * 30), find_cb, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC * 30), find_cb, NULL); + } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR /* Attempt to index existing record in root of level-2 B-tree */ idx = 948; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)948, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)948, find_cb, &idx) < 0) FAIL_STACK_ERROR /* Attempt to index existing record in internal node of level-2 B-tree */ idx = 505; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)505, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)505, find_cb, &idx) < 0) FAIL_STACK_ERROR /* Attempt to index existing record in leaf of level-2 B-tree */ idx = 555; - if(H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)555, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)555, find_cb, &idx) < 0) FAIL_STACK_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); @@ -1565,15 +1545,16 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_make_level2() */ - /*------------------------------------------------------------------------- * Function: test_insert_level2_leaf_redistrib * @@ -1591,18 +1572,17 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_level2_leaf_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ /* * Test inserting many records into v2 B-tree @@ -1610,57 +1590,57 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: redistrib right-most leaf in level 2 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert enough records to force root to split into 2 internal nodes */ /* And fill rightmost leaf */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 8); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 8); u++) { record = u + (INSERT_SPLIT_ROOT_NREC / 2) + 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ - for(; u < ((INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2)); u++) { + for (; u < ((INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2)); u++) { record = u + INSERT_SPLIT_ROOT_NREC + 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2); - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)1859, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)1859, (unsigned)1) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)1921, (unsigned)0) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)1921, (unsigned)0) < 0) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert record to force redistribution of rightmost leaf */ record = u + INSERT_SPLIT_ROOT_NREC + 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)1875, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)1875, (unsigned)1) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)1922, (unsigned)0) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)1922, (unsigned)0) < 0) TEST_ERROR PASSED(); @@ -1668,40 +1648,40 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: redistrib left-most leaf in level 2 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)94, (unsigned)1) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)32, (unsigned)0) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)32, (unsigned)0) < 0) TEST_ERROR /* Add more records to left-most leaf, to force a 2->1 split and then a * 2 node redistribution on left leaf */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC / 2) + 1; u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC / 2) + 1; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)1008, (unsigned)2) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)47, (unsigned)1) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)47, (unsigned)1) < 0) TEST_ERROR - if(check_node_depth(bt2, dxpl, (hsize_t)0, (unsigned)0) < 0) + if (check_node_depth(bt2, dxpl, (hsize_t)0, (unsigned)0) < 0) TEST_ERROR PASSED(); @@ -1709,64 +1689,70 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: redistrib middle leaf in level 2 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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 */ + if (check_node_depth(bt2, dxpl, (hsize_t)1008, (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 */ + if (check_node_depth(bt2, dxpl, (hsize_t)535, (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 */ + if (check_node_depth(bt2, dxpl, (hsize_t)630, (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 */ + if (check_node_depth(bt2, dxpl, (hsize_t)568, (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 */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC / 2) + 1; u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC / 2) + 1; u++) { record = u + (INSERT_SPLIT_ROOT_NREC * 8) + (INSERT_SPLIT_ROOT_NREC / 2) + 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + (INSERT_SPLIT_ROOT_NREC / 2) + 2; - if(check_stats(bt2, &bt2_stat) < 0) + 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 */ + if (check_node_depth(bt2, dxpl, (hsize_t)1008, (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 */ + if (check_node_depth(bt2, dxpl, (hsize_t)524, (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 */ + if (check_node_depth(bt2, dxpl, (hsize_t)577, (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 */ + if (check_node_depth(bt2, dxpl, (hsize_t)568, (unsigned)0) < + 0) /* Record in leaf node just after insertion point */ TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != ((INSERT_SPLIT_ROOT_NREC * 30) + (INSERT_SPLIT_ROOT_NREC / 2) + 2)) + if (idx != ((INSERT_SPLIT_ROOT_NREC * 30) + (INSERT_SPLIT_ROOT_NREC / 2) + 2)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); @@ -1774,15 +1760,16 @@ test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level2_leaf_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_insert_level2_leaf_split * @@ -1800,18 +1787,17 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_level2_leaf_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ /* * Test inserting many records into v2 B-tree @@ -1819,67 +1805,67 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: split right-most leaf in level 2 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + 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 * 8); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 8); u++) { record = u + 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ - for(; u < ((INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2)); u++) { + for (; u < ((INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2)); u++) { record = u + 2; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2); - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 946; /* Record in root node */ + 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) + record = 1797; /* Right-most record in right internal node */ + 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) + record = 1859; /* Right-most record in right-most leaf */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert enough records to force right-most leaf to split */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC / 2) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC / 2) + 1); u++) { record = u + (INSERT_SPLIT_ROOT_NREC * 29) + (INSERT_SPLIT_ROOT_NREC / 2) + 2; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC * 30; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 946; /* Record in root node */ + 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) + record = 1828; /* Next-to-right-most record in right-most internal node */ + 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) + record = 1860; /* Right-most record in right-most internal node */ + 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) + record = 1891; /* Right-most record in right-most leaf */ + if (check_node_depth(bt2, dxpl, record, (unsigned)0) < 0) TEST_ERROR PASSED(); @@ -1887,45 +1873,45 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: split left-most leaf in level 2 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC * 30; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 946; /* Record in root node */ + 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) + record = 63; /* Left-most record in left-most internal node */ + 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) + record = 1; /* Left-most record in left-most leaf */ + 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 */ record = 0; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 946; /* Record in root node */ + 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) + record = 63; /* Left-most record in left-most internal node */ + 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) + record = 32; /* Left-most record in left internal node */ + 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) + record = 0; /* Left-most record in left-most leaf */ + if (check_node_depth(bt2, dxpl, record, (unsigned)0) < 0) TEST_ERROR PASSED(); @@ -1933,73 +1919,73 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: split middle leaf in level 2 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 946; /* Record in root node */ + 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) + record = 504; /* Record in internal node just before insertion point */ + 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) + record = 568; /* Record in internal node just after insertion point */ + 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) + record = 506; /* Record in leaf node just after insertion point */ + 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 */ record = (INSERT_SPLIT_ROOT_NREC * 8) + 1; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 30) + 2; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 946; /* Record in root node */ + 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) + record = 504; /* Left-most record of split in left internal node */ + 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) + record = 537; /* Middle record of split in left internal node */ + 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) + record = 568; /* Right-most record of split in left internal node */ + 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) + record = 506; /* Record in leaf node just after insertion point */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != ((INSERT_SPLIT_ROOT_NREC * 30) + 2)) + if (idx != ((INSERT_SPLIT_ROOT_NREC * 30) + 2)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); @@ -2007,15 +1993,16 @@ test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level2_leaf_split() */ - /*------------------------------------------------------------------------- * Function: test_insert_level2_2internal_redistrib * @@ -2035,17 +2022,17 @@ error: */ static unsigned test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ /* * Test inserting many records into v2 B-tree @@ -2053,58 +2040,58 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: redist. 2 internal (r->l) in level 2 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert enough records to force root to split into 2 internal nodes */ /* And fill up right internal node, to just before to redistribute it */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 44); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 44); u++) { record = u + (INSERT_SPLIT_ROOT_NREC * 6) - 4; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC * 44; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1318; /* Record in root node */ + 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) + record = 3114; /* Right-most record in right internal node */ + 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) + record = 3145; /* Right-most record in right leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert record to redistribute right-most internal node */ record = u + (INSERT_SPLIT_ROOT_NREC * 6) - 4; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC * 44 + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1822; /* Record in root node */ + 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) + record = 3114; /* Right-most record in right internal node */ + 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) + record = 3146; /* Right-most record in right leaf node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)0) < 0) TEST_ERROR PASSED(); @@ -2112,66 +2099,66 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: redist. 2 internal (l->r) in level 2 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC * 44 + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1822; /* Record in root node */ + 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) + record = 436; /* Left-most record in left internal node */ + 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) + record = 374; /* Left-most record in left leaf node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)0) < 0) TEST_ERROR /* Force left-most internal node to redistribute */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 6) - 4); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 6) - 4); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 50) - 3; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1570; /* Record in root node */ + 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) + record = 61; /* Left-most record in left internal node */ + 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) + record = 0; /* Left-most record in left leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != ((INSERT_SPLIT_ROOT_NREC * 50) - 3)) + if (idx != ((INSERT_SPLIT_ROOT_NREC * 50) - 3)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -2179,15 +2166,16 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level2_2internal_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_insert_level2_2internal_split * @@ -2206,18 +2194,17 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_level2_2internal_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ /* * Test inserting many records into v2 B-tree @@ -2225,61 +2212,61 @@ test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: split side internal node to 2 in level 2 B-tree (r->l)"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert enough records to force root to split into 2 internal nodes */ /* (And fill up two child internal nodes) */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 59); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 59); u++) { record = u + (INSERT_SPLIT_ROOT_NREC * 14) - (INSERT_SPLIT_ROOT_NREC / 4) + 3; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC * 59; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 2759; /* Record in root node */ + 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) + record = 4555; /* Right-most record in right internal node */ + 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) + record = 4586; /* Right-most record in right leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert record to split right-most internal node */ record = u + (INSERT_SPLIT_ROOT_NREC * 14) - (INSERT_SPLIT_ROOT_NREC / 4) + 3; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 59) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 2759; /* Left record in root node */ + 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) + record = 3704; /* Right record in root node */ + 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) + record = 4555; /* Right-most record in right internal node */ + 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) + record = 4387; /* Right-most record in right leaf node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)0) < 0) TEST_ERROR PASSED(); @@ -2287,69 +2274,69 @@ test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: split side internal node to 2 in level 2 B-tree (l->2)"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 59) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 2759; /* Left record in root node */ + 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) + record = 932; /* Left-most record in left internal node */ + 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) + record = 870; /* Left-most record in left leaf node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)0) < 0) TEST_ERROR /* Force left-most internal node to split */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 14) - (INSERT_SPLIT_ROOT_NREC / 4) + 3); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 14) - (INSERT_SPLIT_ROOT_NREC / 4) + 3); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 73) - (INSERT_SPLIT_ROOT_NREC / 4) + 4; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 870; /* Left record in root node */ + 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) + record = 1814; /* Next-to-left-most record in root node */ + 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) + record = 61; /* Left-most record in left internal node */ + 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) + record = 0; /* Left-most record in left leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != ((INSERT_SPLIT_ROOT_NREC * 73) - (INSERT_SPLIT_ROOT_NREC / 4) + 4)) + if (idx != ((INSERT_SPLIT_ROOT_NREC * 73) - (INSERT_SPLIT_ROOT_NREC / 4) + 4)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); @@ -2357,15 +2344,16 @@ test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level2_2internal_split() */ - /*------------------------------------------------------------------------- * Function: test_insert_level2_3internal_redistrib * @@ -2386,17 +2374,17 @@ error: */ static unsigned test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ /* * Test inserting many records into v2 B-tree @@ -2404,130 +2392,130 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: redistrib 3 internals in level 2 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert enough records to force root to split into 3 internal nodes */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 36); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 36); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ - for(; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u + (INSERT_SPLIT_ROOT_NREC * 13) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 3; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 59) + 1; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1889; /* Left record in root node */ + 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) + record = 3703; /* Right record in root node */ + 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) + record = 2267; /* Record to left of insertion point in middle internal node */ + 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) + record = 3199; /* Record to right of insertion point in middle internal node */ + 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) + record = 3137; /* Record just above insertion point in leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert records to fill up middle internal node */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 13) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 2); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 13) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 2); u++) { record = u + (INSERT_SPLIT_ROOT_NREC * 36); - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 72) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 3; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1889; /* Left record in root node */ + 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) + record = 3703; /* Right record in root node */ + 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) + record = 3104; /* Record to left of insertion point in middle internal node */ + 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) + record = 3137; /* Record to right of insertion point in middle internal node */ + 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) + record = 3135; /* Record just above insertion point in leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert another record, forcing the middle internal node to redistribute */ record = u + (INSERT_SPLIT_ROOT_NREC * 36); - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 72) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 4; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1574; /* Left record in root node */ + 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) + record = 3104; /* Right record in root node */ + 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) + record = 2862; /* Record to left of insertion point in right internal node (now) */ + 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) +#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) TEST_ERROR - record = 3135; /* Record just above insertion point in leaf node */ - if(check_node_depth(bt2, dxpl, record, (unsigned)0) < 0) + record = 3135; /* Record just above insertion point in leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != ((INSERT_SPLIT_ROOT_NREC * 72) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 4)) + if (idx != ((INSERT_SPLIT_ROOT_NREC * 72) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 4)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); @@ -2535,15 +2523,16 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level2_3internal_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_insert_level2_3internal_split * @@ -2563,18 +2552,17 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_level2_3internal_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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t idx; /* Index within B-tree, for iterator */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t idx; /* Index within B-tree, for iterator */ + unsigned u; /* Local index variable */ /* * Test inserting many records into v2 B-tree @@ -2582,134 +2570,134 @@ test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree insert: split 3 internals to 4 in level 2 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert enough records to force root to split into 3 internal nodes */ /* (and fill right internal node) */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 31); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 31); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ - for(; u < (INSERT_SPLIT_ROOT_NREC * 74); u++) { + for (; u < (INSERT_SPLIT_ROOT_NREC * 74); u++) { record = u + ((INSERT_SPLIT_ROOT_NREC * 13) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 3); - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = INSERT_SPLIT_ROOT_NREC * 74; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1889; /* Left record in root node */ + 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) + record = 3703; /* Right record in root node */ + 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) + record = 1952; /* Record to left of insertion point in middle internal node */ + 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) + record = 2884; /* Record to right of insertion point in middle internal node */ + 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) + record = 2822; /* Record just after insertion point in leaf node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)0) < 0) TEST_ERROR /* Insert records to fill up middle internal node */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 13) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 2); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 13) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 2); u++) { record = u + (INSERT_SPLIT_ROOT_NREC * 31); - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 87) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 2; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1889; /* Left record in root node */ + 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) + record = 3703; /* Right record in root node */ + 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) + record = 2789; /* Record to left of insertion point in middle internal node */ + 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) + record = 2822; /* Record to right of insertion point in middle internal node */ + 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) + record = 2823; /* Record just above insertion point in leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert record to split middle internal node */ record = u + (INSERT_SPLIT_ROOT_NREC * 31); - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Check up on B-tree */ - bt2_stat.depth = 2; + bt2_stat.depth = 2; bt2_stat.nrecords = (INSERT_SPLIT_ROOT_NREC * 87) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 3; - if(check_stats(bt2, &bt2_stat) < 0) + 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) + record = 1889; /* Left record in root node */ + 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) + record = 2789; /* Middle record in root node */ + 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) + record = 3703; /* Right record in root node */ + 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) + record = 3049; /* Record to left of insertion point in middle internal node */ + 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) +#endif /* NONE */ + record = 2822; /* Record to right of insertion point in middle internal node */ + 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) + record = 2823; /* Record just above insertion point in leaf node */ + 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) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != ((INSERT_SPLIT_ROOT_NREC * 87) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 3)) + if (idx != ((INSERT_SPLIT_ROOT_NREC * 87) + ((3 * INSERT_SPLIT_ROOT_NREC) / 4) + 3)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); @@ -2717,15 +2705,16 @@ test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_insert_level2_3internal_split() */ - /*------------------------------------------------------------------------- * Function: test_insert_lots * @@ -2742,31 +2731,30 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { - hid_t file = -1; /* File ID */ - char filename[1024]; /* Filename to use */ - 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t idx; /* Index within B-tree, for iterator */ - time_t curr_time; /* Current time, for seeding random number generator */ - hsize_t *records; /* Record #'s for random insertion */ - unsigned u; /* Local index variable */ - unsigned swap_idx; /* Location to swap with when shuffling */ - hsize_t temp_rec; /* Temporary record */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - hsize_t nrec; /* Number of records in B-tree */ - herr_t ret; /* Generic error return value */ + hid_t file = -1; /* File ID */ + char filename[1024]; /* Filename to use */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t idx; /* Index within B-tree, for iterator */ + time_t curr_time; /* Current time, for seeding random number generator */ + hsize_t * records; /* Record #'s for random insertion */ + unsigned u; /* Local index variable */ + unsigned swap_idx; /* Location to swap with when shuffling */ + hsize_t temp_rec; /* Temporary record */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + hsize_t nrec; /* Number of records in B-tree */ + herr_t ret; /* Generic error return value */ /* Initialize random number seed */ - curr_time=HDtime(NULL); + curr_time = HDtime(NULL); #ifdef QAK -curr_time=1109170019; -HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); + curr_time = 1109170019; + HDfprintf(stderr, "curr_time=%lu\n", (unsigned long)curr_time); #endif /* QAK */ HDsrandom((unsigned)curr_time); @@ -2776,18 +2764,18 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); TESTING("B-tree insert: create random level 4 B-tree"); /* Allocate space for the records */ - if(NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * INSERT_MANY))) + if (NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * INSERT_MANY))) TEST_ERROR /* Initialize record #'s */ - for(u = 0; u < INSERT_MANY; u++) + for (u = 0; u < INSERT_MANY; u++) records[u] = u; /* Shuffle record #'s */ - for(u = 0; u < INSERT_MANY; u++) { - swap_idx = ((unsigned)HDrandom() % (INSERT_MANY - u)) + u; - temp_rec = records[u]; - records[u] = records[swap_idx]; + for (u = 0; u < INSERT_MANY; u++) { + swap_idx = ((unsigned)HDrandom() % (INSERT_MANY - u)) + u; + temp_rec = records[u]; + records[u] = records[swap_idx]; records[swap_idx] = temp_rec; } /* end for */ @@ -2795,109 +2783,107 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); /* Create the file to work on */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) STACK_ERROR /* Create the v2 B-tree & get its address */ - if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert random records */ - for(u = 0; u < INSERT_MANY; u++) { + for (u = 0; u < INSERT_MANY; u++) { record = records[u]; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - bt2_stat.depth = 4; + bt2_stat.depth = 4; bt2_stat.nrecords = INSERT_MANY; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR /* Re-open the file */ - if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) FAIL_STACK_ERROR /* Re-open v2 B-tree */ - if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) + 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.depth = 4; bt2_stat.nrecords = INSERT_MANY; - if(check_stats(bt2, &bt2_stat) < 0) + if (check_stats(bt2, &bt2_stat) < 0) TEST_ERROR /* Iterate over B-tree to check records have been inserted correctly */ idx = 0; - if(H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) + if (H5B2_iterate(bt2, dxpl, iter_cb, &idx) < 0) FAIL_STACK_ERROR /* Make certain that the index is correct */ - if(idx != INSERT_MANY) + if (idx != INSERT_MANY) TEST_ERROR /* Attempt to find non-existant record in level-4 B-tree */ /* (Should not be found, but not fail) */ idx = INSERT_MANY * 2; - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != FALSE) TEST_ERROR /* Find random records */ - for(u = 0; u < FIND_MANY; u++) { + for (u = 0; u < FIND_MANY; u++) { /* Pick random record */ - idx = (hsize_t)(HDrandom()%INSERT_MANY); + idx = (hsize_t)(HDrandom() % INSERT_MANY); /* Attempt to find existant record in root of level-4 B-tree */ - if(H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) + if (H5B2_find(bt2, dxpl, &idx, find_cb, &idx) != TRUE) FAIL_STACK_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*3), find_cb, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_index(bt2, dxpl, H5_ITER_INC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR - H5E_BEGIN_TRY { - ret = H5B2_index(bt2, dxpl, H5_ITER_DEC, (hsize_t)(INSERT_MANY*3), find_cb, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_index(bt2, dxpl, H5_ITER_DEC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR /* Find random records */ - for(u = 0; u < FIND_MANY; u++) { + for (u = 0; u < FIND_MANY; u++) { /* Pick random record */ idx = (hsize_t)(HDrandom() % INSERT_MANY); /* Attempt to find existant record in root of level-4 B-tree */ /* (in increasing order) */ - if(H5B2_index(bt2, dxpl, H5_ITER_INC, idx, find_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_INC, idx, find_cb, &idx) < 0) FAIL_STACK_ERROR /* Attempt to find existant record in root of level-4 B-tree */ /* (in decreasing order) */ - if(H5B2_index(bt2, dxpl, H5_ITER_DEC, idx, find_dec_cb, &idx) < 0) + if (H5B2_index(bt2, dxpl, H5_ITER_DEC, idx, find_dec_cb, &idx) < 0) FAIL_STACK_ERROR } /* end for */ @@ -2906,32 +2892,31 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); TESTING("B-tree insert: attempt duplicate record in level 4 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR record = INSERT_MANY / 2; - H5E_BEGIN_TRY { - ret = H5B2_insert(bt2, dxpl, &record); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_insert(bt2, dxpl, &record); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != INSERT_MANY) + if (nrec != INSERT_MANY) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -2941,16 +2926,17 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; HDfree(records); return 1; } /* test_insert_lots() */ - /*------------------------------------------------------------------------- * Function: test_remove_basic * @@ -2965,46 +2951,44 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - herr_t ret; /* Generic error return value */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + herr_t ret; /* Generic error return value */ /* Record removal tests */ TESTING("B-tree remove: record from empty B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != 0) + if (nrec != 0) TEST_ERROR /* Attempt to remove a record from a B-tree with no records */ record = 0; - H5E_BEGIN_TRY { - ret = H5B2_remove(bt2, dxpl, &record, NULL, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_remove(bt2, dxpl, &record, NULL, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR PASSED(); @@ -3012,37 +2996,36 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: non-existant record from 1 record B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert one record into B-tree */ record = 42; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != 1) + if (nrec != 1) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Attempt to remove a non-existant record from a B-tree with 1 record */ record = 0; - H5E_BEGIN_TRY { - ret = H5B2_remove(bt2, dxpl, &record, NULL, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_remove(bt2, dxpl, &record, NULL, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR PASSED(); @@ -3051,32 +3034,32 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: existant record from 1 record B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - record = 42; + record = 42; rrecord = 0; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 42) + if (rrecord != 42) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != 0) + if (nrec != 0) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the root node has been freed */ - if(H5F_addr_defined(root_addr)) + if (H5F_addr_defined(root_addr)) TEST_ERROR PASSED(); @@ -3085,29 +3068,29 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: adding records to B-tree after removal"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Insert several records into B-tree again */ record = 42; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR record = 34; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR record = 56; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR record = 38; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != 4) + if (nrec != 4) TEST_ERROR PASSED(); @@ -3116,15 +3099,14 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: non-existant record from level-0 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR record = 0; - H5E_BEGIN_TRY { - ret = H5B2_remove(bt2, dxpl, &record, NULL, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_remove(bt2, dxpl, &record, NULL, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR PASSED(); @@ -3133,116 +3115,116 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: mult. existant records from level-0 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - record = 42; + record = 42; rrecord = 0; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 42) + if (rrecord != 42) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != 3) + if (nrec != 3) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the root node has not been freed */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR - record = 34; + record = 34; rrecord = 0; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 34) + if (rrecord != 34) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != 2) + if (nrec != 2) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the root node has not been freed */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR - record = 56; + record = 56; rrecord = 0; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 56) + if (rrecord != 56) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != 1) + if (nrec != 1) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the root node has not been freed */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR - record = 38; + record = 38; rrecord = 0; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 38) + if (rrecord != 38) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != 0) + if (nrec != 0) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the root node has been freed */ - if(H5F_addr_defined(root_addr)) + if (H5F_addr_defined(root_addr)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); @@ -3250,15 +3232,16 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_basic() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_noredistrib * @@ -3273,70 +3256,68 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level1_noredistrib(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - unsigned u; /* Local index variable */ - herr_t ret; /* Generic error return value */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + unsigned u; /* Local index variable */ + herr_t ret; /* Generic error return value */ /* B-tree record removal tests */ TESTING("B-tree remove: non-existant record from level-1 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 3 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Attempt to remove a non-existant record from a B-tree with 1 record */ record = (INSERT_SPLIT_ROOT_NREC * 2) + 1; - H5E_BEGIN_TRY { - ret = H5B2_remove(bt2, dxpl, &record, NULL, NULL); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_remove(bt2, dxpl, &record, NULL, NULL); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC*2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR PASSED(); @@ -3345,42 +3326,42 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: record from right leaf of level-1 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check up on B-tree */ - record = 62; /* Left record in root node */ - if(check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) + record = 62; /* Left record in root node */ + 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) + record = 94; /* Right record in root node */ + 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; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - 2)) + if (rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - 2)) TEST_ERROR /* 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) + record = 62; /* Left record in root node */ + 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) + record = 94; /* Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - 1)) TEST_ERROR PASSED(); @@ -3389,36 +3370,36 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: record from left leaf of level-1 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* 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; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 0) + if (rrecord != 0) TEST_ERROR /* 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) + record = 62; /* Left record in root node */ + 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) + record = 94; /* Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - 2)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - 2)) TEST_ERROR PASSED(); @@ -3427,45 +3408,45 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: record from middle leaf of level-1 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* 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; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != INSERT_SPLIT_ROOT_NREC) + if (rrecord != INSERT_SPLIT_ROOT_NREC) TEST_ERROR /* 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) + record = 62; /* Left record in root node */ + 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) + record = 94; /* Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - 3)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - 3)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); @@ -3473,15 +3454,16 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_noredistrib() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_redistrib * @@ -3496,92 +3478,91 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level1_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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + unsigned u; /* Local index variable */ /* More complex record removals */ TESTING("B-tree remove: redistribute 2 leaves in level-1 B-tree (r->l)"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 3 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left record in root node */ + 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) + record = 94; /* Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove enough records from right leaf of a level-1 B-tree to force redistribution */ - for(u = 0; u < 8; u++) { - record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); + for (u = 0; u < 8; u++) { + record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR } /* end for */ /* 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) + record = 62; /* Left record in root node */ + 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) + record = 90; /* Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR PASSED(); @@ -3590,34 +3571,34 @@ test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: redistribute 2 leaves in level-1 B-tree (l->r)"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - for(u = 0; u < 39; u++) { - record = u; + for (u = 0; u < 39; u++) { + record = u; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != u) + if (rrecord != u) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 2) - 8) - (u + 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 2) - 8) - (u + 1))) TEST_ERROR } /* end for */ /* 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) + record = 64; /* Left record in root node */ + 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) + record = 90; /* Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR PASSED(); @@ -3626,43 +3607,43 @@ test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: redistribute 3 leaves in level-1 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - for(u = 0; u < 2; u++) { - record = INSERT_SPLIT_ROOT_NREC + 2 + u; + for (u = 0; u < 2; u++) { + record = INSERT_SPLIT_ROOT_NREC + 2 + u; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (INSERT_SPLIT_ROOT_NREC + 2 + u)) + if (rrecord != (INSERT_SPLIT_ROOT_NREC + 2 + u)) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((((INSERT_SPLIT_ROOT_NREC * 2) - 47)) - (u + 1))) + if (nrec != ((((INSERT_SPLIT_ROOT_NREC * 2) - 47)) - (u + 1))) TEST_ERROR } /* end for */ /* 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) + record = 64; /* Left record in root node */ + 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) + record = 91; /* Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -3670,15 +3651,16 @@ test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_2leaf_merge * @@ -3693,93 +3675,92 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level1_2leaf_merge(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: merge 2 leaves to 1 in level-1 B-tree (r->l)"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 3 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 94; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 94; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove enough records from right leaf of a level-1 B-tree to force redistribution */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC / 4); u++) { - record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC / 4); u++) { + record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR } /* end for */ /* Check record values in root of B-tree */ ninfo.depth = 1; - ninfo.nrec = 1; - record = 62; /* Left record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 62; /* Left record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR PASSED(); @@ -3788,60 +3769,60 @@ test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: merge 2 leaves to 1 in level-1 B-tree (l->r)"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Fill B-tree back up */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC / 4); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC / 4); u++) { record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 94; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 94; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Remove records */ - for(u = 0; u < ((3 * INSERT_SPLIT_ROOT_NREC) / 4) - 1; u++) { - record = u; + for (u = 0; u < ((3 * INSERT_SPLIT_ROOT_NREC) / 4) - 1; u++) { + record = u; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != u) + if (rrecord != u) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR } /* end for */ /* Check record values in root of B-tree */ ninfo.depth = 1; - ninfo.nrec = 1; - record = 94; /* Left record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 94; /* Left record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -3849,15 +3830,16 @@ test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_2leaf_merge() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_3leaf_merge * @@ -3872,102 +3854,101 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level1_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level1_3leaf_merge(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: merge 3 leaves to 2 in level-1 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 3 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 94; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 94; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove enough records from middle leaf of a level-1 B-tree to force merge */ - for(u = 0; u < ((5 * INSERT_SPLIT_ROOT_NREC) / 6) - 1; u++) { - record = ((3 * INSERT_SPLIT_ROOT_NREC) / 2) - (u + 1); + for (u = 0; u < ((5 * INSERT_SPLIT_ROOT_NREC) / 6) - 1; u++) { + record = ((3 * INSERT_SPLIT_ROOT_NREC) / 2) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (((3 * INSERT_SPLIT_ROOT_NREC) / 2) - (u + 1))) + if (rrecord != (((3 * INSERT_SPLIT_ROOT_NREC) / 2) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR } /* end for */ /* Check record values in root of B-tree */ ninfo.depth = 1; - ninfo.nrec = 1; - record = 37; /* Only record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 37; /* Only record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -3975,15 +3956,16 @@ test_remove_level1_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_3leaf_merge() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_promote * @@ -3998,106 +3980,105 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level1_promote(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from right leaf of level-1 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 5 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 4); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 4); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left-most record in root node */ + 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) + record = 125; /* Center-Left record in root node */ + 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) + record = 188; /* Center-Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 4; - record = 220; /* Right-most record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 4; + record = 220; /* Right-most record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 4)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 4)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove record from root node of a level-1 B-tree to force promotion from right leaf */ - record = 220; + record = 220; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 220) + if (rrecord != 220) TEST_ERROR /* 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) + record = 62; /* Left-most record in root node */ + 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) + record = 125; /* Center-Left record in root node */ + 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) + record = 188; /* Center-Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 4; - record = 221; /* Right-most record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 4; + record = 221; /* Right-most record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 4) - 1) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 4) - 1) TEST_ERROR PASSED(); @@ -4110,40 +4091,40 @@ test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: promote from left leaf of level-1 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - record = 62; + record = 62; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 62) + if (rrecord != 62) TEST_ERROR /* 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) + record = 63; /* Left-most record in root node */ + 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) + record = 125; /* Center-Left record in root node */ + 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) + record = 188; /* Center-Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 4; - record = 221; /* Right-most record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 4; + record = 221; /* Right-most record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 4) - 2) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 4) - 2) TEST_ERROR PASSED(); @@ -4152,49 +4133,49 @@ test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: promote from middle leaf of level-1 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - record = 125; + record = 125; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 125) + if (rrecord != 125) TEST_ERROR /* 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) + record = 63; /* Left-most record in root node */ + 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) + record = 126; /* Center-Left record in root node */ + 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) + record = 188; /* Center-Right record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 4; - record = 221; /* Right-most record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 4; + record = 221; /* Right-most record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 4) - 3) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 4) - 3) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -4202,15 +4183,16 @@ test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_promote() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_promote_2leaf_redistrib * @@ -4226,123 +4208,123 @@ error: */ static unsigned test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from leaf of level-1 B-tree w/2 node redistrib"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 3 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left-most record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 94; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 94; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove record from root node of a level-1 B-tree to force promotion from right leaf */ /* Remove records from right leaf until its ready to redistribute */ - for(u = 0; u < 7; u++) { - record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); + for (u = 0; u < 7; u++) { + record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR } /* end for */ - record = 94; + record = 94; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 94) + if (rrecord != 94) TEST_ERROR /* 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) + record = 62; /* Left-most record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 90; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 90; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2) - 8) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2) - 8) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -4350,15 +4332,16 @@ test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_promote_2leaf_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_promote_3leaf_redistrib * @@ -4374,123 +4357,123 @@ error: */ static unsigned test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from leaf of level-1 B-tree w/3 node redistrib"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 3 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left-most record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 94; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 94; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove record from root node of a level-1 B-tree to force promotion from middle leaf */ /* Remove records from right leaf until its ready to redistribute */ - for(u = 0; u < 7; u++) { - record = 63 + u; + for (u = 0; u < 7; u++) { + record = 63 + u; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (63 + u)) + if (rrecord != (63 + u)) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR } /* end for */ - record = 62; + record = 62; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 62) + if (rrecord != 62) TEST_ERROR /* 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) + record = 39; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 86; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 86; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2) - 8) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2) - 8) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -4498,15 +4481,16 @@ test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_promote_3leaf_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_promote_2leaf_merge * @@ -4522,120 +4506,120 @@ error: */ static unsigned test_remove_level1_promote_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from leaf of level-1 B-tree w/2->1 merge"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 3 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left-most record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 94; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 94; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove record from root node of a level-1 B-tree to force promotion from right leaf */ /* Remove records from right leaf until its ready to merge */ - for(u = 0; u < 14; u++) { - record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); + for (u = 0; u < 14; u++) { + record = (INSERT_SPLIT_ROOT_NREC * 2) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (rrecord != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR } /* end for */ - record = 87; + record = 87; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 87) + if (rrecord != 87) TEST_ERROR /* Check record values in root of B-tree */ ninfo.depth = 1; - ninfo.nrec = 1; - record = 62; /* Middle record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 62; /* Middle record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2) - 15) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2) - 15) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -4643,15 +4627,16 @@ test_remove_level1_promote_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_promote_2leaf_merge() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_promote_3leaf_merge * @@ -4667,120 +4652,120 @@ error: */ static unsigned test_remove_level1_promote_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from leaf of level-1 B-tree w/3->2 merge"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 leaves */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 2); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 62; /* Left-most record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)1) < 0) TEST_ERROR ninfo.depth = 1; - ninfo.nrec = 2; - record = 94; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 94; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove record from root node of a level-1 B-tree to force promotion from middle leaf */ /* Remove records from middle leaf until it's ready to merge */ - for(u = 0; u < 50; u++) { - record = ((3 * INSERT_SPLIT_ROOT_NREC) / 2) - (u + 1); + for (u = 0; u < 50; u++) { + record = ((3 * INSERT_SPLIT_ROOT_NREC) / 2) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (((3 * INSERT_SPLIT_ROOT_NREC) / 2) - (u + 1))) + if (rrecord != (((3 * INSERT_SPLIT_ROOT_NREC) / 2) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 2) - (u + 1))) TEST_ERROR } /* end for */ - record = 25; + record = 25; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 25) + if (rrecord != 25) TEST_ERROR /* Check record values in root of B-tree */ ninfo.depth = 1; - ninfo.nrec = 1; - record = 37; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 37; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 2) - 51) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 2) - 51) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -4788,15 +4773,16 @@ test_remove_level1_promote_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_promote_3leaf_merge() */ - /*------------------------------------------------------------------------- * Function: test_remove_level1_collapse * @@ -4811,115 +4797,114 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level1_collapse(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: collapse level-1 B-tree back to level-0"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-1 B-tree with 2 leaves */ - for(u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { + for (u = 0; u < INSERT_SPLIT_ROOT_NREC; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check record values in root of B-tree */ ninfo.depth = 1; - ninfo.nrec = 1; - record = 31; /* Middle record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 31; /* Middle record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != INSERT_SPLIT_ROOT_NREC) + if (nrec != INSERT_SPLIT_ROOT_NREC) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove records from B-tree to force a single leaf for the B-tree */ - for(u = 0; u < 14; u++) { - record = INSERT_SPLIT_ROOT_NREC - (u + 1); + for (u = 0; u < 14; u++) { + record = INSERT_SPLIT_ROOT_NREC - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (INSERT_SPLIT_ROOT_NREC - (u + 1))) + if (rrecord != (INSERT_SPLIT_ROOT_NREC - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC - (u + 1))) + if (nrec != (INSERT_SPLIT_ROOT_NREC - (u + 1))) TEST_ERROR } /* end for */ /* Check record values in root of B-tree */ ninfo.depth = 0; - ninfo.nrec = INSERT_SPLIT_ROOT_NREC - u; - record = 31; /* Middle record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = INSERT_SPLIT_ROOT_NREC - u; + record = 31; /* Middle record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC - u)) + if (nrec != (INSERT_SPLIT_ROOT_NREC - u)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -4927,15 +4912,16 @@ test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level1_collapse() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_promote * @@ -4950,98 +4936,97 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level2_promote(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from right internal of level-2 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check information about record in right internal node */ ninfo.depth = 1; - ninfo.nrec = 14; - record = 2960; /* Record in right internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 14; + record = 2960; /* Record in right internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Attempt to remove record from right internal node of a level-2 B-tree to force promotion */ - record = 2960; + record = 2960; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 2960) + if (rrecord != 2960) TEST_ERROR /* Check information about record promoted into right internal node */ ninfo.depth = 1; - ninfo.nrec = 14; - record = 2961; /* Record in right internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 14; + record = 2961; /* Record in right internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59)) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59)) TEST_ERROR PASSED(); @@ -5050,38 +5035,38 @@ test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: promote from left internal of level-2 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check information about record in left internal node */ ninfo.depth = 1; - ninfo.nrec = 29; - record = 1133; /* Record in left internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 29; + record = 1133; /* Record in left internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR - record = 1133; + record = 1133; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 1133) + if (rrecord != 1133) TEST_ERROR /* Check information about record in left internal node */ ninfo.depth = 1; - ninfo.nrec = 29; - record = 1134; /* Record in left internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 29; + record = 1134; /* Record in left internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 1) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 1) TEST_ERROR PASSED(); @@ -5090,38 +5075,38 @@ test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: promote from middle internal of level-2 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check information about record in middle internal node */ ninfo.depth = 1; - ninfo.nrec = 14; - record = 2267; /* Record in middle internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 14; + record = 2267; /* Record in middle internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR - record = 2267; + record = 2267; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 2267) + if (rrecord != 2267) TEST_ERROR /* Check information about record in middle internal node */ ninfo.depth = 1; - ninfo.nrec = 14; - record = 2268; /* Record in middle internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 14; + record = 2268; /* Record in middle internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 2) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 2) TEST_ERROR PASSED(); @@ -5130,82 +5115,82 @@ test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree remove: promote record from root of level-2 B-tree"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check information about record in root node */ ninfo.depth = 2; - ninfo.nrec = 2; - record = 1889; /* Left record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 1889; /* Left record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR - record = 1889; + record = 1889; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 1889) + if (rrecord != 1889) TEST_ERROR /* Check information about record in root node */ ninfo.depth = 2; - ninfo.nrec = 2; - record = 1890; /* Left record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 1890; /* Left record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 3) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 3) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check information about record in root node */ ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR - record = 2834; + record = 2834; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 2834) + if (rrecord != 2834) TEST_ERROR /* Check information about record in root node */ ninfo.depth = 2; - ninfo.nrec = 2; - record = 2835; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2835; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 4) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 4) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -5213,15 +5198,16 @@ test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_promote() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_promote_2internal_redistrib * @@ -5237,125 +5223,126 @@ error: */ static unsigned test_remove_level2_promote_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from right internal of level-2 B-tree w/redistrib"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 1; - ninfo.nrec = 14; - record = 3685; /* Right-most record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 14; + record = 3685; /* Right-most record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR - /* Attempt to remove record from right internal node of a level-2 B-tree to force promotion w/redistribution */ - for(u = 0; u < 8; u++) { - record = ((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1); + /* Attempt to remove record from right internal node of a level-2 B-tree to force promotion + * w/redistribution */ + for (u = 0; u < 8; u++) { + record = ((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (((INSERT_SPLIT_ROOT_NREC * 59) + 1)- (u + 1))) + if (rrecord != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR } /* end for */ - record = 3685; + record = 3685; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 3685) + if (rrecord != 3685) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 1; - ninfo.nrec = 14; - record = 3681; /* Right-most record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 14; + record = 3681; /* Right-most record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 8) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 8) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -5363,15 +5350,16 @@ test_remove_level2_promote_2internal_redistrib(hid_t fapl, const H5B2_create_t * return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_promote_2internal_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_3promote_internal_redistrib * @@ -5387,125 +5375,126 @@ error: */ static unsigned test_remove_level2_promote_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from left internal of level-2 B-tree w/redistrib"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 1; - ninfo.nrec = 29; - record = 62; /* Left-most record in left node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 29; + record = 62; /* Left-most record in left node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR - /* Attempt to remove record from left internal node of a level-2 B-tree to force promotion w/redistribution */ - for(u = 0; u < 38; u++) { - record = 63 + u; + /* Attempt to remove record from left internal node of a level-2 B-tree to force promotion + * w/redistribution */ + for (u = 0; u < 38; u++) { + record = 63 + u; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (63 + u)) + if (rrecord != (63 + u)) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR } /* end for */ - record = 62; + record = 62; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 62) + if (rrecord != 62) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 1; - ninfo.nrec = 29; - record = 49; /* Left-most record in left node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 29; + record = 49; /* Left-most record in left node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 38) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 38) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -5513,15 +5502,16 @@ test_remove_level2_promote_3internal_redistrib(hid_t fapl, const H5B2_create_t * return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_promote_3internal_redistrib() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_promote_2internal_merge * @@ -5537,126 +5527,127 @@ error: */ static unsigned test_remove_level2_promote_2internal_merge(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from right internal of level-2 B-tree w/merge"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check information about record in right internal node */ ninfo.depth = 1; - ninfo.nrec = 14; - record = 3685; /* Right-most record in right internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 14; + record = 3685; /* Right-most record in right internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR - /* Attempt to remove record from right internal node of a level-2 B-tree to force promotion w/redistribution */ - for(u = 0; u < 15; u++) { - record = ((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1); + /* Attempt to remove record from right internal node of a level-2 B-tree to force promotion + * w/redistribution */ + for (u = 0; u < 15; u++) { + record = ((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (((INSERT_SPLIT_ROOT_NREC * 59) + 1)- (u + 1))) + if (rrecord != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR } /* end for */ /* Force merge by promoting current right-most record */ - record = 3678; + record = 3678; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 3678) + if (rrecord != 3678) TEST_ERROR /* Check information about record in right internal node */ ninfo.depth = 1; - ninfo.nrec = 13; - record = 3653; /* Right-most record in right internal node (now) */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 13; + record = 3653; /* Right-most record in right internal node (now) */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 15) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 15) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -5664,15 +5655,16 @@ test_remove_level2_promote_2internal_merge(hid_t fapl, const H5B2_create_t *cpar return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_promote_2internal_merge() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_3promote_internal_merge * @@ -5688,126 +5680,127 @@ error: */ static unsigned test_remove_level2_promote_3internal_merge(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: promote from middle internal of level-2 B-tree w/merge"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check information about record in left internal node */ ninfo.depth = 1; - ninfo.nrec = 29; - record = 62; /* Left-most record in left internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 29; + record = 62; /* Left-most record in left internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR - /* Attempt to remove record from left internal node of a level-2 B-tree to force promotion w/redistribution */ - for(u = 0; u < 112; u++) { - record = 48 + u; + /* Attempt to remove record from left internal node of a level-2 B-tree to force promotion + * w/redistribution */ + for (u = 0; u < 112; u++) { + record = 48 + u; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (48 + u)) + if (rrecord != (48 + u)) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR } /* end for */ /* Force merge of left-most internal nodes by promotion */ - record = 25; + record = 25; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != 25) + if (rrecord != 25) TEST_ERROR /* Check information about record in left internal node */ ninfo.depth = 1; - ninfo.nrec = 28; - record = 37; /* Left-most record in left internal node (now) */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 28; + record = 37; /* Left-most record in left internal node (now) */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 112) + if (nrec != (INSERT_SPLIT_ROOT_NREC * 59) - 112) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -5815,15 +5808,16 @@ test_remove_level2_promote_3internal_merge(hid_t fapl, const H5B2_create_t *cpar return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_promote_3internal_merge() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_2internal_merge_left * @@ -5839,101 +5833,101 @@ error: */ static unsigned test_remove_level2_2internal_merge_left(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: merge 2 internal nodes to 1 in level-2 B-tree (l->r)"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove records from a level-2 B-tree to force 2 internal nodes to merge */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 21) + 15); u++) { - record = u; + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 21) + 15); u++) { + record = u; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != u) + if (rrecord != u) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR } /* end for */ /* Check status of B-tree */ ninfo.depth = 2; - ninfo.nrec = 1; - record = 2834; /* Middle record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 2834; /* Middle record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -5941,15 +5935,16 @@ test_remove_level2_2internal_merge_left(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_2internal_merge_left() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_2internal_merge_right * @@ -5965,101 +5960,101 @@ error: */ static unsigned test_remove_level2_2internal_merge_right(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) + 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: merge 2 internal nodes to 1 in level-2 B-tree (r->l)"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove records from a level-2 B-tree to force 2 internal nodes to merge */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 5) + 17); u++) { - record = ((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1); + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 5) + 17); u++) { + record = ((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (rrecord != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u+ 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR } /* end for */ /* Check status of B-tree */ ninfo.depth = 2; - ninfo.nrec = 1; - record = 1889; /* Middle record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 1889; /* Middle record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -6067,15 +6062,16 @@ test_remove_level2_2internal_merge_right(hid_t fapl, const H5B2_create_t *cparam return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_2internal_merge_right() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_3internal_merge * @@ -6090,102 +6086,102 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level2_3internal_merge(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level2_3internal_merge(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: merge 3 internal nodes to 2 in level-2 B-tree"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR - /* Attempt to remove record from middle internal node of a level-2 B-tree to force promotion w/redistribution */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 23) + 15); u++) { - record = (INSERT_SPLIT_ROOT_NREC * 20) + u; + /* Attempt to remove record from middle internal node of a level-2 B-tree to force promotion + * w/redistribution */ + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 23) + 15); u++) { + record = (INSERT_SPLIT_ROOT_NREC * 20) + u; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != ((INSERT_SPLIT_ROOT_NREC * 20) + u)) + if (rrecord != ((INSERT_SPLIT_ROOT_NREC * 20) + u)) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR } /* end for */ /* Check status of B-tree */ ninfo.depth = 2; - ninfo.nrec = 1; - record = 1196; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 1196; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -6193,15 +6189,16 @@ test_remove_level2_3internal_merge(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_3internal_merge() */ - /*------------------------------------------------------------------------- * Function: test_remove_level2_collapse_right * @@ -6216,102 +6213,101 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_remove_level2_collapse_right(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_remove_level2_collapse_right(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - hsize_t nrec; /* Number of records in B-tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + hsize_t nrec; /* Number of records in B-tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ TESTING("B-tree remove: collapse level-2 B-tree back to level-1 (r->l)"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* 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) + record = 1889; /* Left record in root node */ + if (check_node_depth(bt2, dxpl, record, (unsigned)2) < 0) TEST_ERROR ninfo.depth = 2; - ninfo.nrec = 2; - record = 2834; /* Right record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 2834; /* Right record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) + if (nrec != ((INSERT_SPLIT_ROOT_NREC * 59) + 1)) TEST_ERROR /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(!H5F_addr_defined(root_addr)) + if (!H5F_addr_defined(root_addr)) TEST_ERROR /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to remove records from a level-2 B-tree to force back to level-1 */ - for(u = 0; u < (INSERT_SPLIT_ROOT_NREC * 34) + 17; u++) { - record = ((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1); + for (u = 0; u < (INSERT_SPLIT_ROOT_NREC * 34) + 17; u++) { + record = ((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1); rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(record != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (record != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) + if (nrec != (((INSERT_SPLIT_ROOT_NREC * 59) + 1) - (u + 1))) TEST_ERROR } /* end for */ /* Check up on B-tree */ - if(H5B2_stat_info(bt2, &bt2_stat) < 0) + if (H5B2_stat_info(bt2, &bt2_stat) < 0) FAIL_STACK_ERROR - if(bt2_stat.depth != 1) + if (bt2_stat.depth != 1) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -6319,15 +6315,16 @@ test_remove_level2_collapse_right(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_remove_level2_collapse_right() */ - /*------------------------------------------------------------------------- * Function: gen_l4_btree2 * @@ -6342,64 +6339,65 @@ error: *------------------------------------------------------------------------- */ static unsigned -gen_l4_btree2(const char *filename, hid_t fapl, const H5B2_create_t *cparam, - haddr_t *bt2_addr, const hsize_t *records) +gen_l4_btree2(const char *filename, hid_t fapl, const H5B2_create_t *cparam, haddr_t *bt2_addr, + const hsize_t *records) { - 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 */ - hsize_t record; /* Record to insert into tree */ - unsigned u; /* Local index variable */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + 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 */ + hsize_t record; /* Record to insert into tree */ + unsigned u; /* Local index variable */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ /* Create the file to work on */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) STACK_ERROR /* Create the v2 B-tree & get its address */ - if(create_btree(f, dxpl, cparam, &bt2, bt2_addr) < 0) + if (create_btree(f, dxpl, cparam, &bt2, bt2_addr) < 0) TEST_ERROR /* Insert random records */ - for(u = 0; u < INSERT_MANY; u++) { + for (u = 0; u < INSERT_MANY; u++) { record = records[u]; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - if(H5B2_stat_info(bt2, &bt2_stat) < 0) + if (H5B2_stat_info(bt2, &bt2_stat) < 0) FAIL_STACK_ERROR - if(bt2_stat.depth != 4) + if (bt2_stat.depth != 4) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* gen_l4_btree2() */ - /*------------------------------------------------------------------------- * Function: test_remove_lots * @@ -6418,30 +6416,30 @@ error: static unsigned test_remove_lots(const char *env_h5_drvr, hid_t fapl, const H5B2_create_t *cparam) { - hid_t file = -1; /* File ID */ - char filename[1024]; /* Filename to use */ - H5F_t *f = NULL; /* Internal file object pointer */ - int fd = -1; /* File descriptor */ - h5_stat_t sb; /* Stat buffer for file */ - void *file_data = NULL; /* Copy of file data */ - 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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t rrecord; /* Record to remove from tree */ - haddr_t root_addr; /* Address of root of B-tree created */ - time_t curr_time; /* Current time, for seeding random number generator */ - hsize_t *records; /* Record #'s for random insertion */ - unsigned u; /* Local index variable */ - unsigned rem_idx; /* Location to remove */ - hsize_t nrec; /* Number of records in B-tree */ - hbool_t single_file_vfd; /* Whether VFD used stores data in a single file */ + hid_t file = -1; /* File ID */ + char filename[1024]; /* Filename to use */ + H5F_t * f = NULL; /* Internal file object pointer */ + int fd = -1; /* File descriptor */ + h5_stat_t sb; /* Stat buffer for file */ + void * file_data = NULL; /* Copy of file data */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t rrecord; /* Record to remove from tree */ + haddr_t root_addr; /* Address of root of B-tree created */ + time_t curr_time; /* Current time, for seeding random number generator */ + hsize_t * records; /* Record #'s for random insertion */ + unsigned u; /* Local index variable */ + unsigned rem_idx; /* Location to remove */ + hsize_t nrec; /* Number of records in B-tree */ + hbool_t single_file_vfd; /* Whether VFD used stores data in a single file */ /* Initialize random number seed */ curr_time = HDtime(NULL); #ifdef QAK -curr_time = 1163537969; -HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); + curr_time = 1163537969; + HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); #endif /* QAK */ HDsrandom((unsigned)curr_time); @@ -6450,53 +6448,54 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); */ /* Allocate space for the records */ - if(NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * INSERT_MANY))) + if (NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * INSERT_MANY))) TEST_ERROR /* Initialize record #'s */ - for(u = 0; u < INSERT_MANY; u++) + for (u = 0; u < INSERT_MANY; u++) records[u] = u; /* Shuffle record #'s */ - for(u = 0; u < INSERT_MANY; u++) { - hsize_t temp_rec; /* Temporary record */ - unsigned swap_idx; /* Location to swap with when shuffling */ + for (u = 0; u < INSERT_MANY; u++) { + hsize_t temp_rec; /* Temporary record */ + unsigned swap_idx; /* Location to swap with when shuffling */ - swap_idx = ((unsigned)HDrandom() % (INSERT_MANY - u)) + u; - temp_rec = records[u]; - records[u] = records[swap_idx]; + swap_idx = ((unsigned)HDrandom() % (INSERT_MANY - u)) + u; + temp_rec = records[u]; + records[u] = records[swap_idx]; records[swap_idx] = temp_rec; } /* end for */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); /* Generate the v2 B-tree to test */ - if(gen_l4_btree2(filename, fapl, cparam, &bt2_addr, records)) + if (gen_l4_btree2(filename, fapl, cparam, &bt2_addr, records)) TEST_ERROR /* Check for VFD which stores data in multiple files */ - single_file_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family")); - if(single_file_vfd) { + single_file_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && + HDstrcmp(env_h5_drvr, "family")); + if (single_file_vfd) { /* Make a copy of the file in memory, in order to speed up deletion testing */ /* Open the file just created */ - if((fd = HDopen(filename, O_RDONLY, 0)) < 0) + if ((fd = HDopen(filename, O_RDONLY, 0)) < 0) TEST_ERROR /* Retrieve the file's size */ - if(HDfstat(fd, &sb) < 0) + if (HDfstat(fd, &sb) < 0) TEST_ERROR /* Allocate space for the file data */ - if(NULL == (file_data = HDmalloc((size_t)sb.st_size))) + if (NULL == (file_data = HDmalloc((size_t)sb.st_size))) TEST_ERROR /* Read file's data into memory */ - if(HDread(fd, file_data, (size_t)sb.st_size) < (ssize_t)sb.st_size) + if (HDread(fd, file_data, (size_t)sb.st_size) < (ssize_t)sb.st_size) TEST_ERROR /* Close the file */ - if(HDclose(fd) < 0) + if (HDclose(fd) < 0) TEST_ERROR fd = -1; } /* end if */ @@ -6505,337 +6504,329 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); TESTING("B-tree remove: create random level 4 B-tree and delete all records in random order"); /* Re-open the file */ - if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) FAIL_STACK_ERROR /* Re-shuffle record #'s */ - for(u = 0; u < INSERT_MANY; u++) { - hsize_t temp_rec; /* Temporary record */ - unsigned swap_idx; /* Location to swap with when shuffling */ + for (u = 0; u < INSERT_MANY; u++) { + hsize_t temp_rec; /* Temporary record */ + unsigned swap_idx; /* Location to swap with when shuffling */ - swap_idx = ((unsigned)HDrandom() % (INSERT_MANY - u)) + u; - temp_rec = records[u]; - records[u] = records[swap_idx]; + swap_idx = ((unsigned)HDrandom() % (INSERT_MANY - u)) + u; + temp_rec = records[u]; + records[u] = records[swap_idx]; records[swap_idx] = temp_rec; } /* end for */ /* Re-open v2 B-tree */ - if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) + if (NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) FAIL_STACK_ERROR /* Remove all records */ - for(u = 0; u < INSERT_MANY; u++) { - record = records[u]; + for (u = 0; u < INSERT_MANY; u++) { + record = records[u]; rrecord = HSIZET_MAX; - if(H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) + if (H5B2_remove(bt2, dxpl, &record, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != records[u]) + if (rrecord != records[u]) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_MANY - (u + 1))) + if (nrec != (INSERT_MANY - (u + 1))) TEST_ERROR } /* end for */ /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(H5F_addr_defined(root_addr)) + if (H5F_addr_defined(root_addr)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); - - /* Check for VFD which stores data in multiple files */ - if(single_file_vfd) { + if (single_file_vfd) { /* Re-write the file's data with the copy in memory */ /* Open the file just created */ - if((fd = HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0) + if ((fd = HDopen(filename, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) TEST_ERROR /* Write file's data from memory */ - if(HDwrite(fd, file_data, (size_t)sb.st_size) < (ssize_t)sb.st_size) + if (HDwrite(fd, file_data, (size_t)sb.st_size) < (ssize_t)sb.st_size) TEST_ERROR /* Close the file */ - if(HDclose(fd) < 0) + if (HDclose(fd) < 0) TEST_ERROR fd = -1; } /* end if */ else { /* Re-generate the v2 B-tree to test */ - if(gen_l4_btree2(filename, fapl, cparam, &bt2_addr, records)) + if (gen_l4_btree2(filename, fapl, cparam, &bt2_addr, records)) TEST_ERROR } /* end else */ - /* Print banner for this test */ TESTING("B-tree remove: create random level 4 B-tree and delete all records by index, in random order"); /* Re-open the file */ - if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) FAIL_STACK_ERROR /* Re-open v2 B-tree */ - if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) + if (NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) FAIL_STACK_ERROR /* Remove all records */ - for(u = 0; u < INSERT_MANY; u++) { + for (u = 0; u < INSERT_MANY; u++) { /* Pick a record index to remove from randomly */ rem_idx = ((unsigned)HDrandom() % (INSERT_MANY - u)); rrecord = HSIZET_MAX; /* Remove random record */ - if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_INC, (hsize_t)rem_idx, remove_cb, &rrecord) < 0) + if (H5B2_remove_by_idx(bt2, dxpl, H5_ITER_INC, (hsize_t)rem_idx, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord >= INSERT_MANY) + if (rrecord >= INSERT_MANY) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_MANY - (u + 1))) + if (nrec != (INSERT_MANY - (u + 1))) TEST_ERROR } /* end for */ /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(H5F_addr_defined(root_addr)) + if (H5F_addr_defined(root_addr)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); - - /* Check for VFD which stores data in multiple files */ - if(single_file_vfd) { + if (single_file_vfd) { /* Re-write the file's data with the copy in memory */ /* Open the file just created */ - if((fd = HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0) + if ((fd = HDopen(filename, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) TEST_ERROR /* Write file's data from memory */ - if(HDwrite(fd, file_data, (size_t)sb.st_size) < (ssize_t)sb.st_size) + if (HDwrite(fd, file_data, (size_t)sb.st_size) < (ssize_t)sb.st_size) TEST_ERROR /* Close the file */ - if(HDclose(fd) < 0) + if (HDclose(fd) < 0) TEST_ERROR fd = -1; } /* end if */ else { /* Re-generate the v2 B-tree to test */ - if(gen_l4_btree2(filename, fapl, cparam, &bt2_addr, records)) + if (gen_l4_btree2(filename, fapl, cparam, &bt2_addr, records)) TEST_ERROR } /* end else */ - - /* Print banner for this test */ - TESTING("B-tree remove: create random level 4 B-tree and delete all records by index, in increasing order"); + TESTING( + "B-tree remove: create random level 4 B-tree and delete all records by index, in increasing order"); /* Re-open the file */ - if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) FAIL_STACK_ERROR /* Re-open v2 B-tree */ - if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) + if (NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) FAIL_STACK_ERROR /* Remove all records */ - for(u = 0; u < INSERT_MANY; u++) { + for (u = 0; u < INSERT_MANY; u++) { /* Remove first record */ rrecord = HSIZET_MAX; - if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_INC, (hsize_t)0, remove_cb, &rrecord) < 0) + if (H5B2_remove_by_idx(bt2, dxpl, H5_ITER_INC, (hsize_t)0, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != u) + if (rrecord != u) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_MANY - (u + 1))) + if (nrec != (INSERT_MANY - (u + 1))) TEST_ERROR } /* end for */ /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(H5F_addr_defined(root_addr)) + if (H5F_addr_defined(root_addr)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); - - /* Check for VFD which stores data in multiple files */ - if(single_file_vfd) { + if (single_file_vfd) { /* Re-write the file's data with the copy in memory */ /* Open the file just created */ - if((fd = HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0) + if ((fd = HDopen(filename, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) TEST_ERROR /* Write file's data from memory */ - if(HDwrite(fd, file_data, (size_t)sb.st_size) < (ssize_t)sb.st_size) + if (HDwrite(fd, file_data, (size_t)sb.st_size) < (ssize_t)sb.st_size) TEST_ERROR /* Close the file */ - if(HDclose(fd) < 0) + if (HDclose(fd) < 0) TEST_ERROR fd = -1; } /* end if */ else { /* Re-generate the v2 B-tree to test */ - if(gen_l4_btree2(filename, fapl, cparam, &bt2_addr, records)) + if (gen_l4_btree2(filename, fapl, cparam, &bt2_addr, records)) TEST_ERROR } /* end else */ - - /* Print banner for this test */ - TESTING("B-tree remove: create random level 4 B-tree and delete all records by index, in decreasing order"); + TESTING( + "B-tree remove: create random level 4 B-tree and delete all records by index, in decreasing order"); /* Re-open the file */ - if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) FAIL_STACK_ERROR /* Re-open v2 B-tree */ - if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) + if (NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f))) FAIL_STACK_ERROR /* Remove all records */ - for(u = 0; u < INSERT_MANY; u++) { + for (u = 0; u < INSERT_MANY; u++) { /* Remove last record */ rrecord = HSIZET_MAX; - if(H5B2_remove_by_idx(bt2, dxpl, H5_ITER_DEC, (hsize_t)0, remove_cb, &rrecord) < 0) + if (H5B2_remove_by_idx(bt2, dxpl, H5_ITER_DEC, (hsize_t)0, remove_cb, &rrecord) < 0) FAIL_STACK_ERROR /* Make certain that the record value is correct */ - if(rrecord != (INSERT_MANY - (u + 1))) + if (rrecord != (INSERT_MANY - (u + 1))) TEST_ERROR /* Query the number of records in the B-tree */ - if(H5B2_get_nrec(bt2, &nrec) < 0) + if (H5B2_get_nrec(bt2, &nrec) < 0) FAIL_STACK_ERROR /* Make certain that the # of records is correct */ - if(nrec != (INSERT_MANY - (u + 1))) + if (nrec != (INSERT_MANY - (u + 1))) TEST_ERROR } /* end for */ /* Query the address of the root node in the B-tree */ - if(H5B2_get_root_addr_test(bt2, &root_addr) < 0) + if (H5B2_get_root_addr_test(bt2, &root_addr) < 0) FAIL_STACK_ERROR /* Make certain that the address of the root node is defined */ - if(H5F_addr_defined(root_addr)) + if (H5F_addr_defined(root_addr)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); - if(records) + if (records) HDfree(records); - if(file_data) + if (file_data) HDfree(file_data); return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; - if(fd > 0) + if (fd > 0) HDclose(fd); - if(records) + if (records) HDfree(records); - if(file_data) + if (file_data) HDfree(file_data); return 1; } /* test_remove_lots() */ - /*------------------------------------------------------------------------- * Function: test_find_neighbor * @@ -6851,27 +6842,26 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_find_neighbor(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t search; /* Search value */ - hsize_t *records; /* Record #'s for random insertion */ - unsigned u; /* Local index variable */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - herr_t ret; /* Generic error return value */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t search; /* Search value */ + hsize_t * records; /* Record #'s for random insertion */ + unsigned u; /* Local index variable */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + herr_t ret; /* Generic error return value */ /* Allocate space for the records */ - if(NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * FIND_NEIGHBOR))) + if (NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * FIND_NEIGHBOR))) TEST_ERROR /* Initialize record #'s */ - for(u = 0; u < FIND_NEIGHBOR; u++) + for (u = 0; u < FIND_NEIGHBOR; u++) records[u] = u * 2; /* @@ -6880,85 +6870,84 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree find: nearest neighbor less than a value"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert records */ - for(u = 0; u < FIND_NEIGHBOR; u++) { + for (u = 0; u < FIND_NEIGHBOR; u++) { record = records[u]; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Attempt to find record B-tree less than a value */ search = 0; - H5E_BEGIN_TRY { - ret = H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR search = 1; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 0) + if (record != 0) TEST_ERROR search = 2; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 0) + if (record != 0) TEST_ERROR search = 3; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 2) + if (record != 2) TEST_ERROR search = 4; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 2) + if (record != 2) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 1; - ninfo.nrec = 14; - record = 250; /* Record in left internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 14; + record = 250; /* Record in left internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Neighbor is in internal node */ search = 251; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 250) + if (record != 250) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 2; - ninfo.nrec = 1; - record = 1888; /* Record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 1; + record = 1888; /* Record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Neighbor is in root node */ search = 1889; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 1888) + if (record != 1888) TEST_ERROR search = (FIND_NEIGHBOR * 2) + 1; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_LESS, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != ((FIND_NEIGHBOR - 1) * 2)) + if (record != ((FIND_NEIGHBOR - 1) * 2)) TEST_ERROR PASSED(); @@ -6969,76 +6958,75 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree find: nearest neighbor greater than a value"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Attempt to find record B-tree less than a value */ search = (FIND_NEIGHBOR * 2) + 1; - H5E_BEGIN_TRY { - ret = H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR search = 0; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 2) + if (record != 2) TEST_ERROR search = 1; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 2) + if (record != 2) TEST_ERROR search = 2; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 4) + if (record != 4) TEST_ERROR search = 3; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 4) + if (record != 4) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 1; - ninfo.nrec = 16; - record = 2896; /* Record in right internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 16; + record = 2896; /* Record in right internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Neighbor is in internal node */ search = 2895; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 2896) + if (record != 2896) TEST_ERROR /* Neighbor is in root node */ search = 1887; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != 1888) + if (record != 1888) TEST_ERROR search = ((FIND_NEIGHBOR - 1) * 2) - 1; - if(H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) + if (H5B2_neighbor(bt2, dxpl, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record) < 0) FAIL_STACK_ERROR - if(record != ((FIND_NEIGHBOR - 1) * 2)) + if (record != ((FIND_NEIGHBOR - 1) * 2)) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR PASSED(); @@ -7048,16 +7036,17 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; HDfree(records); return 1; } /* test_find_neighbor() */ - /*------------------------------------------------------------------------- * Function: test_delete * @@ -7075,70 +7064,70 @@ error: static unsigned test_delete(hid_t fapl, const H5B2_create_t *cparam) { - hid_t file = -1; /* File ID */ - char filename[1024]; /* Filename to use */ - H5F_t *f = NULL; /* Internal file object pointer */ - h5_stat_size_t empty_size; /* Size of an empty file */ - h5_stat_size_t file_size; /* Size of each file created */ - 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 */ - hsize_t record; /* Record to insert into tree */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - unsigned u; /* Local index variable */ + hid_t file = -1; /* File ID */ + char filename[1024]; /* Filename to use */ + H5F_t * f = NULL; /* Internal file object pointer */ + h5_stat_size_t empty_size; /* Size of an empty file */ + h5_stat_size_t file_size; /* Size of each file created */ + 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 */ + hsize_t record; /* Record to insert into tree */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + unsigned u; /* Local index variable */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); /* Attempt to delete empty B-tree */ TESTING("B-tree delete: delete empty B-tree"); -/* Create empty file for size comparisons later */ + /* Create empty file for size comparisons later */ /* Create the file to work on */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR /* Get the size of an empty file */ - if((empty_size = h5_get_file_size(filename, fapl)) < 0) + if ((empty_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR /* Create the file to work on */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) STACK_ERROR /* Create the v2 B-tree & get its address */ - if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* * Delete v2 B-tree */ - if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0) + if (H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0) FAIL_STACK_ERROR /* Close the file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) + if ((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) + if (file_size != empty_size) TEST_ERROR PASSED(); @@ -7147,51 +7136,51 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam) TESTING("B-tree delete: delete level-0 B-tree"); /* Create the file to work on */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) STACK_ERROR /* Create the v2 B-tree & get its address */ - if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert records */ - for(u = 0; u < DELETE_SMALL; u++) { + for (u = 0; u < DELETE_SMALL; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - if(H5B2_stat_info(bt2, &bt2_stat) < 0) + if (H5B2_stat_info(bt2, &bt2_stat) < 0) FAIL_STACK_ERROR - if(bt2_stat.depth != 0) + if (bt2_stat.depth != 0) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* * Delete v2 B-tree */ - if(H5B2_delete(f, H5P_DATASET_XFER_DEFAULT, bt2_addr, f, NULL, NULL) < 0) + if (H5B2_delete(f, H5P_DATASET_XFER_DEFAULT, bt2_addr, f, NULL, NULL) < 0) FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) + if ((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) + if (file_size != empty_size) TEST_ERROR PASSED(); @@ -7200,51 +7189,51 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam) TESTING("B-tree delete: delete level-1 B-tree"); /* Create the file to work on */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) STACK_ERROR /* Create the v2 B-tree & get its address */ - if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert records */ - for(u = 0; u < DELETE_MEDIUM; u++) { + for (u = 0; u < DELETE_MEDIUM; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - if(H5B2_stat_info(bt2, &bt2_stat) < 0) + if (H5B2_stat_info(bt2, &bt2_stat) < 0) FAIL_STACK_ERROR - if(bt2_stat.depth != 1) + if (bt2_stat.depth != 1) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* * Delete v2 B-tree */ - if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0) + if (H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0) FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) + if ((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) + if (file_size != empty_size) TEST_ERROR PASSED(); @@ -7253,51 +7242,51 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam) TESTING("B-tree delete: delete level-2 B-tree"); /* Create the file to work on */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) STACK_ERROR /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5I_object(file))) + if (NULL == (f = (H5F_t *)H5I_object(file))) STACK_ERROR /* Create the v2 B-tree & get its address */ - if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Insert records */ - for(u = 0; u < DELETE_LARGE; u++) { + for (u = 0; u < DELETE_LARGE; u++) { record = u; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - if(H5B2_stat_info(bt2, &bt2_stat) < 0) + if (H5B2_stat_info(bt2, &bt2_stat) < 0) FAIL_STACK_ERROR - if(bt2_stat.depth != 2) + if (bt2_stat.depth != 2) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* * Delete v2 B-tree */ - if(H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0) + if (H5B2_delete(f, dxpl, bt2_addr, f, NULL, NULL) < 0) FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) + if ((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) + if (file_size != empty_size) TEST_ERROR PASSED(); @@ -7305,15 +7294,16 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam) return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_delete() */ - /*------------------------------------------------------------------------- * Function: test_modify * @@ -7329,21 +7319,20 @@ error: *------------------------------------------------------------------------- */ static unsigned -test_modify(hid_t fapl, const H5B2_create_t *cparam, - const bt2_test_param_t *tparam) +test_modify(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 */ - hsize_t record; /* Record to insert into tree */ - hsize_t modify; /* Modified value */ - hsize_t found; /* Found value */ - H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ - H5B2_node_info_test_t ninfo; /* B-tree node info */ - unsigned u; /* Local index variable */ - herr_t ret; /* Generic error return value */ + 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 */ + hsize_t record; /* Record to insert into tree */ + hsize_t modify; /* Modified value */ + hsize_t found; /* Found value */ + H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ + H5B2_node_info_test_t ninfo; /* B-tree node info */ + unsigned u; /* Local index variable */ + herr_t ret; /* Generic error return value */ /* * Test modifying records @@ -7351,34 +7340,33 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree modify: attempt to modify non-existant record"); /* Create the file for the test */ - if(create_file(&file, &f, fapl) < 0) + 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) + if (create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0) TEST_ERROR /* Create level-2 B-tree with 3 internal nodes */ - for(u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { + for (u = 0; u < ((INSERT_SPLIT_ROOT_NREC * 59) + 1); u++) { record = u * 5; - if(H5B2_insert(bt2, dxpl, &record) < 0) + if (H5B2_insert(bt2, dxpl, &record) < 0) FAIL_STACK_ERROR } /* end for */ /* Check up on B-tree */ - if(H5B2_stat_info(bt2, &bt2_stat) < 0) + if (H5B2_stat_info(bt2, &bt2_stat) < 0) FAIL_STACK_ERROR - if(bt2_stat.depth != 2) + if (bt2_stat.depth != 2) TEST_ERROR /* Attempt to modify a non-existant record */ record = 3; modify = 4; - H5E_BEGIN_TRY { - ret = H5B2_modify(bt2, dxpl, &record, modify_cb, &modify); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5B2_modify(bt2, dxpl, &record, modify_cb, &modify); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR PASSED(); @@ -7386,45 +7374,44 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree modify: modify record in leaf node"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 0; - ninfo.nrec = 62; - record = 4330; /* Record in leaf node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 62; + record = 4330; /* Record in leaf node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Attempt to modify a record in a leaf node */ record = 4330; modify = 4331; - if(H5B2_modify(bt2, dxpl, &record, modify_cb, &modify) < 0) + if (H5B2_modify(bt2, dxpl, &record, modify_cb, &modify) < 0) FAIL_STACK_ERROR /* Check status of B-tree */ ninfo.depth = 0; - ninfo.nrec = 62; - record = 4331; /* Record in leaf node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 62; + record = 4331; /* Record in leaf node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Attempt to find modified record */ record = 4331; - found = 4331; - if(H5B2_find(bt2, dxpl, &record, find_cb, &found) != TRUE) + found = 4331; + if (H5B2_find(bt2, dxpl, &record, find_cb, &found) != TRUE) FAIL_STACK_ERROR - if(found != 4331) + if (found != 4331) TEST_ERROR /* Attempt to find original record */ record = 4330; - found = HSIZET_MAX; - H5E_BEGIN_TRY { - ret = H5B2_modify(bt2, dxpl, &record, modify_cb, &modify); - } H5E_END_TRY; + found = HSIZET_MAX; + H5E_BEGIN_TRY { ret = H5B2_modify(bt2, dxpl, &record, modify_cb, &modify); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR PASSED(); @@ -7432,45 +7419,44 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree modify: modify record in internal node"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 1; - ninfo.nrec = 29; - record = 5350; /* Record in internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 29; + record = 5350; /* Record in internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Attempt to modify a record in an internal node */ record = 5350; modify = 5352; - if(H5B2_modify(bt2, dxpl, &record, modify_cb, &modify) < 0) + if (H5B2_modify(bt2, dxpl, &record, modify_cb, &modify) < 0) FAIL_STACK_ERROR /* Check status of B-tree */ ninfo.depth = 1; - ninfo.nrec = 29; - record = 5352; /* Record in internal node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 29; + record = 5352; /* Record in internal node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Attempt to find modified record */ record = 5352; - found = 5352; - if(H5B2_find(bt2, dxpl, &record, find_cb, &found) != TRUE) + found = 5352; + if (H5B2_find(bt2, dxpl, &record, find_cb, &found) != TRUE) STACK_ERROR - if(found != 5352) + if (found != 5352) TEST_ERROR /* Attempt to find original record */ record = 5350; - found = 5350; - H5E_BEGIN_TRY { - ret = H5B2_modify(bt2, dxpl, &record, modify_cb, &modify); - } H5E_END_TRY; + found = 5350; + H5E_BEGIN_TRY { ret = H5B2_modify(bt2, dxpl, &record, modify_cb, &modify); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR PASSED(); @@ -7478,54 +7464,53 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, TESTING("B-tree modify: modify record in root node"); /* Check for closing & re-opening the B-tree */ - if(reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) + if (reopen_btree(f, dxpl, &bt2, bt2_addr, tparam) < 0) TEST_ERROR /* Check status of B-tree */ ninfo.depth = 2; - ninfo.nrec = 2; - record = 9445; /* Record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 9445; /* Record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Attempt to modify a record in a root node */ record = 9445; modify = 9448; - if(H5B2_modify(bt2, dxpl, &record, modify_cb, &modify) < 0) + if (H5B2_modify(bt2, dxpl, &record, modify_cb, &modify) < 0) FAIL_STACK_ERROR /* Check status of B-tree */ ninfo.depth = 2; - ninfo.nrec = 2; - record = 9448; /* Record in root node */ - if(check_node_info(bt2, dxpl, record, &ninfo) < 0) + ninfo.nrec = 2; + record = 9448; /* Record in root node */ + if (check_node_info(bt2, dxpl, record, &ninfo) < 0) TEST_ERROR /* Attempt to find modified record */ record = 9448; - found = 9448; - if(H5B2_find(bt2, dxpl, &record, find_cb, &found) != TRUE) + found = 9448; + if (H5B2_find(bt2, dxpl, &record, find_cb, &found) != TRUE) STACK_ERROR - if(found != 9448) + if (found != 9448) TEST_ERROR /* Attempt to find original record */ record = 9445; - found = 9445; - H5E_BEGIN_TRY { - ret = H5B2_modify(bt2, dxpl, &record, modify_cb, &modify); - } H5E_END_TRY; + found = 9445; + H5E_BEGIN_TRY { ret = H5B2_modify(bt2, dxpl, &record, modify_cb, &modify); } + H5E_END_TRY; /* Should fail */ - if(ret != FAIL) + if (ret != FAIL) TEST_ERROR /* Close the v2 B-tree */ - if(H5B2_close(bt2, dxpl) < 0) + if (H5B2_close(bt2, dxpl) < 0) FAIL_STACK_ERROR bt2 = NULL; /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR PASSED(); @@ -7533,15 +7518,16 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, return 0; error: - H5E_BEGIN_TRY { - if(bt2) + H5E_BEGIN_TRY + { + if (bt2) H5B2_close(bt2, dxpl); - H5Fclose(file); - } H5E_END_TRY; + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* test_modify() */ - /*------------------------------------------------------------------------- * Function: main * @@ -7559,37 +7545,36 @@ error: int main(void) { - H5B2_create_t cparam; /* 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 */ - hbool_t reopen; /* Whether to reopen B-tree during tests */ - int ExpressMode; - const char *envval = NULL; + H5B2_create_t cparam; /* 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 */ + hbool_t reopen; /* Whether to reopen B-tree during tests */ + int ExpressMode; + const char * envval = NULL; envval = HDgetenv("HDF5_DRIVER"); - if(envval == NULL) + if (envval == NULL) envval = "nomatch"; /* Reset library */ h5_reset(); - fapl = h5_fileaccess(); + fapl = h5_fileaccess(); ExpressMode = GetTestExpress(); - if(ExpressMode > 1) - printf("***Express test mode on. Some tests may be skipped\n"); + if (ExpressMode > 1) + HDprintf("***Express test mode on. Some tests may be skipped\n"); /* Initialize v2 B-tree creation parameters */ init_cparam(&cparam); - /* Loop over re-opening B-tree during tests */ - for(reopen = FALSE; reopen <= TRUE; reopen++) { - if(reopen) { - fprintf(stdout, "Testing with reopening B-tree:\n"); + for (reopen = FALSE; reopen <= TRUE; reopen++) { + if (reopen) { + HDfprintf(stdout, "Testing with reopening B-tree:\n"); tparam.reopen_btree = TRUE; } /* end if */ else { - fprintf(stdout, "Testing without reopening B-tree:\n"); + HDfprintf(stdout, "Testing without reopening B-tree:\n"); tparam.reopen_btree = FALSE; } /* end else */ @@ -7608,8 +7593,8 @@ main(void) nerrors += test_insert_level2_2internal_split(fapl, &cparam, &tparam); nerrors += test_insert_level2_3internal_redistrib(fapl, &cparam, &tparam); nerrors += test_insert_level2_3internal_split(fapl, &cparam, &tparam); - if(ExpressMode > 1) - printf("***Express test mode on. test_insert_lots skipped\n"); + if (ExpressMode > 1) + HDprintf("***Express test mode on. test_insert_lots skipped\n"); else nerrors += test_insert_lots(fapl, &cparam, &tparam); @@ -7635,8 +7620,8 @@ main(void) nerrors += test_remove_level2_2internal_merge_right(fapl, &cparam, &tparam); nerrors += test_remove_level2_3internal_merge(fapl, &cparam, &tparam); nerrors += test_remove_level2_collapse_right(fapl, &cparam, &tparam); - if(ExpressMode > 1) - printf("***Express test mode on. test_remove_lots skipped\n"); + if (ExpressMode > 1) + HDprintf("***Express test mode on. test_remove_lots skipped\n"); else nerrors += test_remove_lots(envval, fapl, &cparam); @@ -7653,7 +7638,7 @@ main(void) /* Verify symbol table messages are cached */ nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); - if(nerrors) + if (nerrors) goto error; puts("All v2 B-tree tests passed."); @@ -7665,10 +7650,8 @@ main(void) error: puts("*** TESTS FAILED ***"); - H5E_BEGIN_TRY { - H5Pclose(fapl); - } H5E_END_TRY; + H5E_BEGIN_TRY { H5Pclose(fapl); } + H5E_END_TRY; return 1; } /* end main() */ - |