WIP: Fix getsize to be recursive

docs/release.rst

@@ -38,6 +38,9 @@ Bug fixes
 * Ensure ``DictStore`` contains only ``bytes`` to facilitate comparisons and protect against writes.
   By :user:`John Kirkham <jakirkham>`, :issue:`350`
 
+* Fix size computation of ``DirectoryStore`` and subclasses to be recursive.
+  By :user:`John Kirkham <jakirkham>`, :issue:`253`, :issue:`362`
+
 Maintenance
 ~~~~~~~~~~~
 

zarr/storage.py

@@ -843,11 +843,10 @@ def getsize(self, path=None):
         if os.path.isfile(fs_path):
             return os.path.getsize(fs_path)
         elif os.path.isdir(fs_path):
-            children = os.listdir(fs_path)
             size = 0
-            for child in children:
-                child_fs_path = os.path.join(fs_path, child)
-                if os.path.isfile(child_fs_path):
+            for dirname, dirs, children in os.walk(fs_path):
+                for child in children:
+                    child_fs_path = os.path.join(dirname, child)
                     size += os.path.getsize(child_fs_path)
             return size
         else:

zarr/tests/test_core.py

@@ -1278,15 +1278,20 @@ def create_array(read_only=False, **kwargs):
                      cache_attrs=cache_attrs)
 
     def test_nbytes_stored(self):
-
-        # dict as store
         z = self.create_array(shape=1000, chunks=100)
         expect_nbytes_stored = sum(buffer_size(v) for v in z.store.values())
         assert expect_nbytes_stored == z.nbytes_stored
         z[:] = 42
         expect_nbytes_stored = sum(buffer_size(v) for v in z.store.values())
         assert expect_nbytes_stored == z.nbytes_stored
 
+        z2 = self.create_array(shape=(1000, 1100), chunks=100)
+        expect_nbytes_stored = sum(buffer_size(v) for v in z2.store.values())
+        assert expect_nbytes_stored == z2.nbytes_stored
+        z2[:] = 42
+        expect_nbytes_stored = sum(buffer_size(v) for v in z2.store.values())
+        assert expect_nbytes_stored == z2.nbytes_stored
+
 
 class TestArrayWithNestedDirectoryStore(TestArrayWithDirectoryStore):
 

zarr/tests/test_storage.py

@@ -211,10 +211,10 @@ def test_hierarchy(self):
 
         # test getsize (optional)
         if hasattr(store, 'getsize'):
-            assert 6 == store.getsize()
+            assert 15 == store.getsize()
             assert 3 == store.getsize('a')
             assert 3 == store.getsize('b')
-            assert 3 == store.getsize('c')
+            assert 9 == store.getsize('c')
             assert 3 == store.getsize('c/d')
             assert 6 == store.getsize('c/e')
             assert 3 == store.getsize('c/e/f')