Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-18 03:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: eslint no-var, vars-on-top

Browse Source
This commit is contained in:
Peter Jaszkowiak
2021-02-04 00:06:15 -07:00
committed by Julian Lam
parent b56d9e12b5
commit dab3b23575
255 changed files with 1988 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/database/index.js
View File

@@ -1,9 +1,9 @@
'use strict';
var nconf = require('nconf');
const nconf = require('nconf');
var databaseName = nconf.get('database');
var winston = require('winston');
const databaseName = nconf.get('database');
const winston = require('winston');
if (!databaseName) {
winston.error(new Error('Database type not set! Run ./nodebb setup'));

14
src/database/mongo/connection.js
View File

@@ -9,8 +9,8 @@ const connection = module.exports;
connection.getConnectionString = function (mongo) {
mongo = mongo || nconf.get('mongo');
var usernamePassword = '';
var uri = mongo.uri || '';
let usernamePassword = '';
const uri = mongo.uri || '';
if (mongo.username && mongo.password) {
usernamePassword = `${nconf.get('mongo:username')}:${encodeURIComponent(nconf.get('mongo:password'))}@`;
} else if (!uri.includes('@') || !uri.slice(uri.indexOf('://') + 3, uri.indexOf('@'))) {
@@ -30,11 +30,11 @@ connection.getConnectionString = function (mongo) {
mongo.database = 'nodebb';
}
var hosts = mongo.host.split(',');
var ports = mongo.port.toString().split(',');
var servers = [];
const hosts = mongo.host.split(',');
const ports = mongo.port.toString().split(',');
const servers = [];
for (var i = 0; i < hosts.length; i += 1) {
for (let i = 0; i < hosts.length; i += 1) {
servers.push(`${hosts[i]}:${ports[i]}`);
}
@@ -43,7 +43,7 @@ connection.getConnectionString = function (mongo) {
connection.getConnectionOptions = function (mongo) {
mongo = mongo || nconf.get('mongo');
var connOptions = {
const connOptions = {
poolSize: 10,
connectTimeoutMS: 90000,
useNewUrlParser: true,

8
src/database/mongo/hash.js
View File

@@ -56,7 +56,7 @@ module.exports = function (module) {
if (!field) {
return;
}
var data = {};
const data = {};
data[field] = value;
await module.setObject(key, data);
};
@@ -177,7 +177,7 @@ module.exports = function (module) {
return;
}
var data = {};
const data = {};
fields.forEach((field) => {
field = helpers.fieldToString(field);
data[field] = '';
@@ -205,12 +205,12 @@ module.exports = function (module) {
return null;
}
var increment = {};
const increment = {};
field = helpers.fieldToString(field);
increment[field] = value;
if (Array.isArray(key)) {
var bulk = module.client.collection('objects').initializeUnorderedBulkOp();
const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
key.forEach((key) => {
bulk.find({ _key: key }).upsert().update({ $inc: increment });
});

4
src/database/mongo/helpers.js
View File

@@ -6,8 +6,8 @@ const utils = require('../../utils');
helpers.noop = function () {};
helpers.toMap = function (data) {
var map = {};
for (var i = 0; i < data.length; i += 1) {
const map = {};
for (let i = 0; i < data.length; i += 1) {
map[data[i]._key] = data[i];
delete data[i]._key;
}

2
src/database/mongo/list.js
View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.listPrepend = async function (key, value) {
if (!key) {

4
src/database/mongo/main.js
View File

@@ -66,7 +66,7 @@ module.exports = function (module) {
const objectData = await module.client.collection('objects').findOne({ _key: key }, { projection: { _id: 0 } });
// fallback to old field name 'value' for backwards compatibility #6340
var value = null;
let value = null;
if (objectData) {
if (objectData.hasOwnProperty('data')) {
value = objectData.data;
@@ -105,7 +105,7 @@ module.exports = function (module) {
return null;
}
delete data.expireAt;
var keys = Object.keys(data);
const keys = Object.keys(data);
if (keys.length === 4 && data.hasOwnProperty('_key') && data.hasOwnProperty('score') && data.hasOwnProperty('value')) {
return 'zset';
} else if (keys.length === 3 && data.hasOwnProperty('_key') && data.hasOwnProperty('members')) {

16
src/database/mongo/sets.js
View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.setAdd = async function (key, value) {
if (!Array.isArray(value)) {
@@ -36,9 +36,9 @@ module.exports = function (module) {
value = value.map(v => helpers.valueToString(v));
var bulk = module.client.collection('objects').initializeUnorderedBulkOp();
const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
for (var i = 0; i < keys.length; i += 1) {
for (let i = 0; i < keys.length; i += 1) {
bulk.find({ _key: keys[i] }).upsert().updateOne({ $addToSet: {
members: {
$each: value,
@@ -103,7 +103,7 @@ module.exports = function (module) {
const result = await module.client.collection('objects').find({ _key: { $in: sets }, members: value }, { projection: { _id: 0, members: 0 } }).toArray();
var map = {};
const map = {};
result.forEach((item) => {
map[item._key] = true;
});
@@ -126,7 +126,7 @@ module.exports = function (module) {
}
const data = await module.client.collection('objects').find({ _key: { $in: keys } }, { projection: { _id: 0 } }).toArray();
var sets = {};
const sets = {};
data.forEach((set) => {
sets[set._key] = set.members || [];
});
@@ -144,7 +144,7 @@ module.exports = function (module) {
module.setsCount = async function (keys) {
const setsMembers = await module.getSetsMembers(keys);
var counts = setsMembers.map(members => (members && members.length) || 0);
const counts = setsMembers.map(members => (members && members.length) || 0);
return counts;
};
@@ -154,8 +154,8 @@ module.exports = function (module) {
return;
}
var randomIndex = Math.floor(Math.random() * data.members.length);
var value = data.members[randomIndex];
const randomIndex = Math.floor(Math.random() * data.members.length);
const value = data.members[randomIndex];
await module.setRemove(data._key, value);
return value;
};

28
src/database/mongo/sorted.js
View File

@@ -143,7 +143,7 @@ module.exports = function (module) {
return;
}
var query = { _key: key };
const query = { _key: key };
if (min !== '-inf') {
query.score = { $gte: min };
}
@@ -226,8 +226,8 @@ module.exports = function (module) {
if (!Array.isArray(keys) || !keys.length) {
return [];
}
var data = new Array(values.length);
for (var i = 0; i < values.length; i += 1) {
const data = new Array(values.length);
for (let i = 0; i < values.length; i += 1) {
data[i] = { key: keys[i], value: values[i] };
}
const promises = data.map(item => method(item.key, item.value));
@@ -271,7 +271,7 @@ module.exports = function (module) {
}
value = helpers.valueToString(value);
const result = await module.client.collection('objects').find({ _key: { $in: keys }, value: value }, { projection: { _id: 0, value: 0 } }).toArray();
var map = {};
const map = {};
result.forEach((item) => {
if (item) {
map[item._key] = item;
@@ -291,7 +291,7 @@ module.exports = function (module) {
values = values.map(helpers.valueToString);
const result = await module.client.collection('objects').find({ _key: key, value: { $in: values } }, { projection: { _id: 0, _key: 0 } }).toArray();
var valueToScore = {};
const valueToScore = {};
result.forEach((item) => {
if (item) {
valueToScore[item.value] = item.score;
@@ -328,7 +328,7 @@ module.exports = function (module) {
projection: { _id: 0, value: 1 },
}).toArray();
var isMember = {};
const isMember = {};
results.forEach((item) => {
if (item) {
isMember[item.value] = true;
@@ -349,7 +349,7 @@ module.exports = function (module) {
projection: { _id: 0, _key: 1, value: 1 },
}).toArray();
var isMember = {};
const isMember = {};
results.forEach((item) => {
if (item) {
isMember[item._key] = true;
@@ -393,7 +393,7 @@ module.exports = function (module) {
if (!key) {
return;
}
var data = {};
const data = {};
value = helpers.valueToString(value);
data.score = parseFloat(increment);
@@ -426,7 +426,7 @@ module.exports = function (module) {
};
async function sortedSetLex(key, min, max, sort, start, count) {
var query = { _key: key };
const query = { _key: key };
start = start !== undefined ? start : 0;
count = count !== undefined ? count : 0;
buildLexQuery(query, min, max);
@@ -441,7 +441,7 @@ module.exports = function (module) {
}
module.sortedSetRemoveRangeByLex = async function (key, min, max) {
var query = { _key: key };
const query = { _key: key };
buildLexQuery(query, min, max);
await module.client.collection('objects').deleteMany(query);
@@ -499,14 +499,14 @@ module.exports = function (module) {
};
module.processSortedSet = async function (setKey, processFn, options) {
var done = false;
var ids = [];
var project = { _id: 0, _key: 0 };
let done = false;
const ids = [];
const project = { _id: 0, _key: 0 };
if (!options.withScores) {
project.score = 0;
}
var cursor = await module.client.collection('objects').find({ _key: setKey }, { projection: project })
const cursor = await module.client.collection('objects').find({ _key: setKey }, { projection: project })
.sort({ score: 1 })
.batchSize(options.batch);

14
src/database/mongo/sorted/add.js
View File

@@ -1,8 +1,8 @@
'use strict';
module.exports = function (module) {
var helpers = require('../helpers');
var utils = require('../../../utils');
const helpers = require('../helpers');
const utils = require('../../../utils');
module.sortedSetAdd = async function (key, score, value) {
if (!key) {
@@ -40,8 +40,8 @@ module.exports = function (module) {
}
values = values.map(helpers.valueToString);
var bulk = module.client.collection('objects').initializeUnorderedBulkOp();
for (var i = 0; i < scores.length; i += 1) {
const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
for (let i = 0; i < scores.length; i += 1) {
bulk.find({ _key: key, value: values[i] }).upsert().updateOne({ $set: { score: parseFloat(scores[i]) } });
}
await bulk.execute();
@@ -63,8 +63,8 @@ module.exports = function (module) {
value = helpers.valueToString(value);
var bulk = module.client.collection('objects').initializeUnorderedBulkOp();
for (var i = 0; i < keys.length; i += 1) {
const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
for (let i = 0; i < keys.length; i += 1) {
bulk.find({ _key: keys[i], value: value }).upsert().updateOne({ $set: { score: parseFloat(isArrayOfScores ? scores[i] : scores) } });
}
await bulk.execute();
@@ -74,7 +74,7 @@ module.exports = function (module) {
if (!Array.isArray(data) || !data.length) {
return;
}
var bulk = module.client.collection('objects').initializeUnorderedBulkOp();
const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
data.forEach((item) => {
if (!utils.isNumber(item[1])) {
throw new Error(`[[error:invalid-score, ${item[1]}]]`);

6
src/database/mongo/sorted/remove.js
View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('../helpers');
const helpers = require('../helpers');
module.sortedSetRemove = async function (key, value) {
if (!key) {
@@ -37,7 +37,7 @@ module.exports = function (module) {
if (!Array.isArray(keys) || !keys.length) {
return;
}
var query = { _key: { $in: keys } };
const query = { _key: { $in: keys } };
if (keys.length === 1) {
query._key = keys[0];
}
@@ -56,7 +56,7 @@ module.exports = function (module) {
if (!Array.isArray(data) || !data.length) {
return;
}
var bulk = module.client.collection('objects').initializeUnorderedBulkOp();
const bulk = module.client.collection('objects').initializeUnorderedBulkOp();
data.forEach(item => bulk.find({ _key: item[0], value: String(item[1]) }).remove());
await bulk.execute();
};

8
src/database/mongo/sorted/union.js
View File

@@ -28,19 +28,19 @@ module.exports = function (module) {
if (!Array.isArray(params.sets) || !params.sets.length) {
return;
}
var limit = params.stop - params.start + 1;
let limit = params.stop - params.start + 1;
if (limit <= 0) {
limit = 0;
}
var aggregate = {};
const aggregate = {};
if (params.aggregate) {
aggregate[`$${params.aggregate.toLowerCase()}`] = '$score';
} else {
aggregate.$sum = '$score';
}
var pipeline = [
const pipeline = [
{ $match: { _key: { $in: params.sets } } },
{ $group: { _id: { value: '$value' }, totalScore: aggregate } },
{ $sort: { totalScore: params.sort } },
@@ -54,7 +54,7 @@ module.exports = function (module) {
pipeline.push({ $limit: limit });
}
var project = { _id: 0, value: '$_id.value' };
const project = { _id: 0, value: '$_id.value' };
if (params.withScores) {
project.score = '$totalScore';
}

6
src/database/postgres.js
View File

@@ -64,7 +64,7 @@ postgresModule.init = async function () {
async function checkUpgrade(client) {
var res = await client.query(`
const res = await client.query(`
SELECT EXISTS(SELECT *
FROM "information_schema"."columns"
WHERE "table_schema" = 'public'
@@ -331,7 +331,7 @@ postgresModule.createIndices = function (callback) {
return callback();
}
var query = postgresModule.pool.query.bind(postgresModule.pool);
const query = postgresModule.pool.query.bind(postgresModule.pool);
winston.info('[database] Checking database indices.');
async.series([
@@ -348,7 +348,7 @@ postgresModule.createIndices = function (callback) {
};
postgresModule.checkCompatibility = function (callback) {
var postgresPkg = require('pg/package.json');
const postgresPkg = require('pg/package.json');
postgresModule.checkCompatibilityVersion(postgresPkg.version, callback);
};

2
src/database/postgres/connection.js
View File

@@ -21,7 +21,7 @@ connection.getConnectionOptions = function (postgres) {
postgres.database = 'nodebb';
}
var connOptions = {
const connOptions = {
host: postgres.host,
port: postgres.port,
user: postgres.username,

4
src/database/postgres/hash.js
View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.setObject = async function (key, data) {
if (!key || !data) {
@@ -158,7 +158,7 @@ SELECT (SELECT jsonb_object_agg(f, d."value")
return res.rows[0].d;
}
var obj = {};
const obj = {};
fields.forEach((f) => {
obj[f] = null;
});

12
src/database/postgres/helpers.js
View File

@@ -1,17 +1,17 @@
'use strict';
var helpers = module.exports;
const helpers = module.exports;
helpers.valueToString = function (value) {
return String(value);
};
helpers.removeDuplicateValues = function (values) {
var others = Array.prototype.slice.call(arguments, 1);
for (var i = 0; i < values.length; i++) {
const others = Array.prototype.slice.call(arguments, 1);
for (let i = 0; i < values.length; i++) {
if (values.lastIndexOf(values[i]) !== i) {
values.splice(i, 1);
for (var j = 0; j < others.length; j++) {
for (let j = 0; j < others.length; j++) {
others[j].splice(i, 1);
}
i -= 1;
@@ -81,14 +81,14 @@ SELECT "_key", "type"
values: [keys],
});
var invalid = res.rows.filter(r => r.type !== type);
const invalid = res.rows.filter(r => r.type !== type);
if (invalid.length) {
const parts = invalid.map(r => `${JSON.stringify(r._key)} is ${r.type}`);
throw new Error(`database: cannot insert multiple objects as ${type} because they already exist: ${parts.join(', ')}`);
}
var missing = keys.filter(k => !res.rows.some(r => r._key === k));
const missing = keys.filter(k => !res.rows.some(r => r._key === k));
if (missing.length) {
throw new Error(`database: failed to insert keys for objects: ${JSON.stringify(missing)}`);

2
src/database/postgres/list.js
View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.listPrepend = async function (key, value) {
if (!key) {

4
src/database/postgres/sets.js
View File

@@ -1,9 +1,9 @@
'use strict';
var _ = require('lodash');
const _ = require('lodash');
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.setAdd = async function (key, value) {
if (!Array.isArray(value)) {

26
src/database/postgres/sorted.js
View File

@@ -1,9 +1,9 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
const util = require('util');
var Cursor = require('pg-cursor');
const Cursor = require('pg-cursor');
Cursor.prototype.readAsync = util.promisify(Cursor.prototype.read);
const sleep = util.promisify(setTimeout);
@@ -41,19 +41,19 @@ module.exports = function (module) {
return [];
}
var reverse = false;
let reverse = false;
if (start === 0 && stop < -1) {
reverse = true;
sort *= -1;
start = Math.abs(stop + 1);
stop = -1;
} else if (start < 0 && stop > start) {
var tmp1 = Math.abs(stop + 1);
const tmp1 = Math.abs(stop + 1);
stop = Math.abs(start + 1);
start = tmp1;
}
var limit = stop - start + 1;
let limit = stop - start + 1;
if (limit <= 0) {
limit = null;
}
@@ -346,7 +346,7 @@ SELECT o."_key" k,
});
return keys.map((k) => {
var s = res.rows.find(r => r.k === k);
const s = res.rows.find(r => r.k === k);
return s ? parseFloat(s.s) : null;
});
};
@@ -375,7 +375,7 @@ SELECT z."value" v,
});
return values.map((v) => {
var s = res.rows.find(r => r.v === v);
const s = res.rows.find(r => r.v === v);
return s ? parseFloat(s.s) : null;
});
};
@@ -507,7 +507,7 @@ RETURNING "score" s`,
};
module.sortedSetLexCount = async function (key, min, max) {
var q = buildLexQuery(key, min, max);
const q = buildLexQuery(key, min, max);
const res = await module.pool.query({
name: `sortedSetLexCount${q.suffix}`,
@@ -528,7 +528,7 @@ SELECT COUNT(*) c
start = start !== undefined ? start : 0;
count = count !== undefined ? count : 0;
var q = buildLexQuery(key, min, max);
const q = buildLexQuery(key, min, max);
q.values.push(start);
q.values.push(count <= 0 ? null : count);
const res = await module.pool.query({
@@ -550,7 +550,7 @@ OFFSET $${q.values.length - 1}::INTEGER`,
}
module.sortedSetRemoveRangeByLex = async function (key, min, max) {
var q = buildLexQuery(key, min, max);
const q = buildLexQuery(key, min, max);
await module.pool.query({
name: `sortedSetRemoveRangeByLex${q.suffix}`,
text: `
@@ -564,7 +564,7 @@ DELETE FROM "legacy_zset" z
};
function buildLexQuery(key, min, max) {
var q = {
const q = {
suffix: '',
where: `o."_key" = $1::TEXT`,
values: [key],
@@ -636,8 +636,8 @@ SELECT z."value",
module.processSortedSet = async function (setKey, process, options) {
const client = await module.pool.connect();
var batchSize = (options || {}).batch || 100;
var cursor = client.query(new Cursor(`
const batchSize = (options || {}).batch || 100;
const cursor = client.query(new Cursor(`
SELECT z."value", z."score"
FROM "legacy_object_live" o
INNER JOIN "legacy_zset" z

4
src/database/postgres/sorted/add.js
View File

@@ -1,8 +1,8 @@
'use strict';
module.exports = function (module) {
var helpers = require('../helpers');
var utils = require('../../../utils');
const helpers = require('../helpers');
const utils = require('../../../utils');
module.sortedSetAdd = async function (key, score, value) {
if (!key) {

12
src/database/postgres/sorted/intersect.js
View File

@@ -37,11 +37,11 @@ SELECT COUNT(*) c
};
async function getSortedSetIntersect(params) {
var sets = params.sets;
var start = params.hasOwnProperty('start') ? params.start : 0;
var stop = params.hasOwnProperty('stop') ? params.stop : -1;
var weights = params.weights || [];
var aggregate = params.aggregate || 'SUM';
const sets = params.sets;
const start = params.hasOwnProperty('start') ? params.start : 0;
const stop = params.hasOwnProperty('stop') ? params.stop : -1;
let weights = params.weights || [];
const aggregate = params.aggregate || 'SUM';
if (sets.length < weights.length) {
weights = weights.slice(0, sets.length);
@@ -50,7 +50,7 @@ SELECT COUNT(*) c
weights.push(1);
}
var limit = stop - start + 1;
let limit = stop - start + 1;
if (limit <= 0) {
limit = null;
}

2
src/database/postgres/sorted/remove.js
View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('../helpers');
const helpers = require('../helpers');
module.sortedSetRemove = async function (key, value) {
if (!key) {

12
src/database/postgres/sorted/union.js
View File

@@ -31,11 +31,11 @@ SELECT COUNT(DISTINCT z."value") c
};
async function getSortedSetUnion(params) {
var sets = params.sets;
var start = params.hasOwnProperty('start') ? params.start : 0;
var stop = params.hasOwnProperty('stop') ? params.stop : -1;
var weights = params.weights || [];
var aggregate = params.aggregate || 'SUM';
const sets = params.sets;
const start = params.hasOwnProperty('start') ? params.start : 0;
const stop = params.hasOwnProperty('stop') ? params.stop : -1;
let weights = params.weights || [];
const aggregate = params.aggregate || 'SUM';
if (sets.length < weights.length) {
weights = weights.slice(0, sets.length);
@@ -44,7 +44,7 @@ SELECT COUNT(DISTINCT z."value") c
weights.push(1);
}
var limit = stop - start + 1;
let limit = stop - start + 1;
if (limit <= 0) {
limit = null;
}

2
src/database/redis/hash.js
View File

@@ -193,7 +193,7 @@ module.exports = function (module) {
}
let result;
if (Array.isArray(key)) {
var batch = module.client.batch();
const batch = module.client.batch();
key.forEach(k => batch.hincrby(k, field, value));
result = await helpers.execBatch(batch);
} else {

4
src/database/redis/helpers.js
View File

@@ -2,7 +2,7 @@
const util = require('util');
var helpers = module.exports;
const helpers = module.exports;
helpers.noop = function () {};
@@ -12,7 +12,7 @@ helpers.execBatch = async function (batch) {
};
helpers.resultsToBool = function (results) {
for (var i = 0; i < results.length; i += 1) {
for (let i = 0; i < results.length; i += 1) {
results[i] = results[i] === 1;
}
return results;

2
src/database/redis/main.js
View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.flushdb = async function () {
await module.client.async.send_command('flushdb', []);

2
src/database/redis/pubsub.js
View File

@@ -20,7 +20,7 @@ const PubSub = function () {
}
try {
var msg = JSON.parse(message);
const msg = JSON.parse(message);
self.emit(msg.event, msg.data);
} catch (err) {
winston.error(err.stack);

6
src/database/redis/sets.js
View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.setAdd = async function (key, value) {
if (!Array.isArray(value)) {
@@ -30,13 +30,13 @@ module.exports = function (module) {
key = [key];
}
var batch = module.client.batch();
const batch = module.client.batch();
key.forEach(k => batch.srem(String(k), value));
await helpers.execBatch(batch);
};
module.setsRemove = async function (keys, value) {
var batch = module.client.batch();
const batch = module.client.batch();
keys.forEach(k => batch.srem(String(k), value));
await helpers.execBatch(batch);
};

16
src/database/redis/sorted.js
View File

@@ -111,7 +111,7 @@ module.exports = function (module) {
if (!Array.isArray(keys) || !keys.length) {
return [];
}
var batch = module.client.batch();
const batch = module.client.batch();
keys.forEach(k => batch.zcard(String(k)));
return await helpers.execBatch(batch);
};
@@ -138,7 +138,7 @@ module.exports = function (module) {
module.sortedSetsRanks = async function (keys, values) {
const batch = module.client.batch();
for (var i = 0; i < values.length; i += 1) {
for (let i = 0; i < values.length; i += 1) {
batch.zrank(keys[i], String(values[i]));
}
return await helpers.execBatch(batch);
@@ -146,7 +146,7 @@ module.exports = function (module) {
module.sortedSetsRevRanks = async function (keys, values) {
const batch = module.client.batch();
for (var i = 0; i < values.length; i += 1) {
for (let i = 0; i < values.length; i += 1) {
batch.zrevrank(keys[i], String(values[i]));
}
return await helpers.execBatch(batch);
@@ -154,7 +154,7 @@ module.exports = function (module) {
module.sortedSetRanks = async function (key, values) {
const batch = module.client.batch();
for (var i = 0; i < values.length; i += 1) {
for (let i = 0; i < values.length; i += 1) {
batch.zrank(key, String(values[i]));
}
return await helpers.execBatch(batch);
@@ -162,7 +162,7 @@ module.exports = function (module) {
module.sortedSetRevRanks = async function (key, values) {
const batch = module.client.batch();
for (var i = 0; i < values.length; i += 1) {
for (let i = 0; i < values.length; i += 1) {
batch.zrevrank(key, String(values[i]));
}
return await helpers.execBatch(batch);
@@ -230,7 +230,7 @@ module.exports = function (module) {
if (!Array.isArray(keys) || !keys.length) {
return [];
}
var batch = module.client.batch();
const batch = module.client.batch();
keys.forEach(k => batch.zrange(k, 0, -1));
return await helpers.execBatch(batch);
};
@@ -257,8 +257,8 @@ module.exports = function (module) {
};
async function sortedSetLex(method, reverse, key, min, max, start, count) {
var minmin;
var maxmax;
let minmin;
let maxmax;
if (reverse) {
minmin = '+';
maxmax = '-';

10
src/database/redis/sorted/add.js
View File

@@ -30,8 +30,8 @@ module.exports = function (module) {
throw new Error(`[[error:invalid-score, ${scores[i]}]]`);
}
}
var args = [key];
for (var i = 0; i < scores.length; i += 1) {
const args = [key];
for (let i = 0; i < scores.length; i += 1) {
args.push(scores[i], String(values[i]));
}
await module.client.async.zadd(args);
@@ -51,8 +51,8 @@ module.exports = function (module) {
throw new Error('[[error:invalid-data]]');
}
var batch = module.client.batch();
for (var i = 0; i < keys.length; i += 1) {
const batch = module.client.batch();
for (let i = 0; i < keys.length; i += 1) {
if (keys[i]) {
batch.zadd(keys[i], isArrayOfScores ? scores[i] : scores, String(value));
}
@@ -64,7 +64,7 @@ module.exports = function (module) {
if (!Array.isArray(data) || !data.length) {
return;
}
var batch = module.client.batch();
const batch = module.client.batch();
data.forEach((item) => {
if (!utils.isNumber(item[1])) {
throw new Error(`[[error:invalid-score, ${item[1]}]]`);

22
src/database/redis/sorted/intersect.js
View File

@@ -7,11 +7,11 @@ module.exports = function (module) {
if (!Array.isArray(keys) || !keys.length) {
return 0;
}
var tempSetName = `temp_${Date.now()}`;
const tempSetName = `temp_${Date.now()}`;
var interParams = [tempSetName, keys.length].concat(keys);
const interParams = [tempSetName, keys.length].concat(keys);
var multi = module.client.multi();
const multi = module.client.multi();
multi.zinterstore(interParams);
multi.zcard(tempSetName);
multi.del(tempSetName);
@@ -30,14 +30,14 @@ module.exports = function (module) {
};
async function getSortedSetRevIntersect(params) {
var sets = params.sets;
var start = params.hasOwnProperty('start') ? params.start : 0;
var stop = params.hasOwnProperty('stop') ? params.stop : -1;
var weights = params.weights || [];
const sets = params.sets;
const start = params.hasOwnProperty('start') ? params.start : 0;
const stop = params.hasOwnProperty('stop') ? params.stop : -1;
const weights = params.weights || [];
var tempSetName = `temp_${Date.now()}`;
const tempSetName = `temp_${Date.now()}`;
var interParams = [tempSetName, sets.length].concat(sets);
let interParams = [tempSetName, sets.length].concat(sets);
if (weights.length) {
interParams = interParams.concat(['WEIGHTS'].concat(weights));
}
@@ -46,12 +46,12 @@ module.exports = function (module) {
interParams = interParams.concat(['AGGREGATE', params.aggregate]);
}
var rangeParams = [tempSetName, start, stop];
const rangeParams = [tempSetName, start, stop];
if (params.withScores) {
rangeParams.push('WITHSCORES');
}
var multi = module.client.multi();
const multi = module.client.multi();
multi.zinterstore(interParams);
multi[params.method](rangeParams);
multi.del(tempSetName);

4
src/database/redis/sorted/remove.js
View File

@@ -2,7 +2,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('../helpers');
const helpers = require('../helpers');
module.sortedSetRemove = async function (key, value) {
if (!key) {
@@ -30,7 +30,7 @@ module.exports = function (module) {
};
module.sortedSetsRemoveRangeByScore = async function (keys, min, max) {
var batch = module.client.batch();
const batch = module.client.batch();
keys.forEach(k => batch.zremrangebyscore(k, min, max));
await helpers.execBatch(batch);
};

10
src/database/redis/sorted/union.js
View File

@@ -4,11 +4,11 @@
module.exports = function (module) {
const helpers = require('../helpers');
module.sortedSetUnionCard = async function (keys) {
var tempSetName = `temp_${Date.now()}`;
const tempSetName = `temp_${Date.now()}`;
if (!keys.length) {
return 0;
}
var multi = module.client.multi();
const multi = module.client.multi();
multi.zunionstore([tempSetName, keys.length].concat(keys));
multi.zcard(tempSetName);
multi.del(tempSetName);
@@ -31,14 +31,14 @@ module.exports = function (module) {
return [];
}
var tempSetName = `temp_${Date.now()}`;
const tempSetName = `temp_${Date.now()}`;
var rangeParams = [tempSetName, params.start, params.stop];
const rangeParams = [tempSetName, params.start, params.stop];
if (params.withScores) {
rangeParams.push('WITHSCORES');
}
var multi = module.client.multi();
const multi = module.client.multi();
multi.zunionstore([tempSetName, params.sets.length].concat(params.sets));
multi[params.method](rangeParams);
multi.del(tempSetName);