From d6ae313bbd93871ecd7ed009a917bb0976392da7 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Sat, 11 May 2019 09:51:27 +0200 Subject: [PATCH] make compare rely less on fragment index also indenting --- src/matrix/room/timeline/SortKey.js | 292 +++++++++++++++------------- 1 file changed, 157 insertions(+), 135 deletions(-) diff --git a/src/matrix/room/timeline/SortKey.js b/src/matrix/room/timeline/SortKey.js index 54f82304..efddc67b 100644 --- a/src/matrix/room/timeline/SortKey.js +++ b/src/matrix/room/timeline/SortKey.js @@ -11,80 +11,80 @@ const MID = MID_UINT32; const MAX = MAX_UINT32; export default class SortKey { - constructor(fragmentIdComparer, buffer) { - if (buffer) { - this._keys = new DataView(buffer); - } else { - this._keys = new DataView(new ArrayBuffer(8)); - // start default key right at the middle fragment key, min event key - // so we have the same amount of key address space either way - this.fragmentId = MID; - this.eventIndex = MIN; - } + constructor(fragmentIdComparer, buffer) { + if (buffer) { + this._keys = new DataView(buffer); + } else { + this._keys = new DataView(new ArrayBuffer(8)); + // start default key right at the middle fragment key, min event key + // so we have the same amount of key address space either way + this.fragmentId = MID; + this.eventIndex = MID; + } this._fragmentIdComparer = fragmentIdComparer; - } + } - get fragmentId() { - return this._keys.getUint32(0, false); - } + get fragmentId() { + return this._keys.getUint32(0, false); + } - set fragmentId(value) { - return this._keys.setUint32(0, value, false); - } + set fragmentId(value) { + return this._keys.setUint32(0, value, false); + } - get eventIndex() { - return this._keys.getUint32(4, false); - } + get eventIndex() { + return this._keys.getUint32(4, false); + } - set eventIndex(value) { - return this._keys.setUint32(4, value, false); - } + set eventIndex(value) { + return this._keys.setUint32(4, value, false); + } - get buffer() { - return this._keys.buffer; - } + get buffer() { + return this._keys.buffer; + } - nextFragmentKey() { - const k = new SortKey(this._fragmentIdComparer); - k.fragmentId = this.fragmentId + 1; - k.eventIndex = MIN; - return k; - } + nextFragmentKey() { + const k = new SortKey(this._fragmentIdComparer); + k.fragmentId = this.fragmentId + 1; + k.eventIndex = MIN; + return k; + } - nextKey() { - const k = new SortKey(this._fragmentIdComparer); - k.fragmentId = this.fragmentId; - k.eventIndex = this.eventIndex + 1; - return k; - } + nextKey() { + const k = new SortKey(this._fragmentIdComparer); + k.fragmentId = this.fragmentId; + k.eventIndex = this.eventIndex + 1; + return k; + } - previousKey() { - const k = new SortKey(this._fragmentIdComparer); - k.fragmentId = this.fragmentId; - k.eventIndex = this.eventIndex - 1; - return k; - } + previousKey() { + const k = new SortKey(this._fragmentIdComparer); + k.fragmentId = this.fragmentId; + k.eventIndex = this.eventIndex - 1; + return k; + } - clone() { - const k = new SortKey(); - k.fragmentId = this.fragmentId; - k.eventIndex = this.eventIndex; - return k; - } + clone() { + const k = new SortKey(); + k.fragmentId = this.fragmentId; + k.eventIndex = this.eventIndex; + return k; + } - static get maxKey() { - const maxKey = new SortKey(null); - maxKey.fragmentId = MAX; - maxKey.eventIndex = MAX; - return maxKey; - } + static get maxKey() { + const maxKey = new SortKey(null); + maxKey.fragmentId = MAX; + maxKey.eventIndex = MAX; + return maxKey; + } - static get minKey() { - const minKey = new SortKey(null); - minKey.fragmentId = MIN; - minKey.eventIndex = MIN; - return minKey; - } + static get minKey() { + const minKey = new SortKey(null); + minKey.fragmentId = MIN; + minKey.eventIndex = MIN; + return minKey; + } compare(otherKey) { const fragmentDiff = this.fragmentId - otherKey.fragmentId; @@ -92,10 +92,10 @@ export default class SortKey { return this.eventIndex - otherKey.eventIndex; } else { // minKey and maxKey might not have fragmentIdComparer, so short-circuit this first ... - if (this.fragmentId === MIN || otherKey.fragmentId === MAX) { + if ((this.fragmentId === MIN && otherKey.fragmentId !== MIN) || (this.fragmentId !== MAX && otherKey.fragmentId === MAX)) { return -1; } - if (this.fragmentId === MAX || otherKey.fragmentId === MIN) { + if ((this.fragmentId === MAX && otherKey.fragmentId !== MAX) || (this.fragmentId !== MIN && otherKey.fragmentId === MIN)) { return 1; } // ... then delegate to fragmentIdComparer. @@ -104,94 +104,116 @@ export default class SortKey { } } - toString() { - return `[${this.fragmentId}/${this.eventIndex}]`; - } + toString() { + return `[${this.fragmentId}/${this.eventIndex}]`; + } } //#ifdef TESTS export function tests() { const fragmentIdComparer = {compare: (a, b) => a - b}; - return { - test_default_key(assert) { - const k = new SortKey(fragmentIdComparer); - assert.equal(k.fragmentId, MID); - assert.equal(k.eventIndex, MIN); - }, + return { + test_no_fragment_index(assert) { + const min = SortKey.minKey; + const max = SortKey.maxKey; + const a = new SortKey(); + a.eventIndex = 1; + a.fragmentId = 1; - test_inc(assert) { - const a = new SortKey(fragmentIdComparer); - const b = a.nextKey(); - assert.equal(a.fragmentId, b.fragmentId); - assert.equal(a.eventIndex + 1, b.eventIndex); - const c = b.previousKey(); - assert.equal(b.fragmentId, c.fragmentId); - assert.equal(c.eventIndex + 1, b.eventIndex); - assert.equal(a.eventIndex, c.eventIndex); - }, + assert(min.compare(min) === 0); + assert(max.compare(max) === 0); + assert(a.compare(a) === 0); - test_min_key(assert) { - const minKey = SortKey.minKey; - const k = new SortKey(fragmentIdComparer); - assert(minKey.fragmentId <= k.fragmentId); - assert(minKey.eventIndex <= k.eventIndex); + assert(min.compare(max) < 0); + assert(max.compare(min) > 0); + + assert(min.compare(a) < 0); + assert(a.compare(min) > 0); + + assert(max.compare(a) > 0); + assert(a.compare(max) < 0); + }, + + test_default_key(assert) { + const k = new SortKey(fragmentIdComparer); + assert.equal(k.fragmentId, MID); + assert.equal(k.eventIndex, MID); + }, + + test_inc(assert) { + const a = new SortKey(fragmentIdComparer); + const b = a.nextKey(); + assert.equal(a.fragmentId, b.fragmentId); + assert.equal(a.eventIndex + 1, b.eventIndex); + const c = b.previousKey(); + assert.equal(b.fragmentId, c.fragmentId); + assert.equal(c.eventIndex + 1, b.eventIndex); + assert.equal(a.eventIndex, c.eventIndex); + }, + + test_min_key(assert) { + const minKey = SortKey.minKey; + const k = new SortKey(fragmentIdComparer); + assert(minKey.fragmentId <= k.fragmentId); + assert(minKey.eventIndex <= k.eventIndex); assert(k.compare(minKey) > 0); assert(minKey.compare(k) < 0); - }, + }, - test_max_key(assert) { - const maxKey = SortKey.maxKey; - const k = new SortKey(fragmentIdComparer); - assert(maxKey.fragmentId >= k.fragmentId); - assert(maxKey.eventIndex >= k.eventIndex); + test_max_key(assert) { + const maxKey = SortKey.maxKey; + const k = new SortKey(fragmentIdComparer); + assert(maxKey.fragmentId >= k.fragmentId); + assert(maxKey.eventIndex >= k.eventIndex); assert(k.compare(maxKey) < 0); assert(maxKey.compare(k) > 0); - }, + }, - test_immutable(assert) { - const a = new SortKey(fragmentIdComparer); - const fragmentId = a.fragmentId; - const eventIndex = a.eventIndex; - a.nextFragmentKey(); - assert.equal(a.fragmentId, fragmentId); - assert.equal(a.eventIndex, eventIndex); - }, + test_immutable(assert) { + const a = new SortKey(fragmentIdComparer); + const fragmentId = a.fragmentId; + const eventIndex = a.eventIndex; + a.nextFragmentKey(); + assert.equal(a.fragmentId, fragmentId); + assert.equal(a.eventIndex, eventIndex); + }, - test_cmp_fragmentid_first(assert) { - const a = new SortKey(fragmentIdComparer); - const b = new SortKey(fragmentIdComparer); - a.fragmentId = 2; - a.eventIndex = 1; - b.fragmentId = 1; - b.eventIndex = 100000; - assert(a.compare(b) > 0); - }, + test_cmp_fragmentid_first(assert) { + const a = new SortKey(fragmentIdComparer); + const b = new SortKey(fragmentIdComparer); + a.fragmentId = 2; + a.eventIndex = 1; + b.fragmentId = 1; + b.eventIndex = 100000; + assert(a.compare(b) > 0); + }, - test_cmp_eventindex_second(assert) { - const a = new SortKey(fragmentIdComparer); - const b = new SortKey(fragmentIdComparer); - a.fragmentId = 1; - a.eventIndex = 100000; - b.fragmentId = 1; - b.eventIndex = 2; - assert(a.compare(b) > 0); - }, + test_cmp_eventindex_second(assert) { + const a = new SortKey(fragmentIdComparer); + const b = new SortKey(fragmentIdComparer); + a.fragmentId = 1; + a.eventIndex = 100000; + b.fragmentId = 1; + b.eventIndex = 2; + assert(a.compare(b) > 0); + assert(b.compare(a) < 0); + }, - test_cmp_max_larger_than_min(assert) { - assert(SortKey.minKey.compare(SortKey.maxKey) < 0); - }, + test_cmp_max_larger_than_min(assert) { + assert(SortKey.minKey.compare(SortKey.maxKey) < 0); + }, - test_cmp_fragmentid_first_large(assert) { - const a = new SortKey(fragmentIdComparer); - const b = new SortKey(fragmentIdComparer); - a.fragmentId = MAX; - a.eventIndex = MIN; - b.fragmentId = MIN; - b.eventIndex = MAX; - assert(b < a); - assert(a > b); - } - }; + test_cmp_fragmentid_first_large(assert) { + const a = new SortKey(fragmentIdComparer); + const b = new SortKey(fragmentIdComparer); + a.fragmentId = MAX; + a.eventIndex = MIN; + b.fragmentId = MIN; + b.eventIndex = MAX; + assert(b < a); + assert(a > b); + } + }; } //#endif