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

sorry sorry sorry -.- fixes #47

Browse Source
This commit is contained in:
Kevin Jahns 2016-02-18 16:51:27 +01:00
parent f579a436c7
commit 06ef22b8ca
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Database.js
View File

@ -241,8 +241,8 @@ module.exports = function (Y /* :any */) {
missing: ids.length
}
for (let key in ids) {
let id = ids[key]
for (let i = 0; i < ids.length; i++) {
let id = ids[i]
let sid = JSON.stringify(id)
let l = this.listenersById[sid]
if (l == null) {
@ -285,8 +285,8 @@ module.exports = function (Y /* :any */) {
if (op == null) {
store.listenersById[sid] = l
} else {
for (let key in l) {
let listener = l[key]
for (let i = 0; i < l.length; i++) {
let listener = l[i]
let o = listener.op
if (--listener.missing === 0) {
yield* store.tryExecute.call(this, o)

11
src/SpecHelper.js
View File

@ -25,7 +25,7 @@ g.g = g
g.YConcurrency_TestingMode = true
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000
g.describeManyTimes = function describeManyTimes (times, name, f) {
for (var i = 0; i < times; i++) {
@ -83,7 +83,7 @@ function getRandomString () {
}
g.getRandomString = getRandomString
function * applyTransactions (relAmount, numberOfTransactions, objects, users, transactions) {
function * applyTransactions (relAmount, numberOfTransactions, objects, users, transactions, noReconnect) {
function randomTransaction (root) {
var f = getRandom(transactions)
f(root)
@ -93,7 +93,7 @@ function * applyTransactions (relAmount, numberOfTransactions, objects, users, t
if (r >= 0.5) {
// 50% chance to flush
yield Y.utils.globalRoom.flushOne() // flushes for some user.. (not necessarily 0)
} else if (r >= 0.05) {
} else if (noReconnect || r >= 0.05) {
// 45% chance to create operation
randomTransaction(getRandom(objects))
yield Y.utils.globalRoom.whenTransactionsFinished()
@ -109,6 +109,11 @@ function * applyTransactions (relAmount, numberOfTransactions, objects, users, t
}
}
g.applyRandomTransactionsNoGCNoDisconnect = async(function * applyRandomTransactions (users, objects, transactions, numberOfTransactions) {
yield* applyTransactions(1, numberOfTransactions, objects, users, transactions, true)
yield Y.utils.globalRoom.flushAll()
})
g.applyRandomTransactionsAllRejoinNoGC = async(function * applyRandomTransactions (users, objects, transactions, numberOfTransactions) {
yield* applyTransactions(1, numberOfTransactions, objects, users, transactions)
yield Y.utils.globalRoom.flushAll()