Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Sync To User performance (batch 1) #1896

Merged
merged 4 commits into from
Dec 22, 2020
Merged

Improve Sync To User performance (batch 1) #1896

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cf2e40
Optimize loading block_region_ids when syncing facilities
kitallis Dec 17, 2020
0b18ad0
Memoize the block_sync_enabled? call for FacilitiesController
kitallis Dec 17, 2020
2f3af87
Address feedback
kitallis Dec 18, 2020
4a4e9a9
Merge branch 'master' into sync-perf-1
prabhanshuguptagit Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/controllers/api/v3/facilities_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,23 @@ def force_resync?
end

def records_to_sync
Facility
.updated_on_server_since(other_facilities_processed_since, limit)
other_facility_records
.with_block_region_id
.includes(:facility_group)
.where.not(facility_group: nil)
end

private

# Memoize this call here so that we don't end up making thousands of calls to check user for each facility
def block_level_sync?
@is_block_level_sync_enabled = current_user&.block_level_sync? if @is_block_level_sync_enabled.nil?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change this to match the more idiomatic way of doing this type of nil-safe memoization?

def block_level_sync_enabled?
  return @block_level_sync_enabled if defined? @block_level_sync_enabled
  @block_level_sync_enabled = current_user&.block_level_sync?
end

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, wasn't aware of this, this seems a lot better, thanks!

@is_block_level_sync_enabled
end

def sync_region_id(facility)
if current_user&.block_level_sync?
facility.region.block_region.id
if block_level_sync?
facility.block_region_id
else
facility.facility_group_id
end
Expand Down
7 changes: 7 additions & 0 deletions app/models/facility.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ class Facility < ApplicationRecord
foreign_key: "assigned_facility_id"

pg_search_scope :search_by_name, against: {name: "A", slug: "B"}, using: {tsearch: {prefix: true, any_word: true}}
scope :with_block_region_id, -> {
return all unless Flipper.enabled?(:regions_prep)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the feature flag check should go up into the sync code that is building up the query...having it done in the scope itself is hard to understand. It isn't clear why return all is valid if regions_prep is turned off...I think it would make more sense reading in context of the records_to_sync method.


joins("INNER JOIN regions facility_regions ON facility_regions.source_id = facilities.id")
.joins("INNER JOIN regions block_region ON block_region.path @> facility_regions.path AND block_region.region_type = 'block'")
.select("block_region.id AS block_region_id, facilities.*")
}

enum facility_size: {
community: "community",
Expand Down