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

fixed some cases that lead to inconsistencies

Browse Source
This commit is contained in:
Kevin Jahns 2016-04-20 12:03:06 +02:00
parent 82025c5de9
commit f46c8df605
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Database.js
View File

@ -342,10 +342,24 @@ module.exports = function (Y /* :any */) {
this.store.addToDebug('yield* this.store.tryExecute.call(this, ', JSON.stringify(op), ')') this.store.addToDebug('yield* this.store.tryExecute.call(this, ', JSON.stringify(op), ')')
if (op.struct === 'Delete') { if (op.struct === 'Delete') {
yield* Y.Struct.Delete.execute.call(this, op) yield* Y.Struct.Delete.execute.call(this, op)
// the following is now called in Transaction.deleteOperation! // this is now called in Transaction.deleteOperation!
// yield* this.store.operationAdded(this, op) // yield* this.store.operationAdded(this, op)
} else { } else {
// check if this op was defined
var defined = yield* this.getOperation(op.id) var defined = yield* this.getOperation(op.id)
while (defined != null && defined.content != null) {
// check if this op has a longer content in the case it is defined
if (defined.content.length < op.content.length) {
var diff = op.content.length - defined.content.length
op.content.splice(0, diff)
op.id = [op.id[0], op.id[1] + diff]
op.left = defined.id
op.origin = defined.id
defined = yield* this.getOperation(op.id)
} else {
break
}
}
if (defined == null) { if (defined == null) {
var isGarbageCollected = yield* this.isGarbageCollected(op.id) var isGarbageCollected = yield* this.isGarbageCollected(op.id)
if (!isGarbageCollected) { if (!isGarbageCollected) {

11
src/Transaction.js
View File

@ -434,12 +434,6 @@ module.exports = function (Y/* :any */) {
op.deleted = true op.deleted = true
if (op.opContent != null) { if (op.opContent != null) {
yield* this.deleteOperation(op.opContent) yield* this.deleteOperation(op.opContent)
/*
var opContent = yield* this.getOperation(op.opContent)
opContent.gc = true
yield* this.setOperation(opContent)
this.store.gc1.push(opContent.id)
*/
} }
if (op.requires != null) { if (op.requires != null) {
for (var i = 0; i < op.requires.length; i++) { for (var i = 0; i < op.requires.length; i++) {
@ -995,9 +989,12 @@ module.exports = function (Y/* :any */) {
} }
var startPos = startSS[user] || 0 var startPos = startSS[user] || 0
if (startPos > 0) { if (startPos > 0) {
// There is a change that [user, startPos] is in a composed Insertion (with a smaller counter)
// find out if that is the case
var firstMissing = yield* this.getInsertion([user, startPos]) var firstMissing = yield* this.getInsertion([user, startPos])
if (firstMissing != null) { if (firstMissing != null) {
// TODO: Send missing depending on content! Also try to recognize this on the receiving end! // update startPos
startPos = firstMissing.id[1]
} }
} }
yield* this.os.iterate(this, [user, startPos], [user, Number.MAX_VALUE], function * (op) { yield* this.os.iterate(this, [user, startPos], [user, Number.MAX_VALUE], function * (op) {