yonote/yjs
19
0
Fork 0
Code Pull Requests 1 Releases Activity

merging delete-sets #263

Browse Source
This commit is contained in:
Kevin Jahns 2020-12-12 22:48:10 +01:00
parent 1e0fd60df4
commit c8534ea6bc
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils/updates.js
View File

@ -5,6 +5,9 @@ import * as encoding from 'lib0/encoding.js'
import { import {
createID, createID,
readItemContent, readItemContent,
readDeleteSet,
writeDeleteSet,
mergeDeleteSets,
Item, GC, AbstractUpdateDecoder, UpdateDecoderV1, UpdateDecoderV2, UpdateEncoderV1, UpdateEncoderV2 // eslint-disable-line Item, GC, AbstractUpdateDecoder, UpdateDecoderV1, UpdateDecoderV2, UpdateEncoderV1, UpdateEncoderV2 // eslint-disable-line
} from '../internals.js' } from '../internals.js'
@ -20,11 +23,6 @@ function * lazyStructReaderGenerator (decoder) {
for (let i = 0; i < numberOfStructs; i++) { for (let i = 0; i < numberOfStructs; i++) {
const info = decoder.readInfo() const info = decoder.readInfo()
if ((binary.BITS5 & info) !== 0) { if ((binary.BITS5 & info) !== 0) {
/**
* The optimized implementation doesn't use any variables because inlining variables is faster.
* Below a non-optimized version is shown that implements the basic algorithm with
* a few comments
*/
const cantCopyParentInfo = (info & (binary.BIT7 | binary.BIT8)) === 0 const cantCopyParentInfo = (info & (binary.BIT7 | binary.BIT8)) === 0
// If parent = null and neither left nor right are defined, then we know that `parent` is child of `y` // If parent = null and neither left nor right are defined, then we know that `parent` is child of `y`
// and we read the next string as parentYKey. // and we read the next string as parentYKey.
@ -32,7 +30,7 @@ function * lazyStructReaderGenerator (decoder) {
// @type {string|null} // @type {string|null}
const struct = new Item( const struct = new Item(
createID(client, clock), createID(client, clock),
null, // leftd null, // left
(info & binary.BIT8) === binary.BIT8 ? decoder.readLeftID() : null, // origin (info & binary.BIT8) === binary.BIT8 ? decoder.readLeftID() : null, // origin
null, // right null, // right
(info & binary.BIT7) === binary.BIT7 ? decoder.readRightID() : null, // right origin (info & binary.BIT7) === binary.BIT7 ? decoder.readRightID() : null, // right origin
@ -217,9 +215,9 @@ export const mergeUpdatesV2 = (updates, YDecoder = UpdateDecoderV2, YEncoder = U
} }
finishLazyStructWriting(lazyStructEncoder) finishLazyStructWriting(lazyStructEncoder)
// Read DeleteSets and merge them. const dss = updateDecoders.map(decoder => readDeleteSet(decoder))
// Write merged deleteset. const ds = mergeDeleteSets(dss)
// -- updateEncoder.writeDs() writeDeleteSet(updateEncoder, ds)
return updateEncoder.toUint8Array() return updateEncoder.toUint8Array()
} }