Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 17:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: update to mongodb 6.1 (#12087)

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-10-15 13:38:57 -04:00
committed by GitHub
parent 212a341575
commit e542b27d1d
7 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -87,7 +87,7 @@
"lru-cache": "10.0.1", "lru-cache": "10.0.1",
"mime": "3.0.0", "mime": "3.0.0",
"mkdirp": "3.0.1", "mkdirp": "3.0.1",
"mongodb": "5.9.0", "mongodb": "6.1.0",
"morgan": "1.10.0", "morgan": "1.10.0",
"mousetrap": "1.6.5", "mousetrap": "1.6.5",
"multiparty": "4.2.3", "multiparty": "4.2.3",

1
public/language/en-GB/admin/advanced/database.json
View File

@@ -17,7 +17,6 @@
"mongo.file-size": "File Size", "mongo.file-size": "File Size",
"mongo.resident-memory": "Resident Memory", "mongo.resident-memory": "Resident Memory",
"mongo.virtual-memory": "Virtual Memory", "mongo.virtual-memory": "Virtual Memory",
"mongo.mapped-memory": "Mapped Memory",
"mongo.bytes-in": "Bytes In", "mongo.bytes-in": "Bytes In",
"mongo.bytes-out": "Bytes Out", "mongo.bytes-out": "Bytes Out",
"mongo.num-requests": "Number of Requests", "mongo.num-requests": "Number of Requests",

9
src/database/mongo.js
View File

@@ -144,10 +144,9 @@ mongoModule.info = async function (db) {
indexSizes: collectionInfo.indexSizes, indexSizes: collectionInfo.indexSizes,
})); }));
stats.mem = serverStatus.mem || { resident: 0, virtual: 0, mapped: 0 }; stats.mem = serverStatus.mem || { resident: 0, virtual: 0 };
stats.mem.resident = (stats.mem.resident / 1024).toFixed(3); stats.mem.resident = (stats.mem.resident / 1024).toFixed(3);
stats.mem.virtual = (stats.mem.virtual / 1024).toFixed(3); stats.mem.virtual = (stats.mem.virtual / 1024).toFixed(3);
stats.mem.mapped = (stats.mem.mapped / 1024).toFixed(3);
stats.collectionData = listCollections; stats.collectionData = listCollections;
stats.network = serverStatus.network || { bytesIn: 0, bytesOut: 0, numRequests: 0 }; stats.network = serverStatus.network || { bytesIn: 0, bytesOut: 0, numRequests: 0 };
stats.network.bytesIn = (stats.network.bytesIn / scale).toFixed(3); stats.network.bytesIn = (stats.network.bytesIn / scale).toFixed(3);
@@ -170,7 +169,11 @@ mongoModule.info = async function (db) {
async function getCollectionStats(db) { async function getCollectionStats(db) {
const items = await db.listCollections().toArray(); const items = await db.listCollections().toArray();
return await Promise.all(items.map(collection => db.collection(collection.name).stats())); return await Promise.all(
items.map(collection => db.collection(collection.name).aggregate([
{ $collStats: { latencyStats: {}, storageStats: {}, count: {} } },
]))
);
} }
mongoModule.close = async function () { mongoModule.close = async function () {

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

@@ -248,6 +248,7 @@ module.exports = function (module) {
$inc: increment, $inc: increment,
}, { }, {
returnDocument: 'after', returnDocument: 'after',
includeResultMetadata: true,
upsert: true, upsert: true,
}); });
cache.del(key); cache.del(key);

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

@@ -112,6 +112,7 @@ module.exports = function (module) {
$inc: { data: 1 }, $inc: { data: 1 },
}, { }, {
returnDocument: 'after', returnDocument: 'after',
includeResultMetadata: true,
upsert: true, upsert: true,
}); });
return result && result.value ? result.value.data : null; return result && result.value ? result.value.data : null;

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

@@ -435,6 +435,7 @@ module.exports = function (module) {
$inc: data, $inc: data,
}, { }, {
returnDocument: 'after', returnDocument: 'after',
includeResultMetadata: true,
upsert: true, upsert: true,
}); });
return result && result.value ? result.value.score : null; return result && result.value ? result.value.score : null;

1
src/views/admin/advanced/database.tpl
View File

@@ -28,7 +28,6 @@
<hr/> <hr/>
<div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.resident-memory]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.mem.resident}]]</span></div> <div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.resident-memory]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.mem.resident}]]</span></div>
<div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.virtual-memory]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.mem.virtual}]]</span></div> <div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.virtual-memory]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.mem.virtual}]]</span></div>
<div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.mapped-memory]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.mem.mapped}]]</span></div>
<hr/> <hr/>
<div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.bytes-in]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.network.bytesIn}]]</span></div> <div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.bytes-in]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.network.bytesIn}]]</span></div>
<div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.bytes-out]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.network.bytesOut}]]</span></div> <div class="d-flex justify-content-between"><span>[[admin/advanced/database:mongo.bytes-out]]</span> <span class="text-end">[[admin/advanced/database:x-gb, {mongo.network.bytesOut}]]</span></div>