pact_broker 2.92.0 → 2.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24079bee3bfb14bfb86f5c9bc12d6f1110a19eb3e4098b8a1543d93a309a562c
-  data.tar.gz: 59ef52df7edeb89738512914f8dbaca0a500d27ce84700e2c5e3bd06f3ce1421
+  metadata.gz: c3be3c5c9c91694873befa3ac15ff196bbcf49b75f250fc22485079ee1630699
+  data.tar.gz: 00aa9e23a79856cf4db4353191d1fd33ae3acf93a991f0074949ad1ccaefc4d3
 SHA512:
-  metadata.gz: 954b6742ba7f76c9af9153c7ba05205e51993df3b97eba56219cbb7a5027df3808cabcb3a4611d72bb2bff7376a2bf3e5b7876eadccc0bda8f23e0affdaad28f
-  data.tar.gz: 8485529fb6980f2925892871d382376d0860b9c7ee9e72afeb3235a99dff18cb2afb08993666095fe6b084373ed79ce5396a16a22a3c70ea5a656246a0335310
+  metadata.gz: 568d1158ee7c4bf41731e26f849f30b5831ccf8d141399a549deabf679a32a1b7f0766bbe385fb604453b69476deff7788afdc5f276902fa09f065fcdb1e459f
+  data.tar.gz: da3b98bed787330c0730b2cf5e270dbee54fcea4106b0866f2fff0b9a7c6b00e31a57a8f2264ac057e24f706a9a96591890b052979fa73f362a15f4ad6e8d5c9

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+<a name="v2.93.0"></a>
+### v2.93.0 (2021-12-07)
+
+#### Features
+
+* remove feature flag for new_wip_calculations	 ([972ceadd](/../../commit/972ceadd))
+* call the database clean within a transaction	 ([408c84ef](/../../commit/408c84ef))
+
+#### Bug Fixes
+
+* fix clean performance fix (#530)	 ([6c71e57b](/../../commit/6c71e57b))
+* fix performance issue loading latest version for pacticipant	 ([c575d132](/../../commit/c575d132))
+
 <a name="v2.92.0"></a>
 ### v2.92.0 (2021-11-27)
 

data/lib/pact_broker/api/resources/verifications.rb

@@ -50,7 +50,7 @@ module PactBroker
         end
 
         def from_json
-          handle_webhook_events do
+          handle_webhook_events(build_url: verification_params["buildUrl"]) do
             verified_pacts = pact_service.find_for_verification_publication(pact_params, event_context[:consumer_version_selectors])
             verification = verification_service.create(next_verification_number, verification_params, verified_pacts, event_context)
             response.body = decorator_for(verification).to_json(decorator_options)

data/lib/pact_broker/db/clean_incremental.rb

@@ -66,13 +66,15 @@ module PactBroker
         if dry_run?
           dry_run_results
         else
-          before_counts = current_counts
-          PactBroker::Domain::Version.where(id: resolve_ids(version_ids_to_delete)).delete
-          delete_orphan_pact_versions
-          after_counts = current_counts
-
-          TABLES.each_with_object({}) do | table_name, comparison_counts |
-            comparison_counts[table_name.to_s] = { "deleted" => before_counts[table_name] - after_counts[table_name], "kept" => after_counts[table_name] }
+          db.transaction do
+            before_counts = current_counts
+            PactBroker::Domain::Version.where(id: resolve_ids(version_ids_to_delete)).delete
+            delete_orphan_pact_versions
+            after_counts = current_counts
+
+            TABLES.each_with_object({}) do | table_name, comparison_counts |
+              comparison_counts[table_name.to_s] = { "deleted" => before_counts[table_name] - after_counts[table_name], "kept" => after_counts[table_name] }
+            end
           end
         end
       end
@@ -102,8 +104,8 @@ module PactBroker
 
       def orphan_pact_versions
         db[:pact_versions]
-          .left_join(:pact_publications, pact_version_id: :id)
-          .left_join(:verifications, pact_version_id: :id)
+          .left_join(:pact_publications, Sequel[:pact_publications][:pact_version_id]=> Sequel[:pact_versions][:id])
+          .left_join(:verifications, Sequel[:verifications][:pact_version_id]=> Sequel[:pact_versions][:id])
           .select(Sequel[:pact_versions][:id])
           .where(
             Sequel[:pact_publications][:id] => nil,

data/lib/pact_broker/domain/pacticipant.rb

@@ -1,14 +1,44 @@
 require "pact_broker/db"
 require "pact_broker/messages"
 require "pact_broker/repositories/helpers"
-require "pact_broker/versions/latest_version"
 require "pact_broker/domain/label"
 require "pact_broker/string_refinements"
 require "pact_broker/pacticipants/generate_display_name"
 
 module PactBroker
   module Domain
+    class LatestVersionForPacticipantEagerLoader
+      def self.call(eo, **_other)
+        populate_associations(eo[:rows])
+      end
+
+      def self.populate_associations(pacticipants)
+        pacticipants.each { | pacticipant | pacticipant.associations[:latest_version] = nil }
+        pacticipant_ids = pacticipants.collect(&:id)
+
+        max_orders = PactBroker::Domain::Version
+                      .where(pacticipant_id: pacticipant_ids)
+                      .select_group(:pacticipant_id)
+                      .select_append { max(order).as(latest_order) }
+
+        max_orders_join = {
+          Sequel[:max_orders][:latest_order] => Sequel[:versions][:order],
+          Sequel[:max_orders][:pacticipant_id] => Sequel[:versions][:pacticipant_id]
+        }
+
+        latest_versions = PactBroker::Domain::Version
+                            .select_all_qualified
+                            .join(max_orders, max_orders_join, { table_alias: :max_orders})
+
+        latest_versions.each do | version |
+          pacticipant = pacticipants.find{ | p | p.id == version.pacticipant_id }
+          pacticipant.associations[:latest_version] = version
+        end
+      end
+    end
+
     class Pacticipant < Sequel::Model
+
       include Messages
       include PactBroker::Pacticipants::GenerateDisplayName
       using PactBroker::StringRefinements
@@ -21,7 +51,11 @@ module PactBroker
       one_to_many :versions, :order => :order, :reciprocal => :pacticipant
       one_to_many :labels, :order => :name, :reciprocal => :pacticipant
       one_to_many :pacts
-      one_to_one :latest_version, :class => "PactBroker::Versions::LatestVersion", primary_key: :id, key: :pacticipant_id
+      one_to_one :latest_version, :class => "PactBroker::Domain::Version",
+        primary_key: :id, key: :pacticipant_id,
+        dataset: lambda { PactBroker::Domain::Version.where(pacticipant_id: id).order(Sequel.desc(:order)).limit(1) },
+        eager_loader: LatestVersionForPacticipantEagerLoader
+
       one_to_many :branch_heads, class: "PactBroker::Versions::BranchHead", primary_key: :id, key: :pacticipant_id
       one_to_many :branches, class: "PactBroker::Versions::Branch", primary_key: :id, key: :pacticipant_id
 
@@ -61,10 +95,6 @@ module PactBroker
         self.main_branch = nil if main_branch.blank?
       end
 
-      def latest_version
-        versions.last
-      end
-
       def to_s
         "Pacticipant: id=#{id}, name=#{name}"
       end

data/lib/pact_broker/pacts/pact_publication_wip_dataset_module.rb

@@ -32,18 +32,7 @@ module PactBroker
         end
       end
 
-      def successfully_verified_by_provider_tag_when_not_wip(provider_id, provider_tag)
-        return new_successfully_verified_by_provider_tag_when_not_wip(provider_id, provider_tag) if PactBroker.feature_enabled?(:new_wip_calculation)
-
-        from_self(alias: :pp)
-          .select(Sequel[:pp].*)
-          .where(Sequel[:pp][:provider_id] => provider_id)
-          .join_successful_non_wip_verifications_for_provider_id(provider_id)
-          .join_provider_version_tags_for_tag(provider_tag)
-          .distinct
-      end
-
-      def new_successfully_verified_by_provider_tag_when_not_wip(_provider_id, provider_tag)
+      def successfully_verified_by_provider_tag_when_not_wip(provider_tag)
         pact_version_provider_tag_verifications_join = {
           Sequel[:sv][:pact_version_id] => Sequel[:pp][:pact_version_id],
           Sequel[:sv][:provider_version_tag_name] => provider_tag,

data/lib/pact_broker/pacts/pacts_for_verification_repository.rb

@@ -270,7 +270,7 @@ module PactBroker
 
       def remove_non_wip_for_tag(pact_publications_query, provider, tag, specified_pact_version_shas)
         specified_explicitly = pact_publications_query.for_pact_version_sha(specified_pact_version_shas)
-        verified_by_this_tag = pact_publications_query.successfully_verified_by_provider_tag_when_not_wip(provider.id, tag)
+        verified_by_this_tag = pact_publications_query.successfully_verified_by_provider_tag_when_not_wip(tag)
         verified_by_another_tag = pact_publications_query.successfully_verified_by_provider_another_tag_before_this_tag_first_created(provider.id, tag)
 
         log_debug_for_wip do

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.92.0"
+  VERSION = "2.93.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.92.0
+  version: 2.93.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -1047,7 +1047,6 @@ files:
 - lib/pact_broker/versions/branch_version.rb
 - lib/pact_broker/versions/branch_version_repository.rb
 - lib/pact_broker/versions/eager_loaders.rb
-- lib/pact_broker/versions/latest_version.rb
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
 - lib/pact_broker/versions/selector.rb

data/lib/pact_broker/versions/latest_version.rb

@@ -1,21 +0,0 @@
-require "pact_broker/domain/version"
-
-module PactBroker
-  module Versions
-    include PactBroker::Repositories::Helpers
-
-    class LatestVersion < PactBroker::Domain::Version
-      set_dataset(:latest_versions)
-    end
-  end
-end
-
-# Table: latest_versions
-# Columns:
-#  id             | integer                     |
-#  number         | text                        |
-#  repository_ref | text                        |
-#  pacticipant_id | integer                     |
-#  order          | integer                     |
-#  created_at     | timestamp without time zone |
-#  updated_at     | timestamp without time zone |