FAPL fix: only support libver_bounds in 1.10.2+

Author: aldanor

src/hl/plist/file_access.rs

@@ -23,7 +23,7 @@ use libhdf5_sys::h5ac::{
     H5AC__MAX_TRACE_FILE_NAME_LEN,
 };
 use libhdf5_sys::h5c::{H5C_cache_decr_mode, H5C_cache_flash_incr_mode, H5C_cache_incr_mode};
-use libhdf5_sys::h5f::{H5F_close_degree_t, H5F_libver_t, H5F_mem_t, H5F_FAMILY_DEFAULT};
+use libhdf5_sys::h5f::{H5F_close_degree_t, H5F_mem_t, H5F_FAMILY_DEFAULT};
 use libhdf5_sys::h5fd::H5FD_MEM_NTYPES;
 use libhdf5_sys::h5fd::{
     H5FD_LOG_ALL, H5FD_LOG_FILE_IO, H5FD_LOG_FILE_READ, H5FD_LOG_FILE_WRITE, H5FD_LOG_FLAVOR,
@@ -35,12 +35,12 @@ use libhdf5_sys::h5fd::{
 };
 use libhdf5_sys::h5p::{
     H5Pcreate, H5Pget_alignment, H5Pget_cache, H5Pget_driver, H5Pget_fapl_core, H5Pget_fapl_family,
-    H5Pget_fapl_multi, H5Pget_fclose_degree, H5Pget_gc_references, H5Pget_libver_bounds,
-    H5Pget_mdc_config, H5Pget_meta_block_size, H5Pget_sieve_buf_size, H5Pget_small_data_block_size,
-    H5Pset_alignment, H5Pset_cache, H5Pset_fapl_core, H5Pset_fapl_family, H5Pset_fapl_log,
-    H5Pset_fapl_multi, H5Pset_fapl_sec2, H5Pset_fapl_split, H5Pset_fapl_stdio,
-    H5Pset_fclose_degree, H5Pset_gc_references, H5Pset_libver_bounds, H5Pset_mdc_config,
-    H5Pset_meta_block_size, H5Pset_sieve_buf_size, H5Pset_small_data_block_size,
+    H5Pget_fapl_multi, H5Pget_fclose_degree, H5Pget_gc_references, H5Pget_mdc_config,
+    H5Pget_meta_block_size, H5Pget_sieve_buf_size, H5Pget_small_data_block_size, H5Pset_alignment,
+    H5Pset_cache, H5Pset_fapl_core, H5Pset_fapl_family, H5Pset_fapl_log, H5Pset_fapl_multi,
+    H5Pset_fapl_sec2, H5Pset_fapl_split, H5Pset_fapl_stdio, H5Pset_fclose_degree,
+    H5Pset_gc_references, H5Pset_mdc_config, H5Pset_meta_block_size, H5Pset_sieve_buf_size,
+    H5Pset_small_data_block_size,
 };
 #[cfg(h5_have_direct)]
 use libhdf5_sys::h5p::{H5Pget_fapl_direct, H5Pset_fapl_direct};
@@ -49,6 +49,8 @@ use libhdf5_sys::h5p::{H5Pget_fapl_mpio, H5Pset_fapl_mpio};
 
 #[cfg(hdf5_1_10_1)]
 use libhdf5_sys::h5ac::{H5AC_cache_image_config_t, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE};
+#[cfg(hdf5_1_10_2)]
+use libhdf5_sys::h5f::H5F_libver_t;
 #[cfg(all(hdf5_1_10_0, h5_have_parallel))]
 use libhdf5_sys::h5p::{
     H5Pget_all_coll_metadata_ops, H5Pget_coll_metadata_write, H5Pset_all_coll_metadata_ops,
@@ -63,6 +65,8 @@ use libhdf5_sys::h5p::{
     H5Pget_evict_on_close, H5Pget_mdc_image_config, H5Pget_page_buffer_size, H5Pset_evict_on_close,
     H5Pset_mdc_image_config, H5Pset_page_buffer_size,
 };
+#[cfg(hdf5_1_10_2)]
+use libhdf5_sys::h5p::{H5Pget_libver_bounds, H5Pset_libver_bounds};
 #[cfg(hdf5_1_10_0)]
 use libhdf5_sys::h5p::{
     H5Pget_mdc_log_options, H5Pget_metadata_read_attempts, H5Pset_mdc_log_options,
@@ -112,7 +116,10 @@ impl Debug for FileAccess {
         formatter.field("fclose_degree", &self.fclose_degree());
         formatter.field("gc_references", &self.gc_references());
         formatter.field("small_data_block_size", &self.small_data_block_size());
-        formatter.field("libver_bounds", &self.libver_bounds());
+        #[cfg(hdf5_1_10_2)]
+        {
+            formatter.field("libver_bounds", &self.libver_bounds());
+        }
         #[cfg(hdf5_1_8_7)]
         {
             formatter.field("elink_file_cache_size", &self.elink_file_cache_size());
@@ -881,63 +888,65 @@ impl Default for CacheLogOptions {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub enum LibraryVersion {
-    Earliest = 0,
-    V18 = 1,
-    V110 = 2,
-}
+#[cfg(hdf5_1_10_2)]
+mod libver {
+    use super::*;
 
-impl LibraryVersion {
-    pub fn is_earliest(self) -> bool {
-        self == LibraryVersion::Earliest
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum LibraryVersion {
+        Earliest = 0,
+        V18 = 1,
+        V110 = 2,
     }
 
-    pub fn latest() -> Self {
-        if cfg!(hdf5_1_10_0) {
+    impl LibraryVersion {
+        pub fn is_earliest(self) -> bool {
+            self == LibraryVersion::Earliest
+        }
+
+        pub const fn latest() -> Self {
             LibraryVersion::V110
-        } else {
-            LibraryVersion::V18
         }
     }
-}
 
-impl Into<H5F_libver_t> for LibraryVersion {
-    fn into(self) -> H5F_libver_t {
-        use self::{H5F_libver_t::*, LibraryVersion::*};
-        match self {
-            V18 => H5F_LIBVER_V18,
-            V110 => H5F_LIBVER_V110,
-            _ => H5F_LIBVER_EARLIEST,
+    impl Into<H5F_libver_t> for LibraryVersion {
+        fn into(self) -> H5F_libver_t {
+            use self::{H5F_libver_t::*, LibraryVersion::*};
+            match self {
+                V18 => H5F_LIBVER_V18,
+                V110 => H5F_LIBVER_V110,
+                _ => H5F_LIBVER_EARLIEST,
+            }
         }
     }
-}
 
-impl From<H5F_libver_t> for LibraryVersion {
-    fn from(libver: H5F_libver_t) -> Self {
-        use self::{H5F_libver_t::*, LibraryVersion::*};
-        match libver {
-            H5F_LIBVER_V18 => V18,
-            H5F_LIBVER_V110 => V110,
-            _ => Earliest,
+    impl From<H5F_libver_t> for LibraryVersion {
+        fn from(libver: H5F_libver_t) -> Self {
+            use self::{H5F_libver_t::*, LibraryVersion::*};
+            match libver {
+                H5F_LIBVER_V18 => V18,
+                H5F_LIBVER_V110 => V110,
+                _ => Earliest,
+            }
         }
     }
-}
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct LibVerBounds {
-    pub low: LibraryVersion,
-    pub high: LibraryVersion,
-}
+    #[derive(Clone, Copy, Debug, PartialEq, Eq)]
+    pub struct LibVerBounds {
+        pub low: LibraryVersion,
+        pub high: LibraryVersion,
+    }
 
-impl Default for LibVerBounds {
-    fn default() -> Self {
-        let low = LibraryVersion::Earliest;
-        let high = if cfg!(hdf5_1_10_0) { LibraryVersion::V110 } else { LibraryVersion::V18 };
-        Self { low, high }
+    impl Default for LibVerBounds {
+        fn default() -> Self {
+            Self { low: LibraryVersion::Earliest, high: LibraryVersion::latest() }
+        }
     }
 }
 
+#[cfg(hdf5_1_10_2)]
+pub use self::libver::*;
+
 /// Builder used to create file access property list.
 #[derive(Clone, Debug, Default)]
 pub struct FileAccessBuilder {
@@ -969,7 +978,8 @@ pub struct FileAccessBuilder {
     coll_metadata_write: Option<bool>,
     gc_references: Option<bool>,
     small_data_block_size: Option<u64>,
-    libver_low_earliest: Option<bool>,
+    #[cfg(hdf5_1_10_2)]
+    libver_bounds: Option<LibVerBounds>,
 }
 
 impl FileAccessBuilder {
@@ -990,7 +1000,11 @@ impl FileAccessBuilder {
         builder.driver(&drv);
         builder.gc_references(plist.get_gc_references()?);
         builder.small_data_block_size(plist.get_small_data_block_size()?);
-        builder.libver_bounds(plist.get_libver_bounds()?.low.is_earliest());
+        #[cfg(hdf5_1_10_2)]
+        {
+            let v = plist.get_libver_bounds()?;
+            builder.libver_bounds(v.low, v.high);
+        }
         #[cfg(hdf5_1_8_7)]
         {
             builder.elink_file_cache_size(plist.get_elink_file_cache_size()?);
@@ -1122,8 +1136,9 @@ impl FileAccessBuilder {
         self
     }
 
-    pub fn libver_bounds(&mut self, low_earliest: bool) -> &mut Self {
-        self.libver_low_earliest = Some(low_earliest);
+    #[cfg(hdf5_1_10_2)]
+    pub fn libver_bounds(&mut self, low: LibraryVersion, high: LibraryVersion) -> &mut Self {
+        self.libver_bounds = Some(LibVerBounds { low, high });
         self
     }
 
@@ -1377,10 +1392,11 @@ impl FileAccessBuilder {
         if let Some(v) = self.small_data_block_size {
             h5try!(H5Pset_small_data_block_size(id, v as _));
         }
-        if let Some(v) = self.libver_low_earliest {
-            let high = LibraryVersion::latest();
-            let low = if v { LibraryVersion::Earliest } else { high };
-            h5try!(H5Pset_libver_bounds(id, low.into(), high.into()));
+        #[cfg(hdf5_1_10_2)]
+        {
+            if let Some(v) = self.libver_bounds {
+                h5try!(H5Pset_libver_bounds(id, v.low.into(), v.high.into()));
+            }
         }
         #[cfg(hdf5_1_8_7)]
         {
@@ -1788,12 +1804,14 @@ impl FileAccess {
         self.get_small_data_block_size().unwrap_or(2048)
     }
 
+    #[cfg(hdf5_1_10_2)]
     #[doc(hidden)]
     pub fn get_libver_bounds(&self) -> Result<LibVerBounds> {
         h5get!(H5Pget_libver_bounds(self.id()): H5F_libver_t, H5F_libver_t)
             .map(|(low, high)| LibVerBounds { low: low.into(), high: high.into() })
     }
 
+    #[cfg(hdf5_1_10_2)]
     pub fn libver_bounds(&self) -> LibVerBounds {
         self.get_libver_bounds().ok().unwrap_or_else(LibVerBounds::default)
     }