dirty_pipeline 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f3fd5ee73f6187ea39daa3d7b88371c84f3c6ca848b7ba65f58b7c8876c55b5
-  data.tar.gz: ab18cf256c02e3851a87c093523bffe204bc25bba6a31be8027a923ddbebaa69
+  metadata.gz: 30736e6846e314622b7be4b807e6d7c6c4adddec24619d4d6cc13c5e88dc38d5
+  data.tar.gz: 30fde8fe371d9140d8b12f937205cf099df36399fbcc2f4d7b17a5bc8faa5385
 SHA512:
-  metadata.gz: a818876d704b6dbb40ec6a0bad6ac45fb38a40ad87fce41859ea5cc2a29ddb8d72067aefdb63d16d888c6cef0fcd840f3b65ca00b0fc810133b081ed10bd25f7
-  data.tar.gz: e6e014a6f8b37f55a688c5797c49287642531d4cc3dc2373688936b1e9bc0c2e7263947e9cbdcf6e9e152294cc0cf6c34f24e5835bad782c5bd497c7960f897e
+  metadata.gz: fccab6567a59465c945f3d2ecf82dd960e813d24defb690fee1da40d35ea0935ce3d3f47d6fb4838581c45ce527ce9502c17c812cb01d3bdf357dd9e2cdb5361
+  data.tar.gz: 9349d42d38f1c3c7e92b523901466859d0fd1d717e9c40d37f29237a4aa52024102d128aac83fbb8745f6a534fff38ea8409d95ca81caea251d3d211a179cd4b

data/lib/dirty_pipeline.rb

@@ -32,6 +32,14 @@ module DirtyPipeline
     fail NotImplementedError
   end
 
+  def self.with_postgres_transaction
+    with_postgres do |conn|
+      conn.transaction do |transaction_conn|
+        yield transaction_conn
+      end
+    end
+  end
+
   # def self.with_postgres
   #   yield(ActiveRecord::Base.connection.raw_connection)
   # ensure

data/lib/dirty_pipeline/pg/queue.rb

@@ -47,9 +47,9 @@ module DirtyPipeline
 
       def clear!
         with_postgres do |c|
-          c.transaction do
-            c.exec(DELETE_ACTIVE, [active_event_key])
-            c.exec(DELETE_EVENTS, [events_queue_key])
+          c.transaction do |tc|
+            tc.exec(DELETE_ACTIVE, [active_event_key])
+            tc.exec(DELETE_EVENTS, [events_queue_key])
           end
         end
       end
@@ -71,9 +71,7 @@ module DirtyPipeline
       SQL
       def push(event)
         with_postgres do |c|
-          c.transaction do
-            c.exec(PUSH_EVENT, [events_queue_key, pack(event)])
-          end
+          c.exec(PUSH_EVENT, [events_queue_key, pack(event)])
         end
 
         self
@@ -85,9 +83,7 @@ module DirtyPipeline
       SQL
       def unshift(event)
         with_postgres do |c|
-          c.transaction do
-            c.exec(UNSHIFT_EVENT, [events_queue_key, pack(event)])
-          end
+          c.exec(UNSHIFT_EVENT, [events_queue_key, pack(event)])
         end
         self
       end
@@ -109,14 +105,14 @@ module DirtyPipeline
       SQL
       def pop
         with_postgres do |c|
-          c.transaction do
+          c.transaction do |tc|
             event_id, raw_event =
-              PG.multi(c.exec(SELECT_LAST_EVENT, [events_queue_key]))
+              PG.multi(tc.exec(SELECT_LAST_EVENT, [events_queue_key]))
             if raw_event.nil?
-              c.exec(DELETE_ACTIVE_EVENT, [active_event_key])
+              tc.exec(DELETE_ACTIVE_EVENT, [active_event_key])
             else
-              c.exec(DELETE_EVENT, [events_queue_key, event_id])
-              c.exec(SET_EVENT_ACTIVE, [active_event_key, raw_event])
+              tc.exec(DELETE_EVENT, [events_queue_key, event_id])
+              tc.exec(SET_EVENT_ACTIVE, [active_event_key, raw_event])
             end
             unpack(raw_event)
           end

data/lib/dirty_pipeline/pg/railway.rb

@@ -37,6 +37,10 @@ module DirtyPipeline
         ]
       end
 
+      def with_postgres(&block)
+        DirtyPipeline.with_postgres(&block)
+      end
+
       DELETE_OPERATION = <<~SQL
         DELETE FROM dp_active_operations WHERE key = $1;
       SQL
@@ -45,10 +49,10 @@ module DirtyPipeline
       SQL
       def clear!
         @queues.values.each(&:clear!)
-        DirtyPipeline.with_postgres do |c|
-          c.transaction do
-            c.exec DELETE_OPERATION, [active_operation_key]
-            c.exec DELETE_TRANSACTION, [active_transaction_key]
+        with_postgres do |c|
+          c.transaction do |tc|
+            tc.exec DELETE_OPERATION, [active_operation_key]
+            tc.exec DELETE_TRANSACTION, [active_transaction_key]
           end
         end
       end
@@ -76,10 +80,10 @@ module DirtyPipeline
         raise ArgumentError unless DEFAULT_OPERATIONS.include?(name.to_s)
         return if name.to_s == active
 
-        DirtyPipeline.with_postgres do |c|
-          c.transaction do
-            c.exec(SWITCH_OPERATION, [active_operation_key, name])
-          end
+        with_postgres do |c|
+          c.exec('START TRANSACTION;')
+          c.exec(SWITCH_OPERATION, [active_operation_key, name])
+          c.exec('COMMIT;')
         end
       end
 
@@ -87,7 +91,7 @@ module DirtyPipeline
         SELECT name FROM dp_active_operations WHERE key = $1;
       SQL
       def active
-        DirtyPipeline.with_postgres do |c|
+        with_postgres do |c|
           PG.single c.exec(SELECT_OPERATION, [active_operation_key])
         end
       end
@@ -97,7 +101,7 @@ module DirtyPipeline
         SELECT name FROM dp_active_transactions WHERE key = $1;
       SQL
       def running_transaction
-        DirtyPipeline.with_postgres do |c|
+        with_postgres do |c|
           PG.single c.exec(SELECT_TRANSACTION, [active_transaction_key])
         end
       end
@@ -128,10 +132,10 @@ module DirtyPipeline
       SQL
       def start_transaction!
         switch_to(DEFAULT_OPERATIONS.first) unless active
-        DirtyPipeline.with_postgres do |c|
-          c.transaction do
-            c.exec(SWITCH_TRANSACTION, [active_transaction_key, @tx_id])
-          end
+        with_postgres do |c|
+          c.exec('START TRANSACTION;')
+          c.exec(SWITCH_TRANSACTION, [active_transaction_key, @tx_id])
+          c.exec('COMMIT;')
         end
       end
 

data/lib/dirty_pipeline/pg/storage.rb

@@ -39,6 +39,10 @@ module DirtyPipeline
         raise InvalidPipelineStorage, store unless valid_store?
       end
 
+      def with_postgres(&block)
+        DirtyPipeline.with_postgres(&block)
+      end
+
       def reset!
         reset
         save!
@@ -57,16 +61,14 @@ module DirtyPipeline
       def commit!(event)
         store["status"] = event.destination  if event.destination
         store["state"].merge!(event.changes) unless event.changes.to_h.empty?
-        DirtyPipeline.with_postgres do |c|
-          data, error = {}, {}
-          data = event.data.to_h if event.data.respond_to?(:to_h)
-          error = event.error.to_h if event.error.respond_to?(:to_h)
-          c.transaction do
-            c.exec(
-              SAVE_EVENT,
-              [event.id, subject_key, JSON.dump(data), JSON.dump(error)]
-            )
-          end
+        data, error = {}, {}
+        data = event.data.to_h if event.data.respond_to?(:to_h)
+        error = event.error.to_h if event.error.respond_to?(:to_h)
+        with_postgres do |c|
+          c.exec(
+            SAVE_EVENT,
+            [event.id, subject_key, JSON.dump(data), JSON.dump(error)]
+          )
         end
         save!
       end
@@ -76,7 +78,7 @@ module DirtyPipeline
         WHERE uuid = $1 AND context = $2;
       SQL
       def find_event(event_id)
-        DirtyPipeline.with_postgres do |c|
+        with_postgres do |c|
           found_event, found_error =
             PG.multi(c.exec(FIND_EVENT, [event_id, subject_key]))
           return unless found_event

data/lib/dirty_pipeline/version.rb

@@ -1,3 +1,3 @@
 module DirtyPipeline
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dirty_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Sergey Dolganov