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

skiplist: Convert _keyToNodeMap to a Map object

Browse source
This commit is contained in:
Richard Hansen 2021-04-12 00:37:17 -04:00
parent e2eb7327c2
commit 1cdfe9193b
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/static/js/skiplist.js
View file

@ -146,7 +146,7 @@ class Point {
up.downSkips[lvl]++; up.downSkips[lvl]++;
up.downSkipWidths[lvl] += newWidth; up.downSkipWidths[lvl] += newWidth;
} }
this._skipList._keyToNodeMap[`$KEY$${newNode.key}`] = newNode; this._skipList._keyToNodeMap.set(newNode.key, newNode);
this._skipList._numNodes++; this._skipList._numNodes++;
this._skipList._totalWidth += newWidth; this._skipList._totalWidth += newWidth;
} }
@ -170,7 +170,7 @@ class Point {
up.downSkipWidths[i] -= elemWidth; up.downSkipWidths[i] -= elemWidth;
} }
} }
delete this._skipList._keyToNodeMap[`$KEY$${elem.key}`]; this._skipList._keyToNodeMap.delete(elem.key);
this._skipList._numNodes--; this._skipList._numNodes--;
this._skipList._totalWidth -= elemWidth; this._skipList._totalWidth -= elemWidth;
} }
@ -191,7 +191,7 @@ class SkipList {
this._end = new Node(null, 1, null, null); this._end = new Node(null, 1, null, null);
this._numNodes = 0; this._numNodes = 0;
this._totalWidth = 0; this._totalWidth = 0;
this._keyToNodeMap = {}; this._keyToNodeMap = new Map();
this._start.downPtrs[0] = this._end; this._start.downPtrs[0] = this._end;
this._end.upPtrs[0] = this._start; this._end.upPtrs[0] = this._start;
} }
@ -226,8 +226,6 @@ class SkipList {
return dist; return dist;
} }
_getNodeByKey(key) { return this._keyToNodeMap[`$KEY$${key}`]; }
// Returns index of first entry such that entryFunc(entry) is truthy, // Returns index of first entry such that entryFunc(entry) is truthy,
// or length() if no such entry. Assumes all falsy entries come before // or length() if no such entry. Assumes all falsy entries come before
// all truthy entries. // all truthy entries.
@ -280,8 +278,8 @@ class SkipList {
} }
} }
next(entry) { return this._getNodeByKey(entry.key).downPtrs[0].entry || null; } next(entry) { return this._keyToNodeMap.get(entry.key).downPtrs[0].entry || null; }
prev(entry) { return this._getNodeByKey(entry.key).upPtrs[0].entry || null; } prev(entry) { return this._keyToNodeMap.get(entry.key).upPtrs[0].entry || null; }
push(entry) { this.splice(this._numNodes, 0, [entry]); } push(entry) { this.splice(this._numNodes, 0, [entry]); }
slice(start, end) { slice(start, end) {
@ -307,14 +305,14 @@ class SkipList {
return array; return array;
} }
atKey(key) { return this._getNodeByKey(key).entry; } atKey(key) { return this._keyToNodeMap.get(key).entry; }
indexOfKey(key) { return this._getNodeIndex(this._getNodeByKey(key)); } indexOfKey(key) { return this._getNodeIndex(this._keyToNodeMap.get(key)); }
indexOfEntry(entry) { return this.indexOfKey(entry.key); } indexOfEntry(entry) { return this.indexOfKey(entry.key); }
containsKey(key) { return !!this._getNodeByKey(key); } containsKey(key) { return this._keyToNodeMap.has(key); }
// gets the last entry starting at or before the offset // gets the last entry starting at or before the offset
atOffset(offset) { return this._getNodeAtOffset(offset).entry; } atOffset(offset) { return this._getNodeAtOffset(offset).entry; }
keyAtOffset(offset) { return this.atOffset(offset).key; } keyAtOffset(offset) { return this.atOffset(offset).key; }
offsetOfKey(key) { return this._getNodeIndex(this._getNodeByKey(key), true); } offsetOfKey(key) { return this._getNodeIndex(this._keyToNodeMap.get(key), true); }
offsetOfEntry(entry) { return this.offsetOfKey(entry.key); } offsetOfEntry(entry) { return this.offsetOfKey(entry.key); }
setEntryWidth(entry, width) { setEntryWidth(entry, width) {
entry.width = width; entry.width = width;