Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix renaming a dir with sub-directories #239

Merged
merged 1 commit into from
Feb 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions memmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,18 @@ func (m *MemMapFs) Rename(oldname, newname string) error {
} else {
return &os.PathError{Op: "rename", Path: oldname, Err: ErrFileNotFound}
}

for p, fileData := range m.getData() {
if strings.HasPrefix(p, oldname+FilePathSeparator) {
m.mu.RUnlock()
m.mu.Lock()
delete(m.getData(), p)
p := strings.Replace(p, oldname, newname, 1)
m.getData()[p] = fileData
m.mu.Unlock()
m.mu.RLock()
}
}
return nil
}

Expand Down
57 changes: 57 additions & 0 deletions memmap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -776,3 +776,60 @@ func TestMemMapFsConfurrentMkdir(t *testing.T) {
t.Errorf("found %d files, but expect %d", len(foundFiles), n)
}
}

func TestMemFsRenameDir(t *testing.T) {
const srcPath = "/src"
const dstPath = "/dst"
const subDir = "dir"
const subFile = "file.txt"

fs := NewMemMapFs()

err := fs.MkdirAll(srcPath+FilePathSeparator+subDir, 0777)
if err != nil {
t.Fatalf("MkDirAll failed: %s", err)
}

f, err := fs.Create(srcPath + FilePathSeparator + subFile)
if err != nil {
t.Fatalf("Create failed: %s", err)
}
if err = f.Close(); err != nil {
t.Fatalf("Close failed: %s", err)
}
nono marked this conversation as resolved.
Show resolved Hide resolved

nono marked this conversation as resolved.
Show resolved Hide resolved
err = fs.Rename(srcPath, dstPath)
if err != nil {
t.Fatalf("Rename failed: %s", err)
}

_, err = fs.Stat(srcPath + FilePathSeparator + subDir)
if err == nil {
t.Fatalf("SubDir still exists in the source dir")
}

_, err = fs.Stat(srcPath + FilePathSeparator + subFile)
if err == nil {
t.Fatalf("SubFile still exists in the source dir")
}

_, err = fs.Stat(dstPath + FilePathSeparator + subDir)
if err != nil {
t.Fatalf("SubDir stat in the destination dir: %s", err)
}

_, err = fs.Stat(dstPath + FilePathSeparator + subFile)
if err != nil {
t.Fatalf("SubFile stat in the destination dir: %s", err)
}

err = fs.Mkdir(srcPath, 0777)
if err != nil {
t.Fatalf("Cannot recreate the source dir: %s", err)
}

err = fs.Mkdir(srcPath+FilePathSeparator+subDir, 0777)
if err != nil {
t.Errorf("Cannot recreate the subdir in the source dir: %s", err)
}
}