diff.go 3.72 KB
Newer Older
1 2 3
package dagutils

import (
Jeromy's avatar
Jeromy committed
4
	"context"
5 6 7 8
	"fmt"
	"path"

	dag "github.com/ipfs/go-ipfs/merkledag"
Jeromy's avatar
Jeromy committed
9

Steven Allen's avatar
Steven Allen committed
10 11
	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
	node "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
12 13 14 15 16 17 18 19 20 21 22
)

const (
	Add = iota
	Remove
	Mod
)

type Change struct {
	Type   int
	Path   string
Jeromy's avatar
Jeromy committed
23 24
	Before *cid.Cid
	After  *cid.Cid
25 26 27 28 29
}

func (c *Change) String() string {
	switch c.Type {
	case Add:
Jeromy's avatar
Jeromy committed
30
		return fmt.Sprintf("Added %s at %s", c.After.String(), c.Path)
31
	case Remove:
Jeromy's avatar
Jeromy committed
32
		return fmt.Sprintf("Removed %s from %s", c.Before.String(), c.Path)
33
	case Mod:
Jeromy's avatar
Jeromy committed
34
		return fmt.Sprintf("Changed %s to %s at %s", c.Before.String(), c.After.String(), c.Path)
35 36 37 38 39
	default:
		panic("nope")
	}
}

Steven Allen's avatar
Steven Allen committed
40
// ApplyChange applies the requested changes to the given node in the given dag.
41
func ApplyChange(ctx context.Context, ds node.DAGService, nd *dag.ProtoNode, cs []*Change) (*dag.ProtoNode, error) {
42
	e := NewDagEditor(nd, ds)
43 44 45
	for _, c := range cs {
		switch c.Type {
		case Add:
46 47 48 49
			child, err := ds.Get(ctx, c.After)
			if err != nil {
				return nil, err
			}
50 51 52 53 54 55 56

			childpb, ok := child.(*dag.ProtoNode)
			if !ok {
				return nil, dag.ErrNotProtobuf
			}

			err = e.InsertNodeAtPath(ctx, c.Path, childpb, nil)
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
			if err != nil {
				return nil, err
			}

		case Remove:
			err := e.RmLink(ctx, c.Path)
			if err != nil {
				return nil, err
			}

		case Mod:
			err := e.RmLink(ctx, c.Path)
			if err != nil {
				return nil, err
			}
72 73 74 75
			child, err := ds.Get(ctx, c.After)
			if err != nil {
				return nil, err
			}
76 77 78 79 80 81 82

			childpb, ok := child.(*dag.ProtoNode)
			if !ok {
				return nil, dag.ErrNotProtobuf
			}

			err = e.InsertNodeAtPath(ctx, c.Path, childpb, nil)
83 84 85 86 87
			if err != nil {
				return nil, err
			}
		}
	}
88

89
	return e.Finalize(ctx, ds)
90 91
}

Jeromy's avatar
Jeromy committed
92
// Diff returns a set of changes that transform node 'a' into node 'b'
93
func Diff(ctx context.Context, ds node.DAGService, a, b node.Node) ([]*Change, error) {
94
	if len(a.Links()) == 0 && len(b.Links()) == 0 {
95 96 97
		return []*Change{
			&Change{
				Type:   Mod,
Jeromy's avatar
Jeromy committed
98 99
				Before: a.Cid(),
				After:  b.Cid(),
100
			},
Jeromy's avatar
Jeromy committed
101
		}, nil
102 103 104
	}

	var out []*Change
105 106
	clean_a := a.Copy().(*dag.ProtoNode)
	clean_b := b.Copy().(*dag.ProtoNode)
107 108

	// strip out unchanged stuff
109
	for _, lnk := range a.Links() {
Jeromy's avatar
Jeromy committed
110
		l, _, err := b.ResolveLink([]string{lnk.Name})
111
		if err == nil {
112
			if l.Cid.Equals(lnk.Cid) {
113 114
				// no change... ignore it
			} else {
Jeromy's avatar
Jeromy committed
115 116 117 118 119 120 121 122 123 124
				anode, err := lnk.GetNode(ctx, ds)
				if err != nil {
					return nil, err
				}

				bnode, err := l.GetNode(ctx, ds)
				if err != nil {
					return nil, err
				}

125 126 127 128 129 130 131 132 133 134 135
				anodepb, ok := anode.(*dag.ProtoNode)
				if !ok {
					return nil, dag.ErrNotProtobuf
				}

				bnodepb, ok := bnode.(*dag.ProtoNode)
				if !ok {
					return nil, dag.ErrNotProtobuf
				}

				sub, err := Diff(ctx, ds, anodepb, bnodepb)
Jeromy's avatar
Jeromy committed
136 137 138
				if err != nil {
					return nil, err
				}
139 140 141 142 143 144 145 146 147 148 149

				for _, subc := range sub {
					subc.Path = path.Join(lnk.Name, subc.Path)
					out = append(out, subc)
				}
			}
			clean_a.RemoveNodeLink(l.Name)
			clean_b.RemoveNodeLink(l.Name)
		}
	}

150
	for _, lnk := range clean_a.Links() {
151 152 153
		out = append(out, &Change{
			Type:   Remove,
			Path:   lnk.Name,
154
			Before: lnk.Cid,
155 156
		})
	}
157
	for _, lnk := range clean_b.Links() {
158 159 160
		out = append(out, &Change{
			Type:  Add,
			Path:  lnk.Name,
161
			After: lnk.Cid,
162 163 164
		})
	}

Jeromy's avatar
Jeromy committed
165
	return out, nil
166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195
}

type Conflict struct {
	A *Change
	B *Change
}

func MergeDiffs(a, b []*Change) ([]*Change, []Conflict) {
	var out []*Change
	var conflicts []Conflict
	paths := make(map[string]*Change)
	for _, c := range a {
		paths[c.Path] = c
	}

	for _, c := range b {
		if ca, ok := paths[c.Path]; ok {
			conflicts = append(conflicts, Conflict{
				A: ca,
				B: c,
			})
		} else {
			out = append(out, c)
		}
	}
	for _, c := range paths {
		out = append(out, c)
	}
	return out, conflicts
}