[svn-r8053] Purpose:

    Bug fix

Description:
    Correct two problems with variable-length datatypes in datasets:
        - When overwriting an entire dataset, writing the fill value to the
            file would be skipped, causing problems for VL datatypes when
            objects in the file had been unlinked (and thus the space in the
            file was not all zeros)
        - When an application has set a fill-value for a dataset and the
            dataset's datatype contained a VL datatype, the library was filling
            space on disk with the memory form of the VL information, instead
            of the disk form.


Platforms tested:
    FreeBSD 4.9 (sleipnir)
    h5committest

2 files changed, 136 insertions, 7 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index cde5dde..15421e7 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -59,12 +59,12 @@ MOSTLYCLEAN=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5   \
             links.h5 links[1-3].h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5  \
             dtypes[1-3].h5 tattr.h5 tselect.h5 mtime.h5 unlink.h5            \
             fillval_[0-9].h5 fillval.raw mount_[0-9].h5 testmeta.h5 ttime.h5 \
-            trefer[1-3].h5 tvltypes.h5 tvlstr.h5 flush.h5 enum1.h5           \
-            titerate.h5 ttsafe.h5 tarray1.h5 tgenprop.h5 tmisc[0-9]*.h5      \
-            set_extent_read.h5 set_extent_create.h5 getname.h5               \
-            getname[1-3].h5 sec2_file.h5 family_file000[0-3][0-9].h5         \
-            multi_file-[rs].h5 core_file new_move_[ab].h5 ntypes.h5          \
-            dangle.h5 error_test.h5 err_compat.h5
+            trefer[1-3].h5 tvltypes.h5 tvlstr.h5 tvlstr2.h5 flush.h5         \
+            enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 tgenprop.h5            \
+            tmisc[0-9]*.h5 set_extent_read.h5 set_extent_create.h5           \
+            getname.h5 getname[1-3].h5 sec2_file.h5                          \
+            family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file         \
+            new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 err_compat.h5
 
 CLEAN=$(TIMINGS)
 
diff --git a/test/tvlstr.c b/test/tvlstr.c
index 2031865..52d883b 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -29,6 +29,7 @@
 #include "hdf5.h"
 
 #define DATAFILE   "tvlstr.h5"
+#define DATAFILE2  "tvlstr2.h5"
 
 /* 1-D dataset with fixed dimensions */
 #define SPACE1_NAME  "Space1"
@@ -43,6 +44,9 @@
 
 #define VLSTR_TYPE      "vl_string_type"
 
+/* Definitions for the VL re-writing test */
+#define REWRITE_NDATASETS       32
+
 /* String for testing attributes */
 static const char *string_att = "This is the string for the attribute";
 static char *string_att_write=NULL;
@@ -713,6 +717,127 @@ static void test_read_vl_string_attribute(void)
     return;
 }
 
+/* Helper routine for test_vl_rewrite() */
+static void write_scalar_dset(hid_t file, hid_t type, hid_t space, char *name, char *data)
+{
+      hid_t dset;
+      herr_t ret;
+
+      dset = H5Dcreate (file, name, type, space, H5P_DEFAULT);
+      CHECK(dset, FAIL, "H5Dcreate");
+
+      ret = H5Dwrite(dset, type, space, space, H5P_DEFAULT, &data);
+      CHECK(ret, FAIL, "H5Dwrite");
+
+      ret = H5Dclose(dset);
+      CHECK(ret, FAIL, "H5Dclose");
+}
+
+/* Helper routine for test_vl_rewrite() */
+static void read_scalar_dset(hid_t file, hid_t type, hid_t space, char *name, char *data)
+{
+    hid_t dset;
+    herr_t ret;
+    char *data_read;
+
+    dset = H5Dopen (file, name);
+    CHECK(dset, FAIL, "H5Dopen");
+
+    ret = H5Dread(dset, type, space, space, H5P_DEFAULT, &data_read);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(dset);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    if(HDstrcmp(data, data_read))
+        TestErrPrintf("Expected %s for dataset %s but read %s\n", data, name, data_read);
+
+    HDfree(data_read);
+}
+
+/****************************************************************
+**
+**  test_vl_rewrite(): Test basic VL string code.
+**      Tests I/O on VL strings when lots of objects in the file
+**      have been linked/unlinked.
+** 
+****************************************************************/
+static void test_vl_rewrite(void)
+{
+    hid_t file1, file2; /* File IDs */
+    hid_t type;         /* VL string datatype ID */
+    hid_t space;        /* Scalar dataspace */
+    char name[256];     /* Buffer for names & data */
+    int i;              /* Local index variable */
+    herr_t ret;         /* Generic return value */
+
+    /* Create the VL string datatype */
+    type = H5Tcopy(H5T_C_S1);
+    CHECK(type, FAIL, "H5Tcopy");
+
+    ret = H5Tset_size(type, H5T_VARIABLE);
+    CHECK(ret, FAIL, "H5Tset_size");
+
+    /* Create the scalar dataspace */
+    space = H5Screate(H5S_SCALAR);
+    CHECK(space, FAIL, "H5Screate");
+
+    /* Open the files */
+    file1 = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(file1, FAIL, "H5Fcreate");
+
+    file2 = H5Fcreate(DATAFILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(file1, FAIL, "H5Fcreate");
+
+    /* Create in file 1 */
+    for(i=0; i<REWRITE_NDATASETS; i++) {
+        sprintf(name, "/set_%d", i);
+        write_scalar_dset(file1, type, space, name, name);
+    }
+
+    /* Effectively copy data from file 1 to 2 */
+    for(i=0; i<REWRITE_NDATASETS; i++) {
+        sprintf(name, "/set_%d", i);
+        read_scalar_dset(file1, type, space, name, name);
+        write_scalar_dset(file2, type, space, name, name);
+    }
+
+    /* Read back from file 2 */
+    for(i=0; i<REWRITE_NDATASETS; i++) {
+        sprintf(name, "/set_%d", i);
+        read_scalar_dset(file2, type, space, name, name);
+    }
+
+    /* Remove from file 2. */
+    for(i=0; i<REWRITE_NDATASETS; i++) {
+        sprintf(name, "/set_%d", i);
+        ret = H5Gunlink(file2, name);
+        CHECK(ret, FAIL, "H5Gunlink");
+    }
+
+    /* Effectively copy from file 1 to file 2 */
+    for(i=0; i<REWRITE_NDATASETS; i++) {
+        sprintf(name, "/set_%d", i);
+        read_scalar_dset(file1, type, space, name, name);
+        write_scalar_dset(file2, type, space, name, name);
+    }
+
+    /* Close everything */
+    ret = H5Tclose(type);
+    CHECK(ret, FAIL, "H5Tclose");
+
+    ret = H5Sclose(space);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    ret = H5Fclose(file1);
+    CHECK(ret, FAIL, "H5Fclose");
+
+    ret = H5Fclose(file2);
+    CHECK(ret, FAIL, "H5Fclose");
+
+    return;
+} /* end test_vl_rewrite() */
+
 /****************************************************************
 **
 **  test_vlstrings(): Main VL string testing routine.
@@ -734,6 +859,9 @@ test_vlstrings(void)
     /* Test using VL strings in attributes */
     test_write_vl_string_attribute();
     test_read_vl_string_attribute();
+
+    /* Test writing VL datasets in files with lots of unlinking */
+    test_vl_rewrite();
 }   /* test_vlstrings() */
 
 
@@ -754,6 +882,7 @@ test_vlstrings(void)
 void
 cleanup_vlstrings(void)
 {
-    remove(DATAFILE);
+    HDremove(DATAFILE);
+    HDremove(DATAFILE2);
 }