Skip to content

Commit 0c422dd

Browse files
sidoraressidorares
authored
Merge pull request #870 from SimonSchick/chore/es6-arrow
chore: use es6 arrows function
2 parents 392e9a1 + 6571b87 commit 0c422dd

File tree

148 files changed

+899
-995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+899
-995
lines changed

‎.eslintrc

+5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@
1414
"node": true
1515
},
1616
"rules": {
17+
"no-invalid-this": "error",
18+
"consistent-this": "error",
19+
"prefer-arrow-callback": "error",
1720
"prefer-const": "error",
21+
"arrow-parens": ["error", "as-needed"],
22+
"arrow-body-style": ["error", "as-needed"],
1823
"no-var": "error",
1924
"no-use-before-define": "error",
2025
"strict": ["error", "global"]

‎benchmarks/FB/hello.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (cluster.isMaster) {
99
cluster.fork();
1010
}
1111

12-
cluster.on('exit', function(worker) {
12+
cluster.on('exit', worker => {
1313
console.log('worker ' + worker.pid + ' died');
1414
});
1515

@@ -58,7 +58,7 @@ function getRandomNumber() {
5858
}
5959

6060
function sequelizeQuery(callback) {
61-
World.findById(getRandomNumber(), function(err, world) {
61+
World.findById(getRandomNumber(), (err, world) => {
6262
callback(null, world);
6363
});
6464
}
@@ -71,7 +71,7 @@ function handlePrepared(req, res) {
7171
mysql2conn.execute(
7272
'SELECT * FROM world WHERE id = ?',
7373
[getRandomNumber()],
74-
function(err, rows) {
74+
(err, rows) => {
7575
results.push(rows[0]);
7676
if (results.length == queries) res.end(JSON.stringify(results));
7777
}
@@ -89,7 +89,7 @@ function handleMysqlIsh(conn, req, res) {
8989
mysql2conn.query(
9090
'SELECT * FROM world WHERE id = ?',
9191
[getRandomNumber()],
92-
function(err, rows) {
92+
(err, rows) => {
9393
results.push(rows[0]);
9494
if (results.length == queries) res.end(JSON.stringify(results));
9595
}
@@ -103,10 +103,10 @@ function handleMysqlIshPool(pool, req, res) {
103103
const queries = values.query.queries || 1;
104104
const results = [];
105105
for (let i = 0; i < queries; ++i) {
106-
pool.getConnection(function() {
106+
pool.getConnection(() => {
107107
mysql2conn.query(
108108
'SELECT * FROM world WHERE id = ' + getRandomNumber(),
109-
function(err, rows) {
109+
(err, rows) => {
110110
results.push(rows[0]);
111111
if (results.length == queries) res.end(JSON.stringify(results));
112112
}
@@ -122,8 +122,8 @@ function handleMaria(req, res) {
122122
for (let i = 0; i < queries; ++i) {
123123
mariaconn
124124
.query('SELECT * FROM world WHERE id = :id', { id: getRandomNumber() })
125-
.on('result', function(dbres) {
126-
dbres.on('row', function(row) {
125+
.on('result', dbres => {
126+
dbres.on('row', row => {
127127
results.push(row);
128128
if (results.length == queries) res.end(JSON.stringify(results));
129129
});
@@ -137,7 +137,7 @@ function sortFortunes(a, b) {
137137

138138
function fortuneMysql(conn, res) {
139139
res.writeHead(200, { 'Content-Type': 'text/html' });
140-
conn.query('select * from Fortune', function(err, fortunes) {
140+
conn.query('select * from Fortune', (err, fortunes) => {
141141
fortunes.push({
142142
id: 0,
143143
message: 'Additional fortune added at request time.'
@@ -150,11 +150,11 @@ function fortuneMysql(conn, res) {
150150
function fortuneMaria(res) {
151151
const fortunes = [];
152152
res.writeHead(200, { 'Content-Type': 'text/html' });
153-
mariaconn.query('SELECT * from Fortune').on('result', function(dbres) {
154-
dbres.on('row', function(row) {
153+
mariaconn.query('SELECT * from Fortune').on('result', dbres => {
154+
dbres.on('row', row => {
155155
fortunes.push(row);
156156
});
157-
dbres.on('end', function() {
157+
dbres.on('end', () => {
158158
fortunes.push({
159159
id: 0,
160160
message: 'Additional fortune added at request time.'
@@ -166,7 +166,7 @@ function fortuneMaria(res) {
166166
}
167167

168168
http
169-
.createServer(function(req, res) {
169+
.createServer((req, res) => {
170170
// JSON response object
171171
const hello = { message: 'Hello, world' };
172172

@@ -197,7 +197,7 @@ http
197197

198198
res.writeHead(200, { 'Content-Type': 'application/json' });
199199

200-
async.parallel(queryFunctions, function(err, results) {
200+
async.parallel(queryFunctions, (err, results) => {
201201
res.end(JSON.stringify(results));
202202
});
203203
break;
@@ -208,12 +208,12 @@ http
208208
function libmysqlQuery2(callback) {
209209
libmysql.query(
210210
'SELECT * FROM world WHERE id = ' + getRandomNumber(),
211-
function(err, res) {
211+
(err, res) => {
212212
if (err) {
213213
throw err;
214214
}
215215

216-
res.fetchAll(function(err, rows) {
216+
res.fetchAll((err, rows) => {
217217
if (err) {
218218
throw err;
219219
}
@@ -232,7 +232,7 @@ http
232232
for (let i = 0; i < queries; i += 1) {
233233
queryFunctions[i] = libmysqlQuery2;
234234
}
235-
async.parallel(queryFunctions, function(err, results) {
235+
async.parallel(queryFunctions, (err, results) => {
236236
if (err) {
237237
res.writeHead(500);
238238
return res.end('MYSQL CONNECTION ERROR.');
@@ -279,12 +279,12 @@ http
279279
function libmysqlQuery(callback) {
280280
libmysql.query(
281281
'SELECT * FROM world WHERE id = ' + getRandomNumber(),
282-
function(err, res) {
282+
(err, res) => {
283283
if (err) {
284284
throw err;
285285
}
286286

287-
res.fetchAll(function(err, rows) {
287+
res.fetchAll((err, rows) => {
288288
if (err) {
289289
throw err;
290290
}
@@ -297,7 +297,7 @@ http
297297
rows[0].randomNumber +
298298
' WHERE id = ' +
299299
rows[0]['id'],
300-
function(err) {
300+
err => {
301301
if (err) {
302302
throw err;
303303
}
@@ -316,7 +316,7 @@ http
316316
for (let i = 0; i < queries; i += 1) {
317317
queryFunctions[i] = libmysqlQuery;
318318
}
319-
async.parallel(queryFunctions, function(err, results) {
319+
async.parallel(queryFunctions, (err, results) => {
320320
if (err) {
321321
res.writeHead(500);
322322
return res.end('MYSQL CONNECTION ERROR.');

‎benchmarks/bench-fake-server-maria.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ connection.connect({
1515
function benchmarkSelect(numLeft, callback) {
1616
let numRows = 0;
1717
const q = connection.query('select 1+1 as qqq');
18-
q.on('result', function(res) {
18+
q.on('result', res => {
1919
//console.log("result!");
2020
//console.log(res);
2121

22-
res.on('row', function() {
22+
res.on('row', () => {
2323
//console.log(r);
2424
numRows++;
2525
});
2626

27-
res.on('end', function() {
27+
res.on('end', () => {
2828
if (numLeft > 1) benchmarkSelect(numLeft - 1, callback);
2929
else callback(numRows);
3030
});
@@ -34,7 +34,7 @@ function benchmarkSelect(numLeft, callback) {
3434
function benchmarkSelects(n, cb) {
3535
const numSelects = 100;
3636
const start = process.hrtime();
37-
benchmarkSelect(numSelects, function(rowsPerQuery) {
37+
benchmarkSelect(numSelects, rowsPerQuery => {
3838
const end = process.hrtime();
3939
const diff = common.hrdiff(start, end);
4040
console.log(
@@ -52,7 +52,7 @@ function benchmarkSelects(n, cb) {
5252
module.exports = function(done) {
5353
console.log('connected');
5454
const testStart = process.hrtime();
55-
benchmarkSelects(5, function() {
55+
benchmarkSelects(5, () => {
5656
const testEnd = process.hrtime();
5757
console.log('total time: ', common.hrdiff(testStart, testEnd) / 1e9);
5858
connection.end();

‎benchmarks/bench-fake-server.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ function benchmarkSelect(numLeft, callback) {
2323

2424
let rows = 0;
2525
const q = connection.query('query from fake server fixture');
26-
q.on('result', function() {
26+
q.on('result', () => {
2727
rows++;
2828
});
29-
q.on('end', function() {
29+
q.on('end', () => {
3030
if (numLeft > 1) benchmarkSelect(numLeft - 1, callback);
3131
else callback(rows);
3232
});
@@ -35,7 +35,7 @@ function benchmarkSelect(numLeft, callback) {
3535
function benchmarkSelects(n, cb) {
3636
const numSelects = 100000;
3737
const start = process.hrtime();
38-
benchmarkSelect(numSelects, function(rowsPerQuery) {
38+
benchmarkSelect(numSelects, rowsPerQuery => {
3939
const end = process.hrtime();
4040
const diff = common.hrdiff(start, end);
4141
console.log(
@@ -52,7 +52,7 @@ function benchmarkSelects(n, cb) {
5252

5353
module.exports = function(done) {
5454
const testStart = process.hrtime();
55-
benchmarkSelects(5, function() {
55+
benchmarkSelects(5, () => {
5656
const testEnd = process.hrtime();
5757
console.log('total time: ', common.hrdiff(testStart, testEnd) / 1e9);
5858
connection.end();

‎benchmarks/bench-insert-select-parallel.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const connection = common.createConnection();
66
const table = 'insert_test';
77
//const text = "本日は晴天なり";
88
const text = 'test abc xyz';
9-
connection.query('drop table ' + table).on('error', function() {});
9+
connection.query('drop table ' + table).on('error', () => {});
1010
connection.query(
1111
[
1212
'CREATE TABLE `' + table + '` (',
@@ -20,7 +20,7 @@ connection.query(
2020
function benchmarkInsert(numLeft, callback) {
2121
connection.query(
2222
'INSERT INTO ' + table + ' SET title="' + text + '"',
23-
function(err) {
23+
err => {
2424
if (err) throw err;
2525
if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
2626
else callback();
@@ -31,7 +31,7 @@ function benchmarkInsert(numLeft, callback) {
3131
function benchmarkInserts(n, cb) {
3232
const numInsert = 50000;
3333
const start = process.hrtime();
34-
benchmarkInsert(numInsert, function() {
34+
benchmarkInsert(numInsert, () => {
3535
const end = process.hrtime();
3636
const diff = common.hrdiff(start, end);
3737
console.log((numInsert * 1e9) / diff + ' inserts/sec');
@@ -75,8 +75,8 @@ function benchmarkParallelSelects(n, size, cb) {
7575

7676
module.exports = function(done) {
7777
const testStart = process.hrtime();
78-
benchmarkInserts(1, function() {
79-
benchmarkParallelSelects(8, 50000, function() {
78+
benchmarkInserts(1, () => {
79+
benchmarkParallelSelects(8, 50000, () => {
8080
const testEnd = process.hrtime();
8181
console.log('total time: ', common.hrdiff(testStart, testEnd) / 1e9);
8282
if (done) done();

‎benchmarks/bench-insert-select-prepared.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function benchmarkInsert(numLeft, callback) {
2020
connection.execute(
2121
'INSERT INTO ' + table + ' SET title="' + text + '"',
2222
[],
23-
function(err) {
23+
err => {
2424
if (err) throw err;
2525
if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
2626
else callback();
@@ -31,7 +31,7 @@ function benchmarkInsert(numLeft, callback) {
3131
function benchmarkInserts(n, cb) {
3232
const numInsert = 10000;
3333
const start = process.hrtime();
34-
benchmarkInsert(numInsert, function() {
34+
benchmarkInsert(numInsert, () => {
3535
const end = process.hrtime();
3636
const diff = common.hrdiff(start, end);
3737
console.log((numInsert * 1e9) / diff + ' inserts/sec');
@@ -44,7 +44,7 @@ function benchmarkSelect(numLeft, numSelect, callback) {
4444
connection.execute(
4545
'select * from ' + table + ' limit ' + numSelect,
4646
[],
47-
function(err) {
47+
err => {
4848
if (err) throw err;
4949
if (numLeft > 1) benchmarkSelect(numLeft - 1, numSelect, callback);
5050
else callback();
@@ -55,7 +55,7 @@ function benchmarkSelect(numLeft, numSelect, callback) {
5555
function benchmarkSelects(n, size, cb) {
5656
const numSelects = 100;
5757
const start = process.hrtime();
58-
benchmarkSelect(numSelects, size, function() {
58+
benchmarkSelect(numSelects, size, () => {
5959
const end = process.hrtime();
6060
const diff = common.hrdiff(start, end);
6161
console.log(
@@ -73,10 +73,10 @@ function benchmarkSelects(n, size, cb) {
7373

7474
module.exports = function(done) {
7575
const testStart = process.hrtime();
76-
benchmarkInserts(1, function() {
77-
benchmarkSelects(5, 100, function() {
78-
benchmarkSelects(10, 1000, function() {
79-
benchmarkSelects(2, 50000, function() {
76+
benchmarkInserts(1, () => {
77+
benchmarkSelects(5, 100, () => {
78+
benchmarkSelects(10, 1000, () => {
79+
benchmarkSelects(2, 50000, () => {
8080
const testEnd = process.hrtime();
8181
console.log('total time: ', common.hrdiff(testStart, testEnd) / 1e9);
8282
connection.end();

‎benchmarks/bench-insert-select.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ connection.query(
1818
function benchmarkInsert(numLeft, callback) {
1919
connection.query(
2020
'INSERT INTO ' + table + ' SET title="' + text + '"',
21-
function(err) {
21+
err => {
2222
if (err) throw err;
2323
if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
2424
else callback();
@@ -29,7 +29,7 @@ function benchmarkInsert(numLeft, callback) {
2929
function benchmarkInserts(n, cb) {
3030
const numInsert = 10000;
3131
const start = process.hrtime();
32-
benchmarkInsert(numInsert, function() {
32+
benchmarkInsert(numInsert, () => {
3333
const end = process.hrtime();
3434
const diff = common.hrdiff(start, end);
3535
console.log((numInsert * 1e9) / diff + ' inserts/sec');
@@ -39,9 +39,7 @@ function benchmarkInserts(n, cb) {
3939
}
4040

4141
function benchmarkSelect(numLeft, numSelect, callback) {
42-
connection.query('select * from ' + table + ' limit ' + numSelect, function(
43-
err
44-
) {
42+
connection.query('select * from ' + table + ' limit ' + numSelect, err => {
4543
if (err) throw err;
4644
if (numLeft > 1) benchmarkSelect(numLeft - 1, numSelect, callback);
4745
else callback();
@@ -51,7 +49,7 @@ function benchmarkSelect(numLeft, numSelect, callback) {
5149
function benchmarkSelects(n, size, cb) {
5250
const numSelects = 100;
5351
const start = process.hrtime();
54-
benchmarkSelect(numSelects, size, function() {
52+
benchmarkSelect(numSelects, size, () => {
5553
const end = process.hrtime();
5654
const diff = common.hrdiff(start, end);
5755
console.log(
@@ -69,10 +67,10 @@ function benchmarkSelects(n, size, cb) {
6967

7068
module.exports = function(done) {
7169
const testStart = process.hrtime();
72-
benchmarkInserts(5, function() {
73-
benchmarkSelects(5, 10000, function() {
74-
benchmarkSelects(10, 1000, function() {
75-
benchmarkSelects(2, 50000, function() {
70+
benchmarkInserts(5, () => {
71+
benchmarkSelects(5, 10000, () => {
72+
benchmarkSelects(10, 1000, () => {
73+
benchmarkSelects(2, 50000, () => {
7674
const testEnd = process.hrtime();
7775
console.log('total time: ', common.hrdiff(testStart, testEnd) / 1e9);
7876
connection.end();

‎benchmarks/benchmark-query.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const sql = process.argv[2];
1111
const start = Date.now();
1212
let prev1000 = start;
1313
function bench() {
14-
db.query(sql).on('end', function() {
14+
db.query(sql).on('end', () => {
1515
left--;
1616
if (left % 1000 === 0) {
1717
const curTime = Date.now();

0 commit comments

Comments
 (0)