gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding VolumeId type

Browse Source
This commit is contained in:
Chris Lu
2012-08-23 22:46:54 -07:00
parent 03f4c0b832
commit 5e3ecc1b82
3 changed files with 154 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
weed-fs/src/cmd/weed/volume.go
View File

@@ -33,7 +33,6 @@ var (
pulse = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") pulse = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
store *storage.Store store *storage.Store
) )
func statusHandler(w http.ResponseWriter, r *http.Request) { func statusHandler(w http.ResponseWriter, r *http.Request) {
@@ -56,7 +55,7 @@ func storeHandler(w http.ResponseWriter, r *http.Request) {
func GetHandler(w http.ResponseWriter, r *http.Request) { func GetHandler(w http.ResponseWriter, r *http.Request) {
n := new(storage.Needle) n := new(storage.Needle)
vid, fid, ext := parseURLPath(r.URL.Path) vid, fid, ext := parseURLPath(r.URL.Path)
volumeId, _ := strconv.ParseUint(vid, 10, 64) volumeId, _ := storage.NewVolumeId(vid)
n.ParsePath(fid) n.ParsePath(fid)
if *IsDebug { if *IsDebug {
@@ -86,7 +85,7 @@ func GetHandler(w http.ResponseWriter, r *http.Request) {
} }
func PostHandler(w http.ResponseWriter, r *http.Request) { func PostHandler(w http.ResponseWriter, r *http.Request) {
vid, _, _ := parseURLPath(r.URL.Path) vid, _, _ := parseURLPath(r.URL.Path)
volumeId, e := strconv.ParseUint(vid, 10, 64) volumeId, e := storage.NewVolumeId(vid)
if e != nil { if e != nil {
writeJson(w, r, e) writeJson(w, r, e)
} else { } else {
@@ -104,7 +103,7 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
func DeleteHandler(w http.ResponseWriter, r *http.Request) { func DeleteHandler(w http.ResponseWriter, r *http.Request) {
n := new(storage.Needle) n := new(storage.Needle)
vid, fid, _ := parseURLPath(r.URL.Path) vid, fid, _ := parseURLPath(r.URL.Path)
volumeId, _ := strconv.ParseUint(vid, 10, 64) volumeId, _ := storage.NewVolumeId(vid)
n.ParsePath(fid) n.ParsePath(fid)
if *IsDebug { if *IsDebug {

20
weed-fs/src/pkg/storage/store.go
View File

@@ -12,7 +12,7 @@ import (
) )
type Store struct { type Store struct {
volumes map[uint64]*Volume volumes map[VolumeId]*Volume
dir string dir string
Port int Port int
PublicUrl string PublicUrl string
@@ -20,7 +20,7 @@ type Store struct {
func NewStore(port int, publicUrl, dirname string, volumeListString string) (s *Store) { func NewStore(port int, publicUrl, dirname string, volumeListString string) (s *Store) {
s = &Store{Port: port, PublicUrl: publicUrl, dir: dirname} s = &Store{Port: port, PublicUrl: publicUrl, dir: dirname}
s.volumes = make(map[uint64]*Volume) s.volumes = make(map[VolumeId]*Volume)
s.AddVolume(volumeListString) s.AddVolume(volumeListString)
@@ -35,7 +35,7 @@ func (s *Store) AddVolume(volumeListString string) error {
if err != nil { if err != nil {
return errors.New("Volume Id " + id_string + " is not a valid unsigned integer!") return errors.New("Volume Id " + id_string + " is not a valid unsigned integer!")
} }
s.addVolume(id) s.addVolume(VolumeId(id))
} else { } else {
pair := strings.Split(range_string, "-") pair := strings.Split(range_string, "-")
start, start_err := strconv.ParseUint(pair[0], 10, 64) start, start_err := strconv.ParseUint(pair[0], 10, 64)
@@ -47,17 +47,17 @@ func (s *Store) AddVolume(volumeListString string) error {
return errors.New("Volume End Id" + pair[1] + " is not a valid unsigned integer!") return errors.New("Volume End Id" + pair[1] + " is not a valid unsigned integer!")
} }
for id := start; id <= end; id++ { for id := start; id <= end; id++ {
s.addVolume(id) s.addVolume(VolumeId(id))
} }
} }
} }
return nil return nil
} }
func (s *Store) addVolume(vid uint64) error { func (s *Store) addVolume(vid VolumeId) error {
if s.volumes[vid] != nil { if s.volumes[vid] != nil {
return errors.New("Volume Id " + strconv.FormatUint(vid, 10) + " already exists!") return errors.New("Volume Id " + vid.String() + " already exists!")
} }
s.volumes[vid] = NewVolume(s.dir, uint32(vid)) s.volumes[vid] = NewVolume(s.dir, vid)
return nil return nil
} }
func (s *Store) Status() *[]*topology.VolumeInfo { func (s *Store) Status() *[]*topology.VolumeInfo {
@@ -88,12 +88,12 @@ func (s *Store) Close() {
v.Close() v.Close()
} }
} }
func (s *Store) Write(i uint64, n *Needle) uint32 { func (s *Store) Write(i VolumeId, n *Needle) uint32 {
return s.volumes[i].write(n) return s.volumes[i].write(n)
} }
func (s *Store) Delete(i uint64, n *Needle) uint32 { func (s *Store) Delete(i VolumeId, n *Needle) uint32 {
return s.volumes[i].delete(n) return s.volumes[i].delete(n)
} }
func (s *Store) Read(i uint64, n *Needle) (int, error) { func (s *Store) Read(i VolumeId, n *Needle) (int, error) {
return s.volumes[i].read(n) return s.volumes[i].read(n)
} }

12
weed-fs/src/pkg/storage/volume.go
View File

@@ -13,8 +13,16 @@ const (
SuperBlockSize = 8 SuperBlockSize = 8
) )
type VolumeId uint32
func NewVolumeId(vid string) (VolumeId,error) {
volumeId, err := strconv.ParseUint(vid, 10, 64)
return VolumeId(volumeId), err
}
func (vid *VolumeId) String() string{
return strconv.FormatUint(uint64(*vid), 10)
}
type Volume struct { type Volume struct {
Id uint32 Id VolumeId
dir string dir string
dataFile *os.File dataFile *os.File
nm *NeedleMap nm *NeedleMap
@@ -22,7 +30,7 @@ type Volume struct {
accessLock sync.Mutex accessLock sync.Mutex
} }
func NewVolume(dirname string, id uint32) (v *Volume) { func NewVolume(dirname string, id VolumeId) (v *Volume) {
var e error var e error
v = &Volume{dir: dirname, Id: id} v = &Volume{dir: dirname, Id: id}
fileName := strconv.FormatUint(uint64(v.Id), 10) fileName := strconv.FormatUint(uint64(v.Id), 10)