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

Topic await errors (#7727)

Browse Source 
* feat: derp await

* feat: restore user.getSettings

* feat: cleanup

* feat: make tid const

* feat: cleanup

* fix: tests

* feat: deprecate filter:controllers.topic.get

* feat: rewrite post-index logic

* feat: change calculation to match others

* fix: use .async

* feat: remove try/catch wrapper
This commit is contained in:
Barış Soner Uşaklı
2019-07-03 12:48:26 -04:00
committed by GitHub
parent 5e46cf9b09
commit bd640a1107
18 changed files with 236 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,6 +208,14 @@ module.exports = function (db, module) {
}
module.sortedSetsRanks = function (keys, values, callback) {
sortedSetsRanks(module.sortedSetRank, keys, values, callback);
};
module.sortedSetsRevRanks = function (keys, values, callback) {
sortedSetsRanks(module.sortedSetRevRank, keys, values, callback);
};
function sortedSetsRanks(method, keys, values, callback) {
if (!Array.isArray(keys) || !keys.length) {
return callback(null, []);
}
@@ -217,12 +225,20 @@ module.exports = function (db, module) {
}
async.map(data, function (item, next) {
getSortedSetRank(false, item.key, item.value, next);
method(item.key, item.value, next);
}, callback);
};
}
module.sortedSetRanks = function (key, values, callback) {
module.getSortedSetRange(key, 0, -1, function (err, sortedSet) {
sortedSetRanks(module.getSortedSetRange, key, values, callback);
};
module.sortedSetRevRanks = function (key, values, callback) {
sortedSetRanks(module.getSortedSetRevRange, key, values, callback);
};
function sortedSetRanks(method, key, values, callback) {
method(key, 0, -1, function (err, sortedSet) {
if (err) {
return callback(err);
}
@@ -237,7 +253,7 @@ module.exports = function (db, module) {
callback(null, result);
});
};
}
module.sortedSetScore = function (key, value, callback) {
if (!key) {

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

@@ -323,6 +323,14 @@ SELECT (SELECT r
getSortedSetRank('ASC', keys, values, callback);
};
module.sortedSetsRevRanks = function (keys, values, callback) {
if (!Array.isArray(keys) || !keys.length) {
return callback(null, []);
}
getSortedSetRank('DESC', keys, values, callback);
};
module.sortedSetRanks = function (key, values, callback) {
if (!Array.isArray(values) || !values.length) {
return callback(null, []);
@@ -331,6 +339,14 @@ SELECT (SELECT r
getSortedSetRank('ASC', new Array(values.length).fill(key), values, callback);
};
module.sortedSetRevRanks = function (key, values, callback) {
if (!Array.isArray(values) || !values.length) {
return callback(null, []);
}
getSortedSetRank('DESC', new Array(values.length).fill(key), values, callback);
};
module.sortedSetScore = function (key, value, callback) {
if (!key) {
return callback(null, null);

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

@@ -149,6 +149,10 @@ module.exports = function (redisClient, module) {
redisClient.zrank(key, value, callback);
};
module.sortedSetRevRank = function (key, value, callback) {
redisClient.zrevrank(key, value, callback);
};
module.sortedSetsRanks = function (keys, values, callback) {
var batch = redisClient.batch();
for (var i = 0; i < values.length; i += 1) {
@@ -157,6 +161,14 @@ module.exports = function (redisClient, module) {
batch.exec(callback);
};
module.sortedSetsRevRanks = function (keys, values, callback) {
var batch = redisClient.batch();
for (var i = 0; i < values.length; i += 1) {
batch.zrevrank(keys[i], values[i]);
}
batch.exec(callback);
};
module.sortedSetRanks = function (key, values, callback) {
var batch = redisClient.batch();
for (var i = 0; i < values.length; i += 1) {
@@ -165,8 +177,12 @@ module.exports = function (redisClient, module) {
batch.exec(callback);
};
module.sortedSetRevRank = function (key, value, callback) {
redisClient.zrevrank(key, value, callback);
module.sortedSetRevRanks = function (key, values, callback) {
var batch = redisClient.batch();
for (var i = 0; i < values.length; i += 1) {
batch.zrevrank(key, values[i]);
}
batch.exec(callback);
};
module.sortedSetScore = function (key, value, callback) {