cleaner

git-svn-id: https://weed-fs.googlecode.com/svn/trunk@16 282b0af5-e82d-9cf1-ede4-77906d7719d0

weed-fs/src/cmd/weeds.go

@@ -22,11 +22,15 @@ var (
 func dirReadHandler(w http.ResponseWriter, r *http.Request) {
 	volumeId, _ := strconv.Atoui64(r.FormValue("volumeId"))
 	machine := mapper.Get(volumeId)
-	writeJson(w, r, machine)
+	writeJson(w, r, machine.Server)
 }
 func dirWriteHandler(w http.ResponseWriter, r *http.Request) {
-	machineList := mapper.PickForWrite()
+	machine := mapper.PickForWrite()
-	writeJson(w, r, machineList)
+	writeJson(w, r, machine)
+}
+func dirPickHandler(w http.ResponseWriter, r *http.Request) {
+    machine := mapper.PickForWrite()
+    writeJson(w, r, machine)
 }
 func dirJoinHandler(w http.ResponseWriter, r *http.Request) {
 	s := r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")+1] + r.FormValue("port")
@@ -64,6 +68,7 @@ func main() {
 	defer mapper.Save()
 	http.HandleFunc("/dir/read", dirReadHandler)
 	http.HandleFunc("/dir/write", dirWriteHandler)
+    http.HandleFunc("/dir/pick", dirPickHandler)
 	http.HandleFunc("/dir/join", dirJoinHandler)
 	http.HandleFunc("/dir/status", dirStatusHandler)
 

weed-fs/src/pkg/directory/volume_mapping.go

@@ -15,13 +15,11 @@ const (
 )
 
 type MachineInfo struct {
-    Server       string //<server name/ip>[:port]
+	Url       string //<server name/ip>[:port]
-    PublicServer string
+	PublicUrl string
 }
 type Machine struct {
-    MachineInfo
+	Server   MachineInfo
-	Server       string //<server name/ip>[:port]
-	PublicServer string
 	Volumes  []storage.VolumeInfo
 	Capacity int
 }
@@ -39,15 +37,12 @@ type Mapper struct {
 	GlobalVolumeSequence uint64
 }
 
-func NewMachine(server, publicServer string, volumes []storage.VolumeInfo, capacity int) (m *Machine) {
+func NewMachine(server, publicServer string, volumes []storage.VolumeInfo, capacity int) *Machine {
-	m = new(Machine)
+	return &Machine{Server:MachineInfo{Url:server,PublicUrl:publicServer},Volumes:volumes,Capacity:capacity}
-	m.Server, m.PublicServer, m.Volumes, m.Capacity = server, publicServer, volumes, capacity
-	return
 }
 
 func NewMapper(dirname string, filename string, capacity int) (m *Mapper) {
-	m = new(Mapper)
+	m = &Mapper{dir:dirname,fileName:filename,capacity:capacity}
-	m.dir, m.fileName, m.capacity = dirname, filename, capacity
 	log.Println("Loading volume id to maching mapping:", path.Join(m.dir, m.fileName+".map"))
 	dataFile, e := os.OpenFile(path.Join(m.dir, m.fileName+".map"), os.O_RDONLY, 0644)
 	m.vid2machineId = make(map[uint64]int)
@@ -74,24 +69,21 @@ func NewMapper(dirname string, filename string, capacity int) (m *Mapper) {
 	}
 	return
 }
-func (m *Mapper) PickForWrite() map[string]string {
+func (m *Mapper) PickForWrite() MachineInfo {
 	vid := rand.Intn(len(m.Writers))
-	return map[string]string{
+	return m.Machines[m.Writers[vid]].Server
-	  "server":m.Machines[m.Writers[vid]].Server,
-      "url":m.Machines[m.Writers[vid]].PublicServer,
-	}
 }
 func (m *Mapper) Get(vid uint64) *Machine {
 	return m.Machines[m.vid2machineId[vid]]
 }
 func (m *Mapper) Add(machine Machine) []uint64 {
-	log.Println("Adding existing", machine.Server, len(machine.Volumes), "volumes to dir", len(m.Machines))
+	log.Println("Adding existing", machine.Server.Url, len(machine.Volumes), "volumes to dir", len(m.Machines))
-	log.Println("Adding      new ", machine.Server, machine.Capacity-len(machine.Volumes), "volumes to dir", len(m.Machines))
+	log.Println("Adding      new ", machine.Server.Url, machine.Capacity-len(machine.Volumes), "volumes to dir", len(m.Machines))
 	//check existing machine, linearly
 	m.lock.Lock()
 	foundExistingMachineId := -1
 	for index, entry := range m.Machines {
-		if machine.Server == entry.Server {
+		if machine.Server.Url == entry.Server.Url {
 			foundExistingMachineId = index
 			break
 		}
@@ -105,11 +97,10 @@ func (m *Mapper) Add(machine Machine) []uint64 {
 	//generate new volumes
 	vids := new([]uint64)
 	for vid, i := m.GlobalVolumeSequence, len(machine.Volumes); i < machine.Capacity; i, vid = i+1, vid+1 {
-		newVolume := *new(storage.VolumeInfo)
+		newVolume := storage.VolumeInfo{Id: vid, Size: 0}
-		newVolume.Id, newVolume.Size = vid, 0
 		machine.Volumes = append(machine.Volumes, newVolume)
 		m.vid2machineId[vid] = machineId
-		log.Println("Adding volume", vid, "from", machine.Server)
+		log.Println("Adding volume", vid, "from", machine.Server.Url)
 		*vids = append(*vids, vid)
 		m.GlobalVolumeSequence = vid + 1
 	}
@@ -119,7 +110,7 @@ func (m *Mapper) Add(machine Machine) []uint64 {
 
 	//add to vid2machineId map, and Writers array
 	for _, v := range machine.Volumes {
-		log.Println("Setting volume", v.Id, "to", machine.Server)
+		log.Println("Setting volume", v.Id, "to", machine.Server.Url)
 		m.vid2machineId[v.Id] = machineId
 		if v.Size < ChunkSizeLimit {
 			m.Writers = append(m.Writers, machineId)

weed-fs/src/pkg/storage/needle.go

@@ -18,6 +18,7 @@ type Needle struct{
 	Checksum     int32  "CRC32 to check integrity"
 	Padding      []byte "Aligned to 8 bytes"
 }
+
 func NewNeedle(r *http.Request) (n *Needle) {
 	n = new(Needle)
 	form, fe := r.MultipartReader()
@@ -64,4 +65,3 @@ func (n *Needle) Read(r io.Reader, size uint32){
 	n.Data = bytes[17 : 17+size]
 	n.Checksum = int32(bytesToUint32(bytes[17+size : 17+size+4]))
 }
-

weed-fs/src/pkg/storage/needle_map.go

@@ -8,13 +8,14 @@ type NeedleKey struct{
 	Key          uint64 "file id"
 	AlternateKey uint32 "supplemental id"
 }
+
 func (k *NeedleKey) String() string {
 	var tmp [12]byte
 	for i := uint(0); i < 8; i++ {
-    tmp[i] = byte(k.Key >> (8*i));
+		tmp[i] = byte(k.Key >> (8 * i))
 	}
 	for i := uint(0); i < 4; i++ {
-    tmp[i+8] = byte(k.AlternateKey >> (8*i));
+		tmp[i+8] = byte(k.AlternateKey >> (8 * i))
 	}
 	return string(tmp[:])
 }
@@ -27,20 +28,19 @@ type NeedleValue struct{
 type NeedleMap struct {
 	m map[string]*NeedleValue //mapping NeedleKey(Key,AlternateKey) to NeedleValue
 }
-func NewNeedleMap() (nm *NeedleMap){
+
-  nm = new(NeedleMap)
+func NewNeedleMap() *NeedleMap {
-  nm.m = make(map[string]*NeedleValue)
+	return &NeedleMap{m: make(map[string]*NeedleValue)}
-  return
 }
 func (nm *NeedleMap) load(file *os.File) {
 }
 func makeKey(key uint64, altKey uint32) string {
 	var tmp [12]byte
 	for i := uint(0); i < 8; i++ {
-    tmp[i] = byte(key >> (8*i));
+		tmp[i] = byte(key >> (8 * i))
 	}
 	for i := uint(0); i < 4; i++ {
-    tmp[i+8] = byte(altKey >> (8*i));
+		tmp[i+8] = byte(altKey >> (8 * i))
 	}
 	return string(tmp[:])
 }

weed-fs/src/pkg/storage/store.go

@@ -22,8 +22,7 @@ type VolumeInfo struct {
 }
 
 func NewStore(port int, publicServer, dirname string, chunkSize, capacity int) (s *Store) {
-	s = new(Store)
+	s = &Store{Port: port, PublicServer: publicServer, dir: dirname, capacity: capacity}
-	s.Port, s.PublicServer, s.dir, s.capacity = port, publicServer, dirname, capacity
 	s.volumes = make(map[uint64]*Volume)
 
 	files, _ := ioutil.ReadDir(dirname)

weed-fs/src/pkg/storage/volume.go

@@ -18,9 +18,7 @@ type Volume struct {
 
 func NewVolume(dirname string, id uint64) (v *Volume) {
 	var e os.Error
-	v = new(Volume)
+	v = &Volume{dir:dirname,Id:id, nm:NewNeedleMap()}
-	v.dir = dirname
-	v.Id = id
 	fileName := strconv.Uitoa64(v.Id)
 	v.dataFile, e = os.OpenFile(path.Join(v.dir,fileName+".dat"), os.O_RDWR|os.O_CREATE, 0644)
 	if e != nil {
@@ -30,7 +28,6 @@ func NewVolume(dirname string, id uint64) (v *Volume) {
 	if e != nil {
 		log.Fatalf("New Volume [ERROR] %s\n", e)
 	}
-	v.nm = NewNeedleMap()
 	v.nm.load(v.indexFile)
 
 	v.accessChannel = make(chan int, 1)