Fix jsonToArray on None array

HDFGroup · Nov 1, 2023 · aad10f6 · aad10f6
1 parent 0bf6bb9
commit aad10f6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/hsds/util/arrayUtil.py b/hsds/util/arrayUtil.py
@@ -106,6 +106,9 @@ def fillVlenArray(rank, data, arr, index):
                 index += 1
         return index
 
+    if data_json is None:
+        return np.array([]).astype(data_dtype)
+
     # need some special conversion for compound types --
     # each element must be a tuple, but the JSON decoder
     # gives us a list instead.

diff --git a/tests/unit/array_util_test.py b/tests/unit/array_util_test.py
@@ -816,6 +816,17 @@ def testGetBroadcastShape(self):
         bcshape = getBroadcastShape([2, 3, 5], 15)
         self.assertEqual(bcshape, [3, 5])
 
+    def testJsonToArrayOnNoneCompoundArray(self):
+        # compound type
+        dt = np.dtype([("a", "i4"), ("b", "S5")])
+        shape = [1,]
+        data = None
+
+        arr = jsonToArray(shape, dt, data)
+
+        self.assertEqual(len(arr), 0)
+        self.assertEqual(arr.dtype, dt)
+
 
 if __name__ == "__main__":
     # setup test files