9 files changed, 30 insertions, 194 deletions
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 3de49da..78ebbe2 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -6097,34 +6097,35 @@ public class H5 implements java.io.Serializable {
      **/
     public synchronized static native String H5Pget_virtual_dsetname(long dcpl_id, long index) throws HDF5LibraryException, IllegalArgumentException;
 
-    /**
-     * H5Pget_vds_file_cache_size retrieves the size of the vds link open file cache.
-     *
-     * @param fapl_id
-     *            IN: File access property list identifier
-     *
-     * @return VDS link open file cache size in number of files.
-     *
-     * @exception HDF5LibraryException
-     *                - Error from the HDF-5 Library.
-     *
-     **/
-    public synchronized static native int H5Pget_vds_file_cache_size(long fapl_id) throws HDF5LibraryException;
-
-    /**
-     * H5Pset_vds_file_cache_size sets the number of files that can be held open in an vds link open file cache.
-     *
-     * @param fapl_id
-     *            IN: File access property list identifier
-     * @param efc_size
-     *            IN: VDS link open file cache size in number of files.
-     *
-     * @exception HDF5LibraryException
-     *                - Error from the HDF-5 Library.
-     *
-     **/
-    public synchronized static native void H5Pset_vds_file_cache_size(long fapl_id, int efc_size)
-            throws HDF5LibraryException;
+//    /////  unimplemented /////
+//    /**
+//     * H5Pget_vds_file_cache_size retrieves the size of the vds link open file cache.
+//     *
+//     * @param fapl_id
+//     *            IN: File access property list identifier
+//     *
+//     * @return VDS link open file cache size in number of files.
+//     *
+//     * @exception HDF5LibraryException
+//     *                - Error from the HDF-5 Library.
+//     *
+//     **/
+//    public synchronized static native int H5Pget_vds_file_cache_size(long fapl_id) throws HDF5LibraryException;
+//
+//    /**
+//     * H5Pset_vds_file_cache_size sets the number of files that can be held open in an vds link open file cache.
+//     *
+//     * @param fapl_id
+//     *            IN: File access property list identifier
+//     * @param efc_size
+//     *            IN: VDS link open file cache size in number of files.
+//     *
+//     * @exception HDF5LibraryException
+//     *                - Error from the HDF-5 Library.
+//     *
+//     **/
+//    public synchronized static native void H5Pset_vds_file_cache_size(long fapl_id, int efc_size)
+//            throws HDF5LibraryException;
 
     /**
      * H5Pget_external returns information about an external file.
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c
index b144ff6..cf27341 100644
--- a/java/src/jni/h5pImp.c
+++ b/java/src/jni/h5pImp.c
@@ -5733,37 +5733,6 @@ Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts
      } /* end else */
 } /* end Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts */
 
-/*
- * Class:     hdf_hdf5lib_H5
- * Method:    H5Pset_vds_file_cache_size
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1vds_1file_1cache_1size
-    (JNIEnv *env, jclass clss, jlong plist, jint size)
-{
-    unsigned  sz = (unsigned)size;
-
-    if (H5Pset_vds_file_cache_size((hid_t)plist, (unsigned)sz) < 0)
-        h5libraryError(env);
-} /* end Java_hdf_hdf5lib_H5_H5Pset_1vds_1file_1cache_1size */
-
-/*
- * Class:     hdf_hdf5lib_H5
- * Method:    H5Pget_vds_file_cache_size
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1vds_1file_1cache_1size
-    (JNIEnv *env, jclass clss, jlong plist)
-{
-    unsigned  s;
-
-    if (H5Pget_vds_file_cache_size((hid_t)plist, &s) < 0)
-        h5libraryError(env);
-
-    return (jint)s;
-} /* end Java_hdf_hdf5lib_H5_H5Pget_1vds_1file_1cache_1size */
 
 /*
  * Class:     hdf_hdf5lib_H5
diff --git a/java/src/jni/h5pImp.h b/java/src/jni/h5pImp.h
index 19df4b2..1d12e3d 100644
--- a/java/src/jni/h5pImp.h
+++ b/java/src/jni/h5pImp.h
@@ -1544,24 +1544,6 @@ Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts
 
 /*
  * Class:     hdf_hdf5lib_H5
- * Method:    H5Pset_vds_file_cache_size
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1vds_1file_1cache_1size
-(JNIEnv *, jclass, jlong, jint);
-
-/*
- * Class:     hdf_hdf5lib_H5
- * Method:    H5Pget_vds_file_cache_size
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1vds_1file_1cache_1size
-(JNIEnv *, jclass, jlong);
-
-/*
- * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_virtual_prefix
  * Signature: (JLjava/lang/String;)V
  */
diff --git a/java/test/JUnit-interface.txt b/java/test/JUnit-interface.txt
index fa5b149..91ea286 100644
--- a/java/test/JUnit-interface.txt
+++ b/java/test/JUnit-interface.txt
@@ -505,7 +505,6 @@ JUnit version 4.11
 .testH5Fmdc_logging
 .testH5Pget_elink_fapl
 .testH5Pset_mdc_config
-.testH5P_vds_file_cache_size
 .testH5P_small_data_block_size
 .testH5Pset_fapl_log
 .testH5P_evict_on_close
@@ -648,7 +647,7 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (646 tests)
+OK (645 tests)
 
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Fopen(): can't set access and transfer property lists
diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java
index f6783d4..48a5986 100644
--- a/java/test/TestH5Pfapl.java
+++ b/java/test/TestH5Pfapl.java
@@ -1390,31 +1390,4 @@ public class TestH5Pfapl {
             fail("H5P_evict_on_close: " + err);
         }
     }
-
-    @Test
-    public void testH5P_vds_file_cache_size() {
-        int vds_size = 0;
-        try {
-            try {
-                vds_size = H5.H5Pget_vds_file_cache_size(fapl_id);
-                assertTrue("H5P_vds_file_cache_size default", vds_size == 0);
-            }
-            catch (UnsupportedOperationException err) {
-                System.out.println(err.getMessage());
-            }
-            try {
-                vds_size = 8;
-                H5.H5Pset_vds_file_cache_size(fapl_id, vds_size);
-                vds_size = H5.H5Pget_vds_file_cache_size(fapl_id);
-                assertTrue("H5P_vds_file_cache_size 8", vds_size == 8);
-            }
-            catch (UnsupportedOperationException err) {
-                System.out.println(err.getMessage());
-            }
-        }
-        catch (Throwable err) {
-            err.printStackTrace();
-            fail("H5P_vds_file_cache_size: " + err);
-        }
-    }
 }
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 96d247a..dc4c98e 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -69,8 +69,6 @@ New Features
       New public APIs:
             herr_t H5Pset_virtual_prefix(hid_t dapl_id, const char* prefix);
             ssize_t H5Pget_virtual_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size);
-            herr_t H5Pset_vds_file_cache_size(hid_t plist_id, unsigned vds_size);
-            herr_t H5Pget_vds_file_cache_size(hid_t plist_id, unsigned *vds_size);
       The prefix can also be set with an environment variable, HDF5_VDS_PREFIX.
 
       (ADB - 2017/12/12, HDFFV-9724)
@@ -146,8 +144,6 @@ New Features
       H5Pget_efile_prefix
       H5Pset_virtual_prefix
       H5Pget_virtual_prefix
-      H5Pset_vds_file_cache_size
-      H5Pget_vds_file_cache_size
 
     Tools:
     ------
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 575aa1c..96b8e36 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -489,7 +489,6 @@ typedef struct H5F_t H5F_t;
 #define H5F_ACS_METADATA_READ_ATTEMPTS_NAME     "metadata_read_attempts" /* # of metadata read attempts */
 #define H5F_ACS_OBJECT_FLUSH_CB_NAME            "object_flush_cb"      /* Object flush callback */
 #define H5F_ACS_EFC_SIZE_NAME                   "efc_size"      /* Size of external file cache */
-#define H5F_ACS_VDS_FILE_CACHE_SIZE_NAME        "vds_file_cache_size"  /* Size of vds file cache */
 #define H5F_ACS_FILE_IMAGE_INFO_NAME            "file_image_info" /* struct containing initial file image and callback info */
 #define H5F_ACS_CLEAR_STATUS_FLAGS_NAME         "clear_status_flags" /* Whether to clear superblock status_flags (private property only used by h5clear) */
 #define H5F_ACS_USE_MDC_LOGGING_NAME            "use_mdc_logging" /* Whether to use metadata cache logging */
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index d4e84ab..ea9bfb4 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -155,11 +155,6 @@
 #define H5F_ACS_EFC_SIZE_DEF                    0
 #define H5F_ACS_EFC_SIZE_ENC                    H5P__encode_unsigned
 #define H5F_ACS_EFC_SIZE_DEC                    H5P__decode_unsigned
-/* Definition for vds file cache size */
-#define H5F_ACS_VDS_FILE_CACHE_SIZE_SIZE        sizeof(unsigned)
-#define H5F_ACS_VDS_FILE_CACHE_SIZE_DEF         0
-#define H5F_ACS_VDS_FILE_CACHE_SIZE_ENC         H5P__encode_unsigned
-#define H5F_ACS_VDS_FILE_CACHE_SIZE_DEC         H5P__decode_unsigned
 /* Definition of pointer to initial file image info */
 #define H5F_ACS_FILE_IMAGE_INFO_SIZE            sizeof(H5FD_file_image_info_t)
 #define H5F_ACS_FILE_IMAGE_INFO_DEF             H5FD_DEFAULT_FILE_IMAGE_INFO
@@ -360,7 +355,6 @@ static const H5FD_mem_t H5F_def_mem_type_g = H5F_ACS_MULTI_TYPE_DEF;
 static const hbool_t H5F_def_latest_format_g = H5F_ACS_LATEST_FORMAT_DEF;          /* Default setting for "use the latest version of the format" flag */
 static const hbool_t H5F_def_want_posix_fd_g = H5F_ACS_WANT_POSIX_FD_DEF;          /* Default setting for retrieving 'handle' from core VFD */
 static const unsigned H5F_def_efc_size_g = H5F_ACS_EFC_SIZE_DEF;                   /* Default external file cache size */
-static const unsigned H5F_def_vds_file_cache_size_g = H5F_ACS_VDS_FILE_CACHE_SIZE_DEF;        /* Default vds file cache size */
 static const H5FD_file_image_info_t H5F_def_file_image_info_g = H5F_ACS_FILE_IMAGE_INFO_DEF;                 /* Default file image info and callbacks */
 static const hbool_t H5F_def_core_write_tracking_flag_g = H5F_ACS_CORE_WRITE_TRACKING_FLAG_DEF;              /* Default setting for core VFD write tracking */
 static const size_t H5F_def_core_write_tracking_page_size_g = H5F_ACS_CORE_WRITE_TRACKING_PAGE_SIZE_DEF;     /* Default core VFD write tracking page size */
@@ -516,12 +510,6 @@ H5P__facc_reg_prop(H5P_genclass_t *pclass)
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-    /* Register the vds file cache size */
-    if(H5P_register_real(pclass, H5F_ACS_VDS_FILE_CACHE_SIZE_NAME, H5F_ACS_VDS_FILE_CACHE_SIZE_SIZE, &H5F_def_vds_file_cache_size_g,
-            NULL, NULL, NULL, H5F_ACS_VDS_FILE_CACHE_SIZE_ENC, H5F_ACS_VDS_FILE_CACHE_SIZE_DEC,
-            NULL, NULL, NULL, NULL) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-
     /* Register the initial file image info */
     /* (Note: this property should not have an encode/decode callback -QAK) */
     if(H5P_register_real(pclass, H5F_ACS_FILE_IMAGE_INFO_NAME, H5F_ACS_FILE_IMAGE_INFO_SIZE, &H5F_def_file_image_info_g,
@@ -2474,75 +2462,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Pset_vds_file_cache_size
- *
- * Purpose:     Sets the number of files opened through vds links
- *              from the file associated with this fapl to be held open
- *              in that file's vds file cache.  When the maximum
- *              number of files is reached, the least recently used file
- *              is closed (unless it is opened from somewhere else).
- *
- * Return:      Non-negative on success/Negative on failure
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_vds_file_cache_size(hid_t plist_id, unsigned vds_size)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "iIu", plist_id, vds_size);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-
-    /* Set value */
-    if(H5P_set(plist, H5F_ACS_VDS_FILE_CACHE_SIZE_NAME, &vds_size) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set vds file cache size")
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_vds_file_cache_size() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5Pget_vds_file_cache_size
- *
- * Purpose:     Gets the number of files opened through vds links
- *              from the file associated with this fapl to be held open
- *              in that file's vds file cache.  When the maximum
- *              number of files is reached, the least recently used file
- *              is closed (unless it is opened from somewhere else).
- *
- * Return:      Non-negative on success/Negative on failure
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_vds_file_cache_size(hid_t plist_id, unsigned *vds_size)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* return value */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "i*Iu", plist_id, vds_size);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
-
-    /* Get value */
-    if(vds_size)
-        if(H5P_get(plist, H5F_ACS_VDS_FILE_CACHE_SIZE_NAME, vds_size) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get vds file cache size")
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Pget_vds_file_cache_size() */
-
-
-/*-------------------------------------------------------------------------
  * Function: H5Pset_file_image
  *
  * Purpose:     Sets the initial file image. Some file drivers can initialize
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 38be320..a2c0418 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -343,8 +343,6 @@ H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low,
     H5F_libver_t *high);
 H5_DLL herr_t H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size);
 H5_DLL herr_t H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size);
-H5_DLL herr_t H5Pset_vds_file_cache_size(hid_t plist_id, unsigned vds_size);
-H5_DLL herr_t H5Pget_vds_file_cache_size(hid_t plist_id, unsigned *vds_size);
 H5_DLL herr_t H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len);
 H5_DLL herr_t H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr);
 H5_DLL herr_t H5Pset_file_image_callbacks(hid_t fapl_id,