-
Notifications
You must be signed in to change notification settings - Fork 7
/
struct_diff.py
294 lines (255 loc) · 9.65 KB
/
struct_diff.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
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
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
#!/usr/bin/env python
from __future__ import absolute_import, print_function, division
class DictDiff(object):
def __init__(self):
self._additions = []
self._deletions = []
self._modifications = []
def finish(self):
self._additions.sort()
self._deletions.sort()
self._modifications.sort()
def edits_expr(self, par=''):
r = self.additions_expr(par=par)
r.extend(self.deletions_expr(par=par))
r.extend(self.modification_expr(par=par))
return r
def additions_expr(self, par=''):
r = []
for k, v in self._additions:
s = '{p}[{k}] = {v}'.format(p=par, k=repr(k), v=repr(v))
r.append(s)
return r
def modification_expr(self, par=''):
r = []
for k, v in self._modifications:
pk = '{p}[{k}]'.format(p=par, k=repr(k))
if isinstance(v, DictDiff) or isinstance(v, ListDiff):
sedits = v.edits_expr(par=pk)
r.extend(sedits)
else:
s = '{pk} = {v}'.format(pk=pk, v=repr(v))
r.append(s)
return r
def deletions_expr(self, par=''):
r = []
for deletion in self._deletions:
k = deletion[0]
s = 'del {p}[{k}]'.format(p=par, k=repr(k))
r.append(s)
return r
def add_addition(self, k, v):
self._additions.append((k, v))
def add_deletion(self, k, v):
self._deletions.append((k, v))
def add_modification(self, k, v):
self._modifications.append((k, v))
def patch(self, src):
for k, v in self._deletions:
del src[k]
for k, v in self._additions:
src[k] = v
for k, v in self._modifications:
if isinstance(v, DictDiff) or isinstance(v, ListDiff):
v.patch(src[k])
else:
src[k] = v
@staticmethod
def create(src, dest, **kwargs):
"""Inefficient comparison of src and dest dicts.
Recurses through dict and lists.
returns None if there is no difference and a
DictDiffObject of there are differences
**kwargs can contain:
wrap_dict_in_list default False. If True and one
value is present as a list and the other is
a dict, then the dict will be converted to
a list of one dict of the comparison. This
is helpful given the BadgerFish convention of
emitting single elements as a dict, but >1 elements
as a list of dicts:
"""
if src == dest:
return None
ddo = DictDiff()
sk = set(src.keys())
dk = set(dest.keys())
for k in sk:
v = src[k]
if k in dk:
dv = dest[k]
if v != dv:
rec_call = None
if isinstance(v, dict) and isinstance(dv, dict):
rec_call = DictDiff.create(v, dv, **kwargs)
elif isinstance(v, list) and isinstance(dv, list):
rec_call = ListDiff.create(v, dv, **kwargs)
elif kwargs.get('wrap_dict_in_list', False):
if isinstance(v, dict) and isinstance(dv, list):
rec_call = ListDiff.create([v], dv, **kwargs)
elif isinstance(dv, dict) or isinstance(v, list):
rec_call = ListDiff.create(v, [dv], **kwargs)
if rec_call is not None:
ddo.add_modification(k, rec_call)
else:
ddo.add_modification(k, dv)
else:
ddo.add_deletion(k, v)
add_keys = dk - sk
for k in add_keys:
ddo.add_addition(k, dest[k])
ddo.finish()
return ddo
class ListDiff(object):
def __init__(self):
self._additions = []
self._modifications = []
self._deletions = []
@staticmethod
def create(src, dest, **kwargs):
"""Inefficient comparison of src and dest dicts.
Recurses through dict and lists.
returns (is_identical, modifications, additions, deletions)
where each
is_identical is a boolean True if the dicts have
contents that compare equal.
and the other three are dicts:
attributes both, but with different values
attributes in dest but not in src
attributes in src but not in dest
Returned dicts may alias objects in src, and dest
"""
if src == dest:
return None
trivial_order = [(i, i) for i in range(min(len(src), len(dest)))]
optimal_order = trivial_order
src_ind = 0
dest_ind = 0
add_offset = 0
num_deletions = 0
diffs = ListDiff()
for p in optimal_order:
ns, nd = p
while src_ind < ns:
diffs.add_deletion(src_ind, src[src_ind])
src_ind += 1
num_deletions += 1
while dest_ind < nd:
diffs.add_insertion(src_ind - num_deletions, add_offset, dest[dest_ind])
dest_ind += 1
add_offset += 1
sv, dv = src[ns], dest[nd]
if sv != dv:
rec_call = None
if isinstance(sv, dict) and isinstance(dv, dict):
rec_call = DictDiff.create(sv, dv, **kwargs)
elif isinstance(sv, list) and isinstance(dv, list):
rec_call = ListDiff.create(sv, dv, **kwargs)
elif kwargs.get('wrap_dict_in_list', False):
if isinstance(sv, dict) and isinstance(dv, list):
rec_call = ListDiff.create([sv], dv, **kwargs)
elif isinstance(dv, dict) or isinstance(sv, list):
rec_call = ListDiff.create(sv, [dv], **kwargs)
if rec_call is not None:
diffs.add_modificaton(src_ind, rec_call)
else:
diffs.add_modificaton(src_ind, (sv, dv))
src_ind += 1
dest_ind += 1
while src_ind < len(src):
diffs.add_deletion(src_ind, src[src_ind])
src_ind += 1
while dest_ind < len(dest):
diffs.add_insertion(src_ind, add_offset, dest[dest_ind])
dest_ind += 1
add_offset += 1
diffs.finish()
return diffs
def edits_expr(self, par=''):
r = self.modification_expr(par=par)
r.extend(self.deletions_expr(par=par))
r.extend(self.additions_expr(par=par))
return r
def additions_expr(self, par=''):
r = []
for k, ld in self._additions:
post_del_ind = k[0] + k[1]
v = ld.obj
s = '{p}.insert({k:d}, {v})'.format(p=par, k=post_del_ind, v=repr(v))
r.append(s)
return r
def modification_expr(self, par=''):
r = []
for k, le in self._modifications:
v = le.obj
pk = '{p}[{k}]'.format(p=par, k=repr(k))
if isinstance(v, DictDiff) or isinstance(v, ListDiff):
sedits = v.edits_expr(par=pk)
r.extend(sedits)
else:
s = '{pk} = {v}'.format(pk=pk, v=repr(v[1]))
r.append(s)
return r
def deletions_expr(self, par=''):
# _deletions are reverse sorted
r = []
for deletion in self._deletions:
k = deletion[0]
s = '{p}.pop({k:d})'.format(p=par, k=k)
r.append(s)
return r
def patch(self, src):
for k, lem in self._modifications:
v = lem.obj
if isinstance(v, DictDiff) or isinstance(v, ListDiff):
v.patch(src[k])
else:
dest = v[1]
src[k] = dest
for k, v in self._deletions:
src.pop(k)
for k, ld in self._additions:
post_del_ind = k[0] + k[1]
v = ld.obj
src.insert(post_del_ind, v)
def add_deletion(self, ind, obj):
tup = (ind, ListDeletion(ind, obj))
self._deletions.append(tup)
def add_insertion(self, ind, add_offset, obj):
sortable_key = (ind, add_offset)
tup = (sortable_key, ListAddition(ind, add_offset, obj))
self._additions.append(tup)
def add_modificaton(self, ind, obj):
tup = (ind, ListElModification(ind, obj))
self._modifications.append(tup)
def finish(self):
self._modifications.sort()
self._deletions.sort(reverse=True)
self._additions.sort()
class ListEdit(object):
def __init__(self, src_ind, obj):
self.src_index = src_ind
self.obj = obj
class ListDeletion(ListEdit):
def __init__(self, src_ind, obj):
ListEdit.__init__(self, src_ind, obj)
def __repr__(self):
return 'ListDeletion({s}, {o})'.format(s=self.src_index, o=repr(self.obj))
def __str__(self):
return repr(self)
class ListAddition(ListEdit):
def __init__(self, src_ind, add_offset, obj):
ListEdit.__init__(self, src_ind, obj)
self.add_offset = add_offset
def __repr__(self):
return 'ListAddition({s}, {o})'.format(s=self.src_index, o=repr(self.obj))
def __str__(self):
return repr(self)
class ListElModification(ListEdit):
def __init__(self, src_ind, obj):
ListEdit.__init__(self, src_ind, obj)
def __repr__(self):
return 'ListElModification({s}, {o})'.format(s=self.src_index,
o=repr(self.obj))
def __str__(self):
return repr(self)