pg_eventstore 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9426880dd6354875d896f5bf37abeac180c4f04b26905db0efc035fec316e6b9
-  data.tar.gz: 355a6c370451fff9e391aa0ecb1c6abf105c6fc537d99f6b7371359067dd2ee4
+  metadata.gz: ccfbe47f6f178820e5f7b5ccc9fb9298bf6beba4fa10081cd01bcd6ce3fe1001
+  data.tar.gz: b55180dc1c24ec04d13e99b0d4ba920eae5eef652ccde632f332ab67b27cc14e
 SHA512:
-  metadata.gz: fc96e847b892e375115a08985678328d166742e5f6be3ee967f67dc808c80166a58f010555567b05fbac172b31c7d98276d1e898de6889d5d53d3ccf0ab2be47
-  data.tar.gz: cba82b0c20d4104cd6878fd2471e5c4d0c70e60991f573cd5aa1a845e7e5b443cf9f15448b81754888a84883c6bfbaf932e452c13fd7d5d229b03185741f1dbd
+  metadata.gz: 4226be0aa1f6109b5a956febca5343b1a1d215c6a16e056267027287bcb629295cd4af1a7f6fc093e781c90a48f885f2b5932faff7962bdd993305519bfca053
+  data.tar.gz: 2eb04ad6b29569f29282768e806813823e990493674c627252963d312966aa1806f06139b4b01937699c0fcf4b25034c2e02cb7375710d65838d62bb3934099d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.10.2] - 2024-03-13
+
+- Review the approach to resolve link events 
+- Fix subscriptions restart interval option not being processed correctly
+
 ## [0.10.1] - 2024-03-12
 
 - Handle edge case when creating partitions

data/docs/configuration.md

@@ -10,7 +10,7 @@ Configuration options:
 | event_class_resolver               | `#call` | `PgEventstore::EventClassResolver.new`                       | A `#call`-able object that accepts a string and returns an event's class. See **Resolving events classes** chapter bellow for more info.                                                                                                                                                                               |
 | connection_pool_size               | Integer | `5`                                                          | Max number of connections per ruby process. It must equal the number of threads of your application. When using subscriptions it is recommended to set it to the number of subscriptions divided by two or greater. See [**Picking max connections number**](#picking-max-connections-number) chapter of this section. |
 | connection_pool_timeout            | Integer | `5`                                                          | Time in seconds to wait for a connection in the pool to be released. If no connections are available during this time - `ConnectionPool::TimeoutError` will be raised. See `connection_pool` gem [docs](https://github.com/mperham/connection_pool#usage) for more info.                                               |
-| subscription_pull_interval         | Float   | `1.0`                                                        | How often to pull new subscription events in seconds.                                                                                                                                                                                                                                                                  |
+| subscription_pull_interval         | Float   | `1.0`                                                        | How often to pull new subscription events in seconds. The minimum meaningful value is `0.2`. Values less than `0.2` will act as it is `0.2`.                                                                                                                                                                           |
 | subscription_max_retries           | Integer | `5`                                                          | Max number of retries of failed subscription.                                                                                                                                                                                                                                                                          |
 | subscription_retries_interval      | Integer | `1`                                                          | Interval in seconds between retries of failed subscriptions.                                                                                                                                                                                                                                                           |
 | subscriptions_set_max_retries      | Integer | `10`                                                         | Max number of retries for failed subscription sets.                                                                                                                                                                                                                                                                    |

data/lib/pg_eventstore/event.rb

@@ -31,6 +31,10 @@ module PgEventstore
     #   @return [String, nil] UUIDv4 of an event the current event points to. If it is not nil, then the current
     #     event is a link
     attribute(:link_id)
+    # @!attribute link
+    #   @return [PgEventstore::Event, nil] when resolve_link_tos: true option is provided during the read of events and
+    #     event is a link event - this attribute will be pointing on that link
+    attribute(:link)
     # @!attribute created_at
     #   @return [Time, nil] a timestamp an event was created at
     attribute(:created_at)
@@ -41,7 +45,7 @@ module PgEventstore
     def ==(other)
       return false unless other.is_a?(PgEventstore::Event)
 
-      attributes_hash == other.attributes_hash
+      attributes_hash.except(:link) == other.attributes_hash.except(:link)
     end
 
     # Detect whether an event is a link event

data/lib/pg_eventstore/event_deserializer.rb

@@ -27,6 +27,7 @@ module PgEventstore
       event.stream = PgEventstore::Stream.new(
         **attrs.slice('context', 'stream_name', 'stream_id').transform_keys(&:to_sym)
       )
+      event.link = without_middlewares.deserialize(attrs['link']) if attrs.key?('link')
       event
     end
 

data/lib/pg_eventstore/queries/event_queries.rb

@@ -47,6 +47,7 @@ module PgEventstore
       raw_events = connection.with do |conn|
         conn.exec_params(*exec_params)
       end.to_a
+      raw_events = links_resolver.resolve(raw_events) if options[:resolve_link_tos]
       deserializer.deserialize_many(raw_events)
     end
 
@@ -106,5 +107,10 @@ module PgEventstore
 
       QueryBuilders::EventsFiltering.specific_stream_filtering(stream, options)
     end
+
+    # @return [PgEventstore::LinksResolver]
+    def links_resolver
+      LinksResolver.new(connection)
+    end
   end
 end

data/lib/pg_eventstore/queries/links_resolver.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  # @!visibility private
+  class LinksResolver
+    attr_reader :connection
+    private :connection
+
+    # @param connection [PgEventstore::Connection]
+    def initialize(connection)
+      @connection = connection
+    end
+
+    # @param raw_events [Array<Hash>]
+    def resolve(raw_events)
+      ids = raw_events.map { _1['link_id'] }.compact.uniq
+      return raw_events if ids.empty?
+
+      original_events = connection.with do |conn|
+        conn.exec_params('select * from events where id = ANY($1::uuid[])', [ids])
+      end.to_h { |attrs| [attrs['id'], attrs] }
+
+      raw_events.map do |attrs|
+        original_event = original_events[attrs['link_id']]
+        next attrs unless original_event
+
+        original_event.merge('link' => attrs).merge(attrs.except(*original_event.keys))
+      end
+    end
+  end
+end

data/lib/pg_eventstore/queries/subscription_queries.rb

@@ -73,15 +73,20 @@ module PgEventstore
       deserialize(pg_result.to_a.first)
     end
 
-    # @param query_options [Array<Array<Integer, Hash>>] array of runner ids and query options
-    # @return [Array<Hash>] array of raw events
+    # @param query_options [Hash{Integer => Hash}] runner_id/query options association
+    # @return [Hash{Integer => Hash}] runner_id/events association
     def subscriptions_events(query_options)
-      return [] if query_options.empty?
+      return {} if query_options.empty?
 
       final_builder = union_builders(query_options.map { |id, opts| query_builder(id, opts) })
-      connection.with do |conn|
+      raw_events = connection.with do |conn|
         conn.exec_params(*final_builder.to_exec_params)
       end.to_a
+      raw_events.group_by { _1['runner_id'] }.to_h do |runner_id, runner_raw_events|
+        next [runner_id, runner_raw_events] unless query_options[runner_id][:resolve_link_tos]
+
+        [runner_id, links_resolver.resolve(runner_raw_events)]
+      end
     end
 
     # @param id [Integer] subscription's id
@@ -144,9 +149,9 @@ module PgEventstore
       TransactionQueries.new(connection)
     end
 
-    # @return [PgEventstore::EventTypeQueries]
-    def event_type_queries
-      EventTypeQueries.new(connection)
+    # @return [PgEventstore::LinksResolver]
+    def links_resolver
+      LinksResolver.new(connection)
     end
 
     # @param hash [Hash]

data/lib/pg_eventstore/queries.rb

@@ -9,6 +9,7 @@ require_relative 'queries/subscription_queries'
 require_relative 'queries/subscriptions_set_queries'
 require_relative 'queries/subscription_command_queries'
 require_relative 'queries/subscriptions_set_command_queries'
+require_relative 'queries/links_resolver'
 
 module PgEventstore
   # @!visibility private

data/lib/pg_eventstore/query_builders/events_filtering_query.rb

@@ -31,7 +31,6 @@ module PgEventstore
           options in { filter: { event_types: Array => event_type_ids } }
           event_filter.add_event_types(event_type_ids)
           event_filter.add_limit(options[:max_count])
-          event_filter.resolve_links(options[:resolve_link_tos])
           options in { filter: { streams: Array => streams } }
           streams&.each { |attrs| event_filter.add_stream_attrs(**attrs) }
           event_filter.add_global_position(options[:from_position], options[:direction])
@@ -47,7 +46,6 @@ module PgEventstore
           options in { filter: { event_types: Array => event_type_ids } }
           event_filter.add_event_types(event_type_ids)
           event_filter.add_limit(options[:max_count])
-          event_filter.resolve_links(options[:resolve_link_tos])
           event_filter.add_stream_attrs(**stream.to_hash)
           event_filter.add_revision(options[:from_revision], options[:direction])
           event_filter.add_stream_direction(options[:direction])
@@ -128,17 +126,6 @@ module PgEventstore
         @sql_builder.limit(limit)
       end
 
-      # @param should_resolve [Boolean]
-      # @return [void]
-      def resolve_links(should_resolve)
-        return unless should_resolve
-
-        @sql_builder.
-          unselect.
-          select("(COALESCE(original_events.*, events.*)).*").
-          join("LEFT JOIN events original_events ON original_events.id = events.link_id")
-      end
-
       # @return [PgEventstore::SQLBuilder]
       def to_sql_builder
         @sql_builder

data/lib/pg_eventstore/subscriptions/events_processor.rb

@@ -20,7 +20,7 @@ module PgEventstore
     # @param raw_events [Array<Hash>]
     # @return [void]
     def feed(raw_events)
-      callbacks.run_callbacks(:feed, raw_events.last&.dig('global_position'))
+      callbacks.run_callbacks(:feed, global_position(raw_events.last))
       @raw_events.push(*raw_events)
     end
 
@@ -35,7 +35,7 @@ module PgEventstore
     # @param raw_event [Hash]
     # @return [void]
     def process_event(raw_event)
-      callbacks.run_callbacks(:process, raw_event['global_position']) do
+      callbacks.run_callbacks(:process, global_position(raw_event)) do
         @handler.call(raw_event)
       end
     end
@@ -68,5 +68,13 @@ module PgEventstore
     def change_state(...)
       callbacks.run_callbacks(:change_state, ...)
     end
+
+    # @param raw_event [Hash, nil]
+    # @return [Integer, nil]
+    def global_position(raw_event)
+      return unless raw_event
+
+      raw_event['link'] ? raw_event['link']['global_position'] : raw_event['global_position']
+    end
   end
 end

data/lib/pg_eventstore/subscriptions/subscription.rb

@@ -130,6 +130,7 @@ module PgEventstore
         chunk_query_interval: chunk_query_interval,
         last_chunk_fed_at: Time.at(0).utc,
         last_chunk_greatest_position: nil,
+        time_between_restarts: time_between_restarts,
         state: RunnerState::STATES[:initial]
       )
     end

data/lib/pg_eventstore/subscriptions/subscription_feeder.rb

@@ -21,7 +21,7 @@ module PgEventstore
       @max_retries = max_retries
       @retries_interval = retries_interval
       @commands_handler = CommandsHandler.new(@config_name, self, @runners)
-      @basic_runner = BasicRunner.new(1, 0)
+      @basic_runner = BasicRunner.new(0.2, 0)
       @force_lock = false
       attach_runner_callbacks
     end

data/lib/pg_eventstore/subscriptions/subscription_runners_feeder.rb

@@ -15,9 +15,8 @@ module PgEventstore
       runners = runners.select(&:running?).select(&:time_to_feed?)
       return if runners.empty?
 
-      runners_query_options = runners.map { |runner| [runner.id, runner.next_chunk_query_opts] }
-      raw_events = subscription_queries.subscriptions_events(runners_query_options)
-      grouped_events = raw_events.group_by { |attrs| attrs['runner_id'] }
+      runners_query_options = runners.to_h { |runner| [runner.id, runner.next_chunk_query_opts] }
+      grouped_events = subscription_queries.subscriptions_events(runners_query_options)
       runners.each do |runner|
         runner.feed(grouped_events[runner.id]) if grouped_events[runner.id]
       end

data/lib/pg_eventstore/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgEventstore
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -91,6 +91,7 @@ files:
 - lib/pg_eventstore/pg_connection.rb
 - lib/pg_eventstore/queries.rb
 - lib/pg_eventstore/queries/event_queries.rb
+- lib/pg_eventstore/queries/links_resolver.rb
 - lib/pg_eventstore/queries/partition_queries.rb
 - lib/pg_eventstore/queries/subscription_command_queries.rb
 - lib/pg_eventstore/queries/subscription_queries.rb