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

update deprecated methods (#6794)

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-09-26 15:02:57 -04:00
committed by GitHub
parent 1cb2e1e368
commit 18d0deeccb
10 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/database/mongo.js
View File

@@ -98,6 +98,7 @@ mongoModule.getConnectionOptions = function () {
reconnectTries: 3600, reconnectTries: 3600,
reconnectInterval: 1000, reconnectInterval: 1000,
autoReconnect: true, autoReconnect: true,
useNewUrlParser: true,
}; };
return _.merge(connOptions, nconf.get('mongo:options') || {}); return _.merge(connOptions, nconf.get('mongo:options') || {});

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

@@ -46,7 +46,7 @@ module.exports = function (db, module) {
if (data.hasOwnProperty('')) { if (data.hasOwnProperty('')) {
delete data['']; delete data[''];
} }
db.collection('objects').update({ _key: key }, { $set: data }, { upsert: true, w: 1 }, function (err) { db.collection('objects').updateOne({ _key: key }, { $set: data }, { upsert: true, w: 1 }, function (err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -208,8 +208,8 @@ module.exports = function (db, module) {
} }
var data = {}; var data = {};
field = helpers.fieldToString(field); field = helpers.fieldToString(field);
data[field] = ''; data[field] = 1;
db.collection('objects').findOne({ _key: key }, { fields: data }, function (err, item) { db.collection('objects').findOne({ _key: key }, { projection: data }, function (err, item) {
callback(err, !!item && item[field] !== undefined && item[field] !== null); callback(err, !!item && item[field] !== undefined && item[field] !== null);
}); });
}; };
@@ -222,10 +222,10 @@ module.exports = function (db, module) {
var data = {}; var data = {};
fields.forEach(function (field) { fields.forEach(function (field) {
field = helpers.fieldToString(field); field = helpers.fieldToString(field);
data[field] = ''; data[field] = 1;
}); });
db.collection('objects').findOne({ _key: key }, { fields: data }, function (err, item) { db.collection('objects').findOne({ _key: key }, { projection: data }, function (err, item) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -259,7 +259,7 @@ module.exports = function (db, module) {
data[field] = ''; data[field] = '';
}); });
db.collection('objects').update({ _key: key }, { $unset: data }, function (err) { db.collection('objects').updateOne({ _key: key }, { $unset: data }, function (err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -317,7 +317,7 @@ module.exports = function (db, module) {
} }
db.collection('objects').findAndModify({ _key: key }, {}, { $inc: data }, { new: true, upsert: true }, function (err, result) { db.collection('objects').findOneAndUpdate({ _key: key }, { $inc: data }, { returnOriginal: false, upsert: true }, function (err, result) {
if (err) { if (err) {
return callback(err); return callback(err);
} }

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

@@ -18,7 +18,7 @@ module.exports = function (db, module) {
} }
if (exists) { if (exists) {
db.collection('objects').update({ _key: key }, { $push: { array: { $each: [value], $position: 0 } } }, { upsert: true, w: 1 }, function (err) { db.collection('objects').updateOne({ _key: key }, { $push: { array: { $each: [value], $position: 0 } } }, { upsert: true, w: 1 }, function (err) {
callback(err); callback(err);
}); });
} else { } else {
@@ -33,7 +33,7 @@ module.exports = function (db, module) {
return callback(); return callback();
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').update({ _key: key }, { $push: { array: value } }, { upsert: true, w: 1 }, function (err) { db.collection('objects').updateOne({ _key: key }, { $push: { array: value } }, { upsert: true, w: 1 }, function (err) {
callback(err); callback(err);
}); });
}; };
@@ -48,7 +48,7 @@ module.exports = function (db, module) {
return callback(err); return callback(err);
} }
db.collection('objects').update({ _key: key }, { $pop: { array: 1 } }, function (err) { db.collection('objects').updateOne({ _key: key }, { $pop: { array: 1 } }, function (err) {
callback(err, (value && value.length) ? value[0] : null); callback(err, (value && value.length) ? value[0] : null);
}); });
}); });
@@ -61,7 +61,7 @@ module.exports = function (db, module) {
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').update({ _key: key }, { $pull: { array: value } }, function (err) { db.collection('objects').updateOne({ _key: key }, { $pull: { array: value } }, function (err) {
callback(err); callback(err);
}); });
}; };
@@ -76,7 +76,7 @@ module.exports = function (db, module) {
return callback(err); return callback(err);
} }
db.collection('objects').update({ _key: key }, { $set: { array: value } }, function (err) { db.collection('objects').updateOne({ _key: key }, { $set: { array: value } }, function (err) {
callback(err); callback(err);
}); });
}); });

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

@@ -12,7 +12,7 @@ module.exports = function (db, module) {
module.emptydb = function (callback) { module.emptydb = function (callback) {
callback = callback || helpers.noop; callback = callback || helpers.noop;
db.collection('objects').remove({}, function (err) { db.collection('objects').deleteMany({}, function (err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -35,7 +35,7 @@ module.exports = function (db, module) {
if (!key) { if (!key) {
return callback(); return callback();
} }
db.collection('objects').remove({ _key: key }, function (err) { db.collection('objects').deleteMany({ _key: key }, function (err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -49,7 +49,7 @@ module.exports = function (db, module) {
if (!Array.isArray(keys) || !keys.length) { if (!Array.isArray(keys) || !keys.length) {
return callback(); return callback();
} }
db.collection('objects').remove({ _key: { $in: keys } }, function (err) { db.collection('objects').deleteMany({ _key: { $in: keys } }, function (err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -97,14 +97,14 @@ module.exports = function (db, module) {
if (!key) { if (!key) {
return callback(); return callback();
} }
db.collection('objects').findAndModify({ _key: key }, {}, { $inc: { data: 1 } }, { new: true, upsert: true }, function (err, result) { db.collection('objects').findOneAndUpdate({ _key: key }, { $inc: { data: 1 } }, { returnOriginal: false, upsert: true }, function (err, result) {
callback(err, result && result.value ? result.value.data : null); callback(err, result && result.value ? result.value.data : null);
}); });
}; };
module.rename = function (oldKey, newKey, callback) { module.rename = function (oldKey, newKey, callback) {
callback = callback || helpers.noop; callback = callback || helpers.noop;
db.collection('objects').update({ _key: oldKey }, { $set: { _key: newKey } }, { multi: true }, function (err) { db.collection('objects').updateMany({ _key: oldKey }, { $set: { _key: newKey } }, function (err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }

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

@@ -13,7 +13,7 @@ module.exports = function (db, module) {
array[index] = helpers.valueToString(element); array[index] = helpers.valueToString(element);
}); });
db.collection('objects').update({ db.collection('objects').updateOne({
_key: key, _key: key,
}, { }, {
$addToSet: { $addToSet: {
@@ -74,7 +74,7 @@ module.exports = function (db, module) {
callback(err); callback(err);
}); });
} else { } else {
db.collection('objects').update({ _key: key }, { $pullAll: { members: value } }, function (err) { db.collection('objects').updateOne({ _key: key }, { $pullAll: { members: value } }, function (err) {
callback(err); callback(err);
}); });
} }
@@ -87,7 +87,7 @@ module.exports = function (db, module) {
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').update({ _key: { $in: keys } }, { $pull: { members: value } }, { multi: true }, function (err) { db.collection('objects').updateMany({ _key: { $in: keys } }, { $pull: { members: value } }, function (err) {
callback(err); callback(err);
}); });
}; };
@@ -98,7 +98,7 @@ module.exports = function (db, module) {
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').findOne({ _key: key, members: value }, { _id: 0, members: 0 }, function (err, item) { db.collection('objects').findOne({ _key: key, members: value }, { projection: { _id: 0, members: 0 } }, function (err, item) {
callback(err, item !== null && item !== undefined); callback(err, item !== null && item !== undefined);
}); });
}; };
@@ -112,7 +112,7 @@ module.exports = function (db, module) {
values[i] = helpers.valueToString(values[i]); values[i] = helpers.valueToString(values[i]);
} }
db.collection('objects').findOne({ _key: key }, { _id: 0, _key: 0 }, function (err, items) { db.collection('objects').findOne({ _key: key }, { projection: { _id: 0, _key: 0 } }, function (err, items) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -131,7 +131,7 @@ module.exports = function (db, module) {
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').find({ _key: { $in: sets }, members: value }, { _id: 0, members: 0 }).toArray(function (err, result) { db.collection('objects').find({ _key: { $in: sets }, members: value }, { projection: { _id: 0, members: 0 } }).toArray(function (err, result) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -184,7 +184,7 @@ module.exports = function (db, module) {
if (!key) { if (!key) {
return callback(null, 0); return callback(null, 0);
} }
db.collection('objects').findOne({ _key: key }, { _id: 0 }, function (err, data) { db.collection('objects').findOne({ _key: key }, { projection: { _id: 0 } }, function (err, data) {
callback(err, data ? data.members.length : 0); callback(err, data ? data.members.length : 0);
}); });
}; };

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

@@ -32,9 +32,9 @@ module.exports = function (db, module) {
return callback(); return callback();
} }
var fields = { _id: 0, value: 1 }; var fields = { _id: 0, _key: 0 };
if (withScores) { if (!withScores) {
fields.score = 1; fields.score = 0;
} }
if (Array.isArray(key)) { if (Array.isArray(key)) {
@@ -62,7 +62,7 @@ module.exports = function (db, module) {
limit = 0; limit = 0;
} }
db.collection('objects').find({ _key: key }, { fields: fields }) db.collection('objects').find({ _key: key }, { projection: fields })
.limit(limit) .limit(limit)
.skip(start) .skip(start)
.sort({ score: sort }) .sort({ score: sort })
@@ -70,6 +70,7 @@ module.exports = function (db, module) {
if (err || !data) { if (err || !data) {
return callback(err); return callback(err);
} }
if (reverse) { if (reverse) {
data.reverse(); data.reverse();
} }
@@ -117,12 +118,12 @@ module.exports = function (db, module) {
query.score.$lte = max; query.score.$lte = max;
} }
var fields = { _id: 0, value: 1 }; var fields = { _id: 0, _key: 0 };
if (withScores) { if (!withScores) {
fields.score = 1; fields.score = 0;
} }
db.collection('objects').find(query, { fields: fields }) db.collection('objects').find(query, { projection: fields })
.limit(count) .limit(count)
.skip(start) .skip(start)
.sort({ score: sort }) .sort({ score: sort })
@@ -155,7 +156,7 @@ module.exports = function (db, module) {
query.score.$lte = max; query.score.$lte = max;
} }
db.collection('objects').count(query, function (err, count) { db.collection('objects').countDocuments(query, function (err, count) {
callback(err, count || 0); callback(err, count || 0);
}); });
}; };
@@ -164,7 +165,7 @@ module.exports = function (db, module) {
if (!key) { if (!key) {
return callback(null, 0); return callback(null, 0);
} }
db.collection('objects').count({ _key: key }, function (err, count) { db.collection('objects').countDocuments({ _key: key }, function (err, count) {
count = parseInt(count, 10); count = parseInt(count, 10);
callback(err, count || 0); callback(err, count || 0);
}); });
@@ -220,7 +221,7 @@ module.exports = function (db, module) {
return callback(err, null); return callback(err, null);
} }
db.collection('objects').count({ db.collection('objects').countDocuments({
$or: [ $or: [
{ {
_key: key, _key: key,
@@ -273,7 +274,7 @@ module.exports = function (db, module) {
return callback(null, null); return callback(null, null);
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').findOne({ _key: key, value: value }, { fields: { _id: 0, score: 1 } }, function (err, result) { db.collection('objects').findOne({ _key: key, value: value }, { projection: { _id: 0, _key: 0, value: 0 } }, function (err, result) {
callback(err, result ? result.score : null); callback(err, result ? result.score : null);
}); });
}; };
@@ -283,7 +284,7 @@ module.exports = function (db, module) {
return callback(); return callback();
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').find({ _key: { $in: keys }, value: value }, { _id: 0, _key: 1, score: 1 }).toArray(function (err, result) { db.collection('objects').find({ _key: { $in: keys }, value: value }, { projection: { _id: 0, value: 0 } }).toArray(function (err, result) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -306,7 +307,7 @@ module.exports = function (db, module) {
return callback(null, null); return callback(null, null);
} }
values = values.map(helpers.valueToString); values = values.map(helpers.valueToString);
db.collection('objects').find({ _key: key, value: { $in: values } }, { _id: 0, value: 1, score: 1 }).toArray(function (err, result) { db.collection('objects').find({ _key: key, value: { $in: values } }, { projection: { _id: 0, _key: 0 } }).toArray(function (err, result) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -333,7 +334,7 @@ module.exports = function (db, module) {
return callback(); return callback();
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').findOne({ _key: key, value: value }, { _id: 0, value: 1 }, function (err, result) { db.collection('objects').findOne({ _key: key, value: value }, { projection: { _id: 0, _key: 0, score: 0 } }, function (err, result) {
callback(err, !!result); callback(err, !!result);
}); });
}; };
@@ -343,17 +344,19 @@ module.exports = function (db, module) {
return callback(); return callback();
} }
values = values.map(helpers.valueToString); values = values.map(helpers.valueToString);
db.collection('objects').find({ _key: key, value: { $in: values } }, { fields: { _id: 0, value: 1 } }).toArray(function (err, results) { db.collection('objects').find({ _key: key, value: { $in: values } }, { projection: { _id: 0, _key: 0, score: 0 } }).toArray(function (err, results) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
var isMember = {};
results = results.map(function (item) { results.forEach(function (item) {
return item.value; if (item) {
isMember[item.value] = true;
}
}); });
values = values.map(function (value) { values = values.map(function (value) {
return results.indexOf(value) !== -1; return !!isMember[value];
}); });
callback(null, values); callback(null, values);
}); });
@@ -364,17 +367,19 @@ module.exports = function (db, module) {
return callback(); return callback();
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').find({ _key: { $in: keys }, value: value }, { fields: { _id: 0, _key: 1, value: 1 } }).toArray(function (err, results) { db.collection('objects').find({ _key: { $in: keys }, value: value }, { projection: { _id: 0, score: 0 } }).toArray(function (err, results) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
var isMember = {};
results = results.map(function (item) { results.forEach(function (item) {
return item._key; if (item) {
isMember[item._key] = true;
}
}); });
results = keys.map(function (key) { results = keys.map(function (key) {
return results.indexOf(key) !== -1; return !!isMember[key];
}); });
callback(null, results); callback(null, results);
}); });
@@ -384,7 +389,7 @@ module.exports = function (db, module) {
if (!Array.isArray(keys) || !keys.length) { if (!Array.isArray(keys) || !keys.length) {
return callback(null, []); return callback(null, []);
} }
db.collection('objects').find({ _key: { $in: keys } }, { _id: 0, _key: 1, value: 1 }).sort({ score: 1 }).toArray(function (err, data) { db.collection('objects').find({ _key: { $in: keys } }, { projection: { _id: 0, score: 0 } }).sort({ score: 1 }).toArray(function (err, data) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -412,7 +417,7 @@ module.exports = function (db, module) {
value = helpers.valueToString(value); value = helpers.valueToString(value);
data.score = parseFloat(increment); data.score = parseFloat(increment);
db.collection('objects').findAndModify({ _key: key, value: value }, {}, { $inc: data }, { new: true, upsert: true }, function (err, result) { db.collection('objects').findOneAndUpdate({ _key: key, value: value }, { $inc: data }, { returnOriginal: false, upsert: true }, function (err, result) {
// if there is duplicate key error retry the upsert // if there is duplicate key error retry the upsert
// https://github.com/NodeBB/NodeBB/issues/4467 // https://github.com/NodeBB/NodeBB/issues/4467
// https://jira.mongodb.org/browse/SERVER-14322 // https://jira.mongodb.org/browse/SERVER-14322
@@ -448,7 +453,7 @@ module.exports = function (db, module) {
var query = { _key: key }; var query = { _key: key };
buildLexQuery(query, min, max); buildLexQuery(query, min, max);
db.collection('objects').find(query, { _id: 0, value: 1 }) db.collection('objects').find(query, { projection: { _id: 0, _key: 0, score: 0 } })
.sort({ value: sort }) .sort({ value: sort })
.skip(start) .skip(start)
.limit(count === -1 ? 0 : count) .limit(count === -1 ? 0 : count)
@@ -469,7 +474,7 @@ module.exports = function (db, module) {
var query = { _key: key }; var query = { _key: key };
buildLexQuery(query, min, max); buildLexQuery(query, min, max);
db.collection('objects').remove(query, function (err) { db.collection('objects').deleteMany(query, function (err) {
callback(err); callback(err);
}); });
}; };
@@ -499,13 +504,12 @@ module.exports = function (db, module) {
module.processSortedSet = function (setKey, processFn, options, callback) { module.processSortedSet = function (setKey, processFn, options, callback) {
var done = false; var done = false;
var ids = []; var ids = [];
var project = { _id: 0, value: 1 }; var project = { _id: 0, _key: 0 };
if (options.withScores) { if (!options.withScores) {
project.score = 1; project.score = 0;
} }
var cursor = db.collection('objects').find({ _key: setKey }) var cursor = db.collection('objects').find({ _key: setKey }, { projection: project })
.sort({ score: 1 }) .sort({ score: 1 })
.project(project)
.batchSize(options.batch); .batchSize(options.batch);
async.whilst( async.whilst(

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

@@ -14,7 +14,7 @@ module.exports = function (db, module) {
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').update({ _key: key, value: value }, { $set: { score: parseFloat(score) } }, { upsert: true, w: 1 }, function (err) { db.collection('objects').updateOne({ _key: key, value: value }, { $set: { score: parseFloat(score) } }, { upsert: true, w: 1 }, function (err) {
if (err && err.message.startsWith('E11000 duplicate key error')) { if (err && err.message.startsWith('E11000 duplicate key error')) {
return process.nextTick(module.sortedSetAdd, key, score, value, callback); return process.nextTick(module.sortedSetAdd, key, score, value, callback);
} }

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

@@ -12,16 +12,16 @@ module.exports = function (db, module) {
return callback(); return callback();
} }
if (Array.isArray(key) && Array.isArray(value)) { if (Array.isArray(key) && Array.isArray(value)) {
db.collection('objects').remove({ _key: { $in: key }, value: { $in: value } }, done); db.collection('objects').deleteMany({ _key: { $in: key }, value: { $in: value } }, done);
} else if (Array.isArray(value)) { } else if (Array.isArray(value)) {
value = value.map(helpers.valueToString); value = value.map(helpers.valueToString);
db.collection('objects').remove({ _key: key, value: { $in: value } }, done); db.collection('objects').deleteMany({ _key: key, value: { $in: value } }, done);
} else if (Array.isArray(key)) { } else if (Array.isArray(key)) {
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').remove({ _key: { $in: key }, value: value }, done); db.collection('objects').deleteMany({ _key: { $in: key }, value: value }, done);
} else { } else {
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').remove({ _key: key, value: value }, done); db.collection('objects').deleteOne({ _key: key, value: value }, done);
} }
}; };
@@ -32,7 +32,7 @@ module.exports = function (db, module) {
} }
value = helpers.valueToString(value); value = helpers.valueToString(value);
db.collection('objects').remove({ _key: { $in: keys }, value: value }, function (err) { db.collection('objects').deleteMany({ _key: { $in: keys }, value: value }, function (err) {
callback(err); callback(err);
}); });
}; };
@@ -52,7 +52,7 @@ module.exports = function (db, module) {
query.score.$lte = parseFloat(max); query.score.$lte = parseFloat(max);
} }
db.collection('objects').remove(query, function (err) { db.collection('objects').deleteMany(query, function (err) {
callback(err); callback(err);
}); });
}; };

4
src/upgrades/1.7.3/key_value_schema_change.js
View File

@@ -23,7 +23,7 @@ module.exports = {
var cursor; var cursor;
async.waterfall([ async.waterfall([
function (next) { function (next) {
client.collection('objects').count({ client.collection('objects').countDocuments({
_key: { $exists: true }, _key: { $exists: true },
value: { $exists: true }, value: { $exists: true },
score: { $exists: false }, score: { $exists: false },
@@ -55,7 +55,7 @@ module.exports = {
} }
delete item.expireAt; delete item.expireAt;
if (Object.keys(item).length === 3 && item.hasOwnProperty('_key') && item.hasOwnProperty('value')) { if (Object.keys(item).length === 3 && item.hasOwnProperty('_key') && item.hasOwnProperty('value')) {
client.collection('objects').update({ _key: item._key }, { $rename: { value: 'data' } }, next); client.collection('objects').updateOne({ _key: item._key }, { $rename: { value: 'data' } }, next);
} else { } else {
next(); next();
} }

18
test/database/keys.js
View File

@@ -192,6 +192,24 @@ describe('Key methods', function () {
}); });
}); });
}); });
it('should rename multiple keys', function (done) {
db.sortedSetAdd('zsettorename', [1, 2, 3], ['value1', 'value2', 'value3'], function (err) {
assert.ifError(err);
db.rename('zsettorename', 'newzsetname', function (err) {
assert.ifError(err);
db.exists('zsettorename', function (err, exists) {
assert.ifError(err);
assert(!exists);
db.getSortedSetRange('newzsetname', 0, -1, function (err, values) {
assert.ifError(err);
assert.deepEqual(['value1', 'value2', 'value3'], values);
done();
});
});
});
});
});
}); });
describe('type', function () { describe('type', function () {