Cache the number of replies in the post object. See NodeBB#5050.

NodeBB#5050 (review)
BenLubar · Oct 14, 2016 · bbfc52b · bbfc52b
1 parent 6e5a556
commit bbfc52b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/src/posts.js b/src/posts.js
@@ -260,16 +260,6 @@ var plugins = require('./plugins');
 		});
 	};
 
-	Posts.countReplies = function(pid, callback) {
-		if (Array.isArray(pid)) {
-			db.sortedSetsCard(pid.map(function (id) {
-				return 'pid:' + id + ':replies';
-			}), callback);
-		} else {
-			db.sortedSetCard('pid:' + pid + ':replies', callback);
-		}
-	};
-
 	Posts.getReplyPids = function(pid, callback) {
 		db.getSortedSetRange('pid:' + pid + ':replies', 0, -1, callback);
 	};

diff --git a/src/posts/create.js b/src/posts/create.js
@@ -86,7 +86,10 @@ module.exports = function (Posts) {
 						if (!postData.toPid) {
 							return next(null);
 						}
-						db.sortedSetAdd('pid:' + postData.toPid + ':replies', timestamp, postData.pid, next);
+						async.parallel([
+							async.apply(db.sortedSetAdd, 'pid:' + postData.toPid + ':replies', timestamp, postData.pid),
+							async.apply(db.incrObjectField, 'post:' + postData.toPid, 'replies')
+						], next);
 					},
 					function (next) {
 						db.incrObjectField('global', 'postCount', next);

diff --git a/src/posts/delete.js b/src/posts/delete.js
@@ -145,7 +145,10 @@ module.exports = function (Posts) {
 							if (!parseInt(toPid, 10)) {
 								return next(null);
 							}
-							db.sortedSetRemove('pid:' + toPid + ':replies', pid, next);
+							async.parallel([
+								async.apply(db.sortedSetRemove, 'pid:' + toPid + ':replies', pid),
+								async.apply(db.decrObjectField, 'post:' + toPid, 'replies')
+							], next);
 						});
 					},
 					function (next) {

diff --git a/src/topics/posts.js b/src/topics/posts.js
@@ -65,9 +65,6 @@ module.exports = function (Topics) {
 			voteData: function (next) {
 				posts.getVoteStatusByPostIDs(pids, uid, next);
 			},
-			replies: function (next) {
-				posts.countReplies(pids, next);
-			},
 			userData: function (next) {
 				var uids = [];
 
@@ -126,7 +123,7 @@ module.exports = function (Topics) {
 					postObj.upvoted = results.voteData.upvotes[i];
 					postObj.downvoted = results.voteData.downvotes[i];
 					postObj.votes = postObj.votes || 0;
-					postObj.replies = results.replies[i] || 0;
+					postObj.replies = postObj.replies || 0;
 					postObj.selfPost = !!parseInt(uid, 10) && parseInt(uid, 10) === parseInt(postObj.uid, 10);
 
 					// Username override for guests, if enabled

diff --git a/src/upgrade.js b/src/upgrade.js
@@ -927,7 +927,10 @@ Upgrade.upgrade = function (callback) {
 							if (!parseInt(post.toPid, 10)) {
 								return next(null);
 							}
-							db.sortedSetAdd('pid:' + postData.toPid + ':replies', postData.timestamp, postData.pid, next);
+							async.parallel([
+								async.apply(db.sortedSetAdd, 'pid:' + postData.toPid + ':replies', postData.timestamp, postData.pid),
+								async.apply(db.incrObjectField, 'post:' + postData.toPid, 'replies')
+							], next);
 						}, next);
 					});
 				}, function(err) {