Skip to content

Commit ea70a37

Browse files
BridgeARRafaelGSS
BridgeAR
authored and
RafaelGSS
committed
assert: improve partialDeepStrictEqual performance
This implements fast paths for typed arrays, array buffers and sets and maps that contain only objects as keys. PR-URL: #57509 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 244f74b commit ea70a37

File tree

4 files changed

+55
-24
lines changed

4 files changed

+55
-24
lines changed

‎benchmark/assert/deepequal-buffer.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const bench = common.createBenchmark(main, {
77
len: [1e2, 1e3],
88
strict: [0, 1],
99
arrayBuffer: [0, 1],
10-
method: ['deepEqual', 'notDeepEqual', 'unequal_length'],
10+
method: ['deepEqual', 'notDeepEqual', 'unequal_length', 'partial'],
1111
}, {
1212
combinationFilter: (p) => {
1313
return p.strict === 1 || p.method === 'deepEqual';
@@ -18,11 +18,16 @@ function main({ len, n, method, strict, arrayBuffer }) {
1818
let actual = Buffer.alloc(len);
1919
let expected = Buffer.alloc(len + Number(method === 'unequal_length'));
2020

21-
2221
if (method === 'unequal_length') {
2322
method = 'notDeepEqual';
2423
}
2524

25+
if (method === 'partial') {
26+
method = 'partialDeepStrictEqual';
27+
} else if (strict) {
28+
method = method.replace('eep', 'eepStrict');
29+
}
30+
2631
for (let i = 0; i < len; i++) {
2732
actual.writeInt8(i % 128, i);
2833
expected.writeInt8(i % 128, i);
@@ -33,10 +38,6 @@ function main({ len, n, method, strict, arrayBuffer }) {
3338
expected[position] = expected[position] + 1;
3439
}
3540

36-
if (strict) {
37-
method = method.replace('eep', 'eepStrict');
38-
}
39-
4041
const fn = assert[method];
4142

4243
if (arrayBuffer) {

‎benchmark/assert/partial-deep-equal.js

+27-7
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ const common = require('../common.js');
44
const assert = require('assert');
55

66
const bench = common.createBenchmark(main, {
7-
n: [25],
7+
n: [125],
88
size: [500],
9-
extraProps: [0],
9+
extraProps: [0, 1],
1010
datasetName: [
1111
'objects',
1212
'sets',
13+
'setsWithObjects',
1314
'maps',
1415
'circularRefs',
1516
'typedArrays',
@@ -31,17 +32,29 @@ function createObjects(length, extraProps, depth = 0) {
3132
foo: 'yarp',
3233
nope: {
3334
bar: '123',
34-
...extraProps ? { a: [1, 2, i] } : {},
35+
...(extraProps ? { a: [1, 2, i] } : {}),
3536
c: {},
3637
b: !depth ? createObjects(2, extraProps, depth + 1) : [],
3738
},
3839
}));
3940
}
4041

42+
function createSetsWithObjects(length, extraProps, depth = 0) {
43+
return Array.from({ length }, (_, i) => new Set([
44+
...(extraProps ? [{}] : []),
45+
{
46+
simple: 'object',
47+
number: i,
48+
},
49+
['array', 'with', 'values'],
50+
new Set([[], {}, { nested: i }]),
51+
]));
52+
}
53+
4154
function createSets(length, extraProps, depth = 0) {
4255
return Array.from({ length }, (_, i) => new Set([
4356
'yarp',
44-
...extraProps ? ['123', 1, 2] : [],
57+
...(extraProps ? ['123', 1, 2] : []),
4558
i + 3,
4659
null,
4760
{
@@ -56,7 +69,7 @@ function createSets(length, extraProps, depth = 0) {
5669

5770
function createMaps(length, extraProps, depth = 0) {
5871
return Array.from({ length }, (_, i) => new Map([
59-
...extraProps ? [['primitiveKey', 'primitiveValue']] : [],
72+
...(extraProps ? [['primitiveKey', 'primitiveValue']] : []),
6073
[42, 'numberKey'],
6174
['objectValue', { a: 1, b: i }],
6275
['arrayValue', [1, 2, i]],
@@ -114,16 +127,23 @@ function createTypedArrays(length, extraParts) {
114127
}
115128

116129
function createArrayBuffers(length, extra) {
117-
return Array.from({ length }, (_, n) => new ArrayBuffer(n + extra ? 1 : 0));
130+
return Array.from({ length }, (_, n) => {
131+
const buffer = Buffer.alloc(n + (extra ? 1 : 0));
132+
for (let i = 0; i < n; i++) {
133+
buffer.writeInt8(i % 128, i);
134+
}
135+
return buffer.buffer;
136+
});
118137
}
119138

120139
function createDataViewArrayBuffers(length, extra) {
121-
return Array.from({ length }, (_, n) => new DataView(new ArrayBuffer(n + extra ? 1 : 0)));
140+
return createArrayBuffers(length, extra).map((buffer) => new DataView(buffer));
122141
}
123142

124143
const datasetMappings = {
125144
objects: createObjects,
126145
sets: createSets,
146+
setsWithObjects: createSetsWithObjects,
127147
maps: createMaps,
128148
circularRefs: createCircularRefs,
129149
typedArrays: createTypedArrays,

‎lib/internal/util/comparisons.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function innerDeepEqual(val1, val2, mode, memos) {
241241
TypedArrayPrototypeGetSymbolToStringTag(val2)) {
242242
return false;
243243
}
244-
if (mode === kPartial) {
244+
if (mode === kPartial && val1.byteLength !== val2.byteLength) {
245245
if (!isPartialArrayBufferView(val1, val2)) {
246246
return false;
247247
}
@@ -278,7 +278,7 @@ function innerDeepEqual(val1, val2, mode, memos) {
278278
if (!isAnyArrayBuffer(val2)) {
279279
return false;
280280
}
281-
if (mode !== kPartial) {
281+
if (mode !== kPartial || val1.byteLength === val2.byteLength) {
282282
if (!areEqualArrayBuffers(val1, val2)) {
283283
return false;
284284
}
@@ -542,18 +542,18 @@ function partialObjectSetEquiv(a, b, mode, set, memo) {
542542
}
543543

544544
function setObjectEquiv(a, b, mode, set, memo) {
545-
if (mode === kPartial) {
546-
return partialObjectSetEquiv(a, b, mode, set, memo);
547-
}
548545
// Fast path for objects only
549-
if (mode === kStrict && set.size === a.size) {
546+
if (mode !== kLoose && set.size === a.size) {
550547
for (const val of a) {
551548
if (!setHasEqualElement(set, val, mode, memo)) {
552549
return false;
553550
}
554551
}
555552
return true;
556553
}
554+
if (mode === kPartial) {
555+
return partialObjectSetEquiv(a, b, mode, set, memo);
556+
}
557557

558558
for (const val of a) {
559559
// Primitive values have already been handled above.
@@ -635,18 +635,18 @@ function partialObjectMapEquiv(a, b, mode, set, memo) {
635635
}
636636

637637
function mapObjectEquivalence(a, b, mode, set, memo) {
638-
if (mode === kPartial) {
639-
return partialObjectMapEquiv(a, b, mode, set, memo);
640-
}
641638
// Fast path for objects only
642-
if (mode === kStrict && set.size === a.size) {
639+
if (mode !== kLoose && set.size === a.size) {
643640
for (const { 0: key1, 1: item1 } of a) {
644641
if (!mapHasEqualEntry(set, b, key1, item1, mode, memo)) {
645642
return false;
646643
}
647644
}
648645
return true;
649646
}
647+
if (mode === kPartial) {
648+
return partialObjectMapEquiv(a, b, mode, set, memo);
649+
}
650650
for (const { 0: key1, 1: item1 } of a) {
651651
if (typeof key1 === 'object' && key1 !== null) {
652652
if (!mapHasEqualEntry(set, b, key1, item1, mode, memo))

‎test/parallel/test-assert-partial-deep-equal.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,11 @@ describe('Object Comparison Tests', () => {
270270
[{ a: 1 }, 'value1'],
271271
]),
272272
},
273+
{
274+
description: 'throws for Maps with mixed unequal entries',
275+
actual: new Map([[{ a: 2 }, 1], [1, 1], [{ b: 1 }, 1], [[], 1], [2, 1], [{ a: 1 }, 1]]),
276+
expected: new Map([[{ a: 1 }, 1], [[], 1], [2, 1], [{ a: 1 }, 1]]),
277+
},
273278
{
274279
description: 'throws for sets with different object values',
275280
actual: new Set([
@@ -484,6 +489,11 @@ describe('Object Comparison Tests', () => {
484489
actual: new Float32Array([+0.0]),
485490
expected: new Float32Array([-0.0]),
486491
},
492+
{
493+
description: 'throws when comparing two Uint8Array objects with non-matching entries',
494+
actual: { typedArray: new Uint8Array([1, 2, 3, 4, 5]) },
495+
expected: { typedArray: new Uint8Array([1, 333, 2, 4]) },
496+
},
487497
{
488498
description: 'throws when comparing two different urls',
489499
actual: new URL('http://foo'),
@@ -703,7 +713,7 @@ describe('Object Comparison Tests', () => {
703713
{
704714
description: 'compares two Uint8Array objects',
705715
actual: { typedArray: new Uint8Array([1, 2, 3, 4, 5]) },
706-
expected: { typedArray: new Uint8Array([1, 2, 3]) },
716+
expected: { typedArray: new Uint8Array([1, 2, 3, 5]) },
707717
},
708718
{
709719
description: 'compares two Int16Array objects',

0 commit comments

Comments
 (0)