pg_eventstore 1.0.0.rc1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbcfe058d0769d031f29580fdd79e899a73987a3108b0b96ad154a5bb913a7d2
-  data.tar.gz: 0f071621693bca4b597defc2be13fbde054be06448648ace7324e8ce14e4e512
+  metadata.gz: ebd667d51438040640b8edeee4d75fe2a88f6f0605c33f7dcb70a5a250d92efd
+  data.tar.gz: 5ca82322415c77be0ef1a44efe594bd6a3813552157e7bffcc67d64f8703718e
 SHA512:
-  metadata.gz: fa8828e002dab641f15b8ed3756c822899b3937929482a8fb9dcbac4bb5c10b7283427fa462a627ee47209d4476157396749ced15d50b64892683b1309e897a8
-  data.tar.gz: 3482263831bc256851999a0093be615cf4e238ceeae5c27f209f2fcc3d8b666db8b4c68bc388e5ef0c52de8f52a65e6abfe4db864042161f823b867f4996e750
+  metadata.gz: b339460c69fd29a43b23cc9d48847527e24a0c3a32b2524f03bec348058f1bad8873508cdf219d83a27ed4fefdb04ef3691aaeca9f67e93d78fff9556fbd1857
+  data.tar.gz: a122c0c6dcd1a65a12fbdf76df47167d26a727db6df47bd38122a0943622433dd410430450fcc9355bfc1ceb2b7f312eed03f1f25ababa4e897d56f8f3f60b76

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [1.0.0]
+
+- Improve performance of Subscription#update by relaxing transaction isolation level
+- Fix calculation of events number in the subscription's chunk
+
+## [1.0.0.rc2]
+
+- Implement confirmation dialog for sensitive admin UI actions
+
 ## [1.0.0.rc1]
 
 - Improve performance of loading original events when resolve_link_tos: true option is provided

data/lib/pg_eventstore/queries/subscription_queries.rb

@@ -84,7 +84,7 @@ module PgEventstore
       end.join(', ')
       sql =
         "UPDATE subscriptions SET #{attrs_sql} WHERE id = $#{attrs.keys.size + 1} RETURNING *"
-      updated_attrs = transaction_queries.transaction do
+      updated_attrs = transaction_queries.transaction(:read_committed) do
         pg_result = connection.with do |conn|
           conn.exec_params(sql, [*attrs.values, id])
         end

data/lib/pg_eventstore/queries/transaction_queries.rb

@@ -3,6 +3,14 @@
 module PgEventstore
   # @!visibility private
   class TransactionQueries
+    ISOLATION_LEVELS = {
+      read_committed: 'READ COMMITTED',
+      repeatable_read: 'REPEATABLE READ',
+      serializable: 'SERIALIZABLE'
+    }.tap do |h|
+      h.default = h[:serializable]
+    end.freeze
+
     attr_reader :connection
     private :connection
 
@@ -11,15 +19,16 @@ module PgEventstore
       @connection = connection
     end
 
+    # @param level [Symbol] transaction isolation level
     # @return [void]
-    def transaction
+    def transaction(level = :serializable)
       connection.with do |conn|
         # We are inside a transaction already - no need to start another one
         if [PG::PQTRANS_ACTIVE, PG::PQTRANS_INTRANS].include?(conn.transaction_status)
           next yield
         end
 
-        pg_transaction(conn) do
+        pg_transaction(ISOLATION_LEVELS[level], conn) do
           yield
         end
       end
@@ -27,11 +36,12 @@ module PgEventstore
 
     private
 
+    # @param level [String] PostgreSQL transaction isolation level
     # @param pg_connection [PG::Connection]
     # @return [void]
-    def pg_transaction(pg_connection)
+    def pg_transaction(level, pg_connection)
       pg_connection.transaction do
-        pg_connection.exec("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE")
+        pg_connection.exec("SET TRANSACTION ISOLATION LEVEL #{level}")
         yield
       end
     rescue PG::TRSerializationFailure, PG::TRDeadlockDetected

data/lib/pg_eventstore/subscriptions/subscription_runner.rb

@@ -55,8 +55,8 @@ module PgEventstore
     def estimate_events_number
       return INITIAL_EVENTS_PER_CHUNK if @stats.average_event_processing_time.zero?
 
-      events_per_chunk = @subscription.chunk_query_interval / @stats.average_event_processing_time
-      [events_per_chunk, MAX_EVENTS_PER_CHUNK].min - @events_processor.events_left_in_chunk
+      events_per_chunk = (@subscription.chunk_query_interval / @stats.average_event_processing_time).round
+      [[events_per_chunk, MAX_EVENTS_PER_CHUNK].min - @events_processor.events_left_in_chunk, 0].max
     end
 
     # @return [void]

data/lib/pg_eventstore/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgEventstore
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0"
 end

data/lib/pg_eventstore/web/application.rb

@@ -53,6 +53,13 @@ module PgEventstore
 
           "#{request.referer}#{params[:hash]}"
         end
+
+        # Shortcut to escape html
+        # @param text [String]
+        # @return [String]
+        def h(text)
+          Rack::Utils.escape_html(text)
+        end
       end
 
       get '/' do

data/lib/pg_eventstore/web/public/javascripts/pg_eventstore.js

@@ -136,19 +136,6 @@ $(function(){
         $(this).parents('tr').next().toggleClass('d-none');
     });
 
-    // Handle a[data-method]. It works very similar to rails ujs
-    $('body').on('click', 'a[data-method]', function(e){
-        e.preventDefault();
-
-        let href = $(this).attr('href');
-        let method = $(this).data('method');
-        let $form = $(`<form method="${method}" action="${href}"></form>`);
-        let hashInput = `<input name="hash" value="${window.location.hash}" type="hidden" />`;
-
-        $form.hide().append(hashInput).appendTo('body');
-        $form.submit();
-    });
-
     // When user navigates through SubscriptionsSet-s tabs - also change a hash of the url. Its value is send when
     // clicking on a[data-method] links
     $('.set-tab').click(function(e){
@@ -160,3 +147,51 @@ $(function(){
         $(`.set-tab[href="${window.location.hash}"]`).get(0).click();
     }
 });
+
+// Confirmation dialog and data-method handling functional
+$(function(){
+    "use strict";
+
+    let $confirmationModal = $('#confirmation-modal');
+
+    $confirmationModal.on('hide.bs.modal', function(){
+        $(this).find('.modal-title').html('');
+        $(this).find('.modal-body').html('');
+        $(this).find('.confirm').off();
+    });
+    let showConfirmation = function(el, callback){
+        let $el = $(el);
+        $confirmationModal.find('.modal-body').html($el.data('confirm'));
+        $confirmationModal.find('.modal-title').html($el.data('confirm-title'));
+        $confirmationModal.modal('show');
+        $confirmationModal.one('click', '.confirm', callback);
+    }
+
+    let handleMethod = function(el){
+        let $el = $(el);
+        let href = $el.attr('href');
+        let method = $el.data('method') || 'GET';
+
+        if(method === 'GET') {
+            window.location.href = href;
+        }else{
+            let $form = $(`<form method="${method}" action="${href}"></form>`);
+            let hashInput = `<input name="hash" value="${window.location.hash}" type="hidden" />`;
+
+            $form.append(hashInput);
+            $form.hide().appendTo('body');
+            $form.submit();
+        }
+    }
+
+    $('body').on('click', 'a[data-confirm], a[data-method]', function(e){
+        e.preventDefault();
+        if($(this).data('confirm')) {
+            showConfirmation(e.target, function(){
+                handleMethod(e.target);
+            });
+            return;
+        }
+        handleMethod(e.target);
+    });
+});

data/lib/pg_eventstore/web/public/stylesheets/pg_eventstore.css

@@ -3,3 +3,7 @@ tr.collapsing {
     transition: none;
     display: none;
 }
+
+#confirmation-modal .modal-body {
+    font-size: 1.2rem;
+}

data/lib/pg_eventstore/web/views/layouts/application.erb

@@ -101,6 +101,25 @@
   </div>
 </div>
 
+<div class="modal fade" id="confirmation-modal" tabindex="-1" role="dialog" aria-labelledby="confirmation-modal" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body font-weight-bold text-break">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-primary confirm">Continue</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- jQuery -->
 <script src="javascripts/vendor/jquery.min.js"></script>
 <!-- Bootstrap -->

data/lib/pg_eventstore/web/views/subscriptions/index.erb

@@ -21,10 +21,6 @@
     <div class="row">
       <div class="col-md-12 col-sm-12">
         <div class="x_panel">
-          <div class="x_title">
-            <h2><i class="fa fa-bars"></i> Tabs <small>Float left</small></h2>
-            <div class="clearfix"></div>
-          </div>
           <div class="x_content">
             <ul class="nav nav-tabs bar_tabs" role="tablist">
               <% @association.association.each.with_index do |(subscriptions_set, _), index| %>
@@ -78,11 +74,11 @@
                                 </a>
                               <% end %>
                               <% if PgEventstore::RunnerState::STATES.values_at(:running, :dead).include?(subscriptions_set.state) %>
-                                <a class="btn btn-warning" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:Stop]) %>" data-toggle="tooltip" title="This action will delete Subscriptions Set and release all related Subscriptions.">
+                                <a class="btn btn-warning" data-confirm="You are about to stop SubscriptionsSet#<%= subscriptions_set.id %>. This will also delete it and will result in stopping all related Subscriptions. Continue?" data-confirm-title="Stop SubscriptionsSet" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:Stop]) %>" data-toggle="tooltip" title="This action will delete Subscriptions Set and release all related Subscriptions.">
                                   Stop
                                 </a>
                               <% end %>
-                              <a class="btn btn-danger" data-method="post" href="<%= url("/delete_subscriptions_set/#{subscriptions_set.id}") %>" data-toggle="tooltip" title="Use this action only on stuck Subscriptions Set - to clean it up.">
+                              <a class="btn btn-danger" data-confirm="You are about to delete SubscriptionsSet#<%= subscriptions_set.id %>. Continue?" data-confirm-title="Delete SubscriptionsSet" data-method="post" href="<%= url("/delete_subscriptions_set/#{subscriptions_set.id}") %>" data-toggle="tooltip" title="Use this action only on stuck Subscriptions Set - to clean it up.">
                                 Delete
                               </a>
                             </td>
@@ -108,11 +104,11 @@
                           <a class="btn btn-success" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:StartAll]) %>">
                             Start All
                           </a>
-                          <a class="btn btn-danger" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:StopAll]) %>">
+                          <a class="btn btn-danger" data-confirm="You are about to stop all Subscriptions. Continue?" data-confirm-title="Stop all Subscriptions" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:StopAll]) %>">
                             Stop All
                           </a>
                         <% else %>
-                          <a class="btn btn-danger" data-method="post" href="<%= delete_all_subscriptions_url(subscriptions.map(&:id)) %>" data-toggle="tooltip" title="Delete all Subscriptions, displayed on the current page.">
+                          <a class="btn btn-danger" data-confirm="You are about to delete all Subscriptions, listed on the page. Continue?" data-confirm-title="Delete all Subscriptions" data-method="post" href="<%= delete_all_subscriptions_url(subscriptions.map(&:id)) %>" data-toggle="tooltip" title="Delete all Subscriptions, displayed on the current page.">
                             Delete All
                           </a>
                         <% end %>
@@ -154,7 +150,11 @@
                             <td><%= subscription.chunk_query_interval %>s</td>
                             <td><%= subscription.last_chunk_fed_at %></td>
                             <td><%= colored_state(subscription.state, subscription.updated_at) %></td>
-                            <td><%= subscription.average_event_processing_time %></td>
+                            <td>
+                              <% if subscription.average_event_processing_time %>
+                                <%= "#{(1 / subscription.average_event_processing_time).to_i}/s" %>
+                              <% end %>
+                            </td>
                             <td><%= subscription.restart_count %></td>
                             <td><%= subscription.max_restarts_number %></td>
                             <td><%= subscription.time_between_restarts %>s</td>
@@ -186,7 +186,7 @@
                                 <% end %>
                               <% end %>
                               <% unless subscriptions_set.id %>
-                                <a class="btn btn-danger" data-method="post" href="<%= url("/delete_subscription/#{subscription.id}") %>" data-toggle="tooltip" title="You will lose the Subscription's position as well.">
+                                <a class="btn btn-danger" data-confirm="You are about to delete <%= h subscription.name.inspect %> Subscription. Continue?" data-confirm-title="Delete Subscription" data-method="post" href="<%= url("/delete_subscription/#{subscription.id}") %>" data-toggle="tooltip" title="You will lose the Subscription's position as well.">
                                   Delete
                                 </a>
                               <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg