tmpoverlayfs: add temporal overlay filesystem

- Added specific tests
- Each method call to the exact method of the underlying filesystems
- Added copyFile private logic

tmpoverlayfs/tmpfs.go

@@ -0,0 +1,172 @@
+package tmpfs
+
+import (
+	"errors"
+	"io"
+	"os"
+	"path"
+
+	"gopkg.in/src-d/go-billy.v2"
+	"gopkg.in/src-d/go-billy.v2/subdirfs"
+)
+
+type tmpFs struct {
+	fs        billy.Filesystem
+	tmp       billy.Filesystem
+	tempFiles map[string]bool
+}
+
+// New creates a new filesystem wrapping up 'fs' and using 'tmp' for temporary
+// files. Any file created with TempFile will be created in 'tmp'. It will be
+// moved to 'fs' if Rename is called on it.
+//
+// This is particularly useful to provide TempFile for filesystems that do not
+// support it or where there is a performance penalty in doing so.
+func New(fs billy.Filesystem, tmp billy.Filesystem) billy.Filesystem {
+	return &tmpFs{
+		fs:        fs,
+		tmp:       tmp,
+		tempFiles: map[string]bool{},
+	}
+}
+
+func (t *tmpFs) Create(path string) (billy.File, error) {
+	if t.isTmpFile(path) {
+		return t.tmp.Create(path)
+	}
+
+	return t.fs.Create(path)
+}
+
+func (t *tmpFs) Open(path string) (billy.File, error) {
+	if t.isTmpFile(path) {
+		return t.tmp.Open(path)
+	}
+
+	return t.fs.Open(path)
+
+}
+
+func (t *tmpFs) OpenFile(p string, flag int, mode os.FileMode) (
+	billy.File, error) {
+	if t.isTmpFile(p) {
+		return t.tmp.OpenFile(p, flag, mode)
+	}
+
+	return t.fs.OpenFile(p, flag, mode)
+}
+
+func (t *tmpFs) ReadDir(p string) ([]billy.FileInfo, error) {
+	return t.fs.ReadDir(p)
+}
+
+func (t *tmpFs) Join(elem ...string) string {
+	return t.fs.Join(elem...)
+}
+
+func (t *tmpFs) Dir(p string) billy.Filesystem {
+	return subdirfs.New(t, p)
+}
+
+func (t *tmpFs) MkdirAll(filename string, perm os.FileMode) error {
+	return t.fs.MkdirAll(filename, perm)
+}
+
+func (t *tmpFs) Base() string {
+	return t.fs.Base()
+}
+
+func (t *tmpFs) TempFile(dir string, prefix string) (billy.File, error) {
+	tmpFile, err := t.tmp.TempFile(dir, prefix)
+	if err != nil {
+		return nil, err
+	}
+
+	t.tempFiles[tmpFile.Filename()] = true
+
+	return tmpFile, nil
+}
+
+func (t *tmpFs) Rename(from, to string) error {
+	if t.isTmpFile(to) {
+		return errors.New("cannot rename to temp file")
+	}
+
+	if t.isTmpFile(from) {
+		err := copyPath(t.tmp, t.fs, from, to)
+		if err != nil {
+			return err
+		}
+
+		if err := t.tmp.Remove(from); err != nil {
+			return err
+		}
+
+		t.removeTempReference(from)
+
+		return nil
+	}
+
+	return t.fs.Rename(from, to)
+}
+
+func (t *tmpFs) Remove(path string) error {
+	if t.isTmpFile(path) {
+		if err := t.tmp.Remove(path); err != nil {
+			return err
+		}
+
+		t.removeTempReference(path)
+
+		return nil
+	}
+
+	return t.fs.Remove(path)
+}
+
+func (t *tmpFs) Stat(path string) (billy.FileInfo, error) {
+	if t.isTmpFile(path) {
+		return t.tmp.Stat(path)
+	}
+
+	return t.fs.Stat(path)
+}
+
+func (t *tmpFs) isTmpFile(p string) bool {
+	p = path.Clean(p)
+	_, ok := t.tempFiles[p]
+	return ok
+}
+
+func (t *tmpFs) removeTempReference(p string) {
+	p = path.Clean(p)
+	delete(t.tempFiles, p)
+}
+
+// copyPath copies a file across filesystems.
+func copyPath(src billy.Filesystem, dst billy.Filesystem,
+	srcPath string, dstPath string) error {
+
+	dstFile, err := dst.Create(dstPath)
+	if err != nil {
+		return err
+	}
+
+	srcFile, err := src.Open(srcPath)
+	if err != nil {
+		return nil
+	}
+
+	_, err = io.Copy(dstFile, srcFile)
+	if err != nil {
+		return nil
+	}
+
+	err = dstFile.Close()
+	if err != nil {
+		_ = srcFile.Close()
+		return err
+	}
+
+	return srcFile.Close()
+}

tmpoverlayfs/tmpfs_specific_test.go

@@ -0,0 +1,217 @@
+package tmpfs
+
+import (
+	"io"
+	"io/ioutil"
+	stdos "os"
+	"path/filepath"
+
+	"gopkg.in/src-d/go-billy.v2"
+	"gopkg.in/src-d/go-billy.v2/osfs"
+
+	. "gopkg.in/check.v1"
+)
+
+type SpecificFilesystemSuite struct {
+	src     billy.Filesystem
+	tmp     billy.Filesystem
+	srcPath string
+	tmpPath string
+}
+
+var _ = Suite(&SpecificFilesystemSuite{})
+
+func (s *SpecificFilesystemSuite) SetUpTest(c *C) {
+	s.srcPath = c.MkDir()
+	s.tmpPath = c.MkDir()
+	s.src = osfs.New(s.srcPath)
+	s.tmp = osfs.New(s.tmpPath)
+}
+
+func (s *SpecificFilesystemSuite) TestTempFileInTmpFs(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.TempFile("test-dir", "test-prefix")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	filename := f.Filename()
+	c.Assert(f.Close(), IsNil)
+
+	_, err = stdos.Stat(filepath.Join(s.srcPath, filename))
+	c.Assert(stdos.IsNotExist(err), Equals, true)
+
+	_, err = stdos.Stat(filepath.Join(s.tmpPath, filename))
+	c.Assert(err, IsNil)
+}
+
+func (s *SpecificFilesystemSuite) TestNonTempFileInSrcFs(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.Create("foo")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	c.Assert(f.Close(), IsNil)
+
+	_, err = stdos.Stat(filepath.Join(s.srcPath, "foo"))
+	c.Assert(err, IsNil)
+
+	_, err = stdos.Stat(filepath.Join(s.tmpPath, "foo"))
+	c.Assert(stdos.IsNotExist(err), Equals, true)
+}
+
+func (s *SpecificFilesystemSuite) TestTempFileCanBeReopened(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.TempFile("test-dir", "test-prefix")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	n, err := f.Write([]byte("foo"))
+	c.Assert(err, IsNil)
+	c.Assert(n, Equals, 3)
+
+	filename := f.Filename()
+	c.Assert(f.Close(), IsNil)
+
+	f, err = tmpFs.Open(filename)
+	c.Assert(err, IsNil)
+	c.Assert(f.Filename(), Equals, filename)
+
+	content, err := ioutil.ReadAll(f)
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, "foo")
+
+	c.Assert(f.Close(), IsNil)
+}
+
+func (s *SpecificFilesystemSuite) TestTempFileCanBeReopenedByOpenFile(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.TempFile("test-dir", "test-prefix")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	n, err := f.Write([]byte("foo"))
+	c.Assert(err, IsNil)
+	c.Assert(n, Equals, 3)
+
+	filename := f.Filename()
+	c.Assert(f.Close(), IsNil)
+
+	f, err = tmpFs.OpenFile(filename, stdos.O_RDONLY, 0)
+	c.Assert(err, IsNil)
+	c.Assert(f.Filename(), Equals, filename)
+
+	content, err := ioutil.ReadAll(f)
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, "foo")
+
+	c.Assert(f.Close(), IsNil)
+}
+
+func (s *SpecificFilesystemSuite) TestStatTempFile(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.TempFile("test-dir", "test-prefix")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	tempFilename := f.Filename()
+	c.Assert(f.Close(), IsNil)
+
+	fi, err := tmpFs.Stat(tempFilename)
+	c.Assert(err, IsNil)
+	c.Assert(fi, NotNil)
+}
+
+func (s *SpecificFilesystemSuite) TestRenameFromTempFile(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.TempFile("test-dir", "test-prefix")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	tempFilename := f.Filename()
+	c.Assert(f.Close(), IsNil)
+
+	err = tmpFs.Rename(tempFilename, "foo")
+	c.Assert(err, IsNil)
+
+	_, err = s.src.Stat("foo")
+	c.Assert(err, IsNil)
+
+	_, err = s.tmp.Stat("foo")
+	c.Assert(err, NotNil)
+
+	_, err = s.tmp.Stat(tempFilename)
+	c.Assert(err, NotNil)
+}
+
+func (s *SpecificFilesystemSuite) TestCannotRenameToTempFile(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.TempFile("test-dir", "test-prefix")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	tempFilename := f.Filename()
+	c.Assert(f.Close(), IsNil)
+
+	f, err = tmpFs.Create("foo")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+	c.Assert(f.Close(), IsNil)
+
+	err = tmpFs.Rename("foo", tempFilename)
+	c.Assert(err, NotNil)
+}
+
+func (s *SpecificFilesystemSuite) TestRemoveTempFile(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.TempFile("test-dir", "test-prefix")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	tempFilename := f.Filename()
+	c.Assert(f.Close(), IsNil)
+
+	err = tmpFs.Remove(tempFilename)
+	c.Assert(err, IsNil)
+
+	_, err = s.tmp.Stat(tempFilename)
+	c.Assert(err, NotNil)
+}
+
+func (s *SpecificFilesystemSuite) TestCreateTempFile(c *C) {
+	tmpFs := New(s.src, s.tmp)
+	c.Assert(tmpFs, NotNil)
+
+	f, err := tmpFs.TempFile("test-dir", "test-prefix")
+	c.Assert(err, IsNil)
+	c.Assert(f, NotNil)
+
+	n, err := f.Write([]byte("TEST"))
+
+	tempFilename := f.Filename()
+	c.Assert(f.Close(), IsNil)
+
+	createdFile, err := tmpFs.Create(tempFilename)
+	c.Assert(err, IsNil)
+	c.Assert(createdFile, NotNil)
+
+	bRead := make([]byte, 4)
+	n, err = createdFile.Read(bRead)
+	c.Assert(n, Equals, 0)
+	c.Assert(err, Equals, io.EOF)
+}