fs: Fix default params for fs.write #7856

papandreou · 2016-07-23T20:49:58Z

Checklist

make -j4 test (UNIX), or vcbuild test nosign (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines

Affected core subsystem(s)

fs

Description of change

Add support for fs.write(fd, buffer, cb) and fs.write(fd, buffer, offset, cb) as documented at https://nodejs.org/api/fs.html#fs_fs_write_fd_data_position_encoding_callback (it says that data can be either a string or a Buffer).

Update: Extended to apply to fs.writeSync as well, which turned out to have the same issue (#7879).

mscdex · 2016-07-23T20:55:55Z

test/sequential/test-fs-write-buffer-without-length.js

+  fs.write(fd,
+           Buffer.from('hello'),
+           3,
+           common.mustCall(function(err, written) {


This looks a bit hectic. What about moving this common.mustCall(...) to a variable and passing that as the fourth argument instead? That way the fs.write() fits all on one line.

Seems like I copy/pasted from a very old version of the https://github.com/nodejs/node/blob/master/test/parallel/test-fs-buffer.js test. Will try to fix it up.

https://github.com/nodejs/node/blob/master/test/parallel/test-fs-write-buffer.js, actually, and that's still just as messy :)

Perhaps, but let's not continue that trend ;-)

Agreed. Fixed in c9d7a77

In both tests I had to keep the definition of cb inside the other callback because it references fd in fs.closeSync(fd);.

mscdex · 2016-07-23T22:01:07Z

Any reason the tests are in sequential/ instead of parallel/?

papandreou · 2016-07-24T06:34:40Z

@mscdex Not a good one, no. I just misunderstood the sequential vs. parallel classification. Moved them to parallel now :)

thefourtheye · 2016-07-25T04:00:46Z

test/parallel/test-fs-write-buffer-without-length.js

+common.refreshTmpDir();
+
+fs.open(filename, 'w', 0o644, common.mustCall(function(err, fd) {
+  if (err) throw err;


You can use assert.ifError

papandreou · 2016-08-01T01:12:41Z

Fixed the nits, including the test that I copied from.

Also fixed fs.writeSync in the same way (came up in #7879).

yorkie · 2016-08-01T09:34:26Z

test/parallel/test-fs-write-buffer.js


-             var found = fs.readFileSync(filename, 'utf8');
-             assert.deepStrictEqual(expected.toString(), found);
-             fs.unlinkSync(filename);


Why removing this line?

@thefourtheye suggested that: #7856 (comment)

jasnell · 2016-08-01T15:16:22Z

Question for @nodejs/ctc : is this a patch or a semver-minor?

trevnorris · 2016-08-02T16:23:54Z

lib/fs.js

+    }
+    if (typeof length !== 'number') {
+      length = buffer.length - offset;
+    }


The comment at the top of the function does not match public documentation. Mind fixing that.

Sure thing, fixed in 4062d4cf. I changed both the comment and the documentation to match the implementation.

trevnorris · 2016-08-02T16:36:26Z

While doing the review I realized that our documented API doesn't come close to following current implementation. For example, src/node_file.cc:node::WriteBuffer() still has all the same throw logic as before. While src/node_file.cc:node::WriteString() relies on coercion rules from external calls to ParseEncoding(), etc.

There is a deeper issue that needs to be fixed. This PR does help bring it closer to compliance to public docs, but is only a superficial fix. I'm fine with this landing, but there should be a follow-up PR that fixes things all the way down.

@jasnell Technically a patch since it aligns implementation closer to documentation, and it shouldn't introduce any regressions.

jasnell · 2016-08-03T16:08:51Z

@trevnorris +1

papandreou · 2016-08-11T09:50:25Z

Squashed and rebased on master as conflicts had been introduced.

The code that works out the default values of the default parameters for fs.write got a bit more complex because the line callback = makeCallback(arguments[arguments.length - 1]); was removed from master in the mean time.

I believe this work is finished and ready to land now, but let me know if you have any feedback, especially about the code that sets the default parameters and finds the callback.

trevnorris · 2016-08-11T18:30:16Z

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

sam-github · 2016-11-08T17:41:54Z

I will land this

Add support for fs.write(fd, buffer, cb) and fs.write(fd, buffer, offset, cb) as documented at https://nodejs.org/api/fs.html#fs_fs_write_fd_data_position_encoding_callback and equivalently for fs.writeSync Update docs and code comments to reflect the implementation. PR-URL: nodejs#7856 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Brian White <mscdex@mscdex.net> Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

sam-github · 2016-11-08T17:50:17Z

Landed in 0b5191f, thanks @papandreou

Add support for fs.write(fd, buffer, cb) and fs.write(fd, buffer, offset, cb) as documented at https://nodejs.org/api/fs.html#fs_fs_write_fd_data_position_encoding_callback and equivalently for fs.writeSync Update docs and code comments to reflect the implementation. PR-URL: #7856 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Brian White <mscdex@mscdex.net> Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

MylesBorins · 2016-12-13T19:54:17Z

added lts labels. Is this going to be reverted as per #10242?

gibfahn · 2017-05-16T18:02:12Z

It sounds like this is a minor behavioural change, where the previous code didn't do exactly what the docs said. Given that this was reported as an issue in v6.x, it might be worth backporting.

Thoughts @nodejs/lts ?

sam-github · 2017-05-16T18:44:57Z

This adds support for new arg combinations, shouldn't it be tagged semver-minor?
@papandreou Can you think of any negative side-effects? Is this purely additive, or does it change an existing behaviour? An existing behaviour that is useful, I mean, changing the existing behaviour of writing absolutely none of the buffer doesn't count.

papandreou · 2017-05-16T20:32:33Z

@sam-github, no, I can't think of any negative side effects of backporting, especially now that it has been on v7 for a while without causing any problems. To my knowledge the change in behavior has only been brought up once (#10242), and that was resolved amicably.

Based on the number of reports of the original problem, I agree that it seems to be something that comes up often enough that we could prevent a few wtf experiences for 6.x users by backporting it.

sam-github · 2017-05-23T21:24:21Z

Above makes sense to me, @papandreou, thanks. Do you have time to do the backport this by opening a PR against the v6.x-staging branch?

papandreou · 2017-05-23T22:04:54Z

@sam-github, sure! #13179

(Backported from nodejs#7856 to v6.x-staging) Add support for fs.write(fd, buffer, cb) and fs.write(fd, buffer, offset, cb) as documented at https://nodejs.org/api/fs.html#fs_fs_write_fd_data_position_encoding_callback and equivalently for fs.writeSync Update docs and code comments to reflect the implementation.

Add support for fs.write(fd, buffer, cb) and fs.write(fd, buffer, offset, cb) as documented at https://nodejs.org/api/fs.html#fs_fs_write_fd_data_position_encoding_callback and equivalently for fs.writeSync Update docs and code comments to reflect the implementation. Backport-PR-URL: #13179 PR-URL: #7856 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Brian White <mscdex@mscdex.net> Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

Notable Changes: * assert: - assert.fail() can now take one or two arguments (Rich Trott) #12293 * crypto: - add sign/verify support for RSASSA-PSS (Tobias Nießen) #11705 * deps: - upgrade openssl sources to 1.0.2m (Shigeki Ohtsu) #16691 - upgrade libuv to 1.15.0 (cjihrig) #15745 - upgrade libuv to 1.14.1 (cjihrig) #14866 - upgrade libuv to 1.13.1 (cjihrig) #14117 - upgrade libuv to 1.12.0 (cjihrig) #13306 * fs: - Add support for fs.write/fs.writeSync(fd, buffer, cb) and fs.write/fs.writeSync(fd, buffer, offset, cb) as documented (Andreas Lind) #7856 * inspector: - enable --inspect-brk (Refael Ackermann) #12615 * process: - add --redirect-warnings command line argument (James M Snell) #10116 * src: - allow CLI args in env with NODE_OPTIONS (Sam Roberts) #12028) - --abort-on-uncaught-exception in NODE_OPTIONS (Sam Roberts) #13932 - allow --tls-cipher-list in NODE_OPTIONS (Sam Roberts) #13172 - use SafeGetenv() for NODE_REDIRECT_WARNINGS (Sam Roberts) #12677 * test: - remove common.fail() (Rich Trott) #12293 PR-URL: #16263

nodejs-github-bot added the fs Issues and PRs related to the fs subsystem / file system. label Jul 23, 2016

mscdex reviewed Jul 23, 2016
View reviewed changes

thefourtheye reviewed Jul 25, 2016
View reviewed changes

papandreou mentioned this pull request Jul 26, 2016

openSync/writeSync/closeSync produces empty file #7879

Closed

yorkie reviewed Aug 1, 2016
View reviewed changes

trevnorris reviewed Aug 2, 2016
View reviewed changes

papandreou force-pushed the fix/defaultParameterForFsWriteWithBuffer branch 3 times, most recently from 8a81850 to 984cd0b Compare August 11, 2016 09:50

sam-github approved these changes Nov 8, 2016

View reviewed changes

sam-github closed this Nov 8, 2016

bnoordhuis mentioned this pull request Dec 13, 2016

Change in fs.statSync behavior between 7.1.0 and 7.2.0 #10242

Closed

MylesBorins added lts-watch-v4.x labels Dec 13, 2016

papandreou mentioned this pull request May 23, 2017

fs: Fix default params for fs.write(Sync) (backport to v6) #13179

Closed

4 tasks

gibfahn added the semver-minor PRs that contain new features and should be released in the next minor version. label May 30, 2017

vsemozhetbyt mentioned this pull request Jun 25, 2017

test: test/parallel/test-fs-write-sync.js failed when node < 7.2.0 #13899

Closed

MylesBorins added backport-requested-v6.x and removed lts-watch-v4.x labels Sep 19, 2017

MylesBorins mentioned this pull request Oct 17, 2017

v6.12.0 proposal #16263

Merged

MylesBorins mentioned this pull request Nov 3, 2017

v4.8.6 proposal #16500

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fs: Fix default params for fs.write #7856

fs: Fix default params for fs.write #7856

papandreou commented Jul 23, 2016 •

edited

Loading

mscdex Jul 23, 2016

papandreou Jul 23, 2016

papandreou Jul 23, 2016

mscdex Jul 23, 2016

papandreou Jul 23, 2016

mscdex commented Jul 23, 2016

papandreou commented Jul 24, 2016

thefourtheye Jul 25, 2016

papandreou commented Aug 1, 2016

yorkie Aug 1, 2016

papandreou Aug 1, 2016

jasnell commented Aug 1, 2016

trevnorris Aug 2, 2016

papandreou Aug 2, 2016

trevnorris commented Aug 2, 2016

jasnell commented Aug 3, 2016

papandreou commented Aug 11, 2016

trevnorris commented Aug 11, 2016

sam-github commented Nov 8, 2016

sam-github commented Nov 8, 2016

MylesBorins commented Dec 13, 2016

gibfahn commented May 16, 2017 •

edited

Loading

sam-github commented May 16, 2017

papandreou commented May 16, 2017

sam-github commented May 23, 2017

papandreou commented May 23, 2017

fs: Fix default params for fs.write #7856

fs: Fix default params for fs.write #7856

Conversation

papandreou commented Jul 23, 2016 • edited Loading

Checklist

Affected core subsystem(s)

Description of change

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mscdex commented Jul 23, 2016

papandreou commented Jul 24, 2016

Choose a reason for hiding this comment

papandreou commented Aug 1, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jasnell commented Aug 1, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trevnorris commented Aug 2, 2016

jasnell commented Aug 3, 2016

papandreou commented Aug 11, 2016

trevnorris commented Aug 11, 2016

sam-github commented Nov 8, 2016

sam-github commented Nov 8, 2016

MylesBorins commented Dec 13, 2016

gibfahn commented May 16, 2017 • edited Loading

sam-github commented May 16, 2017

papandreou commented May 16, 2017

sam-github commented May 23, 2017

papandreou commented May 23, 2017

papandreou commented Jul 23, 2016 •

edited

Loading

gibfahn commented May 16, 2017 •

edited

Loading