-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathdiff.ts
More file actions
300 lines (256 loc) · 6.94 KB
/
Copy pathdiff.ts
File metadata and controls
300 lines (256 loc) · 6.94 KB
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
295
296
297
298
299
300
/**
* Implements efficient prolly-tree diff.
*
* Originally implemented https://www.dolthub.com/blog/2020-06-16-efficient-diff-on-prolly-trees/
* Now traverses buckets of entries instead of entries. This reduces async work.
*
*/
import {
Diff,
difference,
ExclusiveDiff,
diff as orderedDiff,
} from "@tabcat/sorted-sets/difference";
import { pairwiseTraversal } from "@tabcat/sorted-sets/util";
import { toReversed } from "./common.js";
import {
compareBucketDigests,
compareBuckets,
compareBytes,
compareEntries,
compareKeys,
} from "./compare.js";
import {
createCursor,
Cursor,
getCurrentBucket,
getCurrentEntry,
getCurrentLevel,
nextBucket,
nextEntry,
} from "./cursor/index.js";
import {
Blockfetcher,
Bucket,
ComparableKey,
Entry,
ProllyTree,
} from "./interface.js";
import {
doRangesIntersect,
getBucketBoundary,
getEntryRange,
} from "./utils.js";
export type EntryDiff = Diff<Entry>;
export type BucketDiff = ExclusiveDiff<Bucket>;
export interface ProllyTreeDiff {
entries: EntryDiff[];
buckets: BucketDiff[];
}
/**
* Create an empty prolly-tree diff
*
* @returns
*/
export const createProllyTreeDiff = (): ProllyTreeDiff => ({
entries: [],
buckets: [],
});
export const getMatchingBucketsLength = (
leftBuckets: Iterable<Bucket>,
rightBuckets: Iterable<Bucket>,
) => {
let matchingBucketsLength = 0;
for (const [lb, rb] of pairwiseTraversal(
leftBuckets,
rightBuckets,
compareBucketDigests,
)) {
if (lb == null || rb == null) {
break;
}
matchingBucketsLength++;
}
return matchingBucketsLength;
};
export async function unequalizeBuckets(lc: Cursor, rc: Cursor) {
while (!lc.isDone && !rc.isDone) {
const level = getCurrentLevel(lc);
if (compareEntries(getCurrentEntry(lc), getCurrentEntry(rc)) === 0) {
const matchingBucketsLength = getMatchingBucketsLength(
toReversed(lc.currentBuckets),
toReversed(rc.currentBuckets),
);
// moves across matching buckets when cursors are equal
await Promise.all([
nextEntry(lc, matchingBucketsLength + level),
nextEntry(rc, matchingBucketsLength + level),
]);
} else {
if (level > 1) {
await Promise.all([nextEntry(lc, level - 1), nextEntry(rc, level - 1)]);
} else {
break;
}
}
}
await Promise.all([
getCurrentLevel(lc) === 0 || lc.isDone
? Promise.resolve()
: nextEntry(lc, 0),
getCurrentLevel(rc) === 0 || rc.isDone
? Promise.resolve()
: nextEntry(rc, 0),
]);
}
export function writeEntryDiffs(
lEntries: Entry[],
rEntries: Entry[],
cutoff: ComparableKey,
d: ProllyTreeDiff,
): [Entry[], Entry[]] {
const lLeftovers: Entry[] = [];
const rLeftovers: Entry[] = [];
for (const [le, re] of pairwiseTraversal(lEntries, rEntries, (a, b) =>
compareBytes(a.key, b.key),
)) {
if (compareKeys(le?.key ?? (re?.key as Uint8Array), cutoff) <= 0) {
if (le == null || re == null || compareEntries(le, re) !== 0) {
d.entries.push([le, re] as EntryDiff);
}
continue;
}
if (le != null) {
lLeftovers.push(le);
}
if (re != null) {
rLeftovers.push(re);
}
}
return [lLeftovers, rLeftovers];
}
export function* getDifferentBuckets(
lastBuckets: Bucket[],
currentBuckets: Bucket[],
done: boolean,
): Iterable<Bucket> {
yield* difference(
toReversed(lastBuckets),
toReversed(currentBuckets),
compareBuckets,
);
if (done) {
yield* toReversed(currentBuckets); // lowest levels first
}
}
export async function* diff(
blockstore: Blockfetcher,
left: ProllyTree,
right: ProllyTree,
rightBlockstore?: Blockfetcher,
): AsyncIterable<ProllyTreeDiff> {
rightBlockstore = rightBlockstore ?? blockstore;
let d = createProllyTreeDiff();
const lc = createCursor(blockstore, left);
const rc = createCursor(rightBlockstore, right);
// move cursors to the same level
if (getCurrentLevel(lc) > getCurrentLevel(rc)) {
await nextEntry(lc, getCurrentLevel(rc));
}
if (getCurrentLevel(rc) > getCurrentLevel(lc)) {
await nextEntry(rc, getCurrentLevel(lc));
}
// handle empty trees
if (
lc.isDone &&
compareBucketDigests(getCurrentBucket(lc), getCurrentBucket(rc)) !== 0
) {
d.buckets.push([getCurrentBucket(lc), null] as BucketDiff);
}
if (
rc.isDone &&
compareBucketDigests(getCurrentBucket(lc), getCurrentBucket(rc)) !== 0
) {
d.buckets.push([null, getCurrentBucket(rc)] as BucketDiff);
}
await unequalizeBuckets(lc, rc);
// buckets are different and level 0 or one or more cursors done;
let lLeftovers: Entry[] = [];
let rLeftovers: Entry[] = [];
while (!lc.isDone && !rc.isDone) {
const lb = getCurrentBucket(lc);
const rb = getCurrentBucket(rc);
const bucketComparison = compareBuckets(lb, rb);
const lesser: Bucket = bucketComparison < 0 ? lb : rb;
const intersect = doRangesIntersect(
getEntryRange(lb.entries),
getEntryRange(rb.entries),
);
const lLastBuckets = lc.currentBuckets;
const rLastBuckets = rc.currentBuckets;
if (bucketComparison === 0) {
await unequalizeBuckets(lc, rc);
} else {
if (intersect) {
await Promise.all([nextBucket(lc, 0), nextBucket(rc, 0)]);
} else {
lesser === lb ? await nextBucket(lc, 0) : await nextBucket(rc, 0);
}
}
[lLeftovers, rLeftovers] = writeEntryDiffs(
intersect || lesser === lb ? [...lLeftovers, ...lb.entries] : lLeftovers,
intersect || lesser === rb ? [...rLeftovers, ...rb.entries] : rLeftovers,
lc.isDone && rc.isDone ? "MAX_KEY" : getBucketBoundary(lesser)!.key,
d,
);
for (const diff of orderedDiff(
getDifferentBuckets(lLastBuckets, lc.currentBuckets, lc.isDone),
getDifferentBuckets(rLastBuckets, rc.currentBuckets, rc.isDone),
compareBuckets,
)) {
d.buckets.push(diff);
}
yield d;
d = createProllyTreeDiff();
}
while (!lc.isDone) {
const lb = getCurrentBucket(lc);
const lLastBuckets = lc.currentBuckets;
await nextBucket(lc, 0);
[lLeftovers, rLeftovers] = writeEntryDiffs(
[...lLeftovers, ...lb.entries],
rLeftovers,
lc.isDone ? "MAX_KEY" : getBucketBoundary(lb)!.key,
d,
);
for (const b of getDifferentBuckets(
lLastBuckets,
lc.currentBuckets,
lc.isDone,
)) {
d.buckets.push([b, null] as BucketDiff);
}
yield d;
d = createProllyTreeDiff();
}
while (!rc.isDone) {
const rb = getCurrentBucket(rc);
const rLastBuckets = rc.currentBuckets;
await nextBucket(rc, 0);
[lLeftovers, rLeftovers] = writeEntryDiffs(
lLeftovers,
[...rLeftovers, ...rb.entries],
rc.isDone ? "MAX_KEY" : getBucketBoundary(rb)!.key,
d,
);
for (const b of getDifferentBuckets(
rLastBuckets,
rc.currentBuckets,
rc.isDone,
)) {
d.buckets.push([null, b] as BucketDiff);
}
yield d;
d = createProllyTreeDiff();
}
}