FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

assert,util: improve array comparison · nodejs/node@775ee4d · GitHub

/ node Public

Commit 775ee4d

Browse files
BridgeAR
authored and
aduh95
committed
assert,util: improve array comparison
Sparse arrays and arrays containing undefined are now compared faster using assert.deepStrictEqual() or util.isDeepStrictEqual(). PR-URL: #57619 Reviewed-By: Jordan Harband <ljharb@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
1 parent a7e73a0 commit 775ee4d

3 files changed

Lines changed: 34 additions & 26 deletions

File tree

‎benchmark/assert/deepequal-simple-array-and-set.js‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ const bench = common.createBenchmark(main, {
1111
method: [
1212
'deepEqual_Array',
1313
'notDeepEqual_Array',
14+
'deepEqual_sparseArray',
15+
'notDeepEqual_sparseArray',
1416
'deepEqual_Set',
1517
'notDeepEqual_Set',
1618
],
@@ -25,18 +27,30 @@ function run(fn, n, actual, expected) {
2527
}
2628

2729
function main({ n, len, method, strict }) {
28-
const actual = [];
29-
const expected = [];
30+
let actual = Array.from({ length: len }, (_, i) => i);
31+
// Contain one undefined value to trigger a specific code path
32+
actual[0] = undefined;
33+
let expected = actual.slice(0);
3034

31-
for (let i = 0; i < len; i++) {
32-
actual.push(i);
33-
expected.push(i);
34-
}
3535
if (method.includes('not')) {
3636
expected[len - 1] += 1;
3737
}
3838

3939
switch (method) {
40+
case 'deepEqual_sparseArray':
41+
case 'notDeepEqual_sparseArray':
42+
actual = new Array(len);
43+
for (let i = 0; i < len; i += 2) {
44+
actual[i] = i;
45+
}
46+
expected = actual.slice(0);
47+
if (method.includes('not')) {
48+
expected[len - 2] += 1;
49+
run(strict ? notDeepStrictEqual : notDeepEqual, n, actual, expected);
50+
} else {
51+
run(strict ? deepStrictEqual : deepEqual, n, actual, expected);
52+
}
53+
break;
4054
case 'deepEqual_Array':
4155
run(strict ? deepStrictEqual : deepEqual, n, actual, expected);
4256
break;

‎lib/internal/assert/myers_diff.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ function myersDiff(actual, expected, checkCommaDisparity = false) {
2929
const actualLength = actual.length;
3030
const expectedLength = expected.length;
3131
const max = actualLength + expectedLength;
32+
// TODO(BridgeAR): Cap the input in case the values go beyond the limit of 2^31 - 1.
3233
const v = new Int32Array(2 * max + 1);
3334
const trace = [];
3435

‎lib/internal/util/comparisons.js‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,9 @@ function innerDeepEqual(val1, val2, mode, memos) {
194194
}
195195
} else {
196196
if (val1 === null || typeof val1 !== 'object') {
197-
if (val2 === null || typeof val2 !== 'object') {
198-
// eslint-disable-next-line eqeqeq
199-
return val1 == val2 || (NumberIsNaN(val1) && NumberIsNaN(val2));
200-
}
201-
return false;
197+
return (val2 === null || typeof val2 !== 'object') &&
198+
// eslint-disable-next-line eqeqeq
199+
(val1 == val2 || (NumberIsNaN(val1) && NumberIsNaN(val2)));
202200
}
203201
if (val2 === null || typeof val2 !== 'object') {
204202
return false;
@@ -380,9 +378,7 @@ function keyCheck(val1, val2, mode, memos, iterationType, keys2) {
380378
}
381379
} else if (keys2.length !== ObjectKeys(val1).length) {
382380
return false;
383-
}
384-
385-
if (mode === kStrict) {
381+
} else if (mode === kStrict) {
386382
const symbolKeysA = getOwnSymbols(val1);
387383
if (symbolKeysA.length !== 0) {
388384
let count = 0;
@@ -754,9 +750,9 @@ function sparseArrayEquiv(a, b, mode, memos, i) {
754750
if (keysA.length !== keysB.length) {
755751
return false;
756752
}
757-
for (; i < keysA.length; i++) {
758-
const key = keysA[i];
759-
if (!hasOwn(b, key) || !innerDeepEqual(a[key], b[key], mode, memos)) {
753+
for (; i < keysB.length; i++) {
754+
const key = keysB[i];
755+
if ((a[key] === undefined && !hasOwn(a, key)) || !innerDeepEqual(a[key], b[key], mode, memos)) {
760756
return false;
761757
}
762758
}
@@ -778,17 +774,14 @@ function objEquiv(a, b, mode, keys2, memos, iterationType) {
778774
return partialArrayEquiv(a, b, mode, memos);
779775
}
780776
for (let i = 0; i < a.length; i++) {
781-
if (!innerDeepEqual(a[i], b[i], mode, memos)) {
782-
return false;
783-
}
784-
const isSparseA = a[i] === undefined && !hasOwn(a, i);
785-
const isSparseB = b[i] === undefined && !hasOwn(b, i);
786-
if (isSparseA !== isSparseB) {
777+
if (b[i] === undefined) {
778+
if (!hasOwn(b, i))
779+
return sparseArrayEquiv(a, b, mode, memos, i);
780+
if (a[i] !== undefined || !hasOwn(a, i))
781+
return false;
782+
} else if (a[i] === undefined || !innerDeepEqual(a[i], b[i], mode, memos)) {
787783
return false;
788784
}
789-
if (isSparseA) {
790-
return sparseArrayEquiv(a, b, mode, memos, i);
791-
}
792785
}
793786
} else if (iterationType === kIsSet) {
794787
if (!setEquiv(a, b, mode, memos)) {

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL