DEV: Prefer nested queries (#23464)
Some sites have a large number of categories and fetching the category IDs or category topic IDs just to build another query can take a long time or resources (i.e. memory).
This commit is contained in:
parent
1cc2c8fcb6
commit
3700514819
|
@ -20,7 +20,7 @@ class AboutController < ApplicationController
|
||||||
unless current_user.staff?
|
unless current_user.staff?
|
||||||
RateLimiter.new(current_user, "live_post_counts", 1, 10.minutes).performed!
|
RateLimiter.new(current_user, "live_post_counts", 1, 10.minutes).performed!
|
||||||
end
|
end
|
||||||
category_topic_ids = Category.pluck(:topic_id).compact!
|
category_topic_ids = Category.select(:topic_id).where.not(topic_id: nil)
|
||||||
public_topics =
|
public_topics =
|
||||||
Topic.listable_topics.visible.secured(Guardian.new(nil)).where.not(id: category_topic_ids)
|
Topic.listable_topics.visible.secured(Guardian.new(nil)).where.not(id: category_topic_ids)
|
||||||
stats = { public_topic_count: public_topics.count }
|
stats = { public_topic_count: public_topics.count }
|
||||||
|
|
|
@ -931,7 +931,7 @@ class ApplicationController < ActionController::Base
|
||||||
Discourse
|
Discourse
|
||||||
.cache
|
.cache
|
||||||
.fetch(key, expires_in: 10.minutes) do
|
.fetch(key, expires_in: 10.minutes) do
|
||||||
category_topic_ids = Category.pluck(:topic_id).compact
|
category_topic_ids = Category.select(:topic_id).where.not(topic_id: nil)
|
||||||
@top_viewed =
|
@top_viewed =
|
||||||
TopicQuery
|
TopicQuery
|
||||||
.new(nil, except_topic_ids: category_topic_ids)
|
.new(nil, except_topic_ids: category_topic_ids)
|
||||||
|
|
|
@ -344,7 +344,7 @@ class TopicsController < ApplicationController
|
||||||
topic = Topic.find_by(id: params[:id])
|
topic = Topic.find_by(id: params[:id])
|
||||||
guardian.ensure_can_edit!(topic)
|
guardian.ensure_can_edit!(topic)
|
||||||
|
|
||||||
category = Category.where(id: params[:category_id].to_i).first
|
category = Category.find_by(id: params[:category_id].to_i)
|
||||||
guardian.ensure_can_publish_topic!(topic, category)
|
guardian.ensure_can_publish_topic!(topic, category)
|
||||||
|
|
||||||
row_count = SharedDraft.where(topic_id: topic.id).update_all(category_id: category.id)
|
row_count = SharedDraft.where(topic_id: topic.id).update_all(category_id: category.id)
|
||||||
|
|
|
@ -29,8 +29,7 @@ class CategoryFeaturedTopic < ActiveRecord::Base
|
||||||
|
|
||||||
if batched
|
if batched
|
||||||
if categories.length == batch_size
|
if categories.length == batch_size
|
||||||
next_id =
|
next_id = Category.where("id > ?", categories.last.id).order(:id).pick(:id)
|
||||||
Category.where("id > ?", categories.last.id).order("id asc").limit(1).pluck(:id)[0]
|
|
||||||
next_id ? Discourse.redis.setex(NEXT_CATEGORY_ID_KEY, 1.day, next_id) : clear_batch!
|
next_id ? Discourse.redis.setex(NEXT_CATEGORY_ID_KEY, 1.day, next_id) : clear_batch!
|
||||||
else
|
else
|
||||||
clear_batch!
|
clear_batch!
|
||||||
|
|
|
@ -569,8 +569,7 @@ class Topic < ActiveRecord::Base
|
||||||
topics = topics.limit(opts[:limit]) if opts[:limit]
|
topics = topics.limit(opts[:limit]) if opts[:limit]
|
||||||
|
|
||||||
# Remove category topics
|
# Remove category topics
|
||||||
category_topic_ids = Category.pluck(:topic_id).compact!
|
topics = topics.where.not(id: Category.select(:topic_id).where.not(topic_id: nil))
|
||||||
topics = topics.where("topics.id NOT IN (?)", category_topic_ids) if category_topic_ids.present?
|
|
||||||
|
|
||||||
# Remove muted and shared draft categories
|
# Remove muted and shared draft categories
|
||||||
remove_category_ids =
|
remove_category_ids =
|
||||||
|
|
Loading…
Reference in New Issue