gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

13
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")
store *storage.Store
)
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) {
n := new(storage.Needle)
vid, fid, ext := parseURLPath(r.URL.Path)
volumeId, _ := strconv.ParseUint(vid, 10, 64)
volumeId, _ := storage.NewVolumeId(vid)
n.ParsePath(fid)
if *IsDebug {
@ -74,10 +73,10 @@ func GetHandler(w http.ResponseWriter, r *http.Request) {
if ext != "" {
mtype := mime.TypeByExtension(ext)
w.Header().Set("Content-Type", mtype)
if storage.IsCompressable(ext, mtype){
if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip"){
if storage.IsCompressable(ext, mtype) {
if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
w.Header().Set("Content-Encoding", "gzip")
}else{
} else {
n.Data = storage.UnGzipData(n.Data)
}
}
@ -86,7 +85,7 @@ func GetHandler(w http.ResponseWriter, r *http.Request) {
}
func PostHandler(w http.ResponseWriter, r *http.Request) {
vid, _, _ := parseURLPath(r.URL.Path)
volumeId, e := strconv.ParseUint(vid, 10, 64)
volumeId, e := storage.NewVolumeId(vid)
if e != nil {
writeJson(w, r, e)
} else {
@ -104,7 +103,7 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
func DeleteHandler(w http.ResponseWriter, r *http.Request) {
n := new(storage.Needle)
vid, fid, _ := parseURLPath(r.URL.Path)
volumeId, _ := strconv.ParseUint(vid, 10, 64)
volumeId, _ := storage.NewVolumeId(vid)
n.ParsePath(fid)
if *IsDebug {

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

@ -12,7 +12,7 @@ import (
)
type Store struct {
volumes map[uint64]*Volume
volumes map[VolumeId]*Volume
dir string
Port int
PublicUrl string
@ -20,7 +20,7 @@ type Store struct {
func NewStore(port int, publicUrl, dirname string, volumeListString string) (s *Store) {
s = &Store{Port: port, PublicUrl: publicUrl, dir: dirname}
s.volumes = make(map[uint64]*Volume)
s.volumes = make(map[VolumeId]*Volume)
s.AddVolume(volumeListString)
@ -35,7 +35,7 @@ func (s *Store) AddVolume(volumeListString string) error {
if err != nil {
return errors.New("Volume Id " + id_string + " is not a valid unsigned integer!")
}
s.addVolume(id)
s.addVolume(VolumeId(id))
} else {
pair := strings.Split(range_string, "-")
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!")
}
for id := start; id <= end; id++ {
s.addVolume(id)
s.addVolume(VolumeId(id))
}
}
}
return nil
}
func (s *Store) addVolume(vid uint64) error {
func (s *Store) addVolume(vid VolumeId) error {
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
}
func (s *Store) Status() *[]*topology.VolumeInfo {
@ -88,12 +88,12 @@ func (s *Store) 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)
}
func (s *Store) Delete(i uint64, n *Needle) uint32 {
func (s *Store) Delete(i VolumeId, n *Needle) uint32 {
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)
}

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

@ -13,8 +13,16 @@ const (
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 {
Id uint32
Id VolumeId
dir string
dataFile *os.File
nm *NeedleMap
@ -22,7 +30,7 @@ type Volume struct {
accessLock sync.Mutex
}
func NewVolume(dirname string, id uint32) (v *Volume) {
func NewVolume(dirname string, id VolumeId) (v *Volume) {
var e error
v = &Volume{dir: dirname, Id: id}
fileName := strconv.FormatUint(uint64(v.Id), 10)