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

adjusting for types

Browse Source
This commit is contained in:
Chris Lu
2012-08-23 22:56:14 -07:00
parent 5e3ecc1b82
commit 9f92f2779d
6 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
weed-fs/src/pkg/directory/file_id.go
View File

@@ -4,19 +4,18 @@ import (
"encoding/hex"
"log"
"pkg/storage"
"pkg/topology"
"strconv"
"strings"
"pkg/util"
)
type FileId struct {
VolumeId topology.VolumeId
VolumeId storage.VolumeId
Key uint64
Hashcode uint32
}
func NewFileId(VolumeId topology.VolumeId, Key uint64, Hashcode uint32) *FileId {
func NewFileId(VolumeId storage.VolumeId, Key uint64, Hashcode uint32) *FileId {
return &FileId{VolumeId: VolumeId, Key: Key, Hashcode: Hashcode}
}
func ParseFileId(fid string) *FileId{
@@ -28,7 +27,7 @@ func ParseFileId(fid string) *FileId{
vid_string, key_hash_string := a[0], a[1]
vid, _ := strconv.ParseUint(vid_string, 10, 64)
key, hash := storage.ParseKeyHash(key_hash_string)
return &FileId{VolumeId: topology.VolumeId(vid), Key: key, Hashcode: hash}
return &FileId{VolumeId: storage.VolumeId(vid), Key: key, Hashcode: hash}
}
func (n *FileId) String() string {
bytes := make([]byte, 12)

18
weed-fs/src/pkg/directory/volume_mapping.go
View File

@@ -7,7 +7,7 @@ import (
"math/rand"
"os"
"path"
"pkg/topology"
"pkg/storage"
"strconv"
"sync"
)
@@ -22,7 +22,7 @@ type MachineInfo struct {
}
type Machine struct {
Server MachineInfo
Volumes []topology.VolumeInfo
Volumes []storage.VolumeInfo
}
type Mapper struct {
@@ -32,8 +32,8 @@ type Mapper struct {
volumeLock sync.Mutex
sequenceLock sync.Mutex
Machines []*Machine
vid2machineId map[topology.VolumeId]int //machineId is +1 of the index of []*Machine, to detect not found entries
Writers []topology.VolumeId // transient array of Writers volume id
vid2machineId map[storage.VolumeId]int //machineId is +1 of the index of []*Machine, to detect not found entries
Writers []storage.VolumeId // transient array of Writers volume id
FileIdSequence uint64
fileIdCounter uint64
@@ -41,15 +41,15 @@ type Mapper struct {
volumeSizeLimit uint64
}
func NewMachine(server, publicUrl string, volumes []topology.VolumeInfo) *Machine {
func NewMachine(server, publicUrl string, volumes []storage.VolumeInfo) *Machine {
return &Machine{Server: MachineInfo{Url: server, PublicUrl: publicUrl}, Volumes: volumes}
}
func NewMapper(dirname string, filename string, volumeSizeLimit uint64) (m *Mapper) {
m = &Mapper{dir: dirname, fileName: filename}
m.vid2machineId = make(map[topology.VolumeId]int)
m.vid2machineId = make(map[storage.VolumeId]int)
m.volumeSizeLimit = volumeSizeLimit
m.Writers = *new([]topology.VolumeId)
m.Writers = *new([]storage.VolumeId)
m.Machines = *new([]*Machine)
seqFile, se := os.OpenFile(path.Join(m.dir, m.fileName+".seq"), os.O_RDONLY, 0644)
@@ -102,7 +102,7 @@ func (m *Mapper) NextFileId(c string) (uint64,int) {
m.fileIdCounter = m.fileIdCounter - count
return m.FileIdSequence - m.fileIdCounter, int(count)
}
func (m *Mapper) Get(vid topology.VolumeId) (*Machine, error) {
func (m *Mapper) Get(vid storage.VolumeId) (*Machine, error) {
machineId := m.vid2machineId[vid]
if machineId <= 0 {
return nil, errors.New("invalid volume id " + strconv.FormatUint(uint64(vid), 10))
@@ -134,7 +134,7 @@ func (m *Mapper) Add(machine Machine) {
m.vid2machineId[v.Id] = machineId + 1 //use base 1 indexed, to detect not found cases
}
//setting Writers, copy-on-write because of possible updating, this needs some future work!
var writers []topology.VolumeId
var writers []storage.VolumeId
for _, machine_entry := range m.Machines {
for _, v := range machine_entry.Volumes {
if uint64(v.Size) < m.volumeSizeLimit {