Merge pull request #170 from esc/vh/fix/copy_carray

issue regarding deletion of moved columns
Blosc · Apr 19, 2015 · ac52154 · ac52154
2 parents 56dc09f + 42ec9a8
commit ac52154
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bcolz/ctable.py b/bcolz/ctable.py
@@ -491,7 +491,7 @@ def addcol(self, newcol, name=None, pos=None, move=False, **kwargs):
                 shutil.move(newcol.rootdir, col_rootdir)
                 newcol.rootdir = col_rootdir
             else:  # copy the the carray
-                shutil.copytree(newcol.rootdir, col_rootdir)
+                newcol = newcol.copy(rootdir=col_rootdir)
         elif isinstance(newcol, (np.ndarray, bcolz.carray)):
             newcol = bcolz.carray(newcol, **kwargs)
         elif type(newcol) in (list, tuple):

diff --git a/bcolz/tests/test_ctable.py b/bcolz/tests/test_ctable.py
@@ -435,12 +435,15 @@ def test_add_new_column_ondisk_other_carray_rootdir(self):
         c = np.fromiter(("s%d" % i for i in xrange(N)), dtype='S2')
         _, fn = tempfile.mkstemp()
         os.remove(fn)
-        t.addcol(bcolz.carray(c, rootdir=fn), 'f2')
+        c = bcolz.carray(c, rootdir=fn)
+        t.addcol(c, 'f2')
         ra = np.fromiter(((i, i * 2., "s%d" % i) for i in xrange(N)),
                          dtype='i4,f8,S2')
         newpath = os.path.join(self.rootdir, 'f2')
         assert_array_equal(t[:], ra, "ctable values are not correct")
         assert_array_equal(bcolz.carray(rootdir=newpath)[:], ra['f2'])
+        self.assertEqual(fn, c.rootdir)
+        self.assertEqual(newpath, t['f2'].rootdir)
 
 
 class getitemTest(MayBeDiskTest):