Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1965 from jonboulle/fileutil

Browse Source 
pkg/fileutil: sort filenames during ReadDir
This commit is contained in:
Jonathan Boulle 2014-12-18 16:44:07 -08:00
commit 021fc140b8
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/fileutil/fileutil.go
View File

@ -20,6 +20,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"
"sort"
) )
const ( const (
@ -36,7 +37,7 @@ func IsDirWriteable(dir string) error {
return os.Remove(f) return os.Remove(f)
} }
// ReadDir returns the filenames in the given directory. // ReadDir returns the filenames in the given directory in sorted order.
func ReadDir(dirpath string) ([]string, error) { func ReadDir(dirpath string) ([]string, error) {
dir, err := os.Open(dirpath) dir, err := os.Open(dirpath)
if err != nil { if err != nil {
@ -47,5 +48,6 @@ func ReadDir(dirpath string) ([]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
sort.Strings(names)
return names, nil return names, nil
} }

29
pkg/fileutil/fileutil_test.go
View File

@ -19,6 +19,8 @@ package fileutil
import ( import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath"
"reflect"
"testing" "testing"
) )
@ -27,6 +29,7 @@ func TestIsDirWriteable(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected ioutil.TempDir error: %v", err) t.Fatalf("unexpected ioutil.TempDir error: %v", err)
} }
defer os.RemoveAll(tmpdir)
if err := IsDirWriteable(tmpdir); err != nil { if err := IsDirWriteable(tmpdir); err != nil {
t.Fatalf("unexpected IsDirWriteable error: %v", err) t.Fatalf("unexpected IsDirWriteable error: %v", err)
} }
@ -37,3 +40,29 @@ func TestIsDirWriteable(t *testing.T) {
t.Fatalf("expected IsDirWriteable to error") t.Fatalf("expected IsDirWriteable to error")
} }
} }
func TestReadDir(t *testing.T) {
tmpdir, err := ioutil.TempDir("", "")
defer os.RemoveAll(tmpdir)
if err != nil {
t.Fatalf("unexpected ioutil.TempDir error: %v", err)
}
files := []string{"def", "abc", "xyz", "ghi"}
for _, f := range files {
fh, err := os.Create(filepath.Join(tmpdir, f))
if err != nil {
t.Fatalf("error creating file: %v", err)
}
if err := fh.Close(); err != nil {
t.Fatalf("error closing file: %v", err)
}
}
fs, err := ReadDir(tmpdir)
if err != nil {
t.Fatalf("error calling ReadDir: %v", err)
}
wfs := []string{"abc", "def", "ghi", "xyz"}
if !reflect.DeepEqual(fs, wfs) {
t.Fatalf("ReadDir: got %v, want %v", fs, wfs)
}
}

3
wal/wal.go
View File

@ -25,7 +25,6 @@ import (
"os" "os"
"path" "path"
"reflect" "reflect"
"sort"
"github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/fileutil"
"github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/pbutil"
@ -143,8 +142,6 @@ func openAtIndex(dirpath string, index uint64, all bool) (*WAL, error) {
return nil, ErrFileNotFound return nil, ErrFileNotFound
} }
sort.Sort(sort.StringSlice(names))
nameIndex, ok := searchIndex(names, index) nameIndex, ok := searchIndex(names, index)
if !ok || !isValidSeq(names[nameIndex:]) { if !ok || !isValidSeq(names[nameIndex:]) {
return nil, ErrFileNotFound return nil, ErrFileNotFound