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

Batch link expansion queries #3106

Merged
merged 2 commits into from
Feb 3, 2025
Merged

Batch link expansion queries #3106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fe7006
Add content store filter test for `LinkedToEditionsSource`
brucebolt Jan 30, 2025
cff1b0c
Batch GraphQL link expansion queries
brucebolt Jan 30, 2025
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
39 changes: 22 additions & 17 deletions app/graphql/sources/linked_to_editions_source.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
module Sources
class LinkedToEditionsSource < GraphQL::Dataloader::Source
# rubocop:disable Lint/MissingSuper
def initialize(parent_object:)
@object = parent_object
@content_store = parent_object.content_store.to_sym
def initialize(content_store:)
@content_store = content_store.to_sym
end
# rubocop:enable Lint/MissingSuper

def fetch(link_types)
edition_links = @object.links.order(link_type: :asc, position: :asc)
def fetch(editions_and_link_types)
content_id_tuples = editions_and_link_types.map { |edition, link_type| "('#{edition.content_id}','#{link_type}')" }.join(",")
edition_id_tuples = editions_and_link_types.map { |edition, link_type| "(#{edition.id},'#{link_type}')" }.join(",")

all_links = if @object.document.link_set
edition_links.or(@object.document.link_set.links)
else
edition_links
end
edition_links = Link
.joins(:edition, { target_documents: @content_store })
.includes(:edition, { target_documents: @content_store })
.where('("editions"."id", "links"."link_type") IN (?)', Arel.sql(edition_id_tuples))
.where(target_documents: { locale: "en" })
.order(link_type: :asc, position: :asc)

all_links_for_link_type_and_locale = all_links
.includes(target_documents: @content_store) # content_store is :live or :draft (a Document has_one Edition by that name)
.where(link_type: link_types)
.where(target_documents: { locale: "en" })
link_set_links = Link
.joins(:link_set, { target_documents: @content_store })
.includes(:link_set, { target_documents: @content_store })
.where('("link_sets"."content_id", "links"."link_type") IN (?)', Arel.sql(content_id_tuples))
.where(target_documents: { locale: "en" })
.order(link_type: :asc, position: :asc)

link_types_map = link_types.index_with { [] }
all_links = edition_links + link_set_links

all_links_for_link_type_and_locale.each_with_object(link_types_map) { |link, hash|
hash[link.link_type].concat(editions_for_link(link))
link_types_map = editions_and_link_types.map { [_1.content_id, _2] }.index_with { [] }

all_links.each_with_object(link_types_map) { |link, hash|
hash[[(link.link_set || link.edition).content_id, link.link_type]].concat(editions_for_link(link))
}.values
end

Expand Down
4 changes: 2 additions & 2 deletions app/graphql/types/base_object.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def self.links_field(field_name_and_link_type, graphql_field_type)
field(field_name_and_link_type.to_sym, graphql_field_type)

define_method(field_name_and_link_type.to_sym) do
dataloader.with(Sources::LinkedToEditionsSource, parent_object: object)
.load(field_name_and_link_type.to_s)
dataloader.with(Sources::LinkedToEditionsSource, content_store: object.content_store)
.load([object, field_name_and_link_type.to_s])
end
end

Expand Down
8 changes: 4 additions & 4 deletions spec/graphql/sources/linked_to_editions_source_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
create(:link, link_set: link_set, target_content_id: target_edition_3.content_id, link_type: "test_link")

GraphQL::Dataloader.with_dataloading do |dataloader|
request = dataloader.with(described_class, parent_object: source_edition).request("test_link")
request = dataloader.with(described_class, content_store: source_edition.content_store).request([source_edition, "test_link"])
Copy link
Member

Choose a reason for hiding this comment

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

question: are .request in this spec and .load in BaseObject both ending up at the fetch method in LinkedToEditionsSource? 🤯

Copy link
Member

Choose a reason for hiding this comment

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

It appears to be, but I'm not sure why. The same is done is the other dataloader tests too.


expect(request.load).to eq([target_edition_1, target_edition_3])
end
Expand All @@ -28,7 +28,7 @@
})

GraphQL::Dataloader.with_dataloading do |dataloader|
request = dataloader.with(described_class, parent_object: source_edition).request("test_link")
request = dataloader.with(described_class, content_store: source_edition.content_store).request([source_edition, "test_link"])

expect(request.load).to eq([target_edition_1, target_edition_3])
end
Expand All @@ -49,7 +49,7 @@
create(:link, link_set: link_set, target_content_id: target_edition_3.content_id, link_type: "test_link")

GraphQL::Dataloader.with_dataloading do |dataloader|
request = dataloader.with(described_class, parent_object: source_edition).request("test_link")
request = dataloader.with(described_class, content_store: source_edition.content_store).request([source_edition, "test_link"])

expect(request.load).to eq([target_edition_1, target_edition_3])
end
Expand All @@ -72,7 +72,7 @@
create(:link, link_set:, target_content_id: target_edition_4.content_id, link_type: "test_link")

GraphQL::Dataloader.with_dataloading do |dataloader|
request = dataloader.with(described_class, parent_object: source_edition).request("test_link")
request = dataloader.with(described_class, content_store: source_edition.content_store).request([source_edition, "test_link"])

expect(request.load).to eq([target_edition_3, target_edition_4])
end
Expand Down