summaryrefslogtreecommitdiffstats
path: root/test/btree2.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2005-03-05 02:51:55 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2005-03-05 02:51:55 (GMT)
commit009f57c1ba45645f3029f54f9e0cdc74f9fe5822 (patch)
treea9ea28b8bd7726c52e5cddac4cab96202baac341 /test/btree2.c
parent156505bbf949f120261bbe1727eca092fa7c387a (diff)
downloadhdf5-009f57c1ba45645f3029f54f9e0cdc74f9fe5822.zip
hdf5-009f57c1ba45645f3029f54f9e0cdc74f9fe5822.tar.gz
hdf5-009f57c1ba45645f3029f54f9e0cdc74f9fe5822.tar.bz2
[svn-r10152] Purpose:
Bug fix & new feature Description: Fix error in 3-node redistribution when nodes are only moving into the middle node from the left & right nodes (which happens sometimes during record removals). Clean up internal insert & remove routines to remove lots of redundant checking. Added 3->2 node merge routine to handle more record removal cases. Platforms tested: FreeBSD 4.9 (sleipnir) Solaris 2.11 (shanti)
Diffstat (limited to 'test/btree2.c')
-rw-r--r--test/btree2.c117
1 files changed, 117 insertions, 0 deletions
diff --git a/test/btree2.c b/test/btree2.c
index 466be7d..ec2da8e 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -2707,6 +2707,122 @@ error:
/*-------------------------------------------------------------------------
+ * Function: test_remove_level1_3leaf_merge
+ *
+ * Purpose: Basic tests for the B-tree v2 code
+ *
+ * Return: Success: 0
+ *
+ * Failure: 1
+ *
+ * Programmer: Quincey Koziol
+ * Friday, March 4, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_remove_level1_3leaf_merge(hid_t fapl)
+{
+ hid_t file=-1;
+ char filename[1024];
+ H5F_t *f=NULL;
+ hsize_t record; /* Record to insert into tree */
+ hsize_t nrec; /* Number of records in B-tree */
+ haddr_t bt2_addr; /* Address of B-tree created */
+ haddr_t root_addr; /* Address of root of B-tree created */
+ unsigned u; /* Local index variable */
+
+ 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) TEST_ERROR;
+
+ /* Get a pointer to the internal file object */
+ if (NULL==(f=H5I_object(file))) {
+ H5Eprint_stack(H5E_DEFAULT, stdout);
+ TEST_ERROR;
+ }
+
+ /*
+ * Test v2 B-tree creation
+ */
+ if (H5B2_create(f, H5P_DATASET_XFER_DEFAULT, H5B2_TEST, 512, 8, 100, 40, &bt2_addr/*out*/)<0) {
+ H5_FAILED();
+ H5Eprint_stack(H5E_DEFAULT, stdout);
+ goto error;
+ }
+
+ /* Create level-1 B-tree with 3 leaves */
+ for(u=0; u<INSERT_SPLIT_ROOT_NREC*2; u++) {
+ record=u;
+ if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, H5B2_TEST, bt2_addr, &record)<0) {
+ H5_FAILED();
+ H5Eprint_stack(H5E_DEFAULT, stdout);
+ goto error;
+ }
+ }
+
+ /* Query the number of records in the B-tree */
+ if (H5B2_get_nrec(f, H5P_DATASET_XFER_DEFAULT, H5B2_TEST, bt2_addr, &nrec)<0) {
+ H5_FAILED();
+ H5Eprint_stack(H5E_DEFAULT, stdout);
+ goto error;
+ } /* end if */
+
+ /* Make certain that the # of records is correct */
+ 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(f, H5P_DATASET_XFER_DEFAULT, H5B2_TEST, bt2_addr, &root_addr)<0) {
+ H5_FAILED();
+ H5Eprint_stack(H5E_DEFAULT, stdout);
+ goto error;
+ } /* end if */
+
+ /* Make certain that the address of the root node is defined */
+ if(!H5F_addr_defined(root_addr)) TEST_ERROR;
+
+ /* Attempt to remove enough records from middle leaf of a level-1 B-tree to force merge */
+ TESTING("B-tree remove: merge 3 leaves to 2 in level-1 B-tree");
+ for(u=0; u < INSERT_SPLIT_ROOT_NREC+2; u++) {
+ record = (INSERT_SPLIT_ROOT_NREC/2)+3+u;
+ if(H5B2_remove(f, H5P_DATASET_XFER_DEFAULT, H5B2_TEST, bt2_addr, &record)<0) {
+ H5_FAILED();
+ H5Eprint_stack(H5E_DEFAULT, stdout);
+ goto error;
+ } /* end if */
+
+ /* Make certain that the record value is correct */
+ if(record != ((INSERT_SPLIT_ROOT_NREC/2)+3+u)) TEST_ERROR;
+
+ /* Query the number of records in the B-tree */
+ if (H5B2_get_nrec(f, H5P_DATASET_XFER_DEFAULT, H5B2_TEST, bt2_addr, &nrec)<0) {
+ H5_FAILED();
+ H5Eprint_stack(H5E_DEFAULT, stdout);
+ goto error;
+ } /* end if */
+
+ /* Make certain that the # of records is correct */
+ if(nrec != ((INSERT_SPLIT_ROOT_NREC*2)-(u+1))) TEST_ERROR;
+ } /* end for */
+
+ PASSED();
+
+ if (H5Fclose(file)<0) TEST_ERROR;
+
+ return 0;
+
+error:
+ H5E_BEGIN_TRY {
+ H5Fclose(file);
+ } H5E_END_TRY;
+ return 1;
+} /* test_remove_level1_3leaf_merge() */
+
+
+/*-------------------------------------------------------------------------
* Function: main
*
* Purpose: Test the B-tree v2 code
@@ -2760,6 +2876,7 @@ HDfprintf(stderr,"Uncomment tests!\n");
nerrors += test_remove_level1_noredistrib(fapl);
nerrors += test_remove_level1_redistrib(fapl);
nerrors += test_remove_level1_2leaf_merge(fapl);
+ nerrors += test_remove_level1_3leaf_merge(fapl);
#else /* QAK */
HDfprintf(stderr,"Uncomment tests!\n");
#endif /* QAK */