Skip to content
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

Jump to bottom

Don't use new Buffer as it is deprecated #7

Merged
merged 7 commits into from
Apr 30, 2018
Merged

Don't use new Buffer as it is deprecated #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e3f62d
Don't use `new Buffer` as it is deprecated
BYK Apr 28, 2018
aaa648f
Drop Node 5.7, add Node 10
BYK Apr 28, 2018
b2b6bd2
Bring Node 5.7 support back
BYK Apr 30, 2018
d36a98d
Revert unnecessary changes in Travis config
BYK Apr 30, 2018
b54df59
Revert unnecessary formatting changes
BYK Apr 30, 2018
b805c5b
Sigh Node 5.7
BYK Apr 30, 2018
afde811
give up hope for node 5.7
BYK Apr 30, 2018
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ language: node_js
node_js:
- "4"
- "5.6.0"
- "5.7.0" # Introduced "cachedData"/"produceCachedData"
- "5"
- "5" # Introduced "cachedData"/"produceCachedData" after 5.7, need 5.10 for Buffer.from()
- "6"
- "8"
- "9"
- "10"
script:
- case "$TRAVIS_NODE_VERSION" in
4|5.6.0)
Expand Down
80 changes: 40 additions & 40 deletions test/FileSystemBlobStore-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ tap.test('is empty when the file doesn\'t exist', t => {
});

tap.test('allows to read and write buffers from/to memory without persisting them', t => {
blobStore.set('foo', 'invalidation-key-1', new Buffer('foo'));
blobStore.set('bar', 'invalidation-key-2', new Buffer('bar'));
blobStore.set('foo', 'invalidation-key-1', Buffer.from('foo'));
blobStore.set('bar', 'invalidation-key-2', Buffer.from('bar'));

t.same(blobStore.get('foo', 'invalidation-key-1'), new Buffer('foo'));
t.same(blobStore.get('bar', 'invalidation-key-2'), new Buffer('bar'));
t.same(blobStore.get('foo', 'invalidation-key-1'), Buffer.from('foo'));
t.same(blobStore.get('bar', 'invalidation-key-2'), Buffer.from('bar'));

t.type(blobStore.get('foo', 'unexisting-key'), 'undefined');
t.type(blobStore.get('bar', 'unexisting-key'), 'undefined');
Expand All @@ -46,41 +46,41 @@ tap.test('allows to read and write buffers from/to memory without persisting the
});

tap.test('persists buffers when saved and retrieves them on load, giving priority to in-memory ones', t => {
blobStore.set('foo', 'invalidation-key-1', new Buffer('foo'));
blobStore.set('bar', 'invalidation-key-2', new Buffer('bar'));
blobStore.set('foo', 'invalidation-key-1', Buffer.from('foo'));
blobStore.set('bar', 'invalidation-key-2', Buffer.from('bar'));
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);

t.same(blobStore.get('foo', 'invalidation-key-1'), new Buffer('foo'));
t.same(blobStore.get('bar', 'invalidation-key-2'), new Buffer('bar'));
t.same(blobStore.get('foo', 'invalidation-key-1'), Buffer.from('foo'));
t.same(blobStore.get('bar', 'invalidation-key-2'), Buffer.from('bar'));
t.type(blobStore.get('foo', 'unexisting-key'), 'undefined');
t.type(blobStore.get('bar', 'unexisting-key'), 'undefined');

blobStore.set('foo', 'new-key', new Buffer('changed'));
blobStore.set('foo', 'new-key', Buffer.from('changed'));

t.same(blobStore.get('foo', 'new-key'), new Buffer('changed'));
t.same(blobStore.get('foo', 'new-key'), Buffer.from('changed'));
t.type(blobStore.get('foo', 'invalidation-key-1'), 'undefined');

t.done();
});

tap.test('persists both in-memory and previously stored buffers when saved', t => {
blobStore.set('foo', 'invalidation-key-1', new Buffer('foo'));
blobStore.set('bar', 'invalidation-key-2', new Buffer('bar'));
blobStore.set('foo', 'invalidation-key-1', Buffer.from('foo'));
blobStore.set('bar', 'invalidation-key-2', Buffer.from('bar'));
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);

blobStore.set('bar', 'invalidation-key-3', new Buffer('changed'));
blobStore.set('qux', 'invalidation-key-4', new Buffer('qux'));
blobStore.set('bar', 'invalidation-key-3', Buffer.from('changed'));
blobStore.set('qux', 'invalidation-key-4', Buffer.from('qux'));
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);

t.same(blobStore.get('foo', 'invalidation-key-1'), new Buffer('foo'));
t.same(blobStore.get('bar', 'invalidation-key-3'), new Buffer('changed'));
t.same(blobStore.get('qux', 'invalidation-key-4'), new Buffer('qux'));
t.same(blobStore.get('foo', 'invalidation-key-1'), Buffer.from('foo'));
t.same(blobStore.get('bar', 'invalidation-key-3'), Buffer.from('changed'));
t.same(blobStore.get('qux', 'invalidation-key-4'), Buffer.from('qux'));
t.type(blobStore.get('foo', 'unexisting-key'), 'undefined');
t.type(blobStore.get('bar', 'invalidation-key-2'), 'undefined');
t.type(blobStore.get('qux', 'unexisting-key'), 'undefined');
Expand All @@ -89,21 +89,21 @@ tap.test('persists both in-memory and previously stored buffers when saved', t =
});

tap.test('allows to delete keys from both memory and stored buffers', t => {
blobStore.set('a', 'invalidation-key-1', new Buffer('a'));
blobStore.set('b', 'invalidation-key-2', new Buffer('b'));
blobStore.set('a', 'invalidation-key-1', Buffer.from('a'));
blobStore.set('b', 'invalidation-key-2', Buffer.from('b'));
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);

blobStore.set('b', 'invalidation-key-3', new Buffer('b'));
blobStore.set('c', 'invalidation-key-4', new Buffer('c'));
blobStore.set('b', 'invalidation-key-3', Buffer.from('b'));
blobStore.set('c', 'invalidation-key-4', Buffer.from('c'));
blobStore.delete('b');
blobStore.delete('c');
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);

t.same(blobStore.get('a', 'invalidation-key-1'), new Buffer('a'));
t.same(blobStore.get('a', 'invalidation-key-1'), Buffer.from('a'));
t.type(blobStore.get('b', 'invalidation-key-2'), 'undefined');
t.type(blobStore.get('b', 'invalidation-key-3'), 'undefined');
t.type(blobStore.get('c', 'invalidation-key-4'), 'undefined');
Expand All @@ -112,27 +112,27 @@ tap.test('allows to delete keys from both memory and stored buffers', t => {
});

tap.test('ignores errors when loading an invalid blob store', t => {
blobStore.set('a', 'invalidation-key-1', new Buffer('a'));
blobStore.set('b', 'invalidation-key-2', new Buffer('b'));
blobStore.set('a', 'invalidation-key-1', Buffer.from('a'));
blobStore.set('b', 'invalidation-key-2', Buffer.from('b'));
blobStore.save();

// Simulate corruption
fs.writeFileSync(path.join(storageDirectory, 'MAP'), new Buffer([0]));
fs.writeFileSync(path.join(storageDirectory, 'BLOB'), new Buffer([0]));
fs.writeFileSync(path.join(storageDirectory, 'MAP'), Buffer.from([0]));
fs.writeFileSync(path.join(storageDirectory, 'BLOB'), Buffer.from([0]));

blobStore = new FileSystemBlobStore(storageDirectory);

t.type(blobStore.get('a', 'invalidation-key-1'), 'undefined');
t.type(blobStore.get('b', 'invalidation-key-2'), 'undefined');

blobStore.set('a', 'invalidation-key-1', new Buffer('x'));
blobStore.set('b', 'invalidation-key-2', new Buffer('y'));
blobStore.set('a', 'invalidation-key-1', Buffer.from('x'));
blobStore.set('b', 'invalidation-key-2', Buffer.from('y'));
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);

t.same(blobStore.get('a', 'invalidation-key-1'), new Buffer('x'));
t.same(blobStore.get('b', 'invalidation-key-2'), new Buffer('y'));
t.same(blobStore.get('a', 'invalidation-key-1'), Buffer.from('x'));
t.same(blobStore.get('b', 'invalidation-key-2'), Buffer.from('y'));

t.end();
});
Expand All @@ -142,26 +142,26 @@ tap.test('object hash collision', t => {
blobStore.delete('constructor');
t.type(blobStore.get('constructor', 'invalidation-key-1'), 'undefined');

blobStore.set('constructor', 'invalidation-key-1', new Buffer('proto'));
t.same(blobStore.get('constructor', 'invalidation-key-1'), new Buffer('proto'));
blobStore.set('constructor', 'invalidation-key-1', Buffer.from('proto'));
t.same(blobStore.get('constructor', 'invalidation-key-1'), Buffer.from('proto'));
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);
t.same(blobStore.get('constructor', 'invalidation-key-1'), new Buffer('proto'));
t.same(blobStore.get('constructor', 'invalidation-key-1'), Buffer.from('proto'));
t.type(blobStore.get('hasOwnProperty', 'invalidation-key-2'), 'undefined');

t.end();
});

tap.test('dirty state (set)', t => {
blobStore.set('foo', 'invalidation-key-1', new Buffer('foo'));
blobStore.set('foo', 'invalidation-key-1', Buffer.from('foo'));
t.equal(blobStore.isDirty(), true);
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);

t.equal(blobStore.isDirty(), false);
blobStore.set('foo', 'invalidation-key-2', new Buffer('bar'));
blobStore.set('foo', 'invalidation-key-2', Buffer.from('bar'));
t.equal(blobStore.isDirty(), true);

t.end();
Expand All @@ -170,22 +170,22 @@ tap.test('dirty state (set)', t => {
tap.test('dirty state (delete memory)', t => {
blobStore.delete('foo');
t.equal(blobStore.isDirty(), false);
blobStore.set('foo', 'invalidation-key-1', new Buffer('foo'));
blobStore.set('foo', 'invalidation-key-1', Buffer.from('foo'));
blobStore.delete('foo');
t.equal(blobStore.isDirty(), true);
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);

t.equal(blobStore.isDirty(), false);
blobStore.set('foo', 'invalidation-key-2', new Buffer('bar'));
blobStore.set('foo', 'invalidation-key-2', Buffer.from('bar'));
t.equal(blobStore.isDirty(), true);

t.end();
});

tap.test('dirty state (delete stored)', t => {
blobStore.set('foo', 'invalidation-key-1', new Buffer('foo'));
blobStore.set('foo', 'invalidation-key-1', Buffer.from('foo'));
blobStore.save();

blobStore = new FileSystemBlobStore(storageDirectory);
Expand All @@ -197,15 +197,15 @@ tap.test('dirty state (delete stored)', t => {
});

tap.test('prefix', t => {
blobStore.set('foo', 'invalidation-key-1', new Buffer('foo'));
blobStore.set('foo', 'invalidation-key-1', Buffer.from('foo'));
blobStore.save();

t.ok(fs.existsSync(path.join(storageDirectory, 'MAP')));
t.ok(fs.existsSync(path.join(storageDirectory, 'BLOB')));

storageDirectory = temp.path('filesystemblobstore');
blobStore = new FileSystemBlobStore(storageDirectory, 'prefix');
blobStore.set('foo', 'invalidation-key-1', new Buffer('foo'));
blobStore.set('foo', 'invalidation-key-1', Buffer.from('foo'));
blobStore.save();

t.ok(fs.existsSync(path.join(storageDirectory, 'prefix.MAP')));
Expand Down
2 changes: 1 addition & 1 deletion test/NativeCompileCache-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ tap.test('when the cache changes it updates the new cache', t => {

tap.test('deletes previously cached code when the cache is an invalid file', t => {
fakeCacheStore.has = () => true;
fakeCacheStore.get = () => new Buffer('an invalid cache');
fakeCacheStore.get = () => Buffer.from('an invalid cache');
let deleteWasCalledWith = null;
fakeCacheStore.delete = arg => { deleteWasCalledWith = arg; };

Expand Down
2 changes: 1 addition & 1 deletion v8-compile-cache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class FileSystemBlobStore {
this._storedBlob = fs.readFileSync(this._blobFilename);
this._storedMap = JSON.parse(fs.readFileSync(this._mapFilename));
} catch (e) {
this._storedBlob = new Buffer(0);
this._storedBlob = Buffer.alloc(0);
Copy link
Owner

@zertosh zertosh Apr 30, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a dummy fallback buffer. Can you use Buffer.from([]) so that this passes in 5.7.0 please?

this._storedMap = {};
}
this._dirty = false;
Expand Down