Skip to content

buffer: inspect extra properties - #25150

Closed
BridgeAR wants to merge 1 commit into
nodejs:masterfrom
BridgeAR:inspect-extra-buffer-properties
Closed

buffer: inspect extra properties#25150
BridgeAR wants to merge 1 commit into
nodejs:masterfrom
BridgeAR:inspect-extra-buffer-properties

Conversation

@BridgeAR

@BridgeARBridgeAR commented Dec 20, 2018

Copy link
Copy Markdown
Member

This makes sure extra properties on buffers are not ignored anymore
when inspecting the buffer.

I am not sure about this either being a patch or semver-major. We mainly consider changes to util.inspect as patch, so I guess this could be considered a similar thing.

The implementation uses some internal knowledge and it would require more overhead otherwise but this seemed the most straight forward way to do this.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@nodejs-github-bot

Copy link
Copy Markdown
Collaborator

@nodejs-github-botnodejs-github-bot added buffer Issues and PRs related to the buffer subsystem. util Issues and PRs related to the built-in util module. labels Dec 20, 2018
@mscdex

mscdex commented Dec 20, 2018

Copy link
Copy Markdown
Contributor

FWIW getOwnNonIndexProperties() can be replaced with a JS variant that is much faster, at least for the ONLY_ENUMERABLE case if I'm understanding the function's behavior correctly.

Here's what I came up with for the JS implementation:

functionisAllDigits(s){if(s.length===0)returnfalse;for(vari=0;i<s.length;++i){constcode=s.charCodeAt(i);if(code<48||code>57)returnfalse;}returntrue;}functiongetOwnNonIndexProperties(obj,filter){constprops=[];varp=0;if(filter===ONLY_ENUMERABLE){constkeys=Object.keys(obj);for(vari=0;i<keys.length;++i){constkey=keys[i];if(!isAllDigits(key))props[p++]=key;}}else{// TODO or defer to C++ implementation}returnprops;}

It's at least twice as fast for a variety of objects using node master.

@BridgeAR

Copy link
Copy Markdown
MemberAuthor

@mscdex how would that look like? I can't think of any way to access the keys like that in JS. The functions returns the keys of an object that are not numbers (keys are sorted by spec. First the numbers, then strings, then symbols).

@mscdex

Copy link
Copy Markdown
Contributor

@BridgeAR I updated my comment with the implementation I benchmarked with.

@BridgeAR

Copy link
Copy Markdown
MemberAuthor

@mscdex that will be very slow for objects with lots of properties. The reason is that the array with all keys has to be allocated first and that would be very expensive.

@mscdex

Copy link
Copy Markdown
Contributor

@BridgeAR How many properties are we talking about here?

@BridgeAR

Copy link
Copy Markdown
MemberAuthor

@mscdex in my direct comparison I can't get the JS function to be faster under any circumstances. The C++ function has a constant time while the JS function is over linear and even for small buffers, the C++ function wins when running it multiple times.

@mscdex

mscdex commented Dec 20, 2018

Copy link
Copy Markdown
Contributor

@BridgeAR FWIW here is the complete benchmark code I used (comment out the case not being tested):

Benchmark code
constn=1e6;constvals=[{foo: 'bar',baz: 5,quux: true},{'1': 'bar','2': 5,'3': 5.1},{'-1': 'bar','2': 5,'3a': 40000},{'': ()=>{},'1234567890-0987654321': false,quux: false}];const{propertyFilter: {ALL_PROPERTIES,ONLY_ENUMERABLE}}=process.binding('util');constfilter=ONLY_ENUMERABLE;varname;// Case #1//~ const {//~ getOwnNonIndexProperties,//~} = process.binding('util');//~ name = 'C++';// Case #2functionisAllDigits(s){if(s.length===0)returnfalse;for(vari=0;i<s.length;++i){constcode=s.charCodeAt(i);if(code<48||code>57)returnfalse;}returntrue;}functiongetOwnNonIndexProperties(obj,filter){constprops=[];varp=0;if(filter===ONLY_ENUMERABLE){constkeys=Object.keys(obj);for(vari=0;i<keys.length;++i){constkey=keys[i];if(!isAllDigits(key))props[p++]=key;}}else{}returnprops;}name='JS';// Run the benchmarkconsole.time(name);for(vari=0;i<n;++i){for(varj=0;j<vals.length;++j)getOwnNonIndexProperties(vals[j],filter);}console.timeEnd(name);

Running this I get ~1100ms for C++ and ~510ms for JS on node master.

EDIT: For mostly numeric keys the C++ implementation does seem to be a little faster, but not by a whole lot (~50ms), when using objects with the same number of properties as in the cases provided above.

@BridgeAR

BridgeAR commented Dec 20, 2018

Copy link
Copy Markdown
MemberAuthor

@mscdex this function is used for array types (in this case Buffer / Uint8Array), not for regular objects.

@BridgeAR

Copy link
Copy Markdown
MemberAuthor

CI https://ci.nodejs.org/job/node-test-pull-request/19763/

@nodejs/buffer @nodejs/util PTAL

@BridgeARBridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Dec 23, 2018
@Trott

Trott commented Dec 23, 2018

Copy link
Copy Markdown
Member

Resume Build CI: https://ci.nodejs.org/job/node-test-pull-request/19767/ ✔️

This makes sure extra properties on buffers are not ignored anymore
when inspecting the buffer.
@BridgeAR
BridgeARforce-pushed the inspect-extra-buffer-properties branch from 60a5f3d to 1be4412CompareDecember 24, 2018 10:12
@BridgeAR

BridgeAR commented Dec 24, 2018

Copy link
Copy Markdown
MemberAuthor

Rebased due to conflicts.

CI https://ci.nodejs.org/job/node-test-pull-request/19787/ ✔️

@BridgeAR

Copy link
Copy Markdown
MemberAuthor

@nodejs/buffer @nodejs/util PTAL.

This needs another review.

pullBot pushed a commit to shakir-abdo/node that referenced this pull request Dec 27, 2018
This makes sure extra properties on buffers are not ignored anymore
when inspecting the buffer.
PR-URL: nodejs#25150
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
@BridgeAR

Copy link
Copy Markdown
MemberAuthor

Landed in d385e2c 🎉

@addaleax

Copy link
Copy Markdown
Member

Should this be backported to v11.x-staging? If yes please follow the guide and raise a backport PR, if not let me know or add the dont-land-on label.

BridgeAR added a commit to BridgeAR/node that referenced this pull request Jan 9, 2019
This makes sure extra properties on buffers are not ignored anymore
when inspecting the buffer.
PR-URL: nodejs#25150
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
BridgeAR added a commit that referenced this pull request Jan 10, 2019
This makes sure extra properties on buffers are not ignored anymore
when inspecting the buffer.
PR-URL: #25150
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
addaleax pushed a commit that referenced this pull request Jan 14, 2019
This makes sure extra properties on buffers are not ignored anymore
when inspecting the buffer.
PR-URL: #25150
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
refack pushed a commit to refack/node that referenced this pull request Jan 14, 2019
This makes sure extra properties on buffers are not ignored anymore
when inspecting the buffer.
PR-URL: nodejs#25150
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
@BridgeARBridgeAR mentioned this pull request Jan 16, 2019
BridgeAR added a commit to BridgeAR/node that referenced this pull request Jan 16, 2019
This makes sure extra properties on buffers are not ignored anymore
when inspecting the buffer.
PR-URL: nodejs#25150
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
@MylesBorinsMylesBorins mentioned this pull request Jan 24, 2019
@BridgeAR
BridgeAR deleted the inspect-extra-buffer-properties branch January 20, 2020 11:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author readyPRs that have at least one approval, no pending requests for changes, and a CI started.bufferIssues and PRs related to the buffer subsystem.utilIssues and PRs related to the built-in util module.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@BridgeAR@nodejs-github-bot@mscdex@Trott@addaleax@jasnell@targos@BethGriggs