rails_event_store_active_record 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef19b8405b7afab8d877b0b3888ec88c70eeb840992ee14945ec2c7ca57d5744
-  data.tar.gz: 325dc6f18f6a18b734aef78585d1650bef65975f0dfda7cadc8ff342f5ce4680
+  metadata.gz: 067a4f541fc38de8cf27a410bb6ffd32345e648c7875a59ddfba2d28fc835950
+  data.tar.gz: 332fb00fe13b2d437729f5de926f859f9978378e462e5c46062399fec6e3d08d
 SHA512:
-  metadata.gz: e3f3076a4072842438e3ef20f8e167f1e2521ad2c4828eaef2ab29ad5d9a68d3e1dbc0d2ffd505525e82dac0bf4968ac21e31e8114dadf56c3653e7626bdec37
-  data.tar.gz: c1d21b7db9bf332e37b7520219aa45f5059799bb0d32a463f5f4d070f44e7db55225d547242fc0e120622d251589d90c4f656e4c337a61fd4f2651be60ddae3f
+  metadata.gz: 77466a3690ede3b10c7f45346f14efc17fcd08337734e72afeaf2df870efe8f69f3c48296d88d89e8aa50dbd5af6048410d119eee009c6b43df953d3c7bd9715
+  data.tar.gz: ef7e3dd291db6aadb4b5984dcf4d3768bb66e5dd475556e3011e3cf2f08fc47ccd5def474531a17e398aeb30bdff432070f242959bb7b273b304fc874cf793dc

data/Makefile

@@ -1,21 +1,20 @@
 GEM_VERSION  = $(shell cat ../RES_VERSION)
 GEM_NAME     = rails_event_store_active_record
 REQUIRE      = $(GEM_NAME)
-IGNORE       = RailsEventStoreActiveRecord::IndexViolationDetector\#detect
+IGNORE       = RailsEventStoreActiveRecord::IndexViolationDetector\#detect \
+               RailsEventStoreActiveRecord::PgLinearizedEventRepository* \
+               RailsEventStoreActiveRecord::EventRepository\#update_messages
 SUBJECT      ?= RailsEventStoreActiveRecord*
 DATABASE_URL ?= sqlite3::memory:
 
 install: ## Install gem dependencies
 	@echo "Installing gem dependencies"
 	@bundle install
-	@echo "Installing v1_v2_schema_migration gem dependencies"
-	@BUNDLE_GEMFILE=spec/v1_v2_schema_migration/Gemfile bundle install
 	@BUNDLE_GEMFILE=spec/without_rails/Gemfile bundle install
 
 remove-lock:
 	@echo "Removing resolved dependency versions"
 	-rm Gemfile.lock
-	-rm spec/v1_v2_schema_migration/Gemfile.lock
 	-rm spec/without_rails/Gemfile.lock
 
 reinstall: remove-lock install ## Removing resolved dependency versions
@@ -27,14 +26,14 @@ test: ## Run unit tests
 
 mutate: test ## Run mutation tests
 	@echo "Running mutation tests"
-	@BUNDLE_GEMFILE=Gemfile DATABASE_URL=$(DATABASE_URL) bundle exec mutant --include lib \
+	@MUTATING=true BUNDLE_GEMFILE=Gemfile DATABASE_URL=$(DATABASE_URL) bundle exec mutant --include lib \
 		$(addprefix --require ,$(REQUIRE)) \
 		$(addprefix --ignore-subject ,$(IGNORE)) \
 		--use rspec "$(SUBJECT)"
 
 mutate-fast: ## Run mutation tests with --fail-fast
 	@echo "Running mutation tests with --fail-fast"
-	@BUNDLE_GEMFILE=Gemfile DATABASE_URL=$(DATABASE_URL) bundle exec mutant --include lib \
+	@MUTATING=true BUNDLE_GEMFILE=Gemfile DATABASE_URL=$(DATABASE_URL) bundle exec mutant --include lib \
 		$(addprefix --require ,$(REQUIRE)) \
 		$(addprefix --ignore-subject ,$(IGNORE)) \
 		--fail-fast \

data/lib/rails_event_store_active_record/event_repository.rb

@@ -46,13 +46,31 @@ module RailsEventStoreActiveRecord
       @repo_reader.read(specification)
     end
 
+    def update_messages(messages)
+      hashes = messages.map(&:to_h)
+      hashes.each{|h| h[:id] = h.delete(:event_id) }
+      for_update = messages.map(&:event_id)
+      start_transaction do
+        existing = Event.where(id: for_update).pluck(:id)
+        (for_update - existing).each{|id| raise RubyEventStore::EventNotFound.new(id) }
+        Event.import(hashes, on_duplicate_key_update: [:data, :metadata, :event_type])
+      end
+    end
+
+    def streams_of(event_id)
+      EventInStream.where(event_id: event_id)
+        .where.not(stream: SERIALIZED_GLOBAL_STREAM_NAME)
+        .pluck(:stream)
+        .map{|name| RubyEventStore::Stream.new(name)}
+    end
+
     private
 
     def add_to_stream(collection, stream, expected_version, include_global, &to_event_id)
       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)
 
-      ActiveRecord::Base.transaction(requires_new: true) do
+      start_transaction do
         in_stream = collection.flat_map.with_index do |element, index|
           position = compute_position(resolved_version, index)
           event_id = to_event_id.call(element)
@@ -115,6 +133,10 @@ module RailsEventStoreActiveRecord
     # Overwritten in a sub-class
     def fill_ids(_in_stream)
     end
+
+    def start_transaction(&block)
+      ActiveRecord::Base.transaction(requires_new: true, &block)
+    end
   end
 
 end

data/lib/rails_event_store_active_record/event_repository_reader.rb

@@ -24,17 +24,23 @@ module RailsEventStoreActiveRecord
 
 
     def read(spec)
-      raise RubyEventStore::ReservedInternalName if spec.stream_name.eql?(EventRepository::SERIALIZED_GLOBAL_STREAM_NAME)
+      raise RubyEventStore::ReservedInternalName if spec.stream.name.eql?(EventRepository::SERIALIZED_GLOBAL_STREAM_NAME)
 
       stream = EventInStream.preload(:event).where(stream: normalize_stream_name(spec))
-      stream = stream.order(position: order(spec.direction)) unless spec.global_stream?
-      stream = stream.limit(spec.count) if spec.limit?
+      stream = stream.order(position: order(spec)) unless spec.stream.global?
+      stream = stream.limit(spec.limit) if spec.limit?
       stream = stream.where(start_condition(spec)) unless spec.head?
-      stream = stream.order(id: order(spec.direction))
+      stream = stream.order(id: order(spec))
 
       if spec.batched?
         batch_reader = ->(offset, limit) { stream.offset(offset).limit(limit).map(&method(:build_event_instance)) }
-        RubyEventStore::BatchEnumerator.new(spec.batch_size, total_limit(spec), batch_reader).each
+        RubyEventStore::BatchEnumerator.new(spec.batch_size, spec.limit, batch_reader).each
+      elsif spec.first?
+        record = stream.first
+        build_event_instance(record) if record
+      elsif spec.last?
+        record = stream.last
+        build_event_instance(record) if record
       else
         stream.map(&method(:build_event_instance)).each
       end
@@ -42,27 +48,19 @@ module RailsEventStoreActiveRecord
 
     private
 
-    def total_limit(specification)
-      specification.limit? ? specification.count : Float::INFINITY
-    end
-
     def normalize_stream_name(specification)
-      specification.global_stream? ? EventRepository::SERIALIZED_GLOBAL_STREAM_NAME : specification.stream_name
+      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))
-      case specification.direction
-      when :forward
-        ['id > ?', event_record]
-      else
-        ['id < ?', event_record]
-      end
+      condition = specification.forward? ? 'id > ?' : 'id < ?'
+      [condition, event_record]
     end
 
-    def order(direction)
-      {forward: 'ASC', backward: 'DESC'}.fetch(direction)
+    def order(spec)
+      spec.forward? ? 'ASC' : 'DESC'
     end
 
     def build_event_instance(record)

data/lib/rails_event_store_active_record/pg_linearized_event_repository.rb

@@ -0,0 +1,18 @@
+require 'activerecord-import'
+
+module RailsEventStoreActiveRecord
+  class PgLinearizedEventRepository < EventRepository
+
+    def start_transaction(&proc)
+      ActiveRecord::Base.transaction(requires_new: true) do
+        ActiveRecord::Base.
+          connection.
+          execute("SELECT pg_advisory_xact_lock(1845240511599988039) as l").
+          each{}
+
+        proc.call
+      end
+    end
+
+  end
+end

data/lib/rails_event_store_active_record/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStoreActiveRecord
-  VERSION = "0.31.1"
+  VERSION = "0.32.0"
 end

data/lib/rails_event_store_active_record.rb

@@ -1,8 +1,8 @@
 require 'rails_event_store_active_record/generators/migration_generator'
-require 'rails_event_store_active_record/generators/v1_v2_migration_generator'
 require 'rails_event_store_active_record/event'
 require 'rails_event_store_active_record/event_repository'
 require 'rails_event_store_active_record/event_repository_reader'
 require 'rails_event_store_active_record/correct_schema_verifier'
 require 'rails_event_store_active_record/index_violation_detector'
+require 'rails_event_store_active_record/pg_linearized_event_repository'
 require 'rails_event_store_active_record/version'

data/rails_event_store_active_record.gemspec

@@ -32,12 +32,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3', '1.3.13'
   spec.add_development_dependency 'pg', '0.21'
   spec.add_development_dependency 'mysql2', '0.4.10'
-  spec.add_development_dependency 'mutant-rspec', '~> 0.8.14'
+  spec.add_development_dependency 'mutant-rspec', '~> 0.8.17'
   spec.add_development_dependency 'fakefs', '~> 0.11.2'
   spec.add_development_dependency 'childprocess'
   spec.add_development_dependency 'google-protobuf', '~> 3.5.1.2'
 
-  spec.add_dependency 'ruby_event_store', '= 0.31.1'
+  spec.add_dependency 'ruby_event_store', '= 0.32.0'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
   spec.add_dependency 'activerecord-import', '~> 0.21'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.14
+        version: 0.8.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.14
+        version: 0.8.17
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -241,9 +241,8 @@ files:
 - lib/rails_event_store_active_record/event_repository_reader.rb
 - lib/rails_event_store_active_record/generators/migration_generator.rb
 - lib/rails_event_store_active_record/generators/templates/migration_template.rb
-- lib/rails_event_store_active_record/generators/templates/v1_v2_migration_template.rb
-- lib/rails_event_store_active_record/generators/v1_v2_migration_generator.rb
 - lib/rails_event_store_active_record/index_violation_detector.rb
+- lib/rails_event_store_active_record/pg_linearized_event_repository.rb
 - lib/rails_event_store_active_record/version.rb
 - rails_event_store_active_record.gemspec
 homepage: https://railseventstore.org

data/lib/rails_event_store_active_record/generators/templates/v1_v2_migration_template.rb

@@ -1,99 +0,0 @@
-# This migration is not intended for live data  migration
-# It assumes no data is added at when it is running.
-# So stop your application servers from accepting new requests
-# and processing background jobs before running
-
-# Make sure you have a backup before running on production
-
-# 10_000_000 distinct stream names
-# can cause around 2GB of RAM usage
-# make sure you can run this migration on your production system
-class MigrateResSchemaV1ToV2 < ActiveRecord::Migration<%= migration_version %>
-  def up
-    postgres = ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
-    mysql    = ActiveRecord::Base.connection.adapter_name == "Mysql2"
-    sqlite   = ActiveRecord::Base.connection.adapter_name == "SQLite"
-    rails_42 = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5.0.0")
-    enable_extension "pgcrypto" if postgres
-    create_table(:event_store_events_in_streams, force: false) do |t|
-      t.string      :stream,      null: false
-      t.integer     :position,    null: true
-      if postgres
-        t.references :event, null: false, type: :uuid
-      else
-        t.references :event, null: false, type: :string
-      end
-      t.datetime    :created_at,  null: false
-    end
-    streams = {}
-    RailsEventStoreActiveRecord::Event.reset_column_information
-    RailsEventStoreActiveRecord::Event.find_each do |ev|
-      position = nil
-      if preserve_positions?(ev.stream)
-        streams[ev.stream] ||= -1
-        position = streams[ev.stream] += 1
-      end
-      RailsEventStoreActiveRecord::EventInStream.create!(
-        stream: ev.stream,
-        position: position,
-        event_id: ev.event_id,
-        created_at: ev.created_at,
-      )
-      RailsEventStoreActiveRecord::EventInStream.create!(
-        stream: 'all',
-        position: nil,
-        event_id: ev.event_id,
-        created_at: ev.created_at,
-      ) unless ev.stream == 'all'
-    end
-
-    add_index :event_store_events_in_streams, [:stream, :position], unique: true
-    add_index :event_store_events_in_streams, [:stream, :event_id], unique: true
-    add_index :event_store_events_in_streams, [:created_at]
-
-    remove_index  :event_store_events, :event_type
-    remove_column :event_store_events, :stream
-    remove_column :event_store_events, :id
-    rename_column :event_store_events, :event_id, :id
-    change_column :event_store_events, :id, "uuid using id::uuid", default: -> { "gen_random_uuid()" } if postgres
-    change_column :event_store_events, :id, "string", limit: 36 if mysql || sqlite
-
-    case ActiveRecord::Base.connection.adapter_name
-    when "SQLite"
-      remove_index  :event_store_events, name: :index_event_store_events_on_id
-      rename_table :event_store_events, :old_event_store_events
-      create_table(:event_store_events, id: false, force: false) do |t|
-        t.string :id, limit: 36, primary_key: true, null: false
-        t.string      :event_type,  null: false
-        t.text        :metadata
-        t.text        :data,        null: false
-        t.datetime    :created_at,  null: false
-      end
-      add_index :event_store_events, :id, unique: true if rails_42
-      add_index :event_store_events, :created_at
-      execute <<-SQL
-        INSERT INTO event_store_events(id, event_type, metadata, data, created_at)
-        SELECT id, event_type, metadata, data, created_at FROM old_event_store_events;
-      SQL
-      drop_table :old_event_store_events
-    else
-      execute "ALTER TABLE event_store_events ADD PRIMARY KEY (id);"
-      remove_index  :event_store_events, name: :index_event_store_events_on_id
-    end
-  end
-
-  def preserve_positions?(stream_name)
-    # https://railseventstore.org/docs/expected_version/
-    #
-    # return true if you use given stream for event sourcing
-    #   (especially with AggregateRoot gem)
-    # return true if you use an Integer or :none as
-    # expected_version when publishing in this stream
-    #
-    # return false if use use :any (the default) as expected_version
-    # when publishing to this stream
-
-    raise NotImplementedError
-    # false
-  end
-end

data/lib/rails_event_store_active_record/generators/v1_v2_migration_generator.rb

@@ -1,29 +0,0 @@
-begin
-  require 'rails/generators'
-rescue LoadError
-end
-
-module RailsEventStoreActiveRecord
-  class V1V2MigrationGenerator < Rails::Generators::Base
-    source_root File.expand_path(File.join(File.dirname(__FILE__), '../generators/templates'))
-
-    def create_migration
-      template "v1_v2_migration_template.rb", "db/migrate/#{timestamp}_migrate_res_schema_v1_to_v2.rb"
-    end
-
-    private
-
-    def rails_version
-      Rails::VERSION::STRING
-    end
-
-    def migration_version
-      return nil if Gem::Version.new(rails_version) < Gem::Version.new("5.0.0")
-      "[4.2]"
-    end
-
-    def timestamp
-      Time.now.strftime("%Y%m%d%H%M%S")
-    end
-  end
-end if defined?(Rails::Generators::Base)