A platform for community discussion. Free, open, simple.
PERF: Limit frequent score calculations to eligible topics (#44233)
Alan Guo Xiang Tan10ecd5b38a5b
diff --git a/lib/score_calculator.rb b/lib/score_calculator.rbindex 79658395ec5..89a473d3184 100644--- a/lib/score_calculator.rb+++ b/lib/score_calculator.rb@@ -49,25 +49,28 @@ SQLlimit = 20_000builder = DB.build <<~SQL+ WITH eligible_posts AS (+ SELECT posts.id, posts.topic_id, posts.score+ FROM posts+ JOIN topics ON posts.topic_id = topics.id+ /*where*/+ ), ranked_posts AS (+ SELECT id, percent_rank()+ OVER (PARTITION BY topic_id ORDER BY score DESC) AS percent_rank+ FROM eligible_posts+ )UPDATE postsSET percent_rank = X.percent_rankFROM (- SELECT posts.id, Y.percent_rank+ SELECT posts.id, ranked_posts.percent_rankFROM posts- JOIN (- SELECT id, percent_rank()- OVER (PARTITION BY topic_id ORDER BY SCORE DESC) as percent_rank- FROM posts- ) Y ON Y.id = posts.id- JOIN topics ON posts.topic_id = topics.id- /*where*/+ JOIN ranked_posts ON ranked_posts.id = posts.id+ WHERE posts.percent_rank IS NULL OR ranked_posts.percent_rank <> posts.percent_rankLIMIT #{limit}) AS XWHERE posts.id = X.idSQL- builder.where("posts.percent_rank IS NULL OR Y.percent_rank <> posts.percent_rank")-filter_topics(builder, opts)while builder.exec == limit@@ -76,6 +79,12 @@ SQLdef update_topics_rank(opts)builder = DB.build <<~SQL+ WITH eligible_posts AS (+ SELECT p.topic_id, p.score+ FROM posts AS p+ JOIN topics ON p.topic_id = topics.id+ /*where*/+ )UPDATE topics AS topicsSET has_summary = (topics.like_count >= :likes_required ANDtopics.posts_count >= :posts_required AND@@ -84,9 +93,17 @@ SQLFROM (SELECT p.topic_id,MAX(p.score) AS max_score,AVG(p.score) AS avg_score- FROM posts AS p+ FROM eligible_posts AS pGROUP BY p.topic_id) AS x- /*where*/+ WHERE x.topic_id = topics.id AND+ (+ (topics.score <> x.avg_score OR topics.score IS NULL) OR+ (topics.has_summary IS NULL OR topics.has_summary <> (+ topics.like_count >= :likes_required AND+ topics.posts_count >= :posts_required AND+ x.max_score >= :score_required+ ))+ )SQLdefaults = {@@ -95,21 +112,9 @@ SQLscore_required: SiteSetting.summary_score_threshold,}- builder.where(<<~SQL, defaults)- x.topic_id = topics.id AND- (- (topics.score <> x.avg_score OR topics.score IS NULL) OR- (topics.has_summary IS NULL OR topics.has_summary <> (- topics.like_count >= :likes_required AND- topics.posts_count >= :posts_required AND- x.max_score >= :score_required- ))- )- SQL-filter_topics(builder, opts)- builder.exec+ builder.exec(defaults)enddef filter_topics(builder, opts)diff --git a/spec/lib/score_calculator_spec.rb b/spec/lib/score_calculator_spec.rbindex 21602d3fdde..9ad37bd518d 100644--- a/spec/lib/score_calculator_spec.rb+++ b/spec/lib/score_calculator_spec.rb@@ -7,6 +7,69 @@ RSpec.describe ScoreCalculator dofab!(:another_post) { Fabricate(:post, topic: post.topic, reads: 222) }let(:topic) { post.topic }+ describe "#calculate" do+ it "ranks every post in an eligible topic without changing excluded topics" do+ cutoff = 1.day.ago+ old_post = Fabricate(:post, topic: topic, reads: 333)+ old_post.update_columns(created_at: 1.year.ago, percent_rank: nil)+ post.update_column(:percent_rank, nil)+ another_post.update_column(:percent_rank, nil)+ topic.update_column(:bumped_at, cutoff + 1.second)++ old_topic_post = Fabricate(:post, reads: 999, percent_rank: 0.25)+ old_topic_post.topic.update_column(:bumped_at, cutoff)+ long_topic_post = Fabricate(:post, reads: 999, percent_rank: 0.25)+ long_topic_post.topic.update_column(:posts_count, 500)++ ScoreCalculator.new(reads: 1).calculate(min_topic_age: cutoff, max_topic_length: 500)++ expect(+ [old_post.reload.percent_rank, another_post.reload.percent_rank, post.reload.percent_rank],+ ).to eq([0.0, 0.5, 1.0])+ expect([old_topic_post.reload.percent_rank, long_topic_post.reload.percent_rank]).to eq(+ [0.25, 0.25],+ )+ expect([old_topic_post.topic.reload.score, long_topic_post.topic.reload.score]).to eq(+ [nil, nil],+ )+ end++ it "gives tied scores the same rank and calculates the average across all topic posts" do+ third_post = Fabricate(:post, topic: topic, reads: 222)+ topic.update_columns(score: nil, like_count: 2, posts_count: 3)+ SiteSetting.stubs(:summary_likes_required).returns(2)+ SiteSetting.stubs(:summary_posts_required).returns(3)+ SiteSetting.stubs(:summary_score_threshold).returns(222)++ ScoreCalculator.new(reads: 1).calculate(min_topic_age: 1.day.ago)++ expect(+ [+ another_post.reload.percent_rank,+ third_post.reload.percent_rank,+ post.reload.percent_rank,+ ],+ ).to eq([0.0, 0.0, 1.0])+ expect(topic.reload.score).to eq(185)+ expect(topic.has_summary).to eq(true)++ SiteSetting.stubs(:summary_score_threshold).returns(223)+ ScoreCalculator.new(reads: 1).calculate(min_topic_age: 1.day.ago)+ expect(topic.reload.has_summary).to eq(false)+ end++ it "recalculates excluded topics when called without filters" do+ topic.update_columns(bumped_at: 1.year.ago, posts_count: 500, score: nil)+ post.update_column(:percent_rank, nil)+ another_post.update_column(:percent_rank, nil)++ ScoreCalculator.new(reads: 1).calculate++ expect([another_post.reload.percent_rank, post.reload.percent_rank]).to eq([0.0, 1.0])+ expect(topic.reload.score).to eq(166.5)+ end+ end+context "with weightings" dobefore doScoreCalculator.new(reads: 3).calculate