Replace .include? / .map with more efficient SQL statements

Author: philippthun

app/access/space_quota_definition_access.rb

@@ -70,7 +70,7 @@ def delete?(space_quota_definition, params=nil)
     def read?(space_quota_definition, *_)
       context.admin_override || (
         !context.user.nil? && (
-          (context.user.managed_organizations.include? space_quota_definition.organization) ||
+          context.user.managed_organizations_dataset.where(id: space_quota_definition.organization_id).any? ||
           !(context.user.managed_spaces & space_quota_definition.spaces).empty? ||
           !(context.user.audited_spaces & space_quota_definition.spaces).empty? ||
           !(context.user.spaces & space_quota_definition.spaces).empty?

app/actions/service_instance_share.rb

@@ -54,12 +54,12 @@ def validate_plan_visibility!(service_instance, space)
     end
 
     def validate_name_uniqueness!(service_instance, space)
-      if space.service_instances.map(&:name).include?(service_instance.name)
+      if space.service_instances_dataset.where(name: service_instance.name).any?
         error_msg = "A service instance called #{service_instance.name} already exists in #{space.name}."
         error!(error_msg)
       end
 
-      if space.service_instances_shared_from_other_spaces.map(&:name).include?(service_instance.name)
+      if space.service_instances_shared_from_other_spaces_dataset.where(name: service_instance.name).any?
         error_msg = "A service instance called #{service_instance.name} has already been shared with #{space.name}."
         error!(error_msg)
       end

app/controllers/v3/roles_controller.rb

@@ -71,7 +71,7 @@ def destroy
 
       if role.type == VCAP::CloudController::RoleTypes::ORGANIZATION_USER
         org = Organization.find(id: role.organization_id)
-        no_space_role = Role.where(space_id: org.spaces.map(&:id), user_id: role.user_id).empty?
+        no_space_role = Role.where(space_id: org.spaces_dataset.select(:id), user_id: role.user_id).empty?
         unprocessable!('Cannot delete organization_user role while user has roles in spaces in that organization.') unless no_space_role
       end
     end

app/controllers/v3/security_groups_controller.rb

@@ -123,7 +123,7 @@ def delete_running_spaces
     unprocessable_space! unless space
     unauthorized! unless permission_queryer.can_update_active_space?(space.id, space.organization_id)
     suspended! unless permission_queryer.is_space_active?(space.id)
-    unprocessable_space! unless security_group.spaces.include?(space)
+    unprocessable_space! unless security_group.spaces_dataset.where(id: space.id).any?
 
     SecurityGroupUnapply.unapply_running(security_group, space)
 
@@ -140,7 +140,7 @@ def delete_staging_spaces
     unprocessable_space! unless space
     unauthorized! unless permission_queryer.can_update_active_space?(space.id, space.organization_id)
     suspended! unless permission_queryer.is_space_active?(space.id)
-    unprocessable_space! unless security_group.staging_spaces.include?(space)
+    unprocessable_space! unless security_group.staging_spaces_dataset.where(id: space.id).any?
 
     SecurityGroupUnapply.unapply_staging(security_group, space)
 

app/fetchers/route_fetcher.rb

@@ -33,7 +33,10 @@ def filter(message, dataset)
         end
 
         if message.requested?(:organization_guids)
-          space_ids = Organization.where(guid: message.organization_guids).map(&:spaces).flatten.map(&:id)
+          space_ids = Space.
+                      join(:organizations, id: :organization_id).
+                      where(organizations__guid: message.organization_guids).
+                      select(:spaces__id)
           dataset = dataset.where(space_id: space_ids)
         end
 

app/models/runtime/user.rb

@@ -82,13 +82,15 @@ def validate
     end
 
     def validate_organization(org)
-      unless org && organizations.include?(org)
+      unless org && organizations_dataset.where(id: org).any?
         raise InvalidOrganizationRelation.new("Cannot add role, user does not belong to Organization with guid #{org.guid}")
       end
     end
 
     def validate_organization_roles(org)
-      if org && (managed_organizations.include?(org) || billing_managed_organizations.include?(org) || audited_organizations.include?(org))
+      if org && (managed_organizations_dataset.where(id: org.id).any? ||
+          billing_managed_organizations_dataset.where(id: org.id).any? ||
+          audited_organizations_dataset.where(id: org.id).any?)
         raise InvalidOrganizationRelation.new("Cannot remove user from Organization with guid #{org.guid} if the user has the OrgManager, BillingManager, or Auditor role")
       end
     end

app/presenters/v3/security_group_presenter.rb

@@ -27,10 +27,10 @@ def to_hash
         },
         relationships: {
           running_spaces: {
-            data: space_guid_hash_for(security_group.spaces)
+            data: space_guid_hash_for(security_group.spaces_dataset)
           },
           staging_spaces: {
-            data: space_guid_hash_for(security_group.staging_spaces)
+            data: space_guid_hash_for(security_group.staging_spaces_dataset)
           }
         },
         links: build_links,
@@ -43,13 +43,13 @@ def security_group
       @resource
     end
 
-    def space_guid_hash_for(spaces)
-      visible_spaces = if @all_spaces_visible
-                         spaces
-                       else
-                         spaces.select { |space| @visible_space_guids.include? space.guid }
-                       end
-      visible_spaces.map { |space| { guid: space.guid } }
+    def space_guid_hash_for(spaces_dataset)
+      visible_spaces_dataset = if @all_spaces_visible
+                                 spaces_dataset
+                               else
+                                 spaces_dataset.where(guid: @visible_space_guids)
+                               end
+      visible_spaces_dataset.select_map(:guid).map { |guid| { guid: guid } }
     end
 
     def build_links

app/presenters/v3/space_quota_presenter.rb

@@ -56,12 +56,12 @@ def space_quota
     end
 
     def filtered_visible_spaces
-      visible_spaces = if @all_spaces_visible
-                         space_quota.spaces
-                       else
-                         space_quota.spaces.select { |space| @visible_space_guids.include? space.guid }
-                       end
-      visible_spaces.map { |space| { guid: space.guid } }
+      visible_spaces_dataset = if @all_spaces_visible
+                                 space_quota.spaces_dataset
+                               else
+                                 space_quota.spaces_dataset.where(guid: @visible_space_guids)
+                               end
+      visible_spaces_dataset.select_map(:guid).map { |guid| { guid: guid } }
     end
 
     def build_links

lib/cloud_controller/permissions.rb

@@ -245,8 +245,8 @@ def can_read_route?(space_id)
     space = VCAP::CloudController::Space.where(id: space_id).first
 
     space.has_member?(@user) || space.has_supporter?(@user) ||
-      @user.managed_organizations.map(&:id).include?(space.organization_id) ||
-      @user.audited_organizations.map(&:id).include?(space.organization_id)
+      @user.managed_organizations_dataset.where(id: space.organization_id).any? ||
+      @user.audited_organizations_dataset.where(id: space.organization_id).any?
   end
 
   def space_guids_with_readable_routes_query