Skip to content

Commit b38c3a4

Browse files
SimonSchickSimonSchick
committed
chore: apply modern code styles
1 parent 33b94d3 commit b38c3a4

File tree

84 files changed

+465
-714
lines changed

Some content is hidden

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

84 files changed

+465
-714
lines changed

‎.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
root = true
2+
3+
[*]
4+
indent_size = 2
5+
indent_style = space
6+
trim_trailing_whitespace = true
7+
insert_final_newline = true

‎.eslintrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@
1414
"node": true
1515
},
1616
"rules": {
17+
"template-curly-spacing": ["error", "never"],
18+
"prefer-template": "error",
19+
"no-useless-call": "error",
20+
"no-lonely-if": "error",
21+
"indent": ["error", 2, {
22+
"SwitchCase": 1
23+
}],
24+
"no-else-return": ["error", {
25+
"allowElseIf": false
26+
}],
27+
"eqeqeq": "error",
1728
"no-invalid-this": "error",
1829
"consistent-this": "error",
1930
"prefer-arrow-callback": "error",

‎.npmignore

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎benchmarks/FB/hello.js

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if (cluster.isMaster) {
1010
}
1111

1212
cluster.on('exit', worker => {
13-
console.log('worker ' + worker.pid + ' died');
13+
console.log(`worker ${worker.pid} died`);
1414
});
1515

1616
return;
@@ -73,7 +73,7 @@ function handlePrepared(req, res) {
7373
[getRandomNumber()],
7474
(err, rows) => {
7575
results.push(rows[0]);
76-
if (results.length == queries) res.end(JSON.stringify(results));
76+
if (results.length === queries) res.end(JSON.stringify(results));
7777
}
7878
);
7979
}
@@ -91,7 +91,7 @@ function handleMysqlIsh(conn, req, res) {
9191
[getRandomNumber()],
9292
(err, rows) => {
9393
results.push(rows[0]);
94-
if (results.length == queries) res.end(JSON.stringify(results));
94+
if (results.length === queries) res.end(JSON.stringify(results));
9595
}
9696
);
9797
}
@@ -105,10 +105,10 @@ function handleMysqlIshPool(pool, req, res) {
105105
for (let i = 0; i < queries; ++i) {
106106
pool.getConnection(() => {
107107
mysql2conn.query(
108-
'SELECT * FROM world WHERE id = ' + getRandomNumber(),
108+
`SELECT * FROM world WHERE id = ${getRandomNumber()}`,
109109
(err, rows) => {
110110
results.push(rows[0]);
111-
if (results.length == queries) res.end(JSON.stringify(results));
111+
if (results.length === queries) res.end(JSON.stringify(results));
112112
}
113113
);
114114
});
@@ -125,7 +125,7 @@ function handleMaria(req, res) {
125125
.on('result', dbres => {
126126
dbres.on('row', row => {
127127
results.push(row);
128-
if (results.length == queries) res.end(JSON.stringify(results));
128+
if (results.length === queries) res.end(JSON.stringify(results));
129129
});
130130
});
131131
}
@@ -207,7 +207,7 @@ http
207207

208208
function libmysqlQuery2(callback) {
209209
libmysql.query(
210-
'SELECT * FROM world WHERE id = ' + getRandomNumber(),
210+
`SELECT * FROM world WHERE id = ${getRandomNumber()}`,
211211
(err, res) => {
212212
if (err) {
213213
throw err;
@@ -278,7 +278,7 @@ http
278278

279279
function libmysqlQuery(callback) {
280280
libmysql.query(
281-
'SELECT * FROM world WHERE id = ' + getRandomNumber(),
281+
`SELECT * FROM world WHERE id = ${getRandomNumber()}`,
282282
(err, res) => {
283283
if (err) {
284284
throw err;
@@ -293,10 +293,7 @@ http
293293

294294
rows[0].randomNumber = getRandomNumber();
295295
libmysql.query(
296-
'UPDATE World SET randomNumber = ' +
297-
rows[0].randomNumber +
298-
' WHERE id = ' +
299-
rows[0]['id'],
296+
`UPDATE World SET randomNumber = ${rows[0].randomNumber} WHERE id = ${rows[0]['id']}`,
300297
err => {
301298
if (err) {
302299
throw err;

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ function benchmarkSelects(n, cb) {
3838
const end = process.hrtime();
3939
const diff = common.hrdiff(start, end);
4040
console.log(
41-
' rows: ' +
42-
(numSelects * 1e9) / diff +
43-
' results/sec, ' +
44-
(rowsPerQuery * numSelects * 1e9) / diff +
45-
' rows/sec'
41+
` rows: ${(numSelects * 1e9) / diff} results/sec, ${(rowsPerQuery * numSelects * 1e9) / diff} rows/sec`
4642
);
4743
if (n > 1) benchmarkSelects(n - 1, cb);
4844
else cb();

‎benchmarks/bench-fake-server.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ for (let i = 0; i < connections.length; ++i)
1010
let currConn = 0;
1111
function next() {
1212
currConn++;
13-
if (currConn == connections.length) currConn = 0;
13+
if (currConn === connections.length) currConn = 0;
1414
connection = connections[currConn];
1515
}
1616
// ======================
@@ -39,11 +39,7 @@ function benchmarkSelects(n, cb) {
3939
const end = process.hrtime();
4040
const diff = common.hrdiff(start, end);
4141
console.log(
42-
' rows: ' +
43-
(numSelects * 1e9) / diff +
44-
' results/sec, ' +
45-
(rowsPerQuery * numSelects * 1e9) / diff +
46-
' rows/sec'
42+
` rows: ${(numSelects * 1e9) / diff}} results/sec, ${(rowsPerQuery * numSelects * 1e9) / diff} rows/sec`
4743
);
4844
if (n > 1) benchmarkSelects(n - 1, cb);
4945
else cb();

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ 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', () => {});
9+
connection.query(`drop table ${table}`).on('error', () => {});
1010
connection.query(
1111
[
12-
'CREATE TABLE `' + table + '` (',
12+
`CREATE TABLE \`${table}\` (`,
1313
'`id` int(11) unsigned NOT NULL AUTO_INCREMENT,',
1414
'`title` varchar(255) NOT NULL,',
1515
'PRIMARY KEY (`id`)',
@@ -19,7 +19,7 @@ connection.query(
1919

2020
function benchmarkInsert(numLeft, callback) {
2121
connection.query(
22-
'INSERT INTO ' + table + ' SET title="' + text + '"',
22+
`INSERT INTO ${table} SET title="${text}"`,
2323
err => {
2424
if (err) throw err;
2525
if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
@@ -34,7 +34,7 @@ function benchmarkInserts(n, cb) {
3434
benchmarkInsert(numInsert, () => {
3535
const end = process.hrtime();
3636
const diff = common.hrdiff(start, end);
37-
console.log((numInsert * 1e9) / diff + ' inserts/sec');
37+
console.log(`${(numInsert * 1e9) / diff} inserts/sec`);
3838
if (n > 1) benchmarkInserts(n - 1, cb);
3939
else cb();
4040
});
@@ -51,12 +51,7 @@ function benchmarkParallelSelects(n, size, cb) {
5151
const end = process.hrtime();
5252
const diff = common.hrdiff(start, end);
5353
console.log(
54-
size +
55-
' rows: ' +
56-
(n * 1e9) / diff +
57-
' results/sec, ' +
58-
(size * n * 1e9) / diff +
59-
' rows/sec'
54+
`${size} rows: ${(n * 1e9) / diff} results/sec, ${(size * n * 1e9) / diff} rows/sec`
6055
);
6156
cb();
6257
}
@@ -66,7 +61,7 @@ function benchmarkParallelSelects(n, size, cb) {
6661
numRunning++;
6762
connections[i] = common.createConnection();
6863
const cmd = connections[i].execute(
69-
'select * from ' + table + ' limit ' + size,
64+
`select * from ${table} limit ${size}`,
7065
[]
7166
);
7267
cmd.on('end', commandDone);

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const table = 'insert_test';
88
const text = 'test abc xyz';
99
connection.query(
1010
[
11-
'CREATE TEMPORARY TABLE `' + table + '` (',
11+
`CREATE TEMPORARY TABLE \`${table}\` (`,
1212
'`id` int(11) unsigned NOT NULL AUTO_INCREMENT,',
1313
'`title` varchar(255),',
1414
'PRIMARY KEY (`id`)',
@@ -18,7 +18,7 @@ connection.query(
1818

1919
function benchmarkInsert(numLeft, callback) {
2020
connection.execute(
21-
'INSERT INTO ' + table + ' SET title="' + text + '"',
21+
`INSERT INTO ${table} SET title="${text}"`,
2222
[],
2323
err => {
2424
if (err) throw err;
@@ -34,15 +34,15 @@ function benchmarkInserts(n, cb) {
3434
benchmarkInsert(numInsert, () => {
3535
const end = process.hrtime();
3636
const diff = common.hrdiff(start, end);
37-
console.log((numInsert * 1e9) / diff + ' inserts/sec');
37+
console.log(`${(numInsert * 1e9) / diff} inserts/sec`);
3838
if (n > 1) benchmarkInserts(n - 1, cb);
3939
else cb();
4040
});
4141
}
4242

4343
function benchmarkSelect(numLeft, numSelect, callback) {
4444
connection.execute(
45-
'select * from ' + table + ' limit ' + numSelect,
45+
`select * from ${table} limit ${numSelect}`,
4646
[],
4747
err => {
4848
if (err) throw err;
@@ -59,12 +59,7 @@ function benchmarkSelects(n, size, cb) {
5959
const end = process.hrtime();
6060
const diff = common.hrdiff(start, end);
6161
console.log(
62-
size +
63-
' rows: ' +
64-
(numSelects * 1e9) / diff +
65-
' results/sec, ' +
66-
(size * numSelects * 1e9) / diff +
67-
' rows/sec'
62+
`${size} rows: ${(numSelects * 1e9) / diff} results/sec, ${(size * numSelects * 1e9) / diff} rows/sec`
6863
);
6964
if (n > 1) benchmarkSelects(n - 1, size, cb);
7065
else cb();

‎benchmarks/bench-insert-select.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const table = 'insert_test';
77
const text = '本日は晴天なり';
88
connection.query(
99
[
10-
'CREATE TEMPORARY TABLE `' + table + '` (',
10+
`CREATE TEMPORARY TABLE \`${table}\` (`,
1111
'`id` int(11) unsigned NOT NULL AUTO_INCREMENT,',
1212
'`title` varchar(255),',
1313
'PRIMARY KEY (`id`)',
@@ -17,7 +17,7 @@ connection.query(
1717

1818
function benchmarkInsert(numLeft, callback) {
1919
connection.query(
20-
'INSERT INTO ' + table + ' SET title="' + text + '"',
20+
`INSERT INTO ${table} SET title="${text}"`,
2121
err => {
2222
if (err) throw err;
2323
if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
@@ -32,14 +32,14 @@ function benchmarkInserts(n, cb) {
3232
benchmarkInsert(numInsert, () => {
3333
const end = process.hrtime();
3434
const diff = common.hrdiff(start, end);
35-
console.log((numInsert * 1e9) / diff + ' inserts/sec');
35+
console.log(`${(numInsert * 1e9) / diff} inserts/sec`);
3636
if (n > 1) benchmarkInserts(n - 1, cb);
3737
else cb();
3838
});
3939
}
4040

4141
function benchmarkSelect(numLeft, numSelect, callback) {
42-
connection.query('select * from ' + table + ' limit ' + numSelect, err => {
42+
connection.query(`select * from ${table} limit ${numSelect}`, err => {
4343
if (err) throw err;
4444
if (numLeft > 1) benchmarkSelect(numLeft - 1, numSelect, callback);
4545
else callback();
@@ -53,12 +53,7 @@ function benchmarkSelects(n, size, cb) {
5353
const end = process.hrtime();
5454
const diff = common.hrdiff(start, end);
5555
console.log(
56-
size +
57-
' rows: ' +
58-
(numSelects * 1e9) / diff +
59-
' results/sec, ' +
60-
(size * numSelects * 1e9) / diff +
61-
' rows/sec'
56+
`${size} rows: ${(numSelects * 1e9) / diff} results/sec, ${(size * numSelects * 1e9) / diff} rows/sec`
6257
);
6358
if (n > 1) benchmarkSelects(n - 1, size, cb);
6459
else cb();

‎benchmarks/benchmark-query.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ const sql = process.argv[2];
1717
const curTime = Date.now();
1818
const last1000time = curTime - prev1000;
1919
prev1000 = curTime;
20-
console.error(1000000 / last1000time + ' req/sec');
20+
console.error(`${1000000 / last1000time} req/sec`);
2121
}
2222

2323
if (left > 0) bench();
2424
else {
2525
console.error(
26-
10000000 / (Date.now() - start) + ' req/sec (average 10000 reqs)'
26+
`${10000000 / (Date.now() - start)} req/sec (average 10000 reqs)`
2727
);
2828
db.end();
2929
if (cb) cb();

‎benchmarks/http-select-and-render.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const port = process.env.PORT;
1111
http
1212
.createServer((req, res) => {
1313
const q = url.parse(req.url, true);
14-
if (q.pathname == '/render') {
14+
if (q.pathname === '/render') {
1515
const sql = q.query.q;
1616
const n = q.query.n;
1717
let rowsTotal = [];

‎benchmarks/ruby-mysql2/benchmark-query.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,16 @@ let numRequests = 0;
3636
const curTime = Date.now();
3737
const last1000time = curTime - prev1000;
3838
prev1000 = curTime;
39-
console.error(1000000 / last1000time + ' req/sec');
39+
console.error(`${1000000 / last1000time} req/sec`);
4040
}
4141

4242
if (left > 0) bench();
4343
else {
4444
console.error(
45-
(numRequests * 1000) / (Date.now() - start) +
46-
' req/sec (average 10000 reqs)'
45+
`${(numRequests * 1000) / (Date.now() - start)} req/sec (average 10000 reqs)`
4746
);
4847
console.error(
49-
(rowsReceived * 1000) / (Date.now() - start) +
50-
' row/sec (average 10000 reqs)'
48+
`${(rowsReceived * 1000) / (Date.now() - start)} row/sec (average 10000 reqs)`
5149
);
5250
db.end();
5351
if (cb) cb();

‎benchmarks/run-unit.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function runFolder(name, done) {
4646

4747
function benchmarkModule(m, modulePath, done) {
4848
const results = [];
49-
const bar = new progress(m.comment + ' [:bar] ', {
49+
const bar = new progress(`${m.comment} [:bar] `, {
5050
total: nRepeats,
5151
clear: true
5252
});
@@ -122,11 +122,11 @@ function runFileList(base, list, done) {
122122
if (index >= list.length) {
123123
return done(null, results);
124124
}
125-
const fname = base + '/' + list[index];
125+
const fname = `${base}/${list[index]}`;
126126
fs.stat(fname, (err, stat) => {
127127
if (err) return done(err);
128128
if (stat.isDirectory()) return runFolder(fname, runOne);
129-
else if (fname.slice(-3) == '.js') {
129+
if (fname.endsWith('.js')) {
130130
const m = require(fname);
131131
return benchmarkModule(m, fname, runOne);
132132
}
@@ -137,7 +137,7 @@ function runFileList(base, list, done) {
137137
}
138138

139139
//const name = process.argv[2] || __dirname + '/unit';
140-
runFolder(__dirname + '/unit', (err, results) => {
140+
runFolder(`${__dirname}/unit`, (err, results) => {
141141
//console.log(results);
142-
fs.writeFileSync(__dirname + '/results.json', JSON.stringify(results));
142+
fs.writeFileSync(`${__dirname}/results.json`, JSON.stringify(results));
143143
});

0 commit comments

Comments
 (0)