Merge pull request #1806 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/110_HDFFV-10800-h5ocopy-failure to hdf5_1_10

* commit '378ed8bebfe709156b24aacbf8013de1a776c04e':
  Change "bad" hid_t_value to H5I_INVALID_HID in test_libver_bounds_copy() test.
  Bring pull request #1729 from develop to 1.10: Fix for HDFFV-10800 H5Ocopy failure:     The value for the H5F_LIBVER_V18 index in H5O_fill_ver_bounds[], the format     version bounds array for fill value message, should be version 3 not 2.

7 files changed, 104 insertions, 7 deletions

diff --git a/MANIFEST b/MANIFEST
index 307bc22..3040e1c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -992,6 +992,7 @@
 ./test/file_image.c
 ./test/file_image_core_test.h5
 ./test/fill_old.h5
+./test/fill18.h5
 ./test/fillval.c
 ./test/filter_fail.c
 ./test/filter_plugin.c
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 7070b31..f5d85cd 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -376,6 +376,19 @@ Bug Fixes since HDF5-1.10.4 release
 
     Library
     -------
+    - Fixed an issue where copying a version 1.8 dataset between files using
+      H5Ocopy fails due to an incompatible fill version
+
+      When using the HDF5 1.10.x H5Ocopy() API call to copy a version 1.8
+      dataset to a file created with both high and low library bounds set to
+      H5F_LIBVER_V18, the H5Ocopy() call will fail with the error stack indicating
+      that the fill value version is out of bounds.
+
+      This was fixed by changing the fill value message version to H5O_FILL_VERSION_3 
+      (from H5O_FILL_VERSION_2) for H5F_LIBVER_V18.
+
+      (VC - 2019/6/14, HDFFV-10800)
+
     - Fixed a bug that would cause an error or cause fill values to be
       incorrectly read from a chunked dataset using the "single chunk" index if
       the data was held in cache and there was no data on disk.
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 8a6004d..dd3f531 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -156,7 +156,7 @@ const H5O_msg_class_t H5O_MSG_FILL_NEW[1] = {{
 /* Format version bounds for fill value */
 const unsigned H5O_fill_ver_bounds[] = {
     H5O_FILL_VERSION_1,     /* H5F_LIBVER_EARLIEST */
-    H5O_FILL_VERSION_2,     /* H5F_LIBVER_V18 */
+    H5O_FILL_VERSION_3,     /* H5F_LIBVER_V18 */
     H5O_FILL_VERSION_LATEST /* H5F_LIBVER_LATEST */
 };
 
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 9a5791a..fe6c695 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -135,6 +135,7 @@ set (HDF5_REFERENCE_TEST_FILES
     filespace_1_6.h5
     filespace_1_8.h5
     fill_old.h5
+    fill18.h5
     filter_error.h5
     fsm_aggr_nopersist.h5
     fsm_aggr_persist.h5
diff --git a/test/fill18.h5 b/test/fill18.h5
new file mode 100644
index 0000000..c092f59
--- /dev/null
+++ b/test/fill18.h5
diff --git a/test/objcopy.c b/test/objcopy.c
index 18de027..09dd459 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -2136,9 +2136,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src)
     char src_fname[NAME_BUF_SIZE];      /* Name of source file */
     char dst_fname[NAME_BUF_SIZE];      /* Name of destination file */
     H5F_libver_t low, high;             /* File format bounds */
-    H5F_libver_t low_src, high_src;     /* Source file format bounds */
-    unsigned srcdset_fillversion;       /* Fill version of source dataset */
-    hbool_t valid_high = FALSE;         /* TRUE if high bound is valid */
+    unsigned srcdset_layoutversion;     /* Layout version of source dataset */
     int i, j;                           /* Local index variables */
     H5D_t *dsetp = NULL;                /* Pointer to internal dset structure */
     herr_t ret;                         /* Generic return value */
@@ -2181,7 +2179,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src)
 
     /* Get the internal dset ptr to get the fill version for verifying later */
     if ((dsetp = (H5D_t *)H5I_object(did_src)) == NULL) TEST_ERROR
-    srcdset_fillversion = dsetp->shared->dcpl_cache.fill.version;
+    srcdset_layoutversion = dsetp->shared->layout.version;
 
     /* Close dataspace */
     if(H5Sclose(sid) < 0) TEST_ERROR
@@ -2226,9 +2224,9 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src)
             /* If copy failed, check if the failure is expected */
             if (ret < 0)
             {
-                /* Failure is valid if fill version of source dataset is
+                /* Failure is valid if layout version of source dataset is
                    greater than destination */
-                if (srcdset_fillversion <= H5O_fill_ver_bounds[high])
+                if (srcdset_layoutversion <= H5O_layout_ver_bounds[high])
                     TEST_ERROR
 
                 /* Close the DST file before continue */
diff --git a/test/tfile.c b/test/tfile.c
index a0a165f..a73d3e4 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -169,6 +169,15 @@ const char *FILESPACE_NAME[] = {
     NULL
 };
 
+
+/* Declarations for test_libver_bounds_copy():                          */
+/* SRC_FILE: source file created under 1.8 branch with latest format    */
+/* DST_FILE: destination file for copying the dataset in SRC_FILE       */
+/* DSET_DS1: the dataset created in SRC_FILE to be copied to DST_FILE   */
+#define SRC_FILE        "fill18.h5"
+#define DST_FILE        "fill18_copy.h5"
+#define DSET_DS1        "DS1"
+
 /* Local test function declarations for version bounds */
 static void test_libver_bounds_low_high(void);
 static void test_libver_bounds_super(hid_t fapl);
@@ -5081,6 +5090,79 @@ test_libver_bounds_open(void)
 } /* end test_libver_bounds_open() */
 
 
+/*-------------------------------------------------------------------------
+ * Function:    test_libver_bounds_copy
+ *
+ * Purpose:     Test to verify HDFFV-10800 is fixed:
+ *              This test is copied from the user test program: copy10.c.
+ *              (See attached programs in the jira issue.)
+ *
+ *              The source file used in the test is generated by the user test 
+ *              program "fill18.c" with the 1.8 library.  The file is created 
+ *              with the latest format and the dataset created in the file
+ *              has version 3 fill value message (latest).
+ *
+ *              The test creates the destination file with (v18, v18) version bounds.
+ *              H5Ocopy() should succeed in copying the dataset in the source file 
+ *              to the destination file.
+ *
+ * Return:      Success:    0
+ *              Failure:    number of errors
+ *
+ *-------------------------------------------------------------------------
+ */
+static void
+test_libver_bounds_copy(void)
+{
+    hid_t src_fid = -1;     /* File ID */
+    hid_t dst_fid = -1;     /* File ID */
+    hid_t fapl = -1;        /* File access property list ID */
+    const char *src_fname;  /* Source file name */
+    herr_t ret;             /* Generic return value */
+
+    /* Output message about the test being performed */
+    MESSAGE(5, ("Testing H5Ocopy a dataset in a 1.8 library file to a 1.10 library file\n"));
+
+    /* Get the test file name */
+    src_fname = H5_get_srcdir_filename(SRC_FILE); 
+
+    /* Open the source test file */
+    src_fid = H5Fopen(src_fname, H5F_ACC_RDONLY, H5P_DEFAULT);
+    CHECK(src_fid, H5I_INVALID_HID, "H5Fopen");
+
+    /* Create file access property list */
+    fapl = H5Pcreate(H5P_FILE_ACCESS);
+    CHECK(fapl, H5I_INVALID_HID, "H5Pcreate");
+
+    /* Set library version bounds to (v18, v18) */
+    ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_V18, H5F_LIBVER_V18);
+    CHECK(ret, FAIL, "H5Pset_libver_bounds");
+
+    /* Create the destination file with the fapl */
+    dst_fid = H5Fcreate(DST_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+    CHECK(dst_fid, H5I_INVALID_HID, "H5Pcreate");
+
+    /* Close the fapl */
+    ret = H5Pclose(fapl);
+    CHECK(ret, FAIL, "H5Pclose");
+
+    /* Copy the dataset in the source file to the destination file */
+    ret = H5Ocopy(src_fid, DSET_DS1, dst_fid, DSET_DS1, H5P_DEFAULT, H5P_DEFAULT);
+    VERIFY(ret, SUCCEED, "H5Ocopy");
+
+    /* Close the source file */
+    ret = H5Fclose(src_fid);
+    CHECK(ret, FAIL, "H5Fclose");
+
+    /* Close the destination file */
+    ret = H5Fclose(dst_fid);
+    CHECK(ret, FAIL, "H5Fclose");
+
+    /* Remove the destination file */
+    HDremove(DST_FILE);
+
+} /* end test_libver_bounds_copy() */
+
 /****************************************************************
 **
 **  test_libver_bounds():
@@ -5099,6 +5181,7 @@ test_libver_bounds(void)
     test_libver_bounds_real(H5F_LIBVER_EARLIEST, 1, H5F_LIBVER_LATEST, 2);
     test_libver_bounds_real(H5F_LIBVER_LATEST, 2, H5F_LIBVER_EARLIEST, 2);
     test_libver_bounds_open();
+    test_libver_bounds_copy();
 } /* end test_libver_bounds() */
 
 /**************************************************************************************
@@ -7491,5 +7574,6 @@ cleanup_file(void)
     HDremove(FILE5);
     HDremove(FILE6);
     HDremove(FILE7);
+    HDremove(DST_FILE);
 }