Skip to content

Commit a480e09

Browse files
committed
stream: bump default highWaterMark
This should give a performance boost accross the board. Given that the old limit is a decod old and memory capacity has doubled many times since I think it is appropriate to slightly bump the default limit.
1 parent af8ed02 commit a480e09

9 files changed

+17
-10
lines changed

doc/api/stream.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3485,7 +3485,7 @@ changes:
34853485
* `options` {Object}
34863486
* `highWaterMark` {number} Buffer level when
34873487
[`stream.write()`][stream-write] starts returning `false`. **Default:**
3488-
`16384` (16 KiB), or `16` for `objectMode` streams.
3488+
`65536` (64 KiB), or `16` for `objectMode` streams.
34893489
* `decodeStrings` {boolean} Whether to encode `string`s passed to
34903490
[`stream.write()`][stream-write] to `Buffer`s (with the encoding
34913491
specified in the [`stream.write()`][stream-write] call) before passing
@@ -3858,7 +3858,7 @@ changes:
38583858
* `options` {Object}
38593859
* `highWaterMark` {number} The maximum [number of bytes][hwm-gotcha] to store
38603860
in the internal buffer before ceasing to read from the underlying resource.
3861-
**Default:** `16384` (16 KiB), or `16` for `objectMode` streams.
3861+
**Default:** `65536` (64 KiB), or `16` for `objectMode` streams.
38623862
* `encoding` {string} If specified, then buffers will be decoded to
38633863
strings using the specified encoding. **Default:** `null`.
38643864
* `objectMode` {boolean} Whether this stream should behave

lib/internal/streams/state.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const { validateInteger } = require('internal/validators');
88

99
const { ERR_INVALID_ARG_VALUE } = require('internal/errors').codes;
1010

11-
let defaultHighWaterMarkBytes = 16 * 1024;
11+
let defaultHighWaterMarkBytes = 64 * 1024;
1212
let defaultHighWaterMarkObjectMode = 16;
1313

1414
function highWaterMarkFrom(options, isDuplex, duplexKey) {

test/parallel/test-https-hwm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ const httpsServer = https.createServer({
6262
port: this.address().port,
6363
rejectUnauthorized: false,
6464
highWaterMark: undefined,
65-
}, loadCallback(16 * 1024)).on('error', common.mustNotCall()).end();
65+
}, loadCallback(64 * 1024)).on('error', common.mustNotCall()).end();
6666
}));

test/parallel/test-stream-duplex-readable-end.js

+2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ const stream = require('stream');
77
let loops = 5;
88

99
const src = new stream.Readable({
10+
highWaterMark: 16 * 1024,
1011
read() {
1112
if (loops--)
1213
this.push(Buffer.alloc(20000));
1314
}
1415
});
1516

1617
const dst = new stream.Transform({
18+
highWaterMark: 16 * 1024,
1719
transform(chunk, output, fn) {
1820
this.push(null);
1921
fn();

test/parallel/test-stream-pipe-await-drain-push-while-write.js

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const stream = require('stream');
44
const assert = require('assert');
55

66
const writable = new stream.Writable({
7+
highWaterMark: 16 * 1024,
78
write: common.mustCall(function(chunk, encoding, cb) {
89
assert.strictEqual(
910
readable._readableState.awaitDrainWriters,
@@ -26,6 +27,7 @@ const writable = new stream.Writable({
2627
// A readable stream which produces two buffers.
2728
const bufs = [Buffer.alloc(32 * 1024), Buffer.alloc(33 * 1024)]; // above hwm
2829
const readable = new stream.Readable({
30+
highWaterMark: 16 * 1024,
2931
read: function() {
3032
while (bufs.length > 0) {
3133
this.push(bufs.shift());

test/parallel/test-stream-readable-infinite-read.js

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const { Readable } = require('stream');
77
const buf = Buffer.alloc(8192);
88

99
const readable = new Readable({
10+
highWaterMark: 16 * 1024,
1011
read: common.mustCall(function() {
1112
this.push(buf);
1213
}, 31)

test/parallel/test-stream-transform-split-highwatermark.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
require('../common');
33
const assert = require('assert');
44

5-
const { Transform, Readable, Writable } = require('stream');
5+
const { Transform, Readable, Writable, getDefaultHighWaterMark } = require('stream');
66

7-
const DEFAULT = 16 * 1024;
7+
const DEFAULT = getDefaultHighWaterMark();
88

99
function testTransform(expectedReadableHwm, expectedWritableHwm, options) {
1010
const t = new Transform(options);

test/parallel/test-stream-transform-split-objectmode.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ const assert = require('assert');
2525

2626
const Transform = require('stream').Transform;
2727

28-
const parser = new Transform({ readableObjectMode: true });
28+
const parser = new Transform({
29+
readableObjectMode: true
30+
});
2931

3032
assert(parser._readableState.objectMode);
3133
assert(!parser._writableState.objectMode);
3234
assert.strictEqual(parser.readableHighWaterMark, 16);
33-
assert.strictEqual(parser.writableHighWaterMark, 16 * 1024);
35+
assert.strictEqual(parser.writableHighWaterMark, 64 * 1024);
3436
assert.strictEqual(parser.readableHighWaterMark,
3537
parser._readableState.highWaterMark);
3638
assert.strictEqual(parser.writableHighWaterMark,
@@ -57,7 +59,7 @@ const serializer = new Transform({ writableObjectMode: true });
5759

5860
assert(!serializer._readableState.objectMode);
5961
assert(serializer._writableState.objectMode);
60-
assert.strictEqual(serializer.readableHighWaterMark, 16 * 1024);
62+
assert.strictEqual(serializer.readableHighWaterMark, 64 * 1024);
6163
assert.strictEqual(serializer.writableHighWaterMark, 16);
6264
assert.strictEqual(parser.readableHighWaterMark,
6365
parser._readableState.highWaterMark);

test/parallel/test-tls-connect-hwm-option.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ server.listen(0, common.mustCall(() => {
3737
rejectUnauthorized: false,
3838
highWaterMark: undefined,
3939
}, common.mustCall(() => {
40-
assert.strictEqual(defaultHighBob.readableHighWaterMark, 16 * 1024);
40+
assert.strictEqual(defaultHighBob.readableHighWaterMark, 64 * 1024);
4141
defaultHighBob.end();
4242
}));
4343

0 commit comments

Comments
 (0)