A platform for community discussion. Free, open, simple.
PERF: cache list of active nodes (#40979)
Joffrey JAFFEUX666ddc99641d
diff --git a/plugins/discourse-workflows/app/models/discourse_workflows/workflow_dependency.rb b/plugins/discourse-workflows/app/models/discourse_workflows/workflow_dependency.rbindex 9b05e0d3f67..f5159c24911 100644--- a/plugins/discourse-workflows/app/models/discourse_workflows/workflow_dependency.rb+++ b/plugins/discourse-workflows/app/models/discourse_workflows/workflow_dependency.rb@@ -5,6 +5,7 @@ module DiscourseWorkflowsself.table_name = "discourse_workflows_workflow_dependencies"TOPIC_ADMIN_BUTTON_CACHE_KEY = "topic_admin_buttons"+ ACTIVE_NODE_TYPES_KEY = "active_node_types"USER_MODAL_CACHE_KEY = "has_user_modals"belongs_to :workflow, class_name: "DiscourseWorkflows::Workflow"@@ -43,6 +44,20 @@ module DiscourseWorkflowsendend+ def self.active_node_types+ cache.defer_get_set(ACTIVE_NODE_TYPES_KEY) do+ of_type("node_type")+ .joins(:workflow)+ .where(+ "discourse_workflows_workflow_dependencies.workflow_version_id = " \+ "discourse_workflows_workflows.active_version_id",+ )+ .distinct+ .pluck(:dependency_key)+ .to_set+ end+ end+def self.cached_user_modals?cache.defer_get_set(USER_MODAL_CACHE_KEY) doworkflows_referencing("node_type", DiscourseWorkflows::Nodes::Modal::V1.identifier).exists?diff --git a/plugins/discourse-workflows/lib/discourse_workflows/event_listener.rb b/plugins/discourse-workflows/lib/discourse_workflows/event_listener.rbindex fe9cbc41202..4a9b9318cf0 100644--- a/plugins/discourse-workflows/lib/discourse_workflows/event_listener.rb+++ b/plugins/discourse-workflows/lib/discourse_workflows/event_listener.rb@@ -4,6 +4,7 @@ module DiscourseWorkflowsclass EventListenerdef self.handle(trigger_class, *args)return unless SiteSetting.discourse_workflows_enabled+ return if WorkflowDependency.active_node_types.exclude?(trigger_class.identifier)trigger = trigger_class.new(*args)return unless trigger.valid?diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/event_listener_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/event_listener_spec.rbindex 98ae8bb4ee5..4805ee14857 100644--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/event_listener_spec.rb+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/event_listener_spec.rb@@ -8,7 +8,10 @@ RSpec.describe DiscourseWorkflows::EventListener dofab!(:topic) { Fabricate(:topic, category: category) }fab!(:tag) { Fabricate(:tag, name: "matched") }- before { SiteSetting.tagging_enabled = true }+ before do+ SiteSetting.tagging_enabled = true+ DiscourseWorkflows::WorkflowDependency.clear_cache!+ endit "enqueues a job when a matching event fires" dograph = build_workflow_graph { |g| g.node "trigger-1", "trigger:topic_closed" }@@ -219,6 +222,21 @@ RSpec.describe DiscourseWorkflows::EventListener doexpect(enqueued_trigger_node_ids).not_to include("first-post-only")end+ it "does not query the dependencies table when no live workflow uses the fired trigger type" do+ create_published_workflow("closed-trigger", "trigger:topic_closed")+ DiscourseWorkflows::WorkflowDependency.active_node_types # warm the cache++ queries =+ track_sql_queries do+ described_class.handle(DiscourseWorkflows::Nodes::TopicCreated::V1, topic)+ end++ dependency_queries =+ queries.select { |sql| sql.include?("discourse_workflows_workflow_dependencies") }+ expect(dependency_queries).to be_empty+ expect(enqueued_trigger_node_ids).to be_empty+ end+def create_published_workflow(trigger_node_id, trigger_type, configuration: {})graph =build_workflow_graph do |g|diff --git a/plugins/discourse-workflows/spec/models/discourse_workflows/workflow_dependency_spec.rb b/plugins/discourse-workflows/spec/models/discourse_workflows/workflow_dependency_spec.rbindex 364c0fde7b1..7fae67ed05e 100644--- a/plugins/discourse-workflows/spec/models/discourse_workflows/workflow_dependency_spec.rb+++ b/plugins/discourse-workflows/spec/models/discourse_workflows/workflow_dependency_spec.rb@@ -1,15 +1,33 @@# frozen_string_literal: trueRSpec.describe DiscourseWorkflows::WorkflowDependency do+ fab!(:user)fab!(:admin)before { described_class.clear_cache! }+ after { described_class.clear_cache! }def index(workflow)version = workflow.workflow_versions.find_by(version_id: workflow.version_id)DiscourseWorkflows::WorkflowDependencyIndexer.call(workflow, version: version)end+ describe ".active_node_types" do+ it "returns the node types referenced by the active version of a published workflow" do+ graph = build_workflow_graph { |g| g.node "trigger-1", "trigger:topic_closed" }+ Fabricate(:discourse_workflows_workflow, created_by: user, published: true, **graph)++ expect(described_class.active_node_types).to include("trigger:topic_closed")+ end++ it "excludes node types that only exist in an unpublished workflow" do+ graph = build_workflow_graph { |g| g.node "trigger-1", "trigger:topic_closed" }+ Fabricate(:discourse_workflows_workflow, created_by: user, **graph)++ expect(described_class.active_node_types).not_to include("trigger:topic_closed")+ end+ end+describe ".cached_user_modals?" doit "is true when a workflow uses the modal node" dograph =