adjust dataset updates for resize

Author: jreadey

src/h5json/hdf5db.py

@@ -181,7 +181,7 @@ def deleted_objects(self):
         return self._deleted_objects
 
     @property
-    def resized_datsets(self):
+    def resized_datasets(self):
         return self._resized_datasets
 
     def _getDatasetUpdates(self, dset_id):
@@ -769,8 +769,24 @@ def resizeDataset(self, dset_id, shape):
         if dset_id not in self.new_objects:
             self._resized_datasets.add(dset_id)
 
-        # if the shape has shrunk in any dimension, do a flush now
         new_dims = getShapeDims(dset_json)
+        rank = len(new_dims)
+
+        # adjust any selections in the update list
+        updates = self._getDatasetUpdates(dset_id)
+        for i in range(len(updates)):
+            (sel_update, arr) = updates[i]
+            if sel_update.select_type == selections.H5S_SELECT_HYPERSLABS:
+                slices = list(sel_update.slices)
+                for dim in range(rank):
+                    s = slices[dim]
+                    if s.stop > new_dims[dim]:
+                        # selection outside new bounds of dataset
+                        slices[dim] = slice(s.start, new_dims[dim], s.step)
+                sel_update = selections.select(new_dims, tuple(slices))
+                updates[i] = (sel_update, arr)
+
+        # if the shape has shrunk in any dimension, do a flush now
         do_flush = False
         for i in range(len(new_dims)):
             if new_dims[i] < old_dims[i]:

src/h5json/selections.py

@@ -422,7 +422,6 @@ def __getitem__(self, args):
         start, count, step, scalar = _handle_simple(self._shape, args)
         self._sel = (start, count, step, scalar)
 
-        # self._id.select_hyperslab(start, count, step)
         self._select_type = H5S_SELECT_HYPERSLABS
 
         self._mshape = tuple(x for x, y in zip(count, scalar) if not y)

src/h5json/shape_util.py

@@ -40,8 +40,8 @@ def getShapeJson(dims, maxdims=None):
         datasets) """
     if isinstance(dims, int):
         dims = (dims, )
-    if isinstance(maxdims, int):
-        maxdims = (maxdims, )
+    elif dims == "H5S_NULL":
+        dims = None
     if dims is None:
         shape_class = "H5S_NULL"
     elif len(dims) == 0:
@@ -58,6 +58,8 @@ def getShapeJson(dims, maxdims=None):
     if maxdims is not None:
         if shape_class != "H5S_SIMPLE":
             raise ValueError(f"maxdims can not be used with shape class: {shape_class}")
+        if isinstance(maxdims, int):
+            maxdims = (maxdims, )
         if len(maxdims) != len(dims):
             raise ValueError("maxdims must match dataspace rank")
         # convert any 0 or None vlues to "H5S_UNLIMITED"

test/unit/shape_util_test.py

@@ -12,7 +12,7 @@
 import unittest
 import logging
 
-from h5json.shape_util import getShapeClass, getShapeDims, getNumElements, getRank
+from h5json.shape_util import getShapeClass, getShapeDims, getNumElements, getRank, getShapeJson
 from h5json.shape_util import isNullSpace, isScalar, getDataSize, isExtensible, getMaxDims
 
 
@@ -23,6 +23,64 @@ def __init__(self, *args, **kwargs):
         self.logger = logging.getLogger()
         self.logger.setLevel(logging.WARNING)
 
+    def testGetShape(self):
+
+        null_shape = getShapeJson("H5S_NULL")
+        self.assertTrue("class" in null_shape)
+        self.assertEqual(null_shape["class"], "H5S_NULL")
+        self.assertFalse("dims" in null_shape)
+        self.assertFalse("maxdims" in null_shape)
+
+        null_shape = getShapeJson(None)
+        self.assertTrue("class" in null_shape)
+        self.assertEqual(null_shape["class"], "H5S_NULL")
+        self.assertFalse("dims" in null_shape)
+        self.assertFalse("maxdims" in null_shape)
+
+        scalar_shape = getShapeJson(())
+        self.assertTrue("class" in scalar_shape)
+        self.assertEqual(scalar_shape["class"], "H5S_SCALAR")
+        self.assertTrue("dims" not in scalar_shape)
+        self.assertFalse("maxdims" in scalar_shape)
+
+        simple_shape = getShapeJson(42)
+        self.assertTrue("class" in simple_shape)
+        self.assertEqual(simple_shape["class"], "H5S_SIMPLE")
+        self.assertTrue("dims" in simple_shape)
+        self.assertEqual(simple_shape["dims"], (42, ))
+        self.assertFalse("maxdims" in simple_shape)
+
+        simple_shape = getShapeJson((42, ))
+        self.assertTrue("class" in simple_shape)
+        self.assertEqual(simple_shape["class"], "H5S_SIMPLE")
+        self.assertTrue("dims" in simple_shape)
+        self.assertEqual(simple_shape["dims"], (42, ))
+        self.assertFalse("maxdims" in simple_shape)
+
+        extendable_shape = getShapeJson((4, 5), maxdims=("H5S_UNLIMITED", 10))
+        self.assertTrue("class" in extendable_shape)
+        self.assertEqual(extendable_shape["class"], "H5S_SIMPLE")
+        self.assertTrue("dims" in extendable_shape)
+        self.assertEqual(extendable_shape["dims"], (4, 5))
+        self.assertTrue("maxdims" in extendable_shape)
+        self.assertTrue(extendable_shape["maxdims"], ("H5S_UNLIMITED", 10))
+
+        extendable_shape = getShapeJson((4, 5), maxdims=(None, 10))
+        self.assertTrue("class" in extendable_shape)
+        self.assertEqual(extendable_shape["class"], "H5S_SIMPLE")
+        self.assertTrue("dims" in extendable_shape)
+        self.assertEqual(extendable_shape["dims"], (4, 5))
+        self.assertTrue("maxdims" in extendable_shape)
+        self.assertTrue(extendable_shape["maxdims"], ("H5S_UNLIMITED", 10))
+
+        extendable_shape = getShapeJson((4, 5), maxdims=(0, 10))
+        self.assertTrue("class" in extendable_shape)
+        self.assertEqual(extendable_shape["class"], "H5S_SIMPLE")
+        self.assertTrue("dims" in extendable_shape)
+        self.assertEqual(extendable_shape["dims"], (4, 5))
+        self.assertTrue("maxdims" in extendable_shape)
+        self.assertTrue(extendable_shape["maxdims"], ("H5S_UNLIMITED", 10))
+
     def testSimple(self):
 
         type_json = {