check deleted chunks faster

weed/filer2/filer_deletion.go

@@ -74,16 +74,13 @@ func (f *Filer) deleteChunksIfNotNew(oldEntry, newEntry *Entry) {
 	}
 
 	var toDelete []*filer_pb.FileChunk
+	newChunkIds := make(map[string]bool)
+	for _, newChunk := range newEntry.Chunks {
+		newChunkIds[newChunk.GetFileIdString()] = true
+	}
 
 	for _, oldChunk := range oldEntry.Chunks {
-		found := false
-		for _, newChunk := range newEntry.Chunks {
-			if filer_pb.ChunkEquals(oldChunk, newChunk) {
-				found = true
-				break
-			}
-		}
-		if !found {
+		if _, found := newChunkIds[oldChunk.GetFileIdString()]; !found {
 			toDelete = append(toDelete, oldChunk)
 		}
 	}

weed/pb/filer_pb/filer_pb_helper.go

@@ -21,16 +21,6 @@ func (fid *FileId) toFileIdString() string {
 	return needle.NewFileId(needle.VolumeId(fid.VolumeId), fid.FileKey, fid.Cookie).String()
 }
 
-func ChunkEquals(this, that *FileChunk) bool {
-	if this.Fid == nil{
-		this.Fid, _ = toFileIdObject(this.FileId)
-	}
-	if that.Fid == nil{
-		that.Fid, _ = toFileIdObject(that.FileId)
-	}
-	return this.Fid.FileKey == that.Fid.FileKey && this.Fid.VolumeId == that.Fid.VolumeId && this.Fid.Cookie == that.Fid.Cookie
-}
-
 func (c *FileChunk) GetFileIdString() string {
 	if c.FileId != "" {
 		return c.FileId