diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index d06f8df2dd0..64a9ed48224 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -560,7 +560,7 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid h5f_flags[30] = (int_f)H5F_LIBVER_V200; h5f_flags[31] = (int_f)H5F_ACC_SWMR_READ; h5f_flags[32] = (int_f)H5F_ACC_SWMR_WRITE; - h5f_flags[33] = (int_f)H5F_LIBVER_V220; + h5f_flags[33] = (int_f)H5F_LIBVER_V230; /* * H5FD flags diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90 index 421e6a12655..ec304396aec 100644 --- a/fortran/src/H5_ff.F90 +++ b/fortran/src/H5_ff.F90 @@ -391,7 +391,7 @@ CONTAINS H5F_LIBVER_V200_F = H5F_flags(31) H5F_ACC_SWMR_READ_F = H5F_flags(32) H5F_ACC_SWMR_WRITE_F = H5F_flags(33) - H5F_LIBVER_V220_F = H5F_flags(34) + H5F_LIBVER_V230_F = H5F_flags(34) ! ! H5generic flags ! diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90 index 0f3388db0b3..5c30b2b1699 100644 --- a/fortran/src/H5f90global.F90 +++ b/fortran/src/H5f90global.F90 @@ -255,7 +255,7 @@ MODULE H5GLOBAL !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V112_F !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V114_F !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V200_F - !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V220_F + !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V230_F !DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_FSM_AGGR_F !DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_PAGE_F !DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_AGGR_F @@ -292,7 +292,7 @@ MODULE H5GLOBAL INTEGER :: H5F_LIBVER_V112_F !< H5F_LIBVER_V112 INTEGER :: H5F_LIBVER_V114_F !< H5F_LIBVER_V114 INTEGER :: H5F_LIBVER_V200_F !< H5F_LIBVER_V200 - INTEGER :: H5F_LIBVER_V220_F !< H5F_LIBVER_V220 + INTEGER :: H5F_LIBVER_V230_F !< H5F_LIBVER_V230 INTEGER :: H5F_FSPACE_STRATEGY_FSM_AGGR_F !< H5F_FSPACE_STRATEGY_FSM_AGGR INTEGER :: H5F_FSPACE_STRATEGY_PAGE_F !< H5F_FSPACE_STRATEGY_PAGE INTEGER :: H5F_FSPACE_STRATEGY_AGGR_F !< H5F_FSPACE_STRATEGY_AGGR diff --git a/java/hdf/hdf5lib/HDF5Constants.java b/java/hdf/hdf5lib/HDF5Constants.java index 577900ce59a..2fc30d216f3 100644 --- a/java/hdf/hdf5lib/HDF5Constants.java +++ b/java/hdf/hdf5lib/HDF5Constants.java @@ -582,7 +582,7 @@ public class HDF5Constants { /** */ public static final int H5F_LIBVER_V200 = H5F_LIBVER_V200(); /** */ - public static final int H5F_LIBVER_V220 = H5F_LIBVER_V220(); + public static final int H5F_LIBVER_V230 = H5F_LIBVER_V230(); /** */ public static final int H5F_LIBVER_LATEST = H5F_LIBVER_LATEST(); /** */ diff --git a/java/src-jni/hdf/hdf5lib/HDF5Constants.java b/java/src-jni/hdf/hdf5lib/HDF5Constants.java index cfbb2db3d5b..589ec20a10f 100644 --- a/java/src-jni/hdf/hdf5lib/HDF5Constants.java +++ b/java/src-jni/hdf/hdf5lib/HDF5Constants.java @@ -575,7 +575,7 @@ public class HDF5Constants { /** */ public static final int H5F_LIBVER_V200 = H5F_LIBVER_V200(); /** */ - public static final int H5F_LIBVER_V220 = H5F_LIBVER_V220(); + public static final int H5F_LIBVER_V230 = H5F_LIBVER_V230(); /** */ public static final int H5F_LIBVER_LATEST = H5F_LIBVER_LATEST(); /** */ @@ -2096,7 +2096,7 @@ public class HDF5Constants { private static native final int H5F_LIBVER_V200(); - private static native final int H5F_LIBVER_V220(); + private static native final int H5F_LIBVER_V230(); private static native final int H5F_LIBVER_LATEST(); diff --git a/java/src-jni/jni/h5Constants.c b/java/src-jni/jni/h5Constants.c index 4c819993613..9d32c5d65d3 100644 --- a/java/src-jni/jni/h5Constants.c +++ b/java/src-jni/jni/h5Constants.c @@ -1309,9 +1309,9 @@ Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V200(JNIEnv *env, jclass cls) return H5F_LIBVER_V200; } JNIEXPORT jint JNICALL -Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V220(JNIEnv *env, jclass cls) +Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V230(JNIEnv *env, jclass cls) { - return H5F_LIBVER_V220; + return H5F_LIBVER_V230; } JNIEXPORT jint JNICALL Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1LATEST(JNIEnv *env, jclass cls) diff --git a/release_docs/CHANGELOG.md b/release_docs/CHANGELOG.md index b795c9a9890..66db4e9064a 100644 --- a/release_docs/CHANGELOG.md +++ b/release_docs/CHANGELOG.md @@ -124,7 +124,7 @@ We would like to thank the many HDF5 community members who contributed to this r byte per filter and, when set, the blob's locator. Blob bytes live in the global heap, not inline in the object header; deleting the dataset reclaims the heap object. Writing a blob-bearing dataset requires a - library-version high bound of `H5F_LIBVER_V220` (see below) or later; + library-version high bound of `H5F_LIBVER_V230` (see below) or later; files without blobs are unaffected. `H5Pencode`/`H5Pdecode` serialize the blob bytes inline so an encoded DCPL @@ -133,14 +133,14 @@ We would like to thank the many HDF5 community members who contributed to this r HDF5, rank 0 writes the blob and broadcasts the locator so all ranks encode an identical pipeline message. -### Added the H5F_LIBVER_V220 library version bound +### Added the H5F_LIBVER_V230 library version bound - The `H5F_libver_t` enumeration gains `H5F_LIBVER_V220`, and + The `H5F_libver_t` enumeration gains `H5F_LIBVER_V230`, and `H5F_LIBVER_LATEST` now maps to it. A file access property list's high - bound must be at least `H5F_LIBVER_V220` to write the version-3 filter + bound must be at least `H5F_LIBVER_V230` to write the version-3 filter pipeline message introduced for blob storage; all other format versions are unchanged from `H5F_LIBVER_V200`. The constant is mirrored in the - Fortran (`H5F_LIBVER_V220_F`) and Java (`HDF5Constants.H5F_LIBVER_V220`) + Fortran (`H5F_LIBVER_V230_F`) and Java (`HDF5Constants.H5F_LIBVER_V230`) bindings. ### Added string-based filter configuration API (RFC-HDFG-2026-001) diff --git a/src/H5Aint.c b/src/H5Aint.c index 95f8c30e6c7..b234a972b0b 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -99,7 +99,7 @@ const unsigned H5O_attr_ver_bounds[] = { H5O_ATTR_VERSION_3, /* H5F_LIBVER_V112 */ H5O_ATTR_VERSION_3, /* H5F_LIBVER_V114 */ H5O_ATTR_VERSION_3, /* H5F_LIBVER_V200 */ - H5O_ATTR_VERSION_3, /* H5F_LIBVER_V220 */ + H5O_ATTR_VERSION_3, /* H5F_LIBVER_V230 */ H5O_ATTR_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c index 54d99025547..40cd78e413d 100644 --- a/src/H5Dlayout.c +++ b/src/H5Dlayout.c @@ -49,7 +49,7 @@ const unsigned H5O_layout_ver_bounds[] = { H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V112 */ H5O_LAYOUT_VERSION_4, /* H5F_LIBVER_V114 */ H5O_LAYOUT_VERSION_5, /* H5F_LIBVER_V200 */ - H5O_LAYOUT_VERSION_5, /* H5F_LIBVER_V220 */ + H5O_LAYOUT_VERSION_5, /* H5F_LIBVER_V230 */ H5O_LAYOUT_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index b8c3868e456..298cdc9ce60 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -184,7 +184,7 @@ typedef enum H5F_libver_t { H5F_LIBVER_V112 = 3, /**< Use the 1.12 file format for storing objects */ H5F_LIBVER_V114 = 4, /**< Use the 1.14 file format for storing objects */ H5F_LIBVER_V200 = 5, /**< Use the 2.0 file format for storing objects */ - H5F_LIBVER_V220 = 6, /**< Use the 2.2 file format for storing objects */ + H5F_LIBVER_V230 = 6, /**< Use the 2.3 file format for storing objects */ H5F_LIBVER_LATEST = 6, /**< Use the latest file format for storing objects */ H5F_LIBVER_NBOUNDS /**< Sentinel */ } H5F_libver_t; diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index 9422be9c3b2..bfde0aab5e2 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -72,7 +72,7 @@ static const unsigned HDF5_superblock_ver_bounds[] = { HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V112 */ HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V114 */ HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V200 */ - HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V220 */ + HDF5_SUPERBLOCK_VERSION_3, /* H5F_LIBVER_V230 */ HDF5_SUPERBLOCK_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Ofill.c b/src/H5Ofill.c index fdb031c0e93..943dc1e8ccf 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -154,7 +154,7 @@ const unsigned H5O_fill_ver_bounds[] = { H5O_FILL_VERSION_3, /* H5F_LIBVER_V112 */ H5O_FILL_VERSION_3, /* H5F_LIBVER_V114 */ H5O_FILL_VERSION_3, /* H5F_LIBVER_V200 */ - H5O_FILL_VERSION_3, /* H5F_LIBVER_V220 */ + H5O_FILL_VERSION_3, /* H5F_LIBVER_V230 */ H5O_FILL_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c index 56c99608b7a..3c816436c3b 100644 --- a/src/H5Ofsinfo.c +++ b/src/H5Ofsinfo.c @@ -70,7 +70,7 @@ static const unsigned H5O_fsinfo_ver_bounds[] = { H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V112 */ H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V114 */ H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V200 */ - H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V220 */ + H5O_FSINFO_VERSION_1, /* H5F_LIBVER_V230 */ H5O_FSINFO_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; #define N_FSINFO_VERSION_BOUNDS H5F_LIBVER_NBOUNDS diff --git a/src/H5Oint.c b/src/H5Oint.c index 197fa605ac0..c0fe7866677 100644 --- a/src/H5Oint.c +++ b/src/H5Oint.c @@ -129,7 +129,7 @@ const unsigned H5O_obj_ver_bounds[] = { H5O_VERSION_2, /* H5F_LIBVER_V112 */ H5O_VERSION_2, /* H5F_LIBVER_V114 */ H5O_VERSION_2, /* H5F_LIBVER_V200 */ - H5O_VERSION_2, /* H5F_LIBVER_V220 */ + H5O_VERSION_2, /* H5F_LIBVER_V230 */ H5O_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Opline.c b/src/H5Opline.c index 271ba4e1e53..da7a757e507 100644 --- a/src/H5Opline.c +++ b/src/H5Opline.c @@ -91,7 +91,7 @@ const unsigned H5O_pline_ver_bounds[] = { H5O_PLINE_VERSION_2, /* H5F_LIBVER_V112 */ H5O_PLINE_VERSION_2, /* H5F_LIBVER_V114 */ H5O_PLINE_VERSION_2, /* H5F_LIBVER_V200 */ - H5O_PLINE_VERSION_3, /* H5F_LIBVER_V220 */ + H5O_PLINE_VERSION_3, /* H5F_LIBVER_V230 */ H5O_PLINE_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index 7eb301bc331..eeecb3732e8 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -2031,7 +2031,7 @@ done: * * Return: Non-negative on success / Negative on failure * - * Since: 2.2.0 + * Since: 2.3.0 *------------------------------------------------------------------------- */ herr_t diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 7c22829a82f..45780bb729d 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -2886,7 +2886,7 @@ H5_DLL herr_t H5Pappend_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int * to another dataset). The filter's \c set_config callback is not * invoked for this entry point. * - * \since 2.2.0 + * \since 2.3.0 */ H5_DLL herr_t H5Pappend_filter_blob(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, const void *buf, size_t size); diff --git a/src/H5S.c b/src/H5S.c index 1ad10527a80..ee77c23a860 100644 --- a/src/H5S.c +++ b/src/H5S.c @@ -65,7 +65,7 @@ const unsigned H5O_sdspace_ver_bounds[] = { H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V112 */ H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V114 */ H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V200 */ - H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V220 */ + H5O_SDSPACE_VERSION_2, /* H5F_LIBVER_V230 */ H5O_SDSPACE_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 89fe837d6e8..cf4cca72c17 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -242,7 +242,7 @@ static const unsigned H5O_sds_hyper_ver_bounds[] = { H5S_HYPER_VERSION_3, /* H5F_LIBVER_V112 */ H5S_HYPER_VERSION_3, /* H5F_LIBVER_V114 */ H5S_HYPER_VERSION_3, /* H5F_LIBVER_V200 */ - H5S_HYPER_VERSION_3, /* H5F_LIBVER_V220 */ + H5S_HYPER_VERSION_3, /* H5F_LIBVER_V230 */ H5S_HYPER_VERSION_3 /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Spoint.c b/src/H5Spoint.c index acde760cb01..44bb5832b82 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -127,7 +127,7 @@ static const unsigned H5O_sds_point_ver_bounds[] = { H5S_POINT_VERSION_2, /* H5F_LIBVER_V112 */ H5S_POINT_VERSION_2, /* H5F_LIBVER_V114 */ H5S_POINT_VERSION_2, /* H5F_LIBVER_V200 */ - H5S_POINT_VERSION_2, /* H5F_LIBVER_V220 */ + H5S_POINT_VERSION_2, /* H5F_LIBVER_V230 */ H5S_POINT_VERSION_2 /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5T.c b/src/H5T.c index 4bf861d6c1e..d2945f5f993 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -742,7 +742,7 @@ const unsigned H5O_dtype_ver_bounds[] = { H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V112 */ H5O_DTYPE_VERSION_4, /* H5F_LIBVER_V114 */ H5O_DTYPE_VERSION_5, /* H5F_LIBVER_V200 */ - H5O_DTYPE_VERSION_5, /* H5F_LIBVER_V220 */ + H5O_DTYPE_VERSION_5, /* H5F_LIBVER_V230 */ H5O_DTYPE_VERSION_LATEST /* H5F_LIBVER_LATEST */ }; diff --git a/src/H5Zdevelop.h b/src/H5Zdevelop.h index 2b43c16c12c..533d48798c4 100644 --- a/src/H5Zdevelop.h +++ b/src/H5Zdevelop.h @@ -270,7 +270,7 @@ typedef size_t (*H5Z_func2_t)(unsigned int flags, size_t cd_nelmts, const unsign * whatever they need in the two fields, as long as \c read_blob can recover * the blob from them. * - * \since 2.2.0 + * \since 2.3.0 */ typedef struct H5Z_blob_loc_t { haddr_t addr; /**< Global heap collection address */ @@ -292,7 +292,7 @@ typedef struct H5Z_blob_loc_t { * \c set_local callback runs. If the filter class leaves this field * NULL, the library uses its default global-heap (H5HG) writer. * - * \since 2.2.0 + * \since 2.3.0 */ typedef herr_t (*H5Z_write_blob_func_t)(hid_t file_id, const void *buf, size_t size, H5Z_blob_loc_t *loc_out); @@ -313,7 +313,7 @@ typedef herr_t (*H5Z_write_blob_func_t)(hid_t file_id, const void *buf, size_t s * it here using \p file_id and cache the result for later * \c H5Z_func2_t invocations. * - * \since 2.2.0 + * \since 2.3.0 */ typedef herr_t (*H5Z_read_blob_func_t)(hid_t file_id, H5Z_blob_loc_t loc, void **buf_out, size_t *size_out); @@ -328,7 +328,7 @@ typedef herr_t (*H5Z_read_blob_func_t)(hid_t file_id, H5Z_blob_loc_t loc, void * * \details Called at dataset close. If the filter class leaves this field * NULL, the library releases the buffer itself. * - * \since 2.2.0 + * \since 2.3.0 */ typedef herr_t (*H5Z_close_blob_func_t)(void *buf, size_t size); diff --git a/src/H5trace.c b/src/H5trace.c index 91f52be111e..e7f28727587 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -1456,8 +1456,8 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap) H5RS_acat(rs, "H5F_LIBVER_V200"); break; - case H5F_LIBVER_V220: - HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V220); + case H5F_LIBVER_V230: + HDcompile_assert(H5F_LIBVER_LATEST == H5F_LIBVER_V230); H5RS_acat(rs, "H5F_LIBVER_LATEST"); break; diff --git a/test/chunk_info.c b/test/chunk_info.c index 7a62cba1142..b3a7cb2ed3b 100644 --- a/test/chunk_info.c +++ b/test/chunk_info.c @@ -53,7 +53,7 @@ * a new library version bound is added to H5F_libver_t in H5Fpublic.h. */ static const char *FILENAME[] = {"tchunk_info_earliest", "tchunk_info_v18", "tchunk_info_v110", "tchunk_info_v112", "tchunk_info_v114", "tchunk_info_v200", - "tchunk_info_v220", "tchunk_info_v300", NULL}; + "tchunk_info_v230", "tchunk_info_v300", NULL}; /* File to be used in test_failed_attempts */ #define FILTERMASK_FILE "tflt_msk" diff --git a/test/h5test.c b/test/h5test.c index f7330498a4c..80beed55f30 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -111,7 +111,7 @@ const char *LIBVER_NAMES[] = {"earliest", /* H5F_LIBVER_EARLIEST = 0 */ "v112", /* H5F_LIBVER_V112 = 3 */ "v114", /* H5F_LIBVER_V114 = 4 */ "v200", /* H5F_LIBVER_V200 = 5 */ - "v220", /* H5F_LIBVER_V220 = 6 */ + "v230", /* H5F_LIBVER_V230 = 6 */ NULL}; /* Previous error reporting function */