[svn-r9939] Purpose:

    New feature

Description:
    Expand v2 B-tree code to support splitting the root node when enough
records are inserted and move metadata cache callbacks into their own source
file.

Platforms tested:
    FreeBSD 4.11 (sleipnir) w/parallel
    Too minor for h5committest

1 files changed, 138 insertions, 17 deletions

diff --git a/test/btree2.c b/test/btree2.c
index 182c4fa..312f149 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -31,6 +31,8 @@ const char *FILENAME[] = {
     NULL
 };
 
+#define INSERT_SPLIT_ROOT_NREC    80
+
 
 /*-------------------------------------------------------------------------
  * Function:	store
@@ -115,7 +117,44 @@ HDfprintf(stderr,"encode: data=%Hu\n",*(const hsize_t *)nrecord);
 
 
 /*-------------------------------------------------------------------------
- * Function:	test_basic
+ * Function:	decode
+ *
+ * Purpose:	Decode raw disk form of record into native form
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, February  4, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+decode(const H5F_t *f, const uint8_t *raw, void *nrecord)
+{
+    H5F_DECODE_LENGTH(f, raw, *(hsize_t *)nrecord);
+
+#ifdef QAK
+HDfprintf(stderr,"encode: data=%Hu\n",*(const hsize_t *)nrecord);
+#endif /* QAK */
+    return(SUCCEED);
+}
+
+H5B2_class_t type={                 /* B-tree class information */
+    0,                              /* Type of B-tree */
+    sizeof(hsize_t),                /* Size of native key */
+    store,                          /* Record storage callback */
+    compare,                        /* Record comparison callback */
+    encode,                         /* Record encoding callback */
+    decode                          /* Record decoding callback */
+};
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_insert_basic
  *
  * Purpose:	Basic tests for the B-tree v2 code
  *
@@ -131,18 +170,11 @@ HDfprintf(stderr,"encode: data=%Hu\n",*(const hsize_t *)nrecord);
  *-------------------------------------------------------------------------
  */
 static int
-test_basic_insert(hid_t fapl)
+test_insert_basic(hid_t fapl)
 {
     hid_t	file=-1;
     char	filename[1024];
     H5F_t	*f=NULL;
-    H5B2_class_t type={                 /* B-tree class information */
-        0,                              /* Type of B-tree */
-        sizeof(hsize_t),                /* Size of native key */
-        store,                          /* Record storage callback */
-        compare,                        /* Record comparison callback */
-        encode                          /* Record encoding callback */
-    };
     hsize_t     record;                 /* Record to insert into tree */
     haddr_t     bt2_addr;               /* Address of B-tree created */
 
@@ -164,7 +196,7 @@ test_basic_insert(hid_t fapl)
     if (H5B2_create(f, H5P_DATASET_XFER_DEFAULT, &type, 512, 8, 100, 40, &bt2_addr/*out*/)<0) {
 	H5_FAILED();
 	H5Eprint_stack(H5E_DEFAULT, stdout);
-	TEST_ERROR;
+	goto error;
     }
     PASSED();
 
@@ -176,7 +208,7 @@ test_basic_insert(hid_t fapl)
     if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, &type, bt2_addr, &record)<0) {
 	H5_FAILED();
 	H5Eprint_stack(H5E_DEFAULT, stdout);
-	TEST_ERROR;
+	goto error;
     }
 
     /*
@@ -186,7 +218,7 @@ test_basic_insert(hid_t fapl)
     if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, &type, bt2_addr, &record)<0) {
 	H5_FAILED();
 	H5Eprint_stack(H5E_DEFAULT, stdout);
-	TEST_ERROR;
+	goto error;
     }
 
     /*
@@ -196,7 +228,7 @@ test_basic_insert(hid_t fapl)
     if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, &type, bt2_addr, &record)<0) {
 	H5_FAILED();
 	H5Eprint_stack(H5E_DEFAULT, stdout);
-	TEST_ERROR;
+	goto error;
     }
 
     /*
@@ -206,7 +238,7 @@ test_basic_insert(hid_t fapl)
     if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, &type, bt2_addr, &record)<0) {
 	H5_FAILED();
 	H5Eprint_stack(H5E_DEFAULT, stdout);
-	TEST_ERROR;
+	goto error;
     }
     PASSED();
 
@@ -219,7 +251,96 @@ error:
 	H5Fclose(file);
     } H5E_END_TRY;
     return 1;
-}
+} /* test_insert_basic() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_insert_split_root
+ *
+ * Purpose:	Basic tests for the B-tree v2 code.  This test inserts enough
+ *              records to split the root node and force the tree to depth 1.
+ *              It also continues to add a few more records to each of the
+ *              left and right leaf nodes after the split
+ *
+ * Return:	Success:	0
+ *
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, February  3, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_insert_split_root(hid_t fapl)
+{
+    hid_t	file=-1;
+    char	filename[1024];
+    H5F_t	*f=NULL;
+    hsize_t     record;                 /* Record to insert into tree */
+    haddr_t     bt2_addr;               /* Address 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);
+	goto error;
+    }
+
+    /*
+     * Test v2 B-tree creation
+     */
+    if (H5B2_create(f, H5P_DATASET_XFER_DEFAULT, &type, 512, 8, 100, 40, &bt2_addr/*out*/)<0) {
+	H5_FAILED();
+	H5Eprint_stack(H5E_DEFAULT, stdout);
+	goto error;
+    }
+
+    /*
+     * Test inserting many records into v2 B-tree 
+     */
+    TESTING("B-tree many - split root");
+
+    for(u=0; u<INSERT_SPLIT_ROOT_NREC; u++) {
+        record=u+10;
+        if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, &type, bt2_addr, &record)<0) {
+            H5_FAILED();
+            H5Eprint_stack(H5E_DEFAULT, stdout);
+            goto error;
+        }
+    }
+    record=0;
+    if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, &type, bt2_addr, &record)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    }
+    record=1;
+    if (H5B2_insert(f, H5P_DATASET_XFER_DEFAULT, &type, bt2_addr, &record)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    }
+
+    PASSED();
+
+    if (H5Fclose(file)<0) TEST_ERROR;
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* test_insert_split_root() */
 
 
 /*-------------------------------------------------------------------------
@@ -249,8 +370,8 @@ main(void)
     fapl = h5_fileaccess();
 
     /* Test basic B-tree insertion */
-    nerrors += test_basic_insert(fapl);
-/*    nerrors += test_many_insert(fapl); */
+    nerrors += test_insert_basic(fapl);
+    nerrors += test_insert_split_root(fapl);
 
     if (nerrors) goto error;
     puts("All v2 B-tree tests passed.");