mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-27 09:06:15 +01:00
Async refactor in place (#7736)
* feat: allow both callback&and await
* feat: ignore async key
* feat: callbackify and promisify in same file
* Revert "feat: callbackify and promisify in same file"
This reverts commit cea206a9b8.
* feat: no need to store .callbackify
* feat: change getTopics to async
* feat: remove .async
* fix: byScore
* feat: rewrite topics/index and social with async/await
* fix: rewrite topics/data.js
fix issue with async.waterfall, only pass result if its not undefined
* feat: add callbackify to redis/psql
* feat: psql use await
* fix: redis 🌋
* feat: less returns
* feat: more await rewrite
* fix: redis tests
* feat: convert sortedSetAdd
rewrite psql transaction to async/await
* feat: 🐶
* feat: test
* feat: log client and query
* feat: log bind
* feat: more logs
* feat: more logs
* feat: check perform
* feat: dont callbackify transaction
* feat: remove logs
* fix: main functions
* feat: more logs
* fix: increment
* fix: rename
* feat: remove cls
* fix: remove console.log
* feat: add deprecation message to .async usage
* feat: update more dbal methods
* fix: redis :voodoo:
* feat: fix redis zrem, convert setObject
* feat: upgrade getObject methods
* fix: psql getObjectField
* fix: redis tests
* feat: getObjectKeys
* feat: getObjectValues
* feat: isObjectField
* fix: add missing return
* feat: delObjectField
* feat: incrObjectField
* fix: add missing await
* feat: remove exposed helpers
* feat: list methods
* feat: flush/empty
* feat: delete
* fix: redis delete all
* feat: get/set
* feat: incr/rename
* feat: type
* feat: expire
* feat: setAdd
* feat: setRemove
* feat: isSetMember
* feat: getSetMembers
* feat: setCount, setRemoveRandom
* feat: zcard,zcount
* feat: sortedSetRank
* feat: isSortedSetMember
* feat: zincrby
* feat: sortedSetLex
* feat: processSortedSet
* fix: add mising await
* feat: debug psql
* fix: psql test
* fix: test
* fix: another test
* fix: test fix
* fix: psql tests
* feat: remove logs
* feat: user arrow func
use builtin async promises
* feat: topic bookmarks
* feat: topic.delete
* feat: topic.restore
* feat: topics.purge
* feat: merge
* feat: suggested
* feat: topics/user.js
* feat: topics modules
* feat: topics/follow
* fix: deprecation msg
* feat: fork
* feat: topics/posts
* feat: sorted/recent
* feat: topic/teaser
* feat: topics/tools
* feat: topics/unread
* feat: add back node versions
disable deprecation notice
wrap async controllers in try/catch
* feat: use db directly
* feat: promisify in place
* fix: redis/psql
* feat: deprecation message
logs for psql
* feat: more logs
* feat: more logs
* feat: logs again
* feat: more logs
* fix: call release
* feat: restore travis, remove logs
* fix: loops
* feat: remove .async. usage
This commit is contained in:
Barış Soner Uşaklı
committed by
GitHub
GitHub
parent
43ce5f8af3
commit
805dcd7ca2
@@ -1,44 +1,34 @@
|
||||
'use strict';
|
||||
|
||||
var async = require('async');
|
||||
var _ = require('lodash');
|
||||
|
||||
module.exports = function (db, module) {
|
||||
var helpers = module.helpers.postgres;
|
||||
|
||||
module.setAdd = function (key, value, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
var helpers = require('./helpers');
|
||||
|
||||
module.setAdd = async function (key, value) {
|
||||
if (!Array.isArray(value)) {
|
||||
value = [value];
|
||||
}
|
||||
|
||||
module.transaction(function (tx, done) {
|
||||
var query = tx.client.query.bind(tx.client);
|
||||
|
||||
async.series([
|
||||
async.apply(helpers.ensureLegacyObjectType, tx.client, key, 'set'),
|
||||
async.apply(query, {
|
||||
name: 'setAdd',
|
||||
text: `
|
||||
await module.transaction(async function (client) {
|
||||
var query = client.query.bind(client);
|
||||
await helpers.ensureLegacyObjectType(client, key, 'set');
|
||||
await query({
|
||||
name: 'setAdd',
|
||||
text: `
|
||||
INSERT INTO "legacy_set" ("_key", "member")
|
||||
SELECT $1::TEXT, m
|
||||
FROM UNNEST($2::TEXT[]) m
|
||||
ON CONFLICT ("_key", "member")
|
||||
DO NOTHING`,
|
||||
values: [key, value],
|
||||
}),
|
||||
], function (err) {
|
||||
done(err);
|
||||
FROM UNNEST($2::TEXT[]) m
|
||||
ON CONFLICT ("_key", "member")
|
||||
DO NOTHING`,
|
||||
values: [key, value],
|
||||
});
|
||||
}, callback);
|
||||
});
|
||||
};
|
||||
|
||||
module.setsAdd = function (keys, value, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
|
||||
module.setsAdd = async function (keys, value) {
|
||||
if (!Array.isArray(keys) || !keys.length) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Array.isArray(value)) {
|
||||
@@ -47,31 +37,24 @@ SELECT $1::TEXT, m
|
||||
|
||||
keys = _.uniq(keys);
|
||||
|
||||
module.transaction(function (tx, done) {
|
||||
var query = tx.client.query.bind(tx.client);
|
||||
|
||||
async.series([
|
||||
async.apply(helpers.ensureLegacyObjectsType, tx.client, keys, 'set'),
|
||||
async.apply(query, {
|
||||
name: 'setsAdd',
|
||||
text: `
|
||||
await module.transaction(async function (client) {
|
||||
var query = client.query.bind(client);
|
||||
await helpers.ensureLegacyObjectsType(client, keys, 'set');
|
||||
await query({
|
||||
name: 'setsAdd',
|
||||
text: `
|
||||
INSERT INTO "legacy_set" ("_key", "member")
|
||||
SELECT k, m
|
||||
FROM UNNEST($1::TEXT[]) k
|
||||
CROSS JOIN UNNEST($2::TEXT[]) m
|
||||
ON CONFLICT ("_key", "member")
|
||||
DO NOTHING`,
|
||||
values: [keys, value],
|
||||
}),
|
||||
], function (err) {
|
||||
done(err);
|
||||
FROM UNNEST($1::TEXT[]) k
|
||||
CROSS JOIN UNNEST($2::TEXT[]) m
|
||||
ON CONFLICT ("_key", "member")
|
||||
DO NOTHING`,
|
||||
values: [keys, value],
|
||||
});
|
||||
}, callback);
|
||||
});
|
||||
};
|
||||
|
||||
module.setRemove = function (key, value, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
|
||||
module.setRemove = async function (key, value) {
|
||||
if (!Array.isArray(key)) {
|
||||
key = [key];
|
||||
}
|
||||
@@ -80,43 +63,37 @@ SELECT k, m
|
||||
value = [value];
|
||||
}
|
||||
|
||||
db.query({
|
||||
await db.query({
|
||||
name: 'setRemove',
|
||||
text: `
|
||||
DELETE FROM "legacy_set"
|
||||
WHERE "_key" = ANY($1::TEXT[])
|
||||
AND "member" = ANY($2::TEXT[])`,
|
||||
values: [key, value],
|
||||
}, function (err) {
|
||||
callback(err);
|
||||
});
|
||||
};
|
||||
|
||||
module.setsRemove = function (keys, value, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
|
||||
module.setsRemove = async function (keys, value) {
|
||||
if (!Array.isArray(keys) || !keys.length) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
db.query({
|
||||
await db.query({
|
||||
name: 'setsRemove',
|
||||
text: `
|
||||
DELETE FROM "legacy_set"
|
||||
WHERE "_key" = ANY($1::TEXT[])
|
||||
AND "member" = $2::TEXT`,
|
||||
values: [keys, value],
|
||||
}, function (err) {
|
||||
callback(err);
|
||||
});
|
||||
};
|
||||
|
||||
module.isSetMember = function (key, value, callback) {
|
||||
module.isSetMember = async function (key, value) {
|
||||
if (!key) {
|
||||
return callback(null, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
db.query({
|
||||
const res = await db.query({
|
||||
name: 'isSetMember',
|
||||
text: `
|
||||
SELECT 1
|
||||
@@ -127,23 +104,19 @@ SELECT 1
|
||||
WHERE o."_key" = $1::TEXT
|
||||
AND s."member" = $2::TEXT`,
|
||||
values: [key, value],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
callback(null, !!res.rows.length);
|
||||
});
|
||||
|
||||
return !!res.rows.length;
|
||||
};
|
||||
|
||||
module.isSetMembers = function (key, values, callback) {
|
||||
module.isSetMembers = async function (key, values) {
|
||||
if (!key || !Array.isArray(values) || !values.length) {
|
||||
return callback(null, []);
|
||||
return [];
|
||||
}
|
||||
|
||||
values = values.map(helpers.valueToString);
|
||||
|
||||
db.query({
|
||||
const res = await db.query({
|
||||
name: 'isSetMembers',
|
||||
text: `
|
||||
SELECT s."member" m
|
||||
@@ -154,27 +127,21 @@ SELECT s."member" m
|
||||
WHERE o."_key" = $1::TEXT
|
||||
AND s."member" = ANY($2::TEXT[])`,
|
||||
values: [key, values],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
});
|
||||
|
||||
callback(null, values.map(function (v) {
|
||||
return res.rows.some(function (r) {
|
||||
return r.m === v;
|
||||
});
|
||||
}));
|
||||
return values.map(function (v) {
|
||||
return res.rows.some(r => r.m === v);
|
||||
});
|
||||
};
|
||||
|
||||
module.isMemberOfSets = function (sets, value, callback) {
|
||||
module.isMemberOfSets = async function (sets, value) {
|
||||
if (!Array.isArray(sets) || !sets.length) {
|
||||
return callback(null, []);
|
||||
return [];
|
||||
}
|
||||
|
||||
value = helpers.valueToString(value);
|
||||
|
||||
db.query({
|
||||
const res = await db.query({
|
||||
name: 'isMemberOfSets',
|
||||
text: `
|
||||
SELECT o."_key" k
|
||||
@@ -185,25 +152,19 @@ SELECT o."_key" k
|
||||
WHERE o."_key" = ANY($1::TEXT[])
|
||||
AND s."member" = $2::TEXT`,
|
||||
values: [sets, value],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
});
|
||||
|
||||
callback(null, sets.map(function (s) {
|
||||
return res.rows.some(function (r) {
|
||||
return r.k === s;
|
||||
});
|
||||
}));
|
||||
return sets.map(function (s) {
|
||||
return res.rows.some(r => r.k === s);
|
||||
});
|
||||
};
|
||||
|
||||
module.getSetMembers = function (key, callback) {
|
||||
module.getSetMembers = async function (key) {
|
||||
if (!key) {
|
||||
return callback(null, []);
|
||||
return [];
|
||||
}
|
||||
|
||||
db.query({
|
||||
const res = await db.query({
|
||||
name: 'getSetMembers',
|
||||
text: `
|
||||
SELECT s."member" m
|
||||
@@ -213,23 +174,17 @@ SELECT s."member" m
|
||||
AND o."type" = s."type"
|
||||
WHERE o."_key" = $1::TEXT`,
|
||||
values: [key],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
callback(null, res.rows.map(function (r) {
|
||||
return r.m;
|
||||
}));
|
||||
});
|
||||
|
||||
return res.rows.map(r => r.m);
|
||||
};
|
||||
|
||||
module.getSetsMembers = function (keys, callback) {
|
||||
module.getSetsMembers = async function (keys) {
|
||||
if (!Array.isArray(keys) || !keys.length) {
|
||||
return callback(null, []);
|
||||
return [];
|
||||
}
|
||||
|
||||
db.query({
|
||||
const res = await db.query({
|
||||
name: 'getSetsMembers',
|
||||
text: `
|
||||
SELECT o."_key" k,
|
||||
@@ -241,25 +196,19 @@ SELECT o."_key" k,
|
||||
WHERE o."_key" = ANY($1::TEXT[])
|
||||
GROUP BY o."_key"`,
|
||||
values: [keys],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
});
|
||||
|
||||
callback(null, keys.map(function (k) {
|
||||
return (res.rows.find(function (r) {
|
||||
return r.k === k;
|
||||
}) || { m: [] }).m;
|
||||
}));
|
||||
return keys.map(function (k) {
|
||||
return (res.rows.find(r => r.k === k) || { m: [] }).m;
|
||||
});
|
||||
};
|
||||
|
||||
module.setCount = function (key, callback) {
|
||||
module.setCount = async function (key) {
|
||||
if (!key) {
|
||||
return callback(null, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
db.query({
|
||||
const res = await db.query({
|
||||
name: 'setCount',
|
||||
text: `
|
||||
SELECT COUNT(*) c
|
||||
@@ -269,17 +218,13 @@ SELECT COUNT(*) c
|
||||
AND o."type" = s."type"
|
||||
WHERE o."_key" = $1::TEXT`,
|
||||
values: [key],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
callback(null, parseInt(res.rows[0].c, 10));
|
||||
});
|
||||
|
||||
return parseInt(res.rows[0].c, 10);
|
||||
};
|
||||
|
||||
module.setsCount = function (keys, callback) {
|
||||
db.query({
|
||||
module.setsCount = async function (keys) {
|
||||
const res = await db.query({
|
||||
name: 'setsCount',
|
||||
text: `
|
||||
SELECT o."_key" k,
|
||||
@@ -291,23 +236,15 @@ SELECT o."_key" k,
|
||||
WHERE o."_key" = ANY($1::TEXT[])
|
||||
GROUP BY o."_key"`,
|
||||
values: [keys],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
});
|
||||
|
||||
callback(null, keys.map(function (k) {
|
||||
return (res.rows.find(function (r) {
|
||||
return r.k === k;
|
||||
}) || { c: 0 }).c;
|
||||
}));
|
||||
return keys.map(function (k) {
|
||||
return (res.rows.find(r => r.k === k) || { c: 0 }).c;
|
||||
});
|
||||
};
|
||||
|
||||
module.setRemoveRandom = function (key, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
|
||||
db.query({
|
||||
module.setRemoveRandom = async function (key) {
|
||||
const res = await db.query({
|
||||
name: 'setRemoveRandom',
|
||||
text: `
|
||||
WITH A AS (
|
||||
@@ -326,16 +263,7 @@ DELETE FROM "legacy_set" s
|
||||
AND s."member" = A."member"
|
||||
RETURNING A."member" m`,
|
||||
values: [key],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
if (res.rows.length) {
|
||||
return callback(null, res.rows[0].m);
|
||||
}
|
||||
|
||||
callback(null, null);
|
||||
});
|
||||
return res.rows.length ? res.rows[0].m : null;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user