Remove unused NXputattra, NXgetattra, NXgetattrainfo and test -- ornl-next (#39036)

Remove unused NXputattra, NXgetattra, NXgetattrainfo and test (#39019)

* remove unused NXputattra, NXgetattra, NXgetattrainfo and test

* edits to cmake

Author: rboston628

Framework/Nexus/inc/MantidNexus/napi.h

@@ -341,23 +341,6 @@ MANTID_NEXUS_DLL NXstatus NXputdata(NXhandle handle, const void *data);
  */
 MANTID_NEXUS_DLL NXstatus NXputattr(NXhandle handle, CONSTCHAR *name, const void *data, int iDataLen, NXnumtype iType);
 
-/**
- * Write an attribute of any rank. The kind of attribute written depends on the
- * position in the file: at root level, a global attribute is written, if
- * agroup is open but no dataset, a group attribute is written, if a dataset is
- * open, a dataset attribute is written.
- * \param handle A NeXus file handle as initialized by NXopen.
- * \param name The name of the attribute.
- * \param data A pointer to the data to write for the attribute.
- * \param rank Rank of the attribute data
- * \param dim Dimension array for the attribute data
- * \param iType The NeXus data type of the attribute.
- * \return NX_OK on success, NX_ERROR in the case of an error.
- * \ingroup c_readwrite
- */
-MANTID_NEXUS_DLL NXstatus NXputattra(NXhandle handle, CONSTCHAR *name, const void *data, const int rank,
-                                     const int dim[], const NXnumtype iType);
-
 /**
  * Write  a subset of a multi dimensional dataset.
  * \param handle A NeXus file handle as initialized by NXopen.
@@ -515,27 +498,6 @@ MANTID_NEXUS_DLL NXstatus NXgetattrinfo(NXhandle handle, int *no_items);
  */
 MANTID_NEXUS_DLL NXstatus NXgetnextattra(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType);
 
-/**
- * Read an arbitrarily shaped attribute.
- * \param handle A NeXus file handle as initialized by NXopen.
- * \param name The name of the atrribute to read.
- * \param data A pointer to a memory area large enough to hold the attributes value.
- * \return NX_OK on success, NX_ERROR in the case of an error.
- * \ingroup c_readwrite
- */
-MANTID_NEXUS_DLL NXstatus NXgetattra(NXhandle handle, const char *name, void *data);
-
-/**
- * Get the information about the storage of the named attribute.
- * \param handle A NeXus file handle as initialized by NXopen.
- * \param rank Rank of the attribute data.
- * \param dim Dimension array for the attribute content.
- * \param iType A pointer to an integer which be set to the NeXus data type of the attribute.
- * \return NX_OK on success, NX_ERROR in the case of an error.
- * \ingroup c_metadata
- */
-MANTID_NEXUS_DLL NXstatus NXgetattrainfo(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType);
-
 /**
  * Retrieve link data for the currently open group. This link data can later on be used to link this
  * group into a different group.

Framework/Nexus/inc/MantidNexus/napi5.h

@@ -48,10 +48,7 @@ extern NXstatus NX5getgroupinfo(NXhandle handle, int *no_items, NXname name, NXn
 extern NXstatus NX5initgroupdir(NXhandle handle);
 extern NXstatus NX5initattrdir(NXhandle handle);
 
-extern NXstatus NX5putattra(NXhandle handle, CONSTCHAR *name, const void *data, const int rank, const int dim[],
-                            const NXnumtype iType);
 extern NXstatus NX5getnextattra(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType);
-extern NXstatus NX5getattra(NXhandle handle, const char *name, void *data);
 extern NXstatus NX5getattrainfo(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType);
 
 void NX5assignFunctions(pNexusFunction fHandle);

Framework/Nexus/inc/MantidNexus/napi_internal.h

@@ -51,8 +51,6 @@ typedef struct {
   NXstatus (*nxclosedata)(NXhandle handle);
   NXstatus (*nxputdata)(NXhandle handle, const void *data);
   NXstatus (*nxputattr)(NXhandle handle, CONSTCHAR *name, const void *data, int iDataLen, NXnumtype iType);
-  NXstatus (*nxputattra)(NXhandle handle, CONSTCHAR *name, const void *data, const int rank, const int dim[],
-                         const NXnumtype iType);
   NXstatus (*nxputslab64)(NXhandle handle, const void *data, const int64_t start[], const int64_t size[]);
   NXstatus (*nxgetdataID)(NXhandle handle, NXlink *pLink);
   NXstatus (*nxmakelink)(NXhandle handle, NXlink *pLink);
@@ -64,8 +62,6 @@ typedef struct {
   NXstatus (*nxgetnextattr)(NXhandle handle, NXname pName, int *iLength, NXnumtype *iType);
   NXstatus (*nxgetnextattra)(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType);
   NXstatus (*nxgetattr)(NXhandle handle, const char *name, void *data, int *iDataLen, NXnumtype *iType);
-  NXstatus (*nxgetattra)(NXhandle handle, const char *name, void *data);
-  NXstatus (*nxgetattrainfo)(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType);
   NXstatus (*nxgetattrinfo)(NXhandle handle, int *no_items);
   NXstatus (*nxgetgroupID)(NXhandle handle, NXlink *pLink);
   NXstatus (*nxgetgroupinfo)(NXhandle handle, int *no_items, NXname name, NXname nxclass);

Framework/Nexus/src/napi.cpp

@@ -1551,23 +1551,10 @@ NXstatus NXgetpath(NXhandle fid, char *path, int pathlen) {
   return NXstatus::NX_OK;
 }
 
-NXstatus NXputattra(NXhandle handle, CONSTCHAR *name, const void *data, const int rank, const int dim[],
-                    const NXnumtype iType) {
-  pNexusFunction pFunc = handleToNexusFunc(handle);
-  return LOCKED_CALL(pFunc->nxputattra(pFunc->pNexusData, name, data, rank, dim, iType));
-}
 NXstatus NXgetnextattra(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType) {
   pNexusFunction pFunc = handleToNexusFunc(handle);
   return LOCKED_CALL(pFunc->nxgetnextattra(pFunc->pNexusData, pName, rank, dim, iType));
 }
-NXstatus NXgetattra(NXhandle handle, const char *name, void *data) {
-  pNexusFunction pFunc = handleToNexusFunc(handle);
-  return LOCKED_CALL(pFunc->nxgetattra(pFunc->pNexusData, name, data));
-}
-NXstatus NXgetattrainfo(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType) {
-  pNexusFunction pFunc = handleToNexusFunc(handle);
-  return LOCKED_CALL(pFunc->nxgetattrainfo(pFunc->pNexusData, pName, rank, dim, iType));
-}
 
 /*--------------------------------------------------------------------
   format NeXus time. Code needed in every NeXus file driver

Framework/Nexus/src/napi5.cpp

@@ -2285,81 +2285,6 @@ NXstatus NX5initgroupdir(NXhandle fid) {
   return NXstatus::NX_OK;
 }
 
-/*------------------------------------------------------------------------*/
-NXstatus NX5putattra(NXhandle handle, CONSTCHAR *name, const void *data, const int rank, const int dim[],
-                     const NXnumtype iType) {
-  hid_t datatype1, dataspace;
-  hid_t type;
-  pNexusFile5 pFile;
-  int i;
-  hid_t vid, iATT;
-  herr_t iRet;
-  hsize_t mydim[H5S_MAX_RANK];
-
-  pFile = NXI5assert(handle);
-
-  for (i = 0; i < rank; i++) {
-    mydim[i] = static_cast<hsize_t>(dim[i]);
-  }
-
-  /* determine vid */
-  vid = getAttVID(pFile);
-  iATT = H5Aopen_by_name(vid, ".", name, H5P_DEFAULT, H5P_DEFAULT);
-  if (iATT > 0) {
-    H5Aclose(iATT);
-    iRet = H5Adelete(vid, name);
-    if (iRet < 0) {
-      NXReportError("ERROR: old attribute cannot be removed! ");
-      killAttVID(pFile, vid);
-      return NXstatus::NX_ERROR;
-    }
-  }
-
-  if (rank < 0) {
-    char pBuffer[256];
-    sprintf(pBuffer, "ERROR: invalid rank specified %s", name);
-    NXReportError(pBuffer);
-    return NXstatus::NX_ERROR;
-  }
-
-  type = nxToHDF5Type(iType);
-
-  datatype1 = H5Tcopy(type);
-  if (iType == NXnumtype::CHAR) {
-    H5Tset_size(datatype1, static_cast<size_t>(dim[rank - 1]));
-    dataspace = H5Screate_simple(rank - 1, mydim, NULL);
-  } else {
-    dataspace = H5Screate_simple(rank, mydim, NULL);
-  }
-
-  iATT = H5Acreate(vid, static_cast<const char *>(name), datatype1, dataspace, H5P_DEFAULT, H5P_DEFAULT);
-
-  if (iATT < 0) {
-    NXReportError("ERROR: creating attribute failed");
-    return NXstatus::NX_ERROR;
-  } else {
-    pFile->iCurrentA = iATT;
-  }
-
-  iRet = H5Awrite(pFile->iCurrentA, datatype1, data);
-  if (iRet < 0) {
-    NXReportError("ERROR: failure to write attribute");
-    return NXstatus::NX_ERROR;
-  }
-
-  // less than zero is an error so just accumulate them
-  iRet += H5Sclose(dataspace);
-  iRet += H5Tclose(datatype1);
-  iRet += H5Aclose(pFile->iCurrentA);
-  pFile->iCurrentA = 0;
-  if (iRet < 0) {
-    NXReportError("ERROR: HDF cannot close attribute");
-    return NXstatus::NX_ERROR;
-  }
-
-  return NXstatus::NX_OK;
-}
-
 /*------------------------------------------------------------------------*/
 NXstatus NX5getnextattra(NXhandle handle, NXname pName, int *rank, int dim[], NXnumtype *iType) {
   pNexusFile5 pFile;
@@ -2418,95 +2343,6 @@ NXstatus NX5getnextattra(NXhandle handle, NXname pName, int *rank, int dim[], NX
   return NX5getattrainfo(handle, pName, rank, dim, iType);
 }
 /*------------------------------------------------------------------------*/
-NXstatus NX5getattra(NXhandle handle, const char *name, void *data) {
-  pNexusFile5 pFile;
-  int iStart[H5S_MAX_RANK], status;
-  hid_t vid;
-  hid_t memtype_id, filespace, datatype;
-  H5T_class_t tclass;
-  hsize_t dims[H5S_MAX_RANK];
-  htri_t is_vlen_str = 0; /* false */
-  char **vstrdata = NULL;
-
-  pFile = NXI5assert(handle);
-
-  vid = getAttVID(pFile);
-  pFile->iCurrentA = H5Aopen_by_name(vid, ".", name, H5P_DEFAULT, H5P_DEFAULT);
-  if (pFile->iCurrentA < 0) {
-    pFile->iCurrentA = 0;
-    NXReportError("ERROR: unable to open attribute");
-    return NXstatus::NX_ERROR;
-  }
-  filespace = H5Aget_space(pFile->iCurrentA);
-  datatype = H5Aget_type(pFile->iCurrentA);
-  auto ndims = H5Sget_simple_extent_dims(filespace, dims, NULL);
-
-  is_vlen_str = H5Tis_variable_str(datatype);
-  if (ndims == 0 && is_vlen_str) {
-    /* this assumes a fixed size - is this dangerous? */
-    char *strdata = static_cast<char *>(calloc(512, sizeof(char)));
-    status = H5Aread(pFile->iCurrentA, H5S_ALL, &strdata);
-    if (status >= 0) {
-#if defined(__GNUC__) && !(defined(__clang__))
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-truncation"
-#endif
-      std::strncpy(static_cast<char *>(data), strdata, strlen(strdata));
-#if defined(__GNUC__) && !(defined(__clang__))
-#pragma GCC diagnostic pop
-#endif
-    }
-    free(strdata);
-
-    H5Sclose(filespace);
-    H5Tclose(datatype);
-    if (status < 0)
-      return NXstatus::NX_ERROR;
-    return NXstatus::NX_OK;
-  }
-  tclass = H5Tget_class(datatype);
-  /* stop gap kludge for fixed length strings */
-  if (tclass == H5T_STRING && !is_vlen_str) {
-    char *datatmp = NULL;
-    status = readStringAttribute(pFile->iCurrentA, &datatmp);
-    if (status < 0)
-      return NXstatus::NX_ERROR;
-    strcpy(static_cast<char *>(data), datatmp);
-    free(datatmp);
-    return NXstatus::NX_OK;
-  }
-
-  memset(iStart, 0, H5S_MAX_RANK * sizeof(int));
-  /* map datatypes of other plateforms */
-  if (is_vlen_str) {
-    vstrdata = static_cast<char **>(malloc((size_t)dims[0] * sizeof(char *)));
-    memtype_id = H5Tcopy(H5T_C_S1);
-    H5Tset_size(memtype_id, H5T_VARIABLE);
-    status = H5Aread(pFile->iCurrentA, memtype_id, vstrdata);
-    (static_cast<char *>(data))[0] = '\0';
-    if (status >= 0) {
-      for (hsize_t i = 0; i < dims[0]; ++i) {
-        if (vstrdata[i] != NULL) {
-          strcat(static_cast<char *>(data), vstrdata[i]);
-        }
-      }
-    }
-    H5Dvlen_reclaim(memtype_id, pFile->iCurrentS, H5P_DEFAULT, vstrdata);
-    free(vstrdata);
-    H5Tclose(memtype_id);
-  } else if (tclass == H5T_STRING) {
-    status = H5Aread(pFile->iCurrentA, datatype, data);
-  } else {
-    memtype_id = h5MemType(datatype);
-    status = H5Aread(pFile->iCurrentA, memtype_id, data);
-  }
-  if (status < 0) {
-    NXReportError("ERROR: failed to read attribute");
-    return NXstatus::NX_ERROR;
-  }
-  return NXstatus::NX_OK;
-}
-/*------------------------------------------------------------------------*/
 NXstatus NX5getattrainfo(NXhandle handle, NXname name, int *rank, int dim[], NXnumtype *iType) {
   pNexusFile5 pFile;
   int iRet;
@@ -2605,10 +2441,7 @@ void NX5assignFunctions(pNexusFunction fHandle) {
   fHandle->nxnativeexternallink = NX5nativeexternallink;
   fHandle->nxnativeinquirefile = NX5nativeinquirefile;
   fHandle->nxnativeisexternallink = NX5nativeisexternallink;
-  fHandle->nxputattra = NX5putattra;
   fHandle->nxgetnextattra = NX5getnextattra;
-  fHandle->nxgetattra = NX5getattra;
-  fHandle->nxgetattrainfo = NX5getattrainfo;
 }
 
 #endif /* HDF5 */

Framework/Nexus/test/CMakeLists.txt

@@ -19,10 +19,6 @@ add_executable(napi_test_hdf5 EXCLUDE_FROM_ALL napi_test.cpp napi_test_util.cpp
 target_link_libraries(napi_test_hdf5 PRIVATE Mantid::Nexus)
 add_test(NAME "${TEST_PREFIX}-C-HDF5-test" COMMAND napi_test_hdf5)
 
-add_executable(napi_attra_test_hdf5 EXCLUDE_FROM_ALL napi_attra_test.cpp napi_test_util.cpp napi_test_util.h)
-target_link_libraries(napi_attra_test_hdf5 PRIVATE Mantid::Nexus)
-add_test(NAME "${TEST_PREFIX}-C-HDF5-attra-test" COMMAND napi_attra_test_hdf5)
-
 add_executable(napi_test_cpp-hdf5 EXCLUDE_FROM_ALL napi_test_cpp.cpp napi_test_util.cpp napi_test_util.h)
 target_link_libraries(napi_test_cpp-hdf5 PRIVATE Mantid::Nexus)
 add_test(NAME "${TEST_PREFIX}-Cpp-HDF5-test" COMMAND napi_test_cpp-hdf5)
@@ -48,14 +44,8 @@ add_test(NAME "${TEST_PREFIX}-Cpp-leak-test-3" COMMAND napi_leak_test3)
 
 # #### phony target to drag in all tests
 add_custom_target(
-  "${TEST_PREFIX}"
-  DEPENDS napi_test_hdf5
-          napi_attra_test_hdf5
-          napi_test_cpp-hdf5
-          napi_test_nxunlimited
-          napi_leak_test1
-          napi_leak_test2
-          napi_leak_test3
+  "${TEST_PREFIX}" DEPENDS napi_test_hdf5 napi_test_cpp-hdf5 napi_test_nxunlimited napi_leak_test1 napi_leak_test2
+                           napi_leak_test3
 )
 
 add_dependencies(FrameworkTests "${TEST_PREFIX}")