mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-05-06 16:27:30 +02: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,114 +1,83 @@
|
||||
'use strict';
|
||||
|
||||
var async = require('async');
|
||||
|
||||
module.exports = function (db, module) {
|
||||
var helpers = module.helpers.postgres;
|
||||
var helpers = require('./helpers');
|
||||
|
||||
var query = db.query.bind(db);
|
||||
|
||||
module.flushdb = function (callback) {
|
||||
callback = callback || helpers.noop;
|
||||
|
||||
async.series([
|
||||
async.apply(query, `DROP SCHEMA "public" CASCADE`),
|
||||
async.apply(query, `CREATE SCHEMA "public"`),
|
||||
], function (err) {
|
||||
callback(err);
|
||||
});
|
||||
module.flushdb = async function () {
|
||||
await query(`DROP SCHEMA "public" CASCADE`);
|
||||
await query(`CREATE SCHEMA "public"`);
|
||||
};
|
||||
|
||||
module.emptydb = function (callback) {
|
||||
callback = callback || helpers.noop;
|
||||
query(`DELETE FROM "legacy_object"`, function (err) {
|
||||
callback(err);
|
||||
});
|
||||
module.emptydb = async function () {
|
||||
await query(`DELETE FROM "legacy_object"`);
|
||||
};
|
||||
|
||||
module.exists = function (key, callback) {
|
||||
module.exists = async function (key) {
|
||||
if (!key) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
if (Array.isArray(key)) {
|
||||
query({
|
||||
const res = await query({
|
||||
name: 'existsArray',
|
||||
text: `
|
||||
SELECT o."_key" k
|
||||
FROM "legacy_object_live" o
|
||||
WHERE o."_key" = ANY($1::TEXT[])`,
|
||||
values: [key],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
callback(null, key.map(function (k) {
|
||||
return res.rows.some(function (r) {
|
||||
return r.k === k;
|
||||
});
|
||||
}));
|
||||
});
|
||||
} else {
|
||||
query({
|
||||
name: 'exists',
|
||||
text: `
|
||||
SELECT EXISTS(SELECT *
|
||||
return key.map(function (k) {
|
||||
return res.rows.some(r => r.k === k);
|
||||
});
|
||||
}
|
||||
const res = await query({
|
||||
name: 'exists',
|
||||
text: `
|
||||
SELECT EXISTS(SELECT *
|
||||
FROM "legacy_object_live"
|
||||
WHERE "_key" = $1::TEXT
|
||||
LIMIT 1) e`,
|
||||
values: [key],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
callback(null, res.rows[0].e);
|
||||
});
|
||||
}
|
||||
values: [key],
|
||||
});
|
||||
return res.rows[0].e;
|
||||
};
|
||||
|
||||
module.delete = function (key, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
module.delete = async function (key) {
|
||||
if (!key) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
query({
|
||||
await query({
|
||||
name: 'delete',
|
||||
text: `
|
||||
DELETE FROM "legacy_object"
|
||||
WHERE "_key" = $1::TEXT`,
|
||||
values: [key],
|
||||
}, function (err) {
|
||||
callback(err);
|
||||
});
|
||||
};
|
||||
|
||||
module.deleteAll = function (keys, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
|
||||
module.deleteAll = async function (keys) {
|
||||
if (!Array.isArray(keys) || !keys.length) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
query({
|
||||
await query({
|
||||
name: 'deleteAll',
|
||||
text: `
|
||||
DELETE FROM "legacy_object"
|
||||
WHERE "_key" = ANY($1::TEXT[])`,
|
||||
values: [keys],
|
||||
}, function (err) {
|
||||
callback(err);
|
||||
});
|
||||
};
|
||||
|
||||
module.get = function (key, callback) {
|
||||
module.get = async function (key) {
|
||||
if (!key) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
query({
|
||||
const res = await query({
|
||||
name: 'get',
|
||||
text: `
|
||||
SELECT s."data" t
|
||||
@@ -119,94 +88,76 @@ SELECT s."data" t
|
||||
WHERE o."_key" = $1::TEXT
|
||||
LIMIT 1`,
|
||||
values: [key],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
});
|
||||
|
||||
if (res.rows.length) {
|
||||
return callback(null, res.rows[0].t);
|
||||
}
|
||||
return res.rows.length ? res.rows[0].t : null;
|
||||
};
|
||||
|
||||
callback(null, null);
|
||||
module.set = async function (key, value) {
|
||||
if (!key) {
|
||||
return;
|
||||
}
|
||||
|
||||
await module.transaction(async function (client) {
|
||||
var query = client.query.bind(client);
|
||||
await helpers.ensureLegacyObjectType(client, key, 'string');
|
||||
await query({
|
||||
name: 'set',
|
||||
text: `
|
||||
INSERT INTO "legacy_string" ("_key", "data")
|
||||
VALUES ($1::TEXT, $2::TEXT)
|
||||
ON CONFLICT ("_key")
|
||||
DO UPDATE SET "data" = $2::TEXT`,
|
||||
values: [key, value],
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
module.set = function (key, value, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
|
||||
module.increment = async function (key) {
|
||||
if (!key) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
module.transaction(function (tx, done) {
|
||||
async.series([
|
||||
async.apply(helpers.ensureLegacyObjectType, tx.client, key, 'string'),
|
||||
async.apply(tx.client.query.bind(tx.client), {
|
||||
name: 'set',
|
||||
text: `
|
||||
INSERT INTO "legacy_string" ("_key", "data")
|
||||
VALUES ($1::TEXT, $2::TEXT)
|
||||
ON CONFLICT ("_key")
|
||||
DO UPDATE SET "data" = $2::TEXT`,
|
||||
values: [key, value],
|
||||
}),
|
||||
], function (err) {
|
||||
done(err);
|
||||
});
|
||||
}, callback);
|
||||
};
|
||||
|
||||
module.increment = function (key, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
|
||||
if (!key) {
|
||||
return callback();
|
||||
}
|
||||
|
||||
module.transaction(function (tx, done) {
|
||||
async.waterfall([
|
||||
async.apply(helpers.ensureLegacyObjectType, tx.client, key, 'string'),
|
||||
async.apply(tx.client.query.bind(tx.client), {
|
||||
name: 'increment',
|
||||
text: `
|
||||
return await module.transaction(async function (client) {
|
||||
var query = client.query.bind(client);
|
||||
await helpers.ensureLegacyObjectType(client, key, 'string');
|
||||
const res = await query({
|
||||
name: 'increment',
|
||||
text: `
|
||||
INSERT INTO "legacy_string" ("_key", "data")
|
||||
VALUES ($1::TEXT, '1')
|
||||
ON CONFLICT ("_key")
|
||||
DO UPDATE SET "data" = ("legacy_string"."data"::NUMERIC + 1)::TEXT
|
||||
ON CONFLICT ("_key")
|
||||
DO UPDATE SET "data" = ("legacy_string"."data"::NUMERIC + 1)::TEXT
|
||||
RETURNING "data" d`,
|
||||
values: [key],
|
||||
}),
|
||||
], function (err, res) {
|
||||
if (err) {
|
||||
return done(err);
|
||||
}
|
||||
|
||||
done(null, parseFloat(res.rows[0].d));
|
||||
values: [key],
|
||||
});
|
||||
}, callback);
|
||||
return parseFloat(res.rows[0].d);
|
||||
});
|
||||
};
|
||||
|
||||
module.rename = function (oldKey, newKey, callback) {
|
||||
module.transaction(function (tx, done) {
|
||||
async.series([
|
||||
async.apply(tx.delete, newKey),
|
||||
async.apply(tx.client.query.bind(tx.client), {
|
||||
name: 'rename',
|
||||
text: `
|
||||
module.rename = async function (oldKey, newKey) {
|
||||
await module.transaction(async function (client) {
|
||||
var query = client.query.bind(client);
|
||||
await query({
|
||||
name: 'deleteRename',
|
||||
text: `
|
||||
DELETE FROM "legacy_object"
|
||||
WHERE "_key" = $1::TEXT`,
|
||||
values: [newKey],
|
||||
});
|
||||
await query({
|
||||
name: 'rename',
|
||||
text: `
|
||||
UPDATE "legacy_object"
|
||||
SET "_key" = $2::TEXT
|
||||
WHERE "_key" = $1::TEXT`,
|
||||
values: [oldKey, newKey],
|
||||
}),
|
||||
], function (err) {
|
||||
done(err);
|
||||
SET "_key" = $2::TEXT
|
||||
WHERE "_key" = $1::TEXT`,
|
||||
values: [oldKey, newKey],
|
||||
});
|
||||
}, callback || helpers.noop);
|
||||
});
|
||||
};
|
||||
|
||||
module.type = function (key, callback) {
|
||||
query({
|
||||
module.type = async function (key) {
|
||||
const res = await query({
|
||||
name: 'type',
|
||||
text: `
|
||||
SELECT "type"::TEXT t
|
||||
@@ -214,47 +165,35 @@ SELECT "type"::TEXT t
|
||||
WHERE "_key" = $1::TEXT
|
||||
LIMIT 1`,
|
||||
values: [key],
|
||||
}, function (err, res) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
if (res.rows.length) {
|
||||
return callback(null, res.rows[0].t);
|
||||
}
|
||||
|
||||
callback(null, null);
|
||||
});
|
||||
|
||||
return res.rows.length ? res.rows[0].t : null;
|
||||
};
|
||||
|
||||
function doExpire(key, date, callback) {
|
||||
query({
|
||||
async function doExpire(key, date) {
|
||||
await query({
|
||||
name: 'expire',
|
||||
text: `
|
||||
UPDATE "legacy_object"
|
||||
SET "expireAt" = $2::TIMESTAMPTZ
|
||||
WHERE "_key" = $1::TEXT`,
|
||||
values: [key, date],
|
||||
}, function (err) {
|
||||
if (callback) {
|
||||
callback(err);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
module.expire = function (key, seconds, callback) {
|
||||
doExpire(key, new Date(((Date.now() / 1000) + seconds) * 1000), callback);
|
||||
module.expire = async function (key, seconds) {
|
||||
await doExpire(key, new Date(((Date.now() / 1000) + seconds) * 1000));
|
||||
};
|
||||
|
||||
module.expireAt = function (key, timestamp, callback) {
|
||||
doExpire(key, new Date(timestamp * 1000), callback);
|
||||
module.expireAt = async function (key, timestamp) {
|
||||
await doExpire(key, new Date(timestamp * 1000));
|
||||
};
|
||||
|
||||
module.pexpire = function (key, ms, callback) {
|
||||
doExpire(key, new Date(Date.now() + parseInt(ms, 10)), callback);
|
||||
module.pexpire = async function (key, ms) {
|
||||
await doExpire(key, new Date(Date.now() + parseInt(ms, 10)));
|
||||
};
|
||||
|
||||
module.pexpireAt = function (key, timestamp, callback) {
|
||||
doExpire(key, new Date(timestamp), callback);
|
||||
module.pexpireAt = async function (key, timestamp) {
|
||||
await doExpire(key, new Date(timestamp));
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user