Merge pull request #196 from jakirkham/add_move

Add move

Author: alimanfoo

docs/api/hierarchy.rst

@@ -36,3 +36,4 @@ Groups (``zarr.hierarchy``)
     .. automethod:: zeros_like
     .. automethod:: ones_like
     .. automethod:: full_like
+    .. automethod:: move

zarr/hierarchy.py

@@ -10,7 +10,7 @@
 from zarr.attrs import Attributes
 from zarr.core import Array
 from zarr.storage import (contains_array, contains_group, init_group,
-                          DictStore, group_meta_key, attrs_key, listdir, rmdir)
+                          DictStore, group_meta_key, attrs_key, listdir, rename, rmdir)
 from zarr.creation import (array, create, empty, zeros, ones, full,
                            empty_like, zeros_like, ones_like, full_like,
                            normalize_store_arg)
@@ -81,6 +81,7 @@ class Group(MutableMapping):
     ones_like
     full_like
     info
+    move
 
     """
 
@@ -934,6 +935,37 @@ def _full_like_nosync(self, name, data, **kwargs):
         return full_like(data, store=self._store, path=path,
                          chunk_store=self._chunk_store, **kwargs)
 
+    def _move_nosync(self, path, new_path):
+        rename(self._store, path, new_path)
+        if self._chunk_store is not None:
+            rename(self._chunk_store, path, new_path)
+
+    def move(self, source, dest):
+        """Move contents from one path to another relative to the Group.
+
+        Parameters
+        ----------
+        source : string
+            Name or path to a Zarr object to move.
+        dest : string
+            New name or path of the Zarr object.
+        """
+
+        source = self._item_path(source)
+        dest = self._item_path(dest)
+
+        # Check that source exists.
+        if not (contains_array(self._store, source) or contains_group(self._store, source)):
+            raise ValueError('The source, "%s", does not exist.' % source)
+        if contains_array(self._store, dest) or contains_group(self._store, dest):
+            raise ValueError('The dest, "%s", already exists.' % dest)
+
+        # Ensure groups needed for `dest` exist.
+        if "/" in dest:
+            self.require_group("/" + dest.rsplit("/", 1)[0])
+
+        self._write_op(self._move_nosync, source, dest)
+
 
 def _normalize_store_arg(store, clobber=False):
     return normalize_store_arg(store, clobber=clobber, default=DictStore)

zarr/tests/test_hierarchy.py

@@ -685,6 +685,52 @@ def test_delitem(self):
             assert 'bar' not in g
             assert 'bar/baz' not in g
 
+    def test_move(self):
+        g = self.create_group()
+
+        data = np.arange(100)
+        g['boo'] = data
+
+        data = np.arange(100)
+        g['foo'] = data
+
+        try:
+            g.move('foo', 'bar')
+            assert 'foo' not in g
+            assert 'bar' in g
+            assert_array_equal(data, g['bar'])
+
+            g.move('bar', 'foo/bar')
+            assert 'bar' not in g
+            assert 'foo' in g
+            assert 'foo/bar' in g
+            assert isinstance(g['foo'], Group)
+            assert_array_equal(data, g['foo/bar'])
+
+            g.move('foo', 'foo2')
+            assert 'foo' not in g
+            assert 'foo/bar' not in g
+            assert 'foo2' in g
+            assert 'foo2/bar' in g
+            assert isinstance(g['foo2'], Group)
+            assert_array_equal(data, g['foo2/bar'])
+
+            g2 = g['foo2']
+            g2.move('bar', '/bar')
+            assert 'foo2' in g
+            assert 'foo2/bar' not in g
+            assert 'bar' in g
+            assert isinstance(g['foo2'], Group)
+            assert_array_equal(data, g['bar'])
+
+            with assert_raises(ValueError):
+                g2.move('bar', 'bar2')
+
+            with assert_raises(ValueError):
+                g.move('bar', 'boo')
+        except NotImplementedError:
+            pass
+
     def test_array_creation(self):
         grp = self.create_group()