X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/415e641036ebcfb944a37ffa14a101f2545104c3..9f842eecf59f293fd800ece28be2730ff3a39487:/sdk/go/arvados/collection_fs_test.go

diff --git a/sdk/go/arvados/collection_fs_test.go b/sdk/go/arvados/collection_fs_test.go
index 07d00be05b..bd5d08bcf5 100644
--- a/sdk/go/arvados/collection_fs_test.go
+++ b/sdk/go/arvados/collection_fs_test.go
@@ -77,6 +77,21 @@ func (s *CollectionFSSuite) TestHttpFileSystemInterface(c *check.C) {
 	c.Check(ok, check.Equals, true)
 }
 
+func (s *CollectionFSSuite) TestColonInFilename(c *check.C) {
+	fs, err := (&Collection{
+		ManifestText: "./foo:foo 3858f62230ac3c915f300c664312c63f+3 0:3:bar:bar\n",
+	}).FileSystem(s.client, s.kc)
+	c.Assert(err, check.IsNil)
+
+	f, err := fs.Open("/foo:foo")
+	c.Assert(err, check.IsNil)
+
+	fis, err := f.Readdir(0)
+	c.Check(err, check.IsNil)
+	c.Check(len(fis), check.Equals, 1)
+	c.Check(fis[0].Name(), check.Equals, "bar:bar")
+}
+
 func (s *CollectionFSSuite) TestReaddirFull(c *check.C) {
 	f, err := s.fs.Open("/dir1")
 	c.Assert(err, check.IsNil)
@@ -173,7 +188,7 @@ func (s *CollectionFSSuite) TestReadOnlyFile(c *check.C) {
 }
 
 func (s *CollectionFSSuite) TestCreateFile(c *check.C) {
-	f, err := s.fs.OpenFile("/newfile", os.O_RDWR|os.O_CREATE, 0)
+	f, err := s.fs.OpenFile("/new-file 1", os.O_RDWR|os.O_CREATE, 0)
 	c.Assert(err, check.IsNil)
 	st, err := f.Stat()
 	c.Assert(err, check.IsNil)
@@ -185,11 +200,11 @@ func (s *CollectionFSSuite) TestCreateFile(c *check.C) {
 
 	c.Check(f.Close(), check.IsNil)
 
-	f, err = s.fs.OpenFile("/newfile", os.O_RDWR|os.O_CREATE|os.O_EXCL, 0)
+	f, err = s.fs.OpenFile("/new-file 1", os.O_RDWR|os.O_CREATE|os.O_EXCL, 0)
 	c.Check(f, check.IsNil)
 	c.Assert(err, check.NotNil)
 
-	f, err = s.fs.OpenFile("/newfile", os.O_RDWR, 0)
+	f, err = s.fs.OpenFile("/new-file 1", os.O_RDWR, 0)
 	c.Assert(err, check.IsNil)
 	st, err = f.Stat()
 	c.Assert(err, check.IsNil)
@@ -197,8 +212,8 @@ func (s *CollectionFSSuite) TestCreateFile(c *check.C) {
 
 	c.Check(f.Close(), check.IsNil)
 
-	// TODO: serialize to Collection, confirm manifest contents,
-	// make new FileSystem, confirm file contents.
+	m, err := s.fs.MarshalManifest(".")
+	c.Check(m, check.Matches, `. 37b51d194a7513e45b56f6524f2d51f2\+3\+\S+ 0:3:new-file\\0401\n./dir1 .* 3:3:bar 0:3:foo\n`)
 }
 
 func (s *CollectionFSSuite) TestReadWriteFile(c *check.C) {
@@ -222,7 +237,7 @@ func (s *CollectionFSSuite) TestReadWriteFile(c *check.C) {
 	c.Check(err, check.Equals, io.EOF)
 	c.Check(string(buf[:3]), check.DeepEquals, "foo")
 
-	pos, err := f.Seek(-2, os.SEEK_CUR)
+	pos, err := f.Seek(-2, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(1))
 	c.Check(err, check.IsNil)
 
@@ -231,11 +246,11 @@ func (s *CollectionFSSuite) TestReadWriteFile(c *check.C) {
 	c.Check(n, check.Equals, 1)
 	c.Check(err, check.IsNil)
 
-	pos, err = f.Seek(0, os.SEEK_CUR)
+	pos, err = f.Seek(0, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(2))
 	c.Check(err, check.IsNil)
 
-	pos, err = f.Seek(0, os.SEEK_SET)
+	pos, err = f.Seek(0, io.SeekStart)
 	c.Check(pos, check.Equals, int64(0))
 	c.Check(err, check.IsNil)
 
@@ -245,13 +260,13 @@ func (s *CollectionFSSuite) TestReadWriteFile(c *check.C) {
 	c.Check(string(rbuf), check.Equals, "f*o")
 
 	// Write multiple blocks in one call
-	f.Seek(1, os.SEEK_SET)
+	f.Seek(1, io.SeekStart)
 	n, err = f.Write([]byte("0123456789abcdefg"))
 	c.Check(n, check.Equals, 17)
 	c.Check(err, check.IsNil)
-	pos, err = f.Seek(0, os.SEEK_CUR)
+	pos, err = f.Seek(0, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(18))
-	pos, err = f.Seek(-18, os.SEEK_CUR)
+	pos, err = f.Seek(-18, io.SeekCurrent)
 	c.Check(err, check.IsNil)
 	n, err = io.ReadFull(f, buf)
 	c.Check(n, check.Equals, 18)
@@ -264,52 +279,52 @@ func (s *CollectionFSSuite) TestReadWriteFile(c *check.C) {
 
 	// truncate to current size
 	err = f.Truncate(18)
-	f2.Seek(0, os.SEEK_SET)
+	f2.Seek(0, io.SeekStart)
 	buf2, err = ioutil.ReadAll(f2)
 	c.Check(err, check.IsNil)
 	c.Check(string(buf2), check.Equals, "f0123456789abcdefg")
 
 	// shrink to zero some data
 	f.Truncate(15)
-	f2.Seek(0, os.SEEK_SET)
+	f2.Seek(0, io.SeekStart)
 	buf2, err = ioutil.ReadAll(f2)
 	c.Check(err, check.IsNil)
 	c.Check(string(buf2), check.Equals, "f0123456789abcd")
 
 	// grow to partial block/extent
 	f.Truncate(20)
-	f2.Seek(0, os.SEEK_SET)
+	f2.Seek(0, io.SeekStart)
 	buf2, err = ioutil.ReadAll(f2)
 	c.Check(err, check.IsNil)
 	c.Check(string(buf2), check.Equals, "f0123456789abcd\x00\x00\x00\x00\x00")
 
 	f.Truncate(0)
-	f2.Seek(0, os.SEEK_SET)
+	f2.Seek(0, io.SeekStart)
 	f2.Write([]byte("12345678abcdefghijkl"))
 
 	// grow to block/extent boundary
 	f.Truncate(64)
-	f2.Seek(0, os.SEEK_SET)
+	f2.Seek(0, io.SeekStart)
 	buf2, err = ioutil.ReadAll(f2)
 	c.Check(err, check.IsNil)
 	c.Check(len(buf2), check.Equals, 64)
-	c.Check(len(f.(*file).inode.(*filenode).extents), check.Equals, 8)
+	c.Check(len(f.(*filehandle).inode.(*filenode).segments), check.Equals, 8)
 
 	// shrink to block/extent boundary
 	err = f.Truncate(32)
-	f2.Seek(0, os.SEEK_SET)
+	f2.Seek(0, io.SeekStart)
 	buf2, err = ioutil.ReadAll(f2)
 	c.Check(err, check.IsNil)
 	c.Check(len(buf2), check.Equals, 32)
-	c.Check(len(f.(*file).inode.(*filenode).extents), check.Equals, 4)
+	c.Check(len(f.(*filehandle).inode.(*filenode).segments), check.Equals, 4)
 
 	// shrink to partial block/extent
 	err = f.Truncate(15)
-	f2.Seek(0, os.SEEK_SET)
+	f2.Seek(0, io.SeekStart)
 	buf2, err = ioutil.ReadAll(f2)
 	c.Check(err, check.IsNil)
 	c.Check(string(buf2), check.Equals, "12345678abcdefg")
-	c.Check(len(f.(*file).inode.(*filenode).extents), check.Equals, 2)
+	c.Check(len(f.(*filehandle).inode.(*filenode).segments), check.Equals, 2)
 
 	// Force flush to ensure the block "12345678" gets stored, so
 	// we know what to expect in the final manifest below.
@@ -322,11 +337,11 @@ func (s *CollectionFSSuite) TestReadWriteFile(c *check.C) {
 	buf2, err = ioutil.ReadAll(f2)
 	c.Check(err, check.IsNil)
 	c.Check(string(buf2), check.Equals, "")
-	f2.Seek(0, os.SEEK_SET)
+	f2.Seek(0, io.SeekStart)
 	buf2, err = ioutil.ReadAll(f2)
 	c.Check(err, check.IsNil)
 	c.Check(string(buf2), check.Equals, "123")
-	c.Check(len(f.(*file).inode.(*filenode).extents), check.Equals, 1)
+	c.Check(len(f.(*filehandle).inode.(*filenode).segments), check.Equals, 1)
 
 	m, err := s.fs.MarshalManifest(".")
 	c.Check(err, check.IsNil)
@@ -350,21 +365,21 @@ func (s *CollectionFSSuite) TestSeekSparse(c *check.C) {
 		defer f.Close()
 		fi, err = f.Stat()
 		c.Check(fi.Size(), check.Equals, size)
-		pos, err := f.Seek(0, os.SEEK_END)
+		pos, err := f.Seek(0, io.SeekEnd)
 		c.Check(pos, check.Equals, size)
 	}
 
-	f.Seek(2, os.SEEK_END)
+	f.Seek(2, io.SeekEnd)
 	checkSize(0)
 	f.Write([]byte{1})
 	checkSize(3)
 
-	f.Seek(2, os.SEEK_CUR)
+	f.Seek(2, io.SeekCurrent)
 	checkSize(3)
 	f.Write([]byte{})
 	checkSize(5)
 
-	f.Seek(8, os.SEEK_SET)
+	f.Seek(8, io.SeekStart)
 	checkSize(5)
 	n, err := f.Read(make([]byte, 1))
 	c.Check(n, check.Equals, 0)
@@ -466,7 +481,7 @@ func (s *CollectionFSSuite) TestConcurrentWriters(c *check.C) {
 				case 0:
 					f.Truncate(int64(rand.Intn(64)))
 				case 1:
-					f.Seek(int64(rand.Intn(64)), os.SEEK_SET)
+					f.Seek(int64(rand.Intn(64)), io.SeekStart)
 				case 2:
 					_, err := f.Write([]byte("beep boop"))
 					c.Check(err, check.IsNil)
@@ -521,13 +536,13 @@ func (s *CollectionFSSuite) TestRandomWrites(c *check.C) {
 				}
 				copy(expect[woff:], wbytes)
 				f.Truncate(int64(trunc))
-				pos, err := f.Seek(int64(woff), os.SEEK_SET)
+				pos, err := f.Seek(int64(woff), io.SeekStart)
 				c.Check(pos, check.Equals, int64(woff))
 				c.Check(err, check.IsNil)
 				n, err := f.Write(wbytes)
 				c.Check(n, check.Equals, len(wbytes))
 				c.Check(err, check.IsNil)
-				pos, err = f.Seek(0, os.SEEK_SET)
+				pos, err = f.Seek(0, io.SeekStart)
 				c.Check(pos, check.Equals, int64(0))
 				c.Check(err, check.IsNil)
 				buf, err := ioutil.ReadAll(f)
@@ -560,14 +575,14 @@ func (s *CollectionFSSuite) TestRemove(c *check.C) {
 	c.Assert(err, check.IsNil)
 	err = fs.Mkdir("dir1/dir2", 0755)
 	c.Assert(err, check.IsNil)
+	err = fs.Mkdir("dir1/dir3", 0755)
+	c.Assert(err, check.IsNil)
 
 	err = fs.Remove("dir0")
 	c.Check(err, check.IsNil)
 	err = fs.Remove("dir0")
 	c.Check(err, check.Equals, os.ErrNotExist)
 
-	err = fs.Remove("dir1/dir2/")
-	c.Check(err, check.Equals, ErrInvalidArgument)
 	err = fs.Remove("dir1/dir2/.")
 	c.Check(err, check.Equals, ErrInvalidArgument)
 	err = fs.Remove("dir1/dir2/..")
@@ -576,10 +591,36 @@ func (s *CollectionFSSuite) TestRemove(c *check.C) {
 	c.Check(err, check.Equals, ErrDirectoryNotEmpty)
 	err = fs.Remove("dir1/dir2/../../../dir1")
 	c.Check(err, check.Equals, ErrDirectoryNotEmpty)
+	err = fs.Remove("dir1/dir3/")
+	c.Check(err, check.IsNil)
 	err = fs.RemoveAll("dir1")
 	c.Check(err, check.IsNil)
 	err = fs.RemoveAll("dir1")
-	c.Check(err, check.Equals, os.ErrNotExist)
+	c.Check(err, check.IsNil)
+}
+
+func (s *CollectionFSSuite) TestRenameError(c *check.C) {
+	fs, err := (&Collection{}).FileSystem(s.client, s.kc)
+	c.Assert(err, check.IsNil)
+	err = fs.Mkdir("first", 0755)
+	c.Assert(err, check.IsNil)
+	err = fs.Mkdir("first/second", 0755)
+	c.Assert(err, check.IsNil)
+	f, err := fs.OpenFile("first/second/file", os.O_CREATE|os.O_WRONLY, 0755)
+	c.Assert(err, check.IsNil)
+	f.Write([]byte{1, 2, 3, 4, 5})
+	f.Close()
+	err = fs.Rename("first", "first/second/third")
+	c.Check(err, check.Equals, ErrInvalidArgument)
+	err = fs.Rename("first", "first/third")
+	c.Check(err, check.Equals, ErrInvalidArgument)
+	err = fs.Rename("first/second", "second")
+	c.Check(err, check.IsNil)
+	f, err = fs.OpenFile("second/file", 0, 0)
+	c.Assert(err, check.IsNil)
+	data, err := ioutil.ReadAll(f)
+	c.Check(err, check.IsNil)
+	c.Check(data, check.DeepEquals, []byte{1, 2, 3, 4, 5})
 }
 
 func (s *CollectionFSSuite) TestRename(c *check.C) {
@@ -630,7 +671,7 @@ func (s *CollectionFSSuite) TestRename(c *check.C) {
 				// oldname does not exist
 				err := fs.Rename(
 					fmt.Sprintf("dir%d/dir%d/missing", i, j),
-					fmt.Sprintf("dir%d/irelevant", outer-i-1))
+					fmt.Sprintf("dir%d/dir%d/file%d", outer-i-1, j, j))
 				c.Check(err, check.ErrorMatches, `.*does not exist`)
 
 				// newname parent dir does not exist
@@ -813,7 +854,7 @@ func (s *CollectionFSSuite) TestOpenFileFlags(c *check.C) {
 	f, err = fs.OpenFile("new", os.O_TRUNC|os.O_RDWR, 0)
 	c.Assert(err, check.IsNil)
 	defer f.Close()
-	pos, err := f.Seek(0, os.SEEK_END)
+	pos, err := f.Seek(0, io.SeekEnd)
 	c.Check(pos, check.Equals, int64(0))
 	c.Check(err, check.IsNil)
 	fi, err = f.Stat()
@@ -825,16 +866,16 @@ func (s *CollectionFSSuite) TestOpenFileFlags(c *check.C) {
 	f, err = fs.OpenFile("append", os.O_EXCL|os.O_CREATE|os.O_RDWR|os.O_APPEND, 0)
 	c.Assert(err, check.IsNil)
 	f.Write([]byte{1, 2, 3})
-	f.Seek(0, os.SEEK_SET)
+	f.Seek(0, io.SeekStart)
 	n, _ = f.Read(buf[:1])
 	c.Check(n, check.Equals, 1)
 	c.Check(buf[:1], check.DeepEquals, []byte{1})
-	pos, err = f.Seek(0, os.SEEK_CUR)
+	pos, err = f.Seek(0, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(1))
 	f.Write([]byte{4, 5, 6})
-	pos, err = f.Seek(0, os.SEEK_CUR)
+	pos, err = f.Seek(0, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(6))
-	f.Seek(0, os.SEEK_SET)
+	f.Seek(0, io.SeekStart)
 	n, err = f.Read(buf)
 	c.Check(buf[:n], check.DeepEquals, []byte{1, 2, 3, 4, 5, 6})
 	c.Check(err, check.Equals, io.EOF)
@@ -842,14 +883,14 @@ func (s *CollectionFSSuite) TestOpenFileFlags(c *check.C) {
 
 	f, err = fs.OpenFile("append", os.O_RDWR|os.O_APPEND, 0)
 	c.Assert(err, check.IsNil)
-	pos, err = f.Seek(0, os.SEEK_CUR)
+	pos, err = f.Seek(0, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(0))
 	c.Check(err, check.IsNil)
 	f.Read(buf[:3])
-	pos, _ = f.Seek(0, os.SEEK_CUR)
+	pos, _ = f.Seek(0, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(3))
 	f.Write([]byte{7, 8, 9})
-	pos, err = f.Seek(0, os.SEEK_CUR)
+	pos, err = f.Seek(0, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(9))
 	f.Close()
 
@@ -858,9 +899,9 @@ func (s *CollectionFSSuite) TestOpenFileFlags(c *check.C) {
 	n, err = f.Write([]byte{3, 2, 1})
 	c.Check(n, check.Equals, 3)
 	c.Check(err, check.IsNil)
-	pos, _ = f.Seek(0, os.SEEK_CUR)
+	pos, _ = f.Seek(0, io.SeekCurrent)
 	c.Check(pos, check.Equals, int64(3))
-	pos, _ = f.Seek(0, os.SEEK_SET)
+	pos, _ = f.Seek(0, io.SeekStart)
 	c.Check(pos, check.Equals, int64(0))
 	n, err = f.Read(buf)
 	c.Check(n, check.Equals, 0)
@@ -899,9 +940,9 @@ func (s *CollectionFSSuite) TestFlushFullBlocks(c *check.C) {
 	}
 
 	currentMemExtents := func() (memExtents []int) {
-		for idx, e := range f.(*file).inode.(*filenode).extents {
+		for idx, e := range f.(*filehandle).inode.(*filenode).segments {
 			switch e.(type) {
-			case *memExtent:
+			case *memSegment:
 				memExtents = append(memExtents, idx)
 			}
 		}
@@ -926,7 +967,7 @@ func (s *CollectionFSSuite) TestBrokenManifests(c *check.C) {
 		".  0:0:foo\n",
 		". 0:0:foo 0:0:bar\n",
 		". d41d8cd98f00b204e9800998ecf8427e 0:0:foo\n",
-		". d41d8cd98f00b204e9800998ecf8427e+0 0:0:foo:bar\n",
+		". d41d8cd98f00b204e9800998ecf8427e+0 :0:0:foo\n",
 		". d41d8cd98f00b204e9800998ecf8427e+0 foo:0:foo\n",
 		". d41d8cd98f00b204e9800998ecf8427e+0 0:foo:foo\n",
 		". d41d8cd98f00b204e9800998ecf8427e+1 0:1:foo 1:1:bar\n",
@@ -957,10 +998,10 @@ func (s *CollectionFSSuite) TestEdgeCaseManifests(c *check.C) {
 }
 
 func (s *CollectionFSSuite) checkMemSize(c *check.C, f File) {
-	fn := f.(*file).inode.(*filenode)
+	fn := f.(*filehandle).inode.(*filenode)
 	var memsize int64
-	for _, ext := range fn.extents {
-		if e, ok := ext.(*memExtent); ok {
+	for _, seg := range fn.segments {
+		if e, ok := seg.(*memSegment); ok {
 			memsize += int64(len(e.buf))
 		}
 	}