Skip to content

buffer: improve performance of buffer indexof method #26400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+53 −28
Closed

buffer: improve performance of buffer indexof method #26400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a628ad8
buffer: improve performance of buffer indexof method
ZYSzys Mar 7, 2019
50acfb8
fixup! buffer: improve performance of buffer indexof method
ZYSzys Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions benchmark/buffers/buffer-indexof.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ const searchStrings = [

const bench = common.createBenchmark(main, {
search: searchStrings,
encoding: ['undefined', 'utf8', 'ucs2', 'binary'],
encoding: [
'utf8', 'utf-8', 'UTF8', 'UTF-8',
'ucs2', 'ucs-2', 'UCS2', 'UCS-2',
'utf16le', 'utf-16le', 'UTF16LE', 'UTF-16LE',
'latin1', 'LATIN1', 'binary', 'BINARY', 'base64', 'BASE64',
'ascii', 'ASCII', 'hex', 'HEX', 'undefined',
],
type: ['buffer', 'string'],
n: [100000]
n: [1000]
});

function main({ n, search, encoding, type }) {
Expand All @@ -37,7 +43,7 @@ function main({ n, search, encoding, type }) {
encoding = undefined;
}

if (encoding === 'ucs2') {
if (/^(ucs-?2|utf-?16le)$/i.test(encoding)) {
aliceBuffer = Buffer.from(aliceBuffer.toString(), encoding);
}

Expand Down
69 changes: 44 additions & 25 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
dir = !!dir; // Cast to bool.

if (typeof val === 'string') {
if (encoding === undefined) {
if (encoding === undefined || encoding === 'utf8') {
return indexOfString(buffer, val, byteOffset, encoding, dir);
}
return slowIndexOf(buffer, val, byteOffset, encoding, dir);
Expand All @@ -781,34 +781,53 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
}

function slowIndexOf(buffer, val, byteOffset, encoding, dir) {
let loweredCase = false;
for (;;) {
switch (encoding) {
case 'utf8':
case 'utf-8':
case 'ucs2':
case 'ucs-2':
case 'utf16le':
case 'utf-16le':
case 'latin1':
case 'binary':
encoding += '';
switch (encoding.length) {
case 4:
if (encoding === 'utf8' ||
encoding === 'UTF8' ||
encoding === 'ucs2' ||
encoding === 'UCS2')
return indexOfString(buffer, val, byteOffset, encoding, dir);

case 'base64':
case 'ascii':
case 'hex':
break;
case 5:
if (encoding === 'utf-8' ||
encoding === 'UTF-8' ||
encoding === 'ucs-2' ||
encoding === 'UCS-2')
return indexOfString(buffer, val, byteOffset, encoding, dir);
if (encoding === 'ascii' || encoding === 'ASCII')
return indexOfBuffer(
buffer, Buffer.from(val, encoding), byteOffset, encoding, dir);

default:
if (loweredCase) {
throw new ERR_UNKNOWN_ENCODING(encoding);
}

encoding = ('' + encoding).toLowerCase();
loweredCase = true;
}
break;
case 7:
if (encoding === 'utf16le' || encoding === 'UTF16LE')
return indexOfString(buffer, val, byteOffset, encoding, dir);
break;
case 8:
if (encoding === 'utf-16le' || encoding === 'UTF-16LE')
return indexOfString(buffer, val, byteOffset, encoding, dir);
break;
case 6:
if (encoding === 'latin1' ||
encoding === 'LATIN1' ||
encoding === 'binary' ||
encoding === 'BINARY')
return indexOfString(buffer, val, byteOffset, encoding, dir);
if (encoding === 'base64' || encoding === 'BASE64')
return indexOfBuffer(
buffer, Buffer.from(val, encoding), byteOffset, encoding, dir);
break;
case 3:
if (encoding === 'hex' || encoding === 'HEX')
return indexOfBuffer(
buffer, Buffer.from(val, encoding), byteOffset, encoding, dir);
break;
}
const lowerEnc = encoding.toLowerCase();
if (lowerEnc !== encoding)
return slowIndexOf(buffer, val, byteOffset, lowerEnc, dir);
throw new ERR_UNKNOWN_ENCODING(encoding);
}

Buffer.prototype.indexOf = function indexOf(val, byteOffset, encoding) {
Expand Down