From 98cde1578d975fd655747643299e1db55e9ba54b Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Tue, 7 Oct 2014 07:23:30 +0000
Subject: [PATCH] integrate dagmodifier into ipns
---
fuse/ipns/ipns_unix.go | 45 +++++++++++++------------------
importer/dagwriter/dagmodifier.go | 10 ++++---
2 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go
index 7e6b1b33e..dc03d5113 100644
--- a/fuse/ipns/ipns_unix.go
+++ b/fuse/ipns/ipns_unix.go
@@ -1,7 +1,6 @@
package ipns
import (
- "bytes"
"io/ioutil"
"os"
"path/filepath"
@@ -14,6 +13,7 @@ import (
"github.com/jbenet/go-ipfs/core"
ci "github.com/jbenet/go-ipfs/crypto"
imp "github.com/jbenet/go-ipfs/importer"
+ dt "github.com/jbenet/go-ipfs/importer/dagwriter"
ft "github.com/jbenet/go-ipfs/importer/format"
mdag "github.com/jbenet/go-ipfs/merkledag"
u "github.com/jbenet/go-ipfs/util"
@@ -199,11 +199,8 @@ type Node struct {
Ipfs *core.IpfsNode
Nd *mdag.Node
- fd *mdag.DagReader
+ dagMod *dt.DagModifier
cached *ft.PBData
-
- // For writing
- writerBuf WriteAtBuf
}
func (s *Node) loadData() error {
@@ -303,35 +300,32 @@ func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) {
func (n *Node) Write(req *fuse.WriteRequest, resp *fuse.WriteResponse, intr fs.Intr) fuse.Error {
log.Debug("ipns: Node Write [%s]: flags = %s, offset = %d, size = %d", n.name, req.Flags.String(), req.Offset, len(req.Data))
- if n.writerBuf == nil {
- n.writerBuf = NewWriterAtFromBytes(nil)
+ if n.dagMod == nil {
+ dmod, err := dt.NewDagModifier(n.Nd, n.Ipfs.DAG, imp.DefaultSplitter)
+ if err != nil {
+ log.Error("Error creating dag modifier: %s", err)
+ return err
+ }
+ n.dagMod = dmod
}
- _, err := n.writerBuf.WriteAt(req.Data, req.Offset)
+ wrote, err := n.dagMod.WriteAt(req.Data, uint64(req.Offset))
if err != nil {
return err
}
- resp.Size = len(req.Data)
+ resp.Size = wrote
return nil
}
func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
log.Debug("Got flush request [%s]!", n.name)
- if n.writerBuf != nil {
- //TODO:
- // This operation holds everything in memory,
- // should be changed to stream the block creation/storage
- // but for now, since the buf is all in memory anyways...
-
- //NOTE:
- // This should only occur on a file object, if this were to be a
- // folder, bad things would happen.
- buf := bytes.NewReader(n.writerBuf.Bytes())
- newNode, err := imp.NewDagFromReader(buf)
+ if n.dagMod != nil {
+ newNode, err := n.dagMod.GetNode()
if err != nil {
- log.Critical("error creating dag from writerBuf: %s", err)
+ log.Error("Error getting dag node from dagMod: %s", err)
return err
}
+
if n.parent != nil {
log.Debug("updating self in parent!")
err := n.parent.update(n.name, newNode)
@@ -358,7 +352,7 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
fmt.Println(b)
//*/
- n.writerBuf = nil
+ n.dagMod = nil
n.wasChanged()
}
@@ -390,8 +384,6 @@ func (n *Node) republishRoot() error {
return err
}
- n.writerBuf = nil
-
ndkey, err := root.Nd.Key()
if err != nil {
log.Error("getKey error: %s", err)
@@ -451,8 +443,9 @@ func (n *Node) Open(req *fuse.OpenRequest, resp *fuse.OpenResponse, intr fs.Intr
//TODO: check open flags and truncate if necessary
if req.Flags&fuse.OpenTruncate != 0 {
log.Warning("Need to truncate file!")
- }
- if req.Flags&fuse.OpenAppend != 0 {
+ n.cached = nil
+ n.Nd = &mdag.Node{Data: ft.FilePBData(nil, 0)}
+ } else if req.Flags&fuse.OpenAppend != 0 {
log.Warning("Need to append to file!")
}
return n, nil
diff --git a/importer/dagwriter/dagmodifier.go b/importer/dagwriter/dagmodifier.go
index b749da22e..cdcfa17ed 100644
--- a/importer/dagwriter/dagmodifier.go
+++ b/importer/dagwriter/dagmodifier.go
@@ -109,8 +109,6 @@ func (dm *DagModifier) WriteAt(b []byte, offset uint64) (int, error) {
for i, size := range dm.pbdata.Blocksizes[startsubblk:] {
if end > traversed {
changed = append(changed, i+startsubblk)
- } else if end == traversed {
- break
} else {
break
}
@@ -122,6 +120,7 @@ func (dm *DagModifier) WriteAt(b []byte, offset uint64) (int, error) {
}
}
+ // If our write starts in the middle of a block...
var midlnk *mdag.Link
if mid >= 0 {
midlnk = dm.curNode.Links[mid]
@@ -139,6 +138,7 @@ func (dm *DagModifier) WriteAt(b []byte, offset uint64) (int, error) {
b = append(b, data[midoff:]...)
}
+ // Generate new sub-blocks, and sizes
subblocks := splitBytes(b, dm.splitter)
var links []*mdag.Link
var sizes []uint64
@@ -159,8 +159,10 @@ func (dm *DagModifier) WriteAt(b []byte, offset uint64) (int, error) {
// This is disgusting
if len(changed) > 0 {
- dm.curNode.Links = append(dm.curNode.Links[:changed[0]], append(links, dm.curNode.Links[changed[len(changed)-1]+1:]...)...)
- dm.pbdata.Blocksizes = append(dm.pbdata.Blocksizes[:changed[0]], append(sizes, dm.pbdata.Blocksizes[changed[len(changed)-1]+1:]...)...)
+ sechalflink := append(links, dm.curNode.Links[changed[len(changed)-1]+1:]...)
+ dm.curNode.Links = append(dm.curNode.Links[:changed[0]], sechalflink...)
+ sechalfblks := append(sizes, dm.pbdata.Blocksizes[changed[len(changed)-1]+1:]...)
+ dm.pbdata.Blocksizes = append(dm.pbdata.Blocksizes[:changed[0]], sechalfblks...)
} else {
dm.curNode.Links = append(dm.curNode.Links, links...)
dm.pbdata.Blocksizes = append(dm.pbdata.Blocksizes, sizes...)
--
GitLab