fix for use of H5S_UNLIMITED in maxdims

Author: jreadey

hsds/domain_sn.py

@@ -551,7 +551,6 @@ async def GET_Domain(request):
     kwargs = {"verbose": verbose, "getobjs": getobjs, "bucket": bucket}
     rsp_json = await getDomainResponse(app, domain_json, **kwargs)
 
-
     # include dn_ids if requested
     if "getdnids" in params and params["getdnids"]:
         rsp_json["dn_ids"] = app["dn_ids"]

hsds/dset_dn.py

@@ -290,7 +290,7 @@ async def PUT_DatasetShape(request):
             if i == extend_dim:
                 lb = dims[i]
                 ub = lb + extension
-                if maxdims[extend_dim] != 0 and ub > maxdims[extend_dim]:
+                if maxdims[extend_dim] not in (0, "H5S_UNLIMITED") and ub > maxdims[extend_dim]:
                     msg = "maximum extent exceeded"
                     log.warn(msg)
                     raise HTTPConflict()

hsds/dset_lib.py

@@ -1007,7 +1007,7 @@ async def updateShape(app, dset_json, shape_update, bucket=None):
                 raise HTTPBadRequest(reason=msg)
             decreasing_dims.append(i)
         elif shape_update[i] > dims[i]:
-            if maxdims[i] != 0 and shape_update[i] > maxdims[i]:
+            if maxdims[i] not in (0, "H5S_UNLIMITED") and shape_update[i] > maxdims[i]:
                 msg = "Extension dimension can not be extended past max extent"
                 log.warn(msg)
                 raise HTTPConflict()

hsds/util/dsetUtil.py

@@ -50,11 +50,6 @@ def getShapeJson(body):
         log.warn(msg)
         raise ValueError(msg)
 
-    if shape_class not in ("H5S_NULL", "H5S_SCALAR", "H5S_SIMPLE"):
-        msg = f"invalid shape class: {shape_class}"
-        log.warn(msg)
-        raise ValueError(msg)
-
     if shape_class in ("H5S_NULL", "H5S_SCALAR") and dims:
         msg = f"dims not valid for shape class: {body_shape}"
         log.warn(msg)

tests/integ/dataset_test.py

@@ -938,7 +938,7 @@ def testResizableUnlimitedDataset(self):
 
         # create the dataset
         req = self.endpoint + "/datasets"
-        payload = {"type": "H5T_IEEE_F32LE", "shape": [10, 20], "maxdims": [30, 0]}
+        payload = {"type": "H5T_IEEE_F32LE", "shape": [10, 20], "maxdims": [30, "H5S_UNLIMITED"]}
         payload["creationProperties"] = {"fillValue": 3.12}
         req = self.endpoint + "/datasets"
         rsp = self.session.post(req, data=json.dumps(payload), headers=headers)
@@ -970,7 +970,7 @@ def testResizableUnlimitedDataset(self):
         self.assertEqual(shape["dims"][1], 20)
         self.assertTrue("maxdims" in shape)
         self.assertEqual(shape["maxdims"][0], 30)
-        self.assertEqual(shape["maxdims"][1], 0)
+        self.assertEqual(shape["maxdims"][1], "H5S_UNLIMITED")
 
         # verify shape using the GET shape request
         req = req + "/shape"
@@ -987,7 +987,7 @@ def testResizableUnlimitedDataset(self):
         self.assertTrue("maxdims" in shape)
         self.assertEqual(len(shape["maxdims"]), 2)
         self.assertEqual(shape["maxdims"][0], 30)
-        self.assertEqual(shape["maxdims"][1], 0)
+        self.assertEqual(shape["maxdims"][1], "H5S_UNLIMITED")
 
         # resize the second dimension  to 500 elements
         payload = {"shape": [10, 500]}
@@ -1009,7 +1009,7 @@ def testResizableUnlimitedDataset(self):
         self.assertTrue("maxdims" in shape)
         self.assertEqual(len(shape["maxdims"]), 2)
         self.assertEqual(shape["maxdims"][0], 30)
-        self.assertEqual(shape["maxdims"][1], 0)
+        self.assertEqual(shape["maxdims"][1], "H5S_UNLIMITED")
 
     def testExtendDataset(self):
         # test extending dataset