[svn-r24725] HDFFV-8629: h5repack will not attempt to remove UD filters. h5repack requires a check for UD filters that also must check if the filter can be dynamically loaded. This require a change in the library that checks for this.

Tested: locally and reviewed

3 files changed, 167 insertions, 162 deletions

diff --git a/src/H5Z.c b/src/H5Z.c
index 901b506..c55a5e3 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -664,7 +664,13 @@ H5Zfilter_avail(H5Z_filter_t id)
         HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identification number")
  
     if((ret_value = H5Z_filter_avail(id)) < 0)
-	HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "unable to check the availability of the filter")
+    	HGOTO_ERROR(H5E_PLINE, H5E_NOTFOUND, FAIL, "unable to check the availability of the filter")
+    else if(ret_value == FALSE) {
+        const H5Z_class2_t *filter_info;
+
+        if(NULL != (filter_info = (const H5Z_class2_t *)H5PL_load(H5PL_TYPE_FILTER, (int)id)))
+        	ret_value = TRUE;
+    } /* end if */
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -1324,22 +1330,20 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
              */
 	    if((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0) {
                 hbool_t issue_error = FALSE;
-
-                /* Check for "no plugins" indicated" */
-                    const H5Z_class2_t    *filter_info;
-
-                    /* Try loading the filter */
-                    if(NULL != (filter_info = (const H5Z_class2_t *)H5PL_load(H5PL_TYPE_FILTER, (int)(pline->filter[idx].id)))) {
-                        /* Register the filter we loaded */
-                        if(H5Z_register(filter_info) < 0)
-                            HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter")
-
-                        /* Search in the table of registered filters again to find the dynamic filter just loaded and registered */ 
-                        if((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0)
-                            issue_error = TRUE;
-                    } /* end if */
-                    else
-                        issue_error = TRUE;
+				const H5Z_class2_t    *filter_info;
+
+				/* Try loading the filter */
+				if(NULL != (filter_info = (const H5Z_class2_t *)H5PL_load(H5PL_TYPE_FILTER, (int)(pline->filter[idx].id)))) {
+					/* Register the filter we loaded */
+					if(H5Z_register(filter_info) < 0)
+						HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter")
+
+					/* Search in the table of registered filters again to find the dynamic filter just loaded and registered */
+					if((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0)
+						issue_error = TRUE;
+				} /* end if */
+				else
+					issue_error = TRUE;
 
                 /* Check for error */
                 if(issue_error) {
diff --git a/tools/h5repack/CMakeTests.cmake b/tools/h5repack/CMakeTests.cmake
index 95288f0..3252c30 100644
--- a/tools/h5repack/CMakeTests.cmake
+++ b/tools/h5repack/CMakeTests.cmake
@@ -1066,7 +1066,7 @@ ADD_H5_VERIFY_TEST (ckdim_smaller "TEST" 0 h5repack_layout3.h5 chunk_unlimit3 CO
 ##############################################################################
 IF (BUILD_SHARED_LIBS)
   ADD_H5_UD_TEST (plugin_test 0 h5repack_layout.h5 -v -f UD=257,1,9)
-#  ADD_H5_UD_TEST (plugin_none 0 h5repack_layout.UD.h5 -v -f NONE)
+  ADD_H5_UD_TEST (plugin_none 0 h5repack_layout.UD.h5 -v -f NONE)
 ELSE (BUILD_SHARED_LIBS)
   MESSAGE (STATUS " **** Plugins libraries must be built as shared libraries **** ")
   ADD_TEST (
diff --git a/tools/lib/h5tools_filters.c b/tools/lib/h5tools_filters.c
index 2da21ef..3664a29 100644
--- a/tools/lib/h5tools_filters.c
+++ b/tools/lib/h5tools_filters.c
@@ -20,10 +20,10 @@
  * print a warning message
  *-------------------------------------------------------------------------
  */
-static void print_warning(const char *dname, const char *fname)
-{
- fprintf(stderr,"warning: dataset <%s> cannot be read, %s filter is not available\n",
-  dname,fname);
+static void print_warning(const char *dname, const char *fname) {
+	fprintf(stderr,
+			"warning: dataset <%s> cannot be read, %s filter is not available\n",
+			dname, fname);
 }
 
 /*-------------------------------------------------------------------------
@@ -46,109 +46,111 @@ int h5tools_canreadf(const char* name, /* object name, serves also as boolean pr
                      hid_t dcpl_id)    /* dataset creation property list */
 {
 
- int          nfilters;       /* number of filters */
- H5Z_filter_t filtn;          /* filter identification number */
- int          i;              /* index */
-
-
- /* get information about filters */
- if ((nfilters = H5Pget_nfilters(dcpl_id))<0)
-  return -1;
-
- /* if we do not have filters, we can read the dataset safely */
- if (!nfilters)
-  return 1;
-
- /* check availability of filters */
- for(i = 0; i < nfilters; i++)
- {
-  if((filtn = H5Pget_filter2(dcpl_id, (unsigned)i, 0, 0, 0, (size_t)0, 0, NULL)) < 0)
-   return -1;
-
-  switch(filtn)
-  {
-/*-------------------------------------------------------------------------
- * user defined filter
- *-------------------------------------------------------------------------
- */
-  default:
-    if(name)
-     print_warning(name, "user defined");
-    return 0;
-
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_DEFLATE      1 , deflation like gzip
- *-------------------------------------------------------------------------
- */
-  case H5Z_FILTER_DEFLATE:
+	int nfilters; /* number of filters */
+	H5Z_filter_t filtn; /* filter identification number */
+	int i; /* index */
+	int udfilter_avail; /* index */
+
+	/* get information about filters */
+	if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
+		return -1;
+
+	/* if we do not have filters, we can read the dataset safely */
+	if (!nfilters)
+		return 1;
+
+	/* check availability of filters */
+	for (i = 0; i < nfilters; i++) {
+		if ((filtn = H5Pget_filter2(dcpl_id, (unsigned) i, 0, 0, 0, (size_t) 0, 0, NULL)) < 0)
+			return -1;
+
+		switch (filtn) {
+		/*-------------------------------------------------------------------------
+		 * user defined filter
+		 *-------------------------------------------------------------------------
+		 */
+		default:
+			if ((udfilter_avail = H5Zfilter_avail(filtn)) < 0)
+				return -1;
+			else if (udfilter_avail == 0) {
+				if (name)
+					print_warning(name, "user defined");
+				return 0;
+			}
+			break;
+
+			/*-------------------------------------------------------------------------
+			 * H5Z_FILTER_DEFLATE      1 , deflation like gzip
+			 *-------------------------------------------------------------------------
+			 */
+		case H5Z_FILTER_DEFLATE:
 #ifndef H5_HAVE_FILTER_DEFLATE
-    if (name)
-     print_warning(name,"deflate");
-    return 0;
+			if (name)
+				print_warning(name,"deflate");
+			return 0;
 #endif
-   break;
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_SZIP       4 , szip compression
- *-------------------------------------------------------------------------
- */
-  case H5Z_FILTER_SZIP:
+			break;
+			/*-------------------------------------------------------------------------
+			 * H5Z_FILTER_SZIP       4 , szip compression
+			 *-------------------------------------------------------------------------
+			 */
+		case H5Z_FILTER_SZIP:
 #ifndef H5_HAVE_FILTER_SZIP
-    if (name)
-     print_warning(name,"SZIP");
-    return 0;
+			if (name)
+				print_warning(name,"SZIP");
+			return 0;
 #endif
-   break;
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_SHUFFLE    2 , shuffle the data
- *-------------------------------------------------------------------------
- */
-  case H5Z_FILTER_SHUFFLE:
+			break;
+			/*-------------------------------------------------------------------------
+			 * H5Z_FILTER_SHUFFLE    2 , shuffle the data
+			 *-------------------------------------------------------------------------
+			 */
+		case H5Z_FILTER_SHUFFLE:
 #ifndef H5_HAVE_FILTER_SHUFFLE
-    if (name)
-     print_warning(name,"shuffle");
-    return 0;
+			if (name)
+				print_warning(name,"shuffle");
+			return 0;
 #endif
-   break;
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
- *-------------------------------------------------------------------------
- */
-  case H5Z_FILTER_FLETCHER32:
+			break;
+			/*-------------------------------------------------------------------------
+			 * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
+			 *-------------------------------------------------------------------------
+			 */
+		case H5Z_FILTER_FLETCHER32:
 #ifndef H5_HAVE_FILTER_FLETCHER32
-    if (name)
-     print_warning(name,"fletcher32");
-    return 0;
+			if (name)
+				print_warning(name,"fletcher32");
+			return 0;
 #endif
-   break;
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_NBIT
- *-------------------------------------------------------------------------
- */
-  case H5Z_FILTER_NBIT:
+			break;
+			/*-------------------------------------------------------------------------
+			 * H5Z_FILTER_NBIT
+			 *-------------------------------------------------------------------------
+			 */
+		case H5Z_FILTER_NBIT:
 #ifndef H5_HAVE_FILTER_NBIT
-    if (name)
-     print_warning(name,"nbit");
-    return 0;
+			if (name)
+				print_warning(name,"nbit");
+			return 0;
 #endif
-   break;
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_SCALEOFFSET
- *-------------------------------------------------------------------------
- */
-  case H5Z_FILTER_SCALEOFFSET:
+			break;
+			/*-------------------------------------------------------------------------
+			 * H5Z_FILTER_SCALEOFFSET
+			 *-------------------------------------------------------------------------
+			 */
+		case H5Z_FILTER_SCALEOFFSET:
 #ifndef H5_HAVE_FILTER_SCALEOFFSET
-    if (name)
-     print_warning(name,"scaleoffset");
-    return 0;
+			if (name)
+				print_warning(name,"scaleoffset");
+			return 0;
 #endif
-   break;
-  }/*switch*/
- }/*for*/
+			break;
+		}/*switch*/
+	}/*for*/
 
- return 1;
+	return 1;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: h5tools_canwritef
  *
@@ -164,71 +166,70 @@ int h5tools_canreadf(const char* name, /* object name, serves also as boolean pr
  *
  *-------------------------------------------------------------------------
  */
-int h5tools_can_encode( H5Z_filter_t filtn)
-{
-  switch (filtn)
-  {
-    /* user defined filter     */
-  default:
-    return 0;
+int h5tools_can_encode(H5Z_filter_t filtn) {
+	switch (filtn) {
+	/* user defined filter     */
+	default:
+		return 0;
 
-  case H5Z_FILTER_DEFLATE:
+	case H5Z_FILTER_DEFLATE:
 #ifndef H5_HAVE_FILTER_DEFLATE
-   return 0;
+		return 0;
 #endif
-   break;
-  case H5Z_FILTER_SZIP:
+		break;
+	case H5Z_FILTER_SZIP:
 #ifndef H5_HAVE_FILTER_SZIP
-   return 0;
+		return 0;
 #else
-   {
-   unsigned int filter_config_flags;
-
-   if(H5Zget_filter_info(filtn, &filter_config_flags)<0)
-       return -1;
-   if ((filter_config_flags &
-          (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) == 0) {
-    /* filter present but neither encode nor decode is supported (???) */
-    return -1;
-   } else if ((filter_config_flags &
-          (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) ==
-    H5Z_FILTER_CONFIG_DECODE_ENABLED) {
-     /* decoder only: read but not write */
-    return 0;
-   } else if ((filter_config_flags &
-          (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) ==
-    H5Z_FILTER_CONFIG_ENCODE_ENABLED) {
-     /* encoder only: write but not read (???) */
-     return -1;
-   } else if ((filter_config_flags &
-          (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) ==
-          (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) {
-    return 1;
-   }
-   }
+	{
+		unsigned int filter_config_flags;
+
+		if (H5Zget_filter_info(filtn, &filter_config_flags) < 0)
+			return -1;
+		if ((filter_config_flags
+				& (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == 0) {
+			/* filter present but neither encode nor decode is supported (???) */
+			return -1;
+		} 
+		else if ((filter_config_flags
+				& (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == H5Z_FILTER_CONFIG_DECODE_ENABLED) {
+			/* decoder only: read but not write */
+			return 0;
+		} 
+		else if ((filter_config_flags
+				& (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == H5Z_FILTER_CONFIG_ENCODE_ENABLED) {
+			/* encoder only: write but not read (???) */
+			return -1;
+		} 
+		else if ((filter_config_flags
+				& (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED))
+				== (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) {
+			return 1;
+		}
+	}
 #endif
-   break;
-  case H5Z_FILTER_SHUFFLE:
+		break;
+	case H5Z_FILTER_SHUFFLE:
 #ifndef H5_HAVE_FILTER_SHUFFLE
-    return 0;
+		return 0;
 #endif
-   break;
-  case H5Z_FILTER_FLETCHER32:
+		break;
+	case H5Z_FILTER_FLETCHER32:
 #ifndef H5_HAVE_FILTER_FLETCHER32
-    return 0;
+		return 0;
 #endif
-   break;
-  case H5Z_FILTER_NBIT:
+		break;
+	case H5Z_FILTER_NBIT:
 #ifndef H5_HAVE_FILTER_NBIT
-    return 0;
+		return 0;
 #endif
-   break;
-  case H5Z_FILTER_SCALEOFFSET:
+		break;
+	case H5Z_FILTER_SCALEOFFSET:
 #ifndef H5_HAVE_FILTER_SCALEOFFSET
-    return 0;
+		return 0;
 #endif
-   break;
-  }/*switch*/
+		break;
+	}/*switch*/
 
- return 1;
+	return 1;
 }