move mem-dag construction to its own function, and actually call Writ…

…eOutputTo License: MIT Signed-off-by: Jeromy <[email protected]>
ipfs · Sep 5, 2015 · 920f557 · 920f557
1 parent 6131a27
commit 920f557
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
@@ -102,6 +102,9 @@ func (s *BlockService) GetBlock(ctx context.Context, k key.Key) (*blocks.Block,
 		log.Debug("Blockservice: Searching bitswap.")
 		blk, err := s.Exchange.GetBlock(ctx, k)
 		if err != nil {
+			if err == blockstore.ErrNotFound {
+				return nil, ErrNotFound
+			}
 			return nil, err
 		}
 		return blk, nil

diff --git a/core/commands/add.go b/core/commands/add.go
@@ -108,7 +108,7 @@ remains to be implemented.
 		hidden, _, _ := req.Option(hiddenOptionName).Bool()
 		chunker, _, _ := req.Option(chunkerOptionName).String()
 
-		e := dagutils.NewDagEditor(n.DAG, newDirNode())
+		e := dagutils.NewDagEditor(NewMemoryDagService(), newDirNode())
 		if hash {
 			nilnode, err := core.NewNode(n.Context(), &core.BuildCfg{
 				//TODO: need this to be true or all files
@@ -120,16 +120,6 @@ remains to be implemented.
 				return
 			}
 			n = nilnode
-
-			// build mem-datastore for editor's intermediary nodes
-			bs := bstore.NewBlockstore(syncds.MutexWrap(ds.NewMapDatastore()))
-			bsrv, err := bserv.New(bs, offline.Exchange(bs))
-			if err != nil {
-				res.SetError(err, cmds.ErrNormal)
-				return
-			}
-			memds := dag.NewDAGService(bsrv)
-			e = dagutils.NewDagEditor(memds, newDirNode())
 		}
 
 		outChan := make(chan interface{}, 8)
@@ -182,6 +172,15 @@ remains to be implemented.
 				return err
 			}
 
+			if !hash {
+				// copy intermediary nodes from editor to our actual dagservice
+				err := e.WriteOutputTo(n.DAG)
+				if err != nil {
+					log.Error("WRITE OUT: ", err)
+					return err
+				}
+			}
+
 			rootnd, err := fileAdder.RootNode()
 			if err != nil {
 				return err
@@ -196,6 +195,7 @@ remains to be implemented.
 				res.SetError(err, cmds.ErrNormal)
 				return
 			}
+
 		}()
 	},
 	PostRun: func(req cmds.Request, res cmds.Response) {
@@ -284,6 +284,13 @@ remains to be implemented.
 	Type: AddedObject{},
 }
 
+func NewMemoryDagService() dag.DAGService {
+	// build mem-datastore for editor's intermediary nodes
+	bs := bstore.NewBlockstore(syncds.MutexWrap(ds.NewMapDatastore()))
+	bsrv := bserv.New(bs, offline.Exchange(bs))
+	return dag.NewDAGService(bsrv)
+}
+
 // Internal structure for holding the switches passed to the `add` call
 type adder struct {
 	ctx      cxt.Context
@@ -335,6 +342,7 @@ func (params *adder) RootNode() (*dag.Node, error) {
 	if !params.wrap && len(r.Links) == 1 {
 		var err error
 		r, err = r.Links[0].GetNode(params.ctx, params.editor.GetDagService())
+		log.Error("ERR: ", err)
 		// no need to output, as we've already done so.
 		return r, err
 	}

diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go
@@ -98,6 +98,9 @@ func (n *dagService) Get(ctx context.Context, k key.Key) (*Node, error) {
 
 	b, err := n.Blocks.GetBlock(ctx, k)
 	if err != nil {
+		if err == bserv.ErrNotFound {
+			return nil, ErrNotFound
+		}
 		return nil, err
 	}
 

diff --git a/merkledag/utils/diff.go b/merkledag/utils/diff.go
@@ -41,7 +41,11 @@ func ApplyChange(ctx context.Context, ds dag.DAGService, nd *dag.Node, cs []*Cha
 	for _, c := range cs {
 		switch c.Type {
 		case Add:
-			err := e.InsertNodeAtPath(ctx, c.Path, c.After, nil)
+			child, err := ds.Get(ctx, c.After)
+			if err != nil {
+				return nil, err
+			}
+			err = e.InsertNodeAtPath(ctx, c.Path, child, nil)
 			if err != nil {
 				return nil, err
 			}
@@ -57,7 +61,11 @@ func ApplyChange(ctx context.Context, ds dag.DAGService, nd *dag.Node, cs []*Cha
 			if err != nil {
 				return nil, err
 			}
-			err = e.InsertNodeAtPath(ctx, c.Path, c.After, nil)
+			child, err := ds.Get(ctx, c.After)
+			if err != nil {
+				return nil, err
+			}
+			err = e.InsertNodeAtPath(ctx, c.Path, child, nil)
 			if err != nil {
 				return nil, err
 			}