Skip to content

Fix/speedup service brokers get endpoint #5098

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

Open
serdarozerr wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −1
Open

Fix/speedup service brokers get endpoint #5098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1f0a3d
fixing N+1 query for service broker when it is space broker
serdarozerr May 11, 2026
49d99b8
test: test added when serviece broker has space then sequel cache mus…
serdarozerr May 12, 2026
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
2 changes: 1 addition & 1 deletion app/fetchers/service_broker_list_fetcher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module VCAP::CloudController
class ServiceBrokerListFetcher < BaseListFetcher
class << self
def fetch(message:, permitted_space_guids: nil, eager_loaded_associations: [])
dataset = ServiceBroker.dataset.eager(eager_loaded_associations)
dataset = ServiceBroker.dataset.eager(eager_loaded_associations).eager(:space)

dataset = dataset.join(:spaces, id: Sequel[:service_brokers][:space_id]) if permitted_space_guids || message.requested?(:space_guids)

Expand Down
7 changes: 7 additions & 0 deletions spec/unit/fetchers/service_broker_list_fetcher_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ module VCAP::CloudController
expect(dataset.all.first.associations.key?(:labels)).to be true
expect(dataset.all.first.associations.key?(:annotations)).to be false
end

it 'sets space to nil for global brokers and to the space object for space-scoped brokers' do
brokers = fetcher.fetch(message:).all.index_by(&:name)

expect(brokers[broker.name].associations[:space]).to be_nil
expect(brokers[space_scoped_broker_1.name].associations[:space]).to eq(space_1)
end
end

context 'when filtering by space GUIDs' do
Expand Down
Loading