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

dont modify gc buffer if gcTimeout > 0 or disconnected

Browse Source
This commit is contained in:
Kevin Jahns 2016-11-02 20:55:24 +01:00
parent dda2a1ef82
commit 480dfdfb77
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Database.js
View File

@ -149,7 +149,7 @@ module.exports = function (Y /* :any */) {
clearInterval(this.repairCheckIntervalHandler) clearInterval(this.repairCheckIntervalHandler)
} }
queueGarbageCollector (id) { queueGarbageCollector (id) {
if (this.y.isConnected()) { if (this.y.isConnected() && this.gcTimeout > 0) {
this.gc1.push(id) this.gc1.push(id)
} }
} }
@ -204,7 +204,7 @@ module.exports = function (Y /* :any */) {
TODO: rename this function TODO: rename this function
Rulez: Rulez:
* Only gc if this user is online * Only gc if this user is online & gcTimeout > 0
* The most left element in a list must not be gc'd. * The most left element in a list must not be gc'd.
=> There is at least one element in the list => There is at least one element in the list
@ -213,7 +213,9 @@ module.exports = function (Y /* :any */) {
* addToGarbageCollector (op, left) { * addToGarbageCollector (op, left) {
if ( if (
op.gc == null && op.gc == null &&
op.deleted === true op.deleted === true &&
this.store.gcTimeout > 0 &&
this.y.isConnected()
) { ) {
var gc = false var gc = false
if (left != null && left.deleted === true) { if (left != null && left.deleted === true) {