rails_event_store_active_record 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5968e2e91ed12b5ddfa6597aa022e261d9abd3d1cf060f43bd41b8fc58e3a506
-  data.tar.gz: 17a713daaf14b8b2a42b9aedeb80beae5c054704c49e18469f08dc87ff6d9572
+  metadata.gz: 4e48d5961480e62370dc58515c5547f58fb76c32b9f8f7edbab71b3369614ac8
+  data.tar.gz: a896d6cf151521d88fb35edb5bcdbaf00e2a49980bbf4b4f2345a994c6716446
 SHA512:
-  metadata.gz: 4ca8fc592daffd5b6729b4ae026cd9b791dfd47a0e98a408f5a57ce92a21214ecd1266b47731f35176bf2eba6b69429f8242967243387048a9d972bf4d796d36
-  data.tar.gz: 4df7433ad7a9d2eccc2c41a1d379d797454917dd54a6308a25c833231c97158b8983307c209cf4c020545d688c686ad833d06207743d682dfaabfb96b67be91a
+  metadata.gz: cf060accdb07a4cd2d17855c5c064b32eb816b92753cf27f92cd98883fbfc0bbe9e975d633e31bcb2e1baef4c3a3b1ffeadf7eb437dfa0b148b2d5a43fcb8d54
+  data.tar.gz: 35d51b518967785f80500ff4be0b014cc5604400f0c020df4deebf4906a7100b5ade2166b9de59d91e8318a7165a61a63bb409d9db31b489f956a3cf8812c4d2

data/lib/rails_event_store_active_record.rb

@@ -6,6 +6,7 @@ require 'rails_event_store_active_record/generators/limit_for_event_id_generator
 require 'rails_event_store_active_record/generators/binary_data_and_metadata_generator'
 require 'rails_event_store_active_record/event'
 require 'rails_event_store_active_record/event_repository'
+require 'rails_event_store_active_record/batch_enumerator'
 require 'rails_event_store_active_record/event_repository_reader'
 require 'rails_event_store_active_record/index_violation_detector'
 require 'rails_event_store_active_record/pg_linearized_event_repository'

data/lib/rails_event_store_active_record/batch_enumerator.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module RailsEventStoreActiveRecord
+  class BatchEnumerator
+    def initialize(batch_size, total_limit, reader)
+      @batch_size  = batch_size
+      @total_limit = total_limit
+      @reader      = reader
+    end
+
+    def each
+      return to_enum unless block_given?
+      offset_id = nil
+
+      0.step(total_limit - 1, batch_size) do |batch_offset|
+        batch_limit        = [batch_size, total_limit - batch_offset].min
+        results, offset_id = reader.call(offset_id, batch_limit)
+
+        break if results.empty?
+        yield results
+      end
+    end
+
+    def first
+      each.first
+    end
+
+    def to_a
+      each.to_a
+    end
+
+    private
+
+    attr_reader :batch_size, :total_limit, :reader
+  end
+end
+

data/lib/rails_event_store_active_record/event_repository.rb

@@ -12,9 +12,13 @@ module RailsEventStoreActiveRecord
     end
 
     def append_to_stream(events, stream, expected_version)
-      add_to_stream(Array(events), stream, expected_version, true) do |event|
-        build_event_record(event).save!
-        event.event_id
+      records, event_ids = [], []
+      Array(events).each do |event|
+        records << build_event_hash(event)
+        event_ids << event.event_id
+      end
+      add_to_stream(event_ids, stream, expected_version, true) do
+        Event.import(records)
       end
     end
 
@@ -23,9 +27,7 @@ module RailsEventStoreActiveRecord
       (event_ids - Event.where(id: event_ids).pluck(:id)).each do |id|
         raise RubyEventStore::EventNotFound.new(id)
       end
-      add_to_stream(event_ids, stream, expected_version, nil) do |event_id|
-        event_id
-      end
+      add_to_stream(event_ids, stream, expected_version, nil)
     end
 
     def delete_stream(stream)
@@ -68,14 +70,14 @@ module RailsEventStoreActiveRecord
 
     private
 
-    def add_to_stream(collection, stream, expected_version, include_global, &to_event_id)
+    def add_to_stream(event_ids, stream, expected_version, include_global)
       last_stream_version = ->(stream_) { EventInStream.where(stream: stream_.name).order("position DESC").first.try(:position) }
       resolved_version = expected_version.resolve_for(stream, last_stream_version)
 
       start_transaction do
-        in_stream = collection.flat_map.with_index do |element, index|
+        yield if block_given?
+        in_stream = event_ids.flat_map.with_index do |event_id, index|
           position = compute_position(resolved_version, index)
-          event_id = to_event_id.call(element)
           collection = []
           collection.unshift({
             stream: SERIALIZED_GLOBAL_STREAM_NAME,
@@ -114,13 +116,13 @@ module RailsEventStoreActiveRecord
       IndexViolationDetector.new.detect(message)
     end
 
-    def build_event_record(serialized_record)
-      Event.new(
+    def build_event_hash(serialized_record)
+      {
         id:         serialized_record.event_id,
         data:       serialized_record.data,
         metadata:   serialized_record.metadata,
         event_type: serialized_record.event_type
-      )
+      }
     end
 
     # Overwritten in a sub-class

data/lib/rails_event_store_active_record/event_repository_reader.rb

@@ -9,7 +9,7 @@ module RailsEventStoreActiveRecord
 
     def last_stream_event(stream)
       record = EventInStream.where(stream: stream.name).order('position DESC, id DESC').first
-      record && build_event_instance(record)
+      record && build_serialized_record(record)
     end
 
     def read(spec)
@@ -18,16 +18,19 @@ module RailsEventStoreActiveRecord
       stream = read_scope(spec)
 
       if spec.batched?
-        batch_reader = ->(offset, limit) { stream.offset(offset).limit(limit).map(&method(:build_event_instance)) }
-        RubyEventStore::BatchEnumerator.new(spec.batch_size, spec.limit, batch_reader).each
+        batch_reader = ->(offset_id, limit) do
+          records = offset_id.nil? ? stream.limit(limit) : stream.where(start_offset_condition(spec, offset_id)).limit(limit)
+          [records.map(&method(:build_serialized_record)), records.last]
+        end
+        BatchEnumerator.new(spec.batch_size, spec.limit, batch_reader).each
       elsif spec.first?
         record = stream.first
-        build_event_instance(record) if record
+        build_serialized_record(record) if record
       elsif spec.last?
         record = stream.last
-        build_event_instance(record) if record
+        build_serialized_record(record) if record
       else
-        stream.map(&method(:build_event_instance)).each
+        stream.map(&method(:build_serialized_record)).each
       end
     end
 
@@ -55,25 +58,31 @@ module RailsEventStoreActiveRecord
       specification.stream.global? ? EventRepository::SERIALIZED_GLOBAL_STREAM_NAME : specification.stream.name
     end
 
-    def start_condition(specification)
-      event_record =
-        EventInStream.find_by!(event_id: specification.start, stream: normalize_stream_name(specification))
+    def start_offset_condition(specification, record_id)
       condition = specification.forward? ? 'event_store_events_in_streams.id > ?' : 'event_store_events_in_streams.id < ?'
-      [condition, event_record]
+      [condition, record_id]
     end
 
-    def stop_condition(specification)
-      event_record =
-        EventInStream.find_by!(event_id: specification.stop, stream: normalize_stream_name(specification))
+    def stop_offset_condition(specification, record_id)
       condition = specification.forward? ? 'event_store_events_in_streams.id < ?' : 'event_store_events_in_streams.id > ?'
-      [condition, event_record]
+      [condition, record_id]
+    end
+
+    def start_condition(specification)
+      start_offset_condition(specification,
+        EventInStream.find_by!(event_id: specification.start, stream: normalize_stream_name(specification)))
+    end
+
+    def stop_condition(specification)
+      stop_offset_condition(specification,
+        EventInStream.find_by!(event_id: specification.stop, stream: normalize_stream_name(specification)))
     end
 
     def order(spec)
       spec.forward? ? 'ASC' : 'DESC'
     end
 
-    def build_event_instance(record)
+    def build_serialized_record(record)
       RubyEventStore::SerializedRecord.new(
         event_id: record.event.id,
         metadata: record.event.metadata,

data/lib/rails_event_store_active_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsEventStoreActiveRecord
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/rails_event_store_active_record.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'ruby_event_store', '= 1.1.0'
+  spec.add_dependency 'ruby_event_store', '= 1.1.1'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
   spec.add_dependency 'activerecord-import', '>= 1.0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,7 @@ files:
 - bin/console
 - bin/setup
 - lib/rails_event_store_active_record.rb
+- lib/rails_event_store_active_record/batch_enumerator.rb
 - lib/rails_event_store_active_record/event.rb
 - lib/rails_event_store_active_record/event_repository.rb
 - lib/rails_event_store_active_record/event_repository_reader.rb