A platform for community discussion. Free, open, simple.
PERF: Skip event extraction and batch lookups on hot paths
Régis Hanol64b53d63fd09
diff --git a/plugins/discourse-events/app/serializers/discourse_events/events/event_serializer.rb b/plugins/discourse-events/app/serializers/discourse_events/events/event_serializer.rbindex ae4e60acc2f..83dc9e13c02 100644--- a/plugins/discourse-events/app/serializers/discourse_events/events/event_serializer.rb+++ b/plugins/discourse-events/app/serializers/discourse_events/events/event_serializer.rb@@ -197,8 +197,8 @@ module DiscourseEventsenddef should_display_invitees- (object.public? && object.invitees.count > 0) ||- (object.private? && can_display_invitee_details? && Array(object.raw_invitees).count > 0)+ (object.public? && object.invitees.exists?) ||+ (object.private? && can_display_invitee_details? && Array(object.raw_invitees).any?)enddef include_url?diff --git a/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb b/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rbindex e6b1456db61..aaa6412cedc 100644--- a/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb+++ b/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb@@ -6,11 +6,14 @@ module Jobsevery 1.minutedef execute(args)- DiscourseEvents::Events::EventDate.pending.find_each do |event_date|- send_reminder(event_date)- trigger_events(event_date)- finish(event_date)- end+ DiscourseEvents::Events::EventDate+ .pending+ .includes(:event)+ .find_each do |event_date|+ send_reminder(event_date)+ trigger_events(event_date)+ finish(event_date)+ endenddef send_reminder(event_date)diff --git a/plugins/discourse-events/lib/discourse_events/events/parser.rb b/plugins/discourse-events/lib/discourse_events/events/parser.rbindex 7f45e32ed74..511b9a20532 100644--- a/plugins/discourse-events/lib/discourse_events/events/parser.rb+++ b/plugins/discourse-events/lib/discourse_events/events/parser.rb@@ -29,8 +29,13 @@ module DiscourseEventsLEGACY_ESCAPED_ATTRS = %w[data-location]SCHEME_PREFIX = /\A[a-z][a-z0-9+.\-]*:/i+ EVENT_MARKER = /\[event|discourse-post-event/i+def self.extract_events(post)- cooked = PrettyText.cook(post.raw, topic_id: post.topic_id, user_id: post.user_id)+ raw = post.raw.to_s+ return [] if !raw.match?(EVENT_MARKER)++ cooked = PrettyText.cook(raw, topic_id: post.topic_id, user_id: post.user_id)valid_options = valid_option_attributesvalid_custom_fields =diff --git a/plugins/discourse-events/plugin.rb b/plugins/discourse-events/plugin.rbindex 99ad7a1419b..4fdafc85b0b 100644--- a/plugins/discourse-events/plugin.rb+++ b/plugins/discourse-events/plugin.rb@@ -365,7 +365,7 @@ after_initialize doif SiteSetting.discourse_post_event_enabledtopic_view.instance_variable_set(:@posts,- topic_view.posts.includes(event: [:image_upload, { event_hosts: :user }]),+ topic_view.posts.includes(event: [:image_upload, :event_dates, { event_hosts: :user }]),)endenddiff --git a/plugins/discourse-events/spec/lib/discourse_events/events/parser_spec.rb b/plugins/discourse-events/spec/lib/discourse_events/events/parser_spec.rbindex b552261b045..63c27292f28 100644--- a/plugins/discourse-events/spec/lib/discourse_events/events/parser_spec.rb+++ b/plugins/discourse-events/spec/lib/discourse_events/events/parser_spec.rb@@ -19,6 +19,11 @@ describe DiscourseEvents::Events::Parser doexpect(events.length).to eq(1)end+ it "finds an event whose tag is not lowercase" do+ events = parser.extract_events(build_post(user, '[EVENT start="2020"]\n[/EVENT]'))+ expect(events.length).to eq(1)+ end+it "finds multiple events" dopost_event = build_post user, <<~TXT[event start="2020"]