fix for getDatasetValues

Author: jreadey

src/h5json/hdf5db.py

@@ -587,7 +587,7 @@ def getDatasetValues(self, dset_id, sel):
         if fetch:
             arr = self.reader.getDatasetValues(dset_id, sel, dtype=dtype)
         else:
-            arr = np.zeros(sel.shape, dtype=dtype)
+            arr = np.zeros(sel.mshape, dtype=dtype)
 
         if "updates" in dset_json:
             # apply any non-flushed changes that intersect the current selection

test/unit/h5py_reader_test.py

@@ -13,8 +13,11 @@
 
 import logging
 import time
+import numpy as np
+
 from h5json import Hdf5db
 from h5json.h5pystore.h5py_reader import H5pyReader
+from h5json import selections
 
 
 class H5pyReaderTest(unittest.TestCase):
@@ -70,7 +73,23 @@ def testSimple(self):
             self.assertTrue(k in attr1_json)
         dset_shape = dset_json["shape"]
         self.assertEqual(dset_shape["class"], "H5S_SIMPLE")
-        self.assertEqual(dset_shape["dims"], [10, 10])
+        dims = dset_shape["dims"]
+        self.assertEqual(dims, [10, 10])
+        dims = tuple(dims)
+
+        # read one element from a dataset
+        sel = selections.select(dims, (slice(4, 5), slice(5, 6)))
+        arr = db.getDatasetValues(dset111_id, sel)
+        self.assertTrue(isinstance(arr, np.ndarray))
+        self.assertEqual(arr.shape, (1, 1))
+        self.assertEqual(arr[0, 0], 20)
+
+        # read one row
+        sel = selections.select(dims, (slice(4, 5), slice(0, 10)))
+        arr = db.getDatasetValues(dset111_id, sel)
+        self.assertTrue(isinstance(arr, np.ndarray))
+        self.assertEqual(arr.shape, (1, 10))
+        self.assertEqual(list(arr[0]), list(range(0, 40, 4)))
 
         # try adding an attribute
         db.createAttribute(dset111_id, "attr3", value=42)

test/unit/hdf5db_test.py

@@ -448,6 +448,33 @@ def testSimpleDataset(self):
 
         db.close()
 
+    def testBoolDataset(self):
+        shape = (10,)
+        dtype = np.dtype(bool)
+
+        db = Hdf5db(app_logger=self.log)
+        root_id = db.open()
+        dset_id = db.createDataset(shape, dtype=dtype)
+        db.createHardLink(root_id, "dset", dset_id)
+        sel_first = selections.select(shape, slice(0, 1))
+        arr = db.getDatasetValues(dset_id, sel_first)
+        self.assertEqual(arr.dtype, dtype)
+        self.assertEqual(arr.shape, (1,))
+        self.assertEqual(arr[0], False)
+
+        # update one element
+        sel_second = selections.select(shape, slice(1, 2))
+        db.setDatasetValues(dset_id, sel_second, np.array([True,], dtype=dtype))
+
+        # read back three elements
+        sel_three = selections.select(shape, slice(0, 3))
+        arr = db.getDatasetValues(dset_id, sel_three)
+        self.assertEqual(arr.dtype, dtype)
+        self.assertEqual(arr.shape, (3,))
+        self.assertEqual(list(arr[...]), [False, True, False])
+
+        db.close()
+
     def testScalarDataset(self):
         dtype = np.int32