mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 19:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

transition is now much clearer.

Browse source 
It now does partial findPaths, builds the final path as it goes  and requests changesets for missing bits only.
This commit is contained in:
s1341 2013-12-31 18:03:31 +02:00
parent aaf028335e
commit 1060544b86
1 changed files with 50 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/static/js/revisioncache.js
View file

@ -141,7 +141,7 @@ $.Class("Revision",
$.Class("RevisionCache", $.Class("RevisionCache",
{ {
VERBOSE: false, VERBOSE: true,
}, },
{//instance {//instance
/** /**
@ -297,28 +297,56 @@ $.Class("RevisionCache",
return res; return res;
} }
// lets just keep a 'final' path, which is a list of changesets.
// The transition should complete when the first element's from revnum is
// from_revnum, and the last element's to revnum is to_revnum.
// (Assuming that there are no discontinuities.
var thePath = [];
function is_complete() {
console.log(thePath);
if (thePath.length && thePath[0].from_revision.revnum == from_revnum
&& thePath.slice(-1)[0].to_revision.revnum == to_revnum) {
return true;
}
return false;
}
var thePath = [];
var _this = this; var _this = this;
function partialTransition (current_revnum) { function partialTransition (cur_start, cur_end) {
_this.log("[partialTransition] from: %d, to: %d, current: %d", from_revnum, to_revnum, current_revnum); _this.log("[partialTransition] from: %d, to: %d, cur_start: %d, cur_end: %d", from_revnum, to_revnum, cur_start, cur_end);
var res = _this.findPath(_this.getRevision(from_revnum), target_revision); var cur_start_rev = _this.getRevision(cur_start);
//log("find: ", print_path(res.path)); var res = _this.findPath(cur_start_rev, _this.getRevision(cur_end));
if (res.end_revision == target_revision) { log("find: ", print_path(res.path));
if (!res.path.length) {
// we got nutting, request changesets for the full path.
_this.requestChangesets(cur_start_rev, target_revision, partialTransition);
return;
}
//TODO: we should probably check for discontinuities
// just prepend the found path to thePath
thePath = res.path.concat(thePath);
log("THE PATH: ", print_path(thePath));
//FIXME: this should test for 'completeness'!
if (is_complete()) {
//log("found: ", print_path(res.path)); //log("found: ", print_path(res.path));
if(applyChangeset_callback) { if(applyChangeset_callback) {
applyChangeset_callback(res.path); applyChangeset_callback(thePath);
} }
return; return;
} }
else { // next iteration, we want to find a path that reaches the beginning of our
//log("end: %d, target: %d", res.end_revision.revnum, target_revision.revnum); // current path, as we assume that the 'tail' of the path is always correct.
} target_revision = thePath[0].from_revision;
// we can now request changesets from the end of that partial path
// to the target:
_this.requestChangesets(res.end_revision, target_revision, partialTransition);
} }
partialTransition(from_revnum); partialTransition(from_revnum, to_revnum);
}, },
/** /**
@ -345,8 +373,12 @@ $.Class("RevisionCache",
for (var i = 0; i < data.timeDeltas.length; i++, start += data.granularity) { for (var i = 0; i < data.timeDeltas.length; i++, start += data.granularity) {
_this.addChangesetPair(start, start + data.granularity, data.forwardsChangesets[i], data.backwardsChangesets[i], data.timeDeltas[i]); _this.addChangesetPair(start, start + data.granularity, data.forwardsChangesets[i], data.backwardsChangesets[i], data.timeDeltas[i]);
} }
if (changesetsProcessed_callback) if (changesetsProcessed_callback) {
changesetsProcessed_callback(data.start); if (sign == 1)
changesetsProcessed_callback(data.start, data.start + (data.granularity*data.timeDeltas.length));
else
changesetsProcessed_callback(data.start + (data.granularity*data.timeDeltas.length), data.start);
}
} }
var rounddown = function (a, b) { var rounddown = function (a, b) {
@ -446,7 +478,7 @@ $.Class("ChangesetRequest",
Thread("ChangesetLoader", Thread("ChangesetLoader",
{//statics {//statics
VERBOSE: false, VERBOSE: true,
}, },
{//instance {//instance
/** /**