get and delete now checks cookie

adding super block
adding tool to fix volume index

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

weed-fs/src/cmd/fix_volume_index.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"storage"
+	"flag"
+	"log"
+	"os"
+	"path"
+	"strconv"
+)
+
+var (
+	dir      = flag.String("dir", "/tmp", "data directory to store files")
+	volumeId = flag.Int("volumeId", -1, "volume id")
+	IsDebug  = flag.Bool("debug", false, "enable debug mode")
+
+	store *storage.Store
+)
+
+func main() {
+	flag.Parse()
+
+	if *volumeId == -1 {
+		flag.Usage()
+		return
+	}
+
+	fileName := strconv.Itoa(*volumeId)
+	dataFile, e := os.OpenFile(path.Join(*dir, fileName+".dat"), os.O_RDONLY, 0644)
+	if e != nil {
+		log.Fatalf("Read Volume [ERROR] %s\n", e)
+	}
+	defer dataFile.Close()
+	indexFile, ie := os.OpenFile(path.Join(*dir, fileName+".idx"), os.O_WRONLY|os.O_CREATE, 0644)
+	if ie != nil {
+		log.Fatalf("Create Volume Index [ERROR] %s\n", ie)
+	}
+	defer indexFile.Close()
+
+	//skip the volume super block
+	dataFile.Seek(storage.SuperBlockSize, 0)
+
+	n, length := storage.ReadNeedle(dataFile)
+	nm := storage.NewNeedleMap(indexFile)
+	offset := uint32(storage.SuperBlockSize)
+	for n != nil {
+		if *IsDebug {
+			log.Println("key", n.Key, "volume offset", offset, "data_size", n.Size, "length", length)
+		}
+		if n.Size > 0 {
+			count, pe := nm.Put(n.Key, offset/8, n.Size)
+			if *IsDebug {
+				log.Println("saved", count, "with error", pe)
+			}
+		}
+		offset += length
+		n, length = storage.ReadNeedle(dataFile)
+	}
+}

weed-fs/src/cmd/weedc.go

@@ -56,7 +56,15 @@ func GetHandler(w http.ResponseWriter, r *http.Request) {
 	if *IsDebug {
 		log.Println("volume", volumeId, "reading", n)
 	}
-	store.Read(volumeId, n)
+	cookie := n.Cookie
+	count, e := store.Read(volumeId, n)
+	if *IsDebug {
+		log.Println("read bytes", count, "error", e)
+	}
+	if n.Cookie != cookie {
+		log.Println("request with unmaching cookie from ", r.RemoteAddr, "agent", r.UserAgent())
+		return
+	}
 	if dotIndex > 0 {
 		ext := path[dotIndex:]
 		w.Header().Set("Content-Type", mime.TypeByExtension(ext))
@@ -78,7 +86,35 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 func DeleteHandler(w http.ResponseWriter, r *http.Request) {
+	n := new(storage.Needle)
+    path := r.URL.Path
+    sepIndex := strings.LastIndex(path, "/")
+    commaIndex := strings.LastIndex(path[sepIndex:], ",")
+    dotIndex := strings.LastIndex(path[sepIndex:], ".")
+    fid := path[commaIndex+1:]
+    if dotIndex > 0 {
+        fid = path[commaIndex+1 : dotIndex]
+    }
+    if commaIndex <= 0 {
+        log.Println("unknown file id", path[sepIndex+1:commaIndex])
+        return
+    }
+    volumeId, _ := strconv.Atoui64(path[sepIndex+1 : commaIndex])
+    n.ParsePath(fid)
 
+    cookie := n.Cookie
+    count, _ := store.Read(volumeId, n)
+
+    if n.Cookie != cookie {
+        log.Println("delete with unmaching cookie from ", r.RemoteAddr, "agent", r.UserAgent())
+        return
+    }
+    
+    n.Size = 0
+	store.Write(volumeId, n)
+	m := make(map[string]uint32)
+	m["size"] = uint32(count)
+	writeJson(w, r, m)
 }
 func writeJson(w http.ResponseWriter, r *http.Request, obj interface{}) {
 	w.Header().Set("Content-Type", "application/javascript")