Merge pull request #1931 in HDFFV/hdf5 from feature/references to develop

* commit '9ed9762889fcd05dc230d6652b92fddc5ec880a4':
  Update RELEASE.txt for reference changes
  Fix reference type comparison in h5dump
  Make wrappers, tests and tools use H5Treclaim() instead of H5Dvlen_reclaim()
  Add new H5R API that abstracts object, region and attribute reference types
  Remove ability to loc by ref from H5VL layer
  Add support for retrieving object name by token
  Add H5VL_OBJECT_GET_TYPE to get object type
  Add H5VL_MAX_TOKEN_SIZE and H5VL_token_t
  Adapt Jerome's "file info" H5VL 'get' query to retrieve container token info.
  Fix H5VL_blob_get to return size of blob
  Add 'blob' callbacks to VOL, along with a native implementation to store them in the global heap, and changed the VL datatype conversion code to use blobs.

1 files changed, 58 insertions, 91 deletions

diff --git a/src/H5VLnative_object.c b/src/H5VLnative_object.c
index 49d4b2c..64d3978 100644
--- a/src/H5VLnative_object.c
+++ b/src/H5VLnative_object.c
@@ -16,7 +16,6 @@
  */
 
 #define H5O_FRIEND              /* Suppress error about including H5Opkg    */
-#define H5R_FRIEND              /* Suppress error about including H5Rpkg    */
 
 #include "H5private.h"          /* Generic Functions                        */
 #include "H5Eprivate.h"         /* Error handling                           */
@@ -25,7 +24,6 @@
 #include "H5Iprivate.h"         /* IDs                                      */
 #include "H5Opkg.h"             /* Object headers                           */
 #include "H5Pprivate.h"         /* Property lists                           */
-#include "H5Rpkg.h"             /* References                               */
 #include "H5VLprivate.h"        /* Virtual Object Layer                     */
 
 #include "H5VLnative_private.h" /* Native VOL connector                     */
@@ -71,34 +69,14 @@ H5VL__native_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_typ
                 break;
             }
 
-        case H5VL_OBJECT_BY_ADDR:
+        case H5VL_OBJECT_BY_TOKEN:
             {
                 /* Open the object */
-                if(NULL == (ret_value = H5O_open_by_addr(&loc, loc_params->loc_data.loc_by_addr.addr, opened_type)))
+                if(NULL == (ret_value = H5O_open_by_addr(&loc, *(haddr_t *)loc_params->loc_data.loc_by_token.token, opened_type)))
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object by address")
                 break;
             }
 
-        case H5VL_OBJECT_BY_REF:
-            {
-                hid_t temp_id = H5I_INVALID_HID;
-                H5F_t *file = NULL;
-
-                /* Get the file pointer from the entry */
-                file = loc.oloc->file;
-
-                /* Create reference */
-                if((temp_id = H5R__dereference(file, loc_params->loc_data.loc_by_ref.lapl_id, 
-                                              loc_params->loc_data.loc_by_ref.ref_type, 
-                                              loc_params->loc_data.loc_by_ref._ref)) < 0)
-                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTOPENOBJ, NULL, "unable to dereference object")
-
-                *opened_type = H5I_get_type(temp_id);
-                if(NULL == (ret_value = H5I_remove(temp_id)))
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object")
-                break;
-            }
-
         case H5VL_OBJECT_BY_SELF:
         default:
             HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, NULL, "unknown open parameters")
@@ -166,53 +144,6 @@ H5VL__native_object_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_obj
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
 
     switch(get_type) {
-        /* H5Rget_region */
-        case H5VL_REF_GET_REGION:
-            {
-                hid_t       *ret                    =  HDva_arg(arguments, hid_t *);
-                H5R_type_t  H5_ATTR_UNUSED ref_type =  (H5R_type_t)HDva_arg(arguments, int); /* enum work-around */
-                void        *ref                    =  HDva_arg(arguments, void *);
-                H5S_t       *space = NULL;    /* Dataspace object */
-
-                /* Get the dataspace with the correct region selected */
-                if((space = H5R__get_region(loc.oloc->file, ref)) == NULL)
-                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "unable to retrieve region")
-
-                /* Atomize */
-                if((*ret = H5I_register(H5I_DATASPACE, space, TRUE)) < 0)
-                    HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom")
-
-                break;
-            }
-
-        /* H5Rget_obj_type1/2 */
-        case H5VL_REF_GET_TYPE:
-            {
-                H5O_type_t  *obj_type  =  HDva_arg(arguments, H5O_type_t *);
-                H5R_type_t  ref_type   =  (H5R_type_t)HDva_arg(arguments, int); /* enum work-around */
-                void        *ref       =  HDva_arg(arguments, void *);
-
-                /* Get the object information */
-                if(H5R__get_obj_type(loc.oloc->file, ref_type, ref, obj_type) < 0)
-                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "unable to determine object type")
-                break;
-            }
-
-        /* H5Rget_name */
-        case H5VL_REF_GET_NAME:
-            {
-                ssize_t     *ret       = HDva_arg(arguments, ssize_t *);
-                char        *name      = HDva_arg(arguments, char *);
-                size_t      size       = HDva_arg(arguments, size_t);
-                H5R_type_t  ref_type   = (H5R_type_t)HDva_arg(arguments, int); /* enum work-around */
-                void        *ref       = HDva_arg(arguments, void *);
-
-                /* Get name */
-                if((*ret = H5R__get_name(loc.oloc->file, ref_type, ref, name, size)) < 0)
-                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "unable to determine object path")
-                break;
-            }
-
         /* Object name */
         case H5VL_OBJECT_GET_NAME:
             {
@@ -225,13 +156,13 @@ H5VL__native_object_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_obj
                     if((*ret = H5G_get_name(&loc, name, size, NULL)) < 0)
                         HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't retrieve object name")
                 } /* end if */
-                else if(loc_params->type == H5VL_OBJECT_BY_ADDR) {
+                else if(loc_params->type == H5VL_OBJECT_BY_TOKEN) {
                     H5O_loc_t obj_oloc; /* Object location */
 
                     /* Initialize the object location */
                     H5O_loc_reset(&obj_oloc);
                     obj_oloc.file = loc.oloc->file;
-                    obj_oloc.addr = loc_params->loc_data.loc_by_addr.addr;
+                    obj_oloc.addr = *(haddr_t *)loc_params->loc_data.loc_by_token.token;
 
                     /* Retrieve object's name */
                     if((*ret = H5G_get_name_by_addr(loc.oloc->file, &obj_oloc, name, size)) < 0)
@@ -242,6 +173,29 @@ H5VL__native_object_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_obj
                 break;
             }
 
+        /* Object type */
+        case H5VL_OBJECT_GET_TYPE:
+            {
+                H5O_type_t *obj_type = HDva_arg(arguments, H5O_type_t *);
+
+                if(loc_params->type == H5VL_OBJECT_BY_TOKEN) {
+                    H5O_loc_t obj_oloc; /* Object location */
+                    unsigned rc;        /* Reference count of object */
+
+                    /* Initialize the object location */
+                    H5O_loc_reset(&obj_oloc);
+                    obj_oloc.file = loc.oloc->file;
+                    obj_oloc.addr = *(haddr_t *)loc_params->loc_data.loc_by_token.token;
+
+                    /* Get the # of links for object, and its type */
+                    /* (To check to make certain that this object hasn't been deleted) */
+                    if(H5O_get_rc_and_type(&obj_oloc, &rc, obj_type) < 0 || 0 == rc)
+                        HGOTO_ERROR(H5E_REFERENCE, H5E_LINKCOUNT, FAIL, "dereferencing deleted object")
+                } else
+                    HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "unknown get_type parameters")
+                break;
+            }
+
         default:
             HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't get this type of information from object")
     } /* end switch */
@@ -300,6 +254,37 @@ H5VL__native_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5V
                 break;
             }
 
+        /* Lookup object */
+        case H5VL_OBJECT_LOOKUP:
+            {
+                void *token = va_arg(arguments, void *);
+
+                HDassert(token);
+
+                if(loc_params->type == H5VL_OBJECT_BY_NAME) {
+                    H5G_loc_t obj_loc;      /* Group hier. location of object */
+                    H5G_name_t obj_path;    /* Object group hier. path */
+                    H5O_loc_t obj_oloc;     /* Object object location */
+
+                    /* Set up opened group location to fill in */
+                    obj_loc.oloc = &obj_oloc;
+                    obj_loc.path = &obj_path;
+                    H5G_loc_reset(&obj_loc);
+
+                    /* Find the object */
+                    if(H5G_loc_find(&loc, loc_params->loc_data.loc_by_name.name, &obj_loc) < 0)
+                        HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "object not found")
+                    *(haddr_t *)token = obj_loc.oloc->addr;
+
+                    /* Release the object location */
+                    if(H5G_loc_free(&obj_loc) < 0)
+                        HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't free location")
+                } /* end if */
+                else
+                    HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "unknown object exists parameters")
+                break;
+            }
+
         case H5VL_OBJECT_VISIT:
             {
                 H5_index_t idx_type     = (H5_index_t)HDva_arg(arguments, int); /* enum work-around */
@@ -347,24 +332,6 @@ H5VL__native_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5V
                 break;
             }
 
-        case H5VL_REF_CREATE:
-            {
-                void        *ref      = HDva_arg(arguments, void *);
-                const char  *name     = HDva_arg(arguments, char *);
-                H5R_type_t  ref_type  = (H5R_type_t)HDva_arg(arguments, int); /* enum work-around */
-                hid_t       space_id  = HDva_arg(arguments, hid_t);
-                H5S_t       *space = NULL;   /* Pointer to dataspace containing region */
-                
-                if(space_id != (-1) && (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
-
-                /* Create reference */
-                if(H5R__create(ref, &loc, name, ref_type, space) < 0)
-                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create reference")
-
-                break;
-            }
-
         default:
             HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't recognize this operation type")
     } /* end switch */