[svn-r10198] Purpose:

    New feature

Description:
    Handle merging new blocks with existing blocks

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Solaris 2.9 (shanti)

1 files changed, 209 insertions, 8 deletions

diff --git a/test/blocktrack.c b/test/blocktrack.c
index 4d9b33c..224de78 100644
--- a/test/blocktrack.c
+++ b/test/blocktrack.c
@@ -311,7 +311,7 @@ test_insert_few(hid_t fapl)
 	H5Eprint_stack(H5E_DEFAULT, stdout);
 	goto error;
     } /* end if */
-    /* Make certain that the max. info is correct */
+    /* Make certain that the min. info is correct */
     if(min_size != 20) TEST_ERROR;
     if(min_count != 1) TEST_ERROR;
     if(min_valid != 1) TEST_ERROR;
@@ -345,7 +345,7 @@ test_insert_few(hid_t fapl)
 	H5Eprint_stack(H5E_DEFAULT, stdout);
 	goto error;
     } /* end if */
-    /* Make certain that the max. info is correct */
+    /* Make certain that the min. info is correct */
     if(min_size != 20) TEST_ERROR;
     if(min_count != 1) TEST_ERROR;
     if(min_valid != 1) TEST_ERROR;
@@ -379,12 +379,12 @@ test_insert_few(hid_t fapl)
 	H5Eprint_stack(H5E_DEFAULT, stdout);
 	goto error;
     } /* end if */
-    /* Make certain that the max. info is correct */
+    /* Make certain that the min. info is correct */
     if(min_size != 20) TEST_ERROR;
     if(min_count != 1) TEST_ERROR;
     if(min_valid != 1) TEST_ERROR;
 
-    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)120, (hsize_t)20)<0) {
+    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)130, (hsize_t)20)<0) {
 	H5_FAILED();
 	H5Eprint_stack(H5E_DEFAULT, stdout);
 	goto error;
@@ -413,12 +413,12 @@ test_insert_few(hid_t fapl)
 	H5Eprint_stack(H5E_DEFAULT, stdout);
 	goto error;
     } /* end if */
-    /* Make certain that the max. info is correct */
+    /* Make certain that the min. info is correct */
     if(min_size != 20) TEST_ERROR;
     if(min_count != 2) TEST_ERROR;
     if(min_valid != 1) TEST_ERROR;
 
-    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)150, (hsize_t)10)<0) {
+    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)160, (hsize_t)10)<0) {
 	H5_FAILED();
 	H5Eprint_stack(H5E_DEFAULT, stdout);
 	goto error;
@@ -447,7 +447,7 @@ test_insert_few(hid_t fapl)
 	H5Eprint_stack(H5E_DEFAULT, stdout);
 	goto error;
     } /* end if */
-    /* Make certain that the max. info is correct */
+    /* Make certain that the min. info is correct */
     if(min_size != 10) TEST_ERROR;
     if(min_count != 1) TEST_ERROR;
     if(min_valid != 1) TEST_ERROR;
@@ -549,7 +549,7 @@ test_insert_many(hid_t fapl)
             H5Eprint_stack(H5E_DEFAULT, stdout);
             goto error;
         } /* end if */
-        /* Make certain that the max. info is correct */
+        /* Make certain that the min. info is correct */
         if(min_size != 20) TEST_ERROR;
         if(min_count != (u+1)) TEST_ERROR;
         if(min_valid != 1) TEST_ERROR;
@@ -675,6 +675,206 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	test_insert_merge
+ *
+ * Purpose:	Basic tests for the block tracker code
+ *
+ * Return:	Success:	0
+ *
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, March 10, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_insert_merge(hid_t fapl)
+{
+    hid_t	file=-1;
+    char	filename[1024];
+    H5F_t	*f=NULL;
+    haddr_t     bt_addr;                /* Address of block tracker created */
+    hsize_t     tot_size;               /* Total size of blocks tracked */
+    hsize_t     max_size;               /* Max. size of blocks tracked */
+    uint32_t    max_count;              /* Ref. count of max. size of blocks tracked */
+    hbool_t     max_valid;              /* Is max. size valid over all blocks? */
+    hsize_t     min_size;               /* Min. size of blocks tracked */
+    uint32_t    min_count;              /* Ref. count of min. size of blocks tracked */
+    hbool_t     min_valid;              /* Is min. size valid over all blocks? */
+
+    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;
+    } /* end if */
+
+    if (H5BT_create(f, H5P_DATASET_XFER_DEFAULT, &bt_addr/*out*/)<0) {
+	H5_FAILED();
+	H5Eprint_stack(H5E_DEFAULT, stdout);
+	goto error;
+    } /* end if */
+
+    /* Insert first block */
+    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)10, (hsize_t)20)<0) {
+	H5_FAILED();
+	H5Eprint_stack(H5E_DEFAULT, stdout);
+	goto error;
+    } /* end if */
+
+    /*
+     * Test inserting blocks which should merge into existing block(s)
+     */
+    TESTING("insert block which merges with existing upper block");
+
+    /* Insert block which should merge with beginning of existing block */
+    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)8, (hsize_t)2)<0) {
+	H5_FAILED();
+	H5Eprint_stack(H5E_DEFAULT, stdout);
+	goto error;
+    } /* end if */
+
+    if (H5BT_get_total_size(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &tot_size)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the size is correct */
+    if(tot_size != 22) TEST_ERROR;
+
+    if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the max. info is correct */
+    if(max_size != 22) TEST_ERROR;
+    if(max_count != 1) TEST_ERROR;
+    if(max_valid != 1) TEST_ERROR;
+
+    if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the min. info is correct */
+    if(min_size != 22) TEST_ERROR;
+    if(min_count != 1) TEST_ERROR;
+    if(min_valid != 0) TEST_ERROR;
+
+    PASSED();
+
+    /*
+     * Test inserting blocks which should merge into existing block(s)
+     */
+    TESTING("insert block which merges with existing lower block");
+
+    /* Insert block which should merge with end of existing block */
+    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)30, (hsize_t)4)<0) {
+	H5_FAILED();
+	H5Eprint_stack(H5E_DEFAULT, stdout);
+	goto error;
+    } /* end if */
+
+    if (H5BT_get_total_size(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &tot_size)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the size is correct */
+    if(tot_size != 26) TEST_ERROR;
+
+    if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the max. info is correct */
+    if(max_size != 26) TEST_ERROR;
+    if(max_count != 1) TEST_ERROR;
+    if(max_valid != 1) TEST_ERROR;
+
+    if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the min. info is correct */
+    if(min_size != 26) TEST_ERROR;
+    if(min_count != 1) TEST_ERROR;
+    if(min_valid != 0) TEST_ERROR;
+
+    PASSED();
+
+    /*
+     * Test inserting blocks which should merge into existing block(s)
+     */
+    TESTING("insert block which merges with existing upper & lower blocks");
+
+    /* Insert block to merge with */
+    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)40, (hsize_t)10) < 0) {
+	H5_FAILED();
+	H5Eprint_stack(H5E_DEFAULT, stdout);
+	goto error;
+    } /* end if */
+
+    /* Insert block which should merge with end of existing block */
+    if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)34, (hsize_t)6) < 0) {
+	H5_FAILED();
+	H5Eprint_stack(H5E_DEFAULT, stdout);
+	goto error;
+    } /* end if */
+
+    if (H5BT_get_total_size(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &tot_size)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the size is correct */
+    if(tot_size != 42) TEST_ERROR;
+
+    if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the max. info is correct */
+    if(max_size != 42) TEST_ERROR;
+    if(max_count != 1) TEST_ERROR;
+    if(max_valid != 1) TEST_ERROR;
+
+    if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) {
+        H5_FAILED();
+        H5Eprint_stack(H5E_DEFAULT, stdout);
+        goto error;
+    } /* end if */
+    /* Make certain that the min. info is correct */
+    if(min_size != 42) TEST_ERROR;
+    if(min_count != 1) TEST_ERROR;
+    if(min_valid != 0) TEST_ERROR;
+
+    PASSED();
+
+    if (H5Fclose(file)<0) TEST_ERROR;
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+	H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* test_insert_merge() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	main
  *
  * Purpose:	Test the block tracker code
@@ -708,6 +908,7 @@ main(void)
     nerrors += test_insert_few(fapl);
     nerrors += test_insert_many(fapl);
     nerrors += test_insert_overlap(fapl);
+    nerrors += test_insert_merge(fapl);
 
     if (nerrors) goto error;
     puts("All block tracker tests passed.");