evt-consumer 0.11.0.3 → 0.11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e969a682c0e9a3266862786dedd42c714e5bd49e662444b92a09e44abaf88dc6
-  data.tar.gz: 46bc457ada751040b08b9d8386f7a1b73dc2619e7c45df45e862d8025f37d295
+  metadata.gz: d59370128eb98868d476174baba504dbfcd3bd07f2fe0aa1cf262cf88d63f99e
+  data.tar.gz: a89e817d675aca9cf8d635c5cf73c184dc67bffa6fe0431606d9bfa67acea9e7
 SHA512:
-  metadata.gz: 65d7b9f143d8e42dc42875d6f2d1e0f5b7aa55b058aea5b47f58e82abb0f91e6c8c48fa0cca1fddf5018d349c05c22d2072464e049040ae0de8e11a2dc5c78b4
-  data.tar.gz: 364a0ac290d971286ad46298fc2d867ee40ca2eadf33145f8649f082c9232123070c71d57030360478ee1e8aff5e09b95940ce68581bba971708e4ba6f9c6bdb
+  metadata.gz: 572476d4ba197f55312e1b42f64785aa12e54aa6a0b009569a6892ca45ecfdaaf4506691ebb39f49a24212633478a0a0ca42f06cf9ac3654a6e738b7800fe086
+  data.tar.gz: 46fd4742ec78e986bf6c99f8411a78506963c8c173eaec5c7057f49631904bb7d176549293bec7fc231962a33447e8328ee9af70d212f76ab6bfa4e581d4ca2d

data/lib/consumer/actor.rb

@@ -5,12 +5,21 @@ module Consumer
     include Initializer
     include Log::Dependency
 
-    initializer :subscription_address
+    initializer :subscription_address, a(:delay_threshold)
 
     dependency :consumer, Consumer
 
+    attr_writer :prefetch_queue
+    def prefetch_queue
+      @prefetch_queue ||= []
+    end
+
     def self.build(consumer, subscription)
-      instance = new subscription.address
+      subscription_address = subscription.address
+
+      delay_threshold = subscription.batch_size
+
+      instance = new(subscription_address, delay_threshold)
       instance.consumer = consumer
       instance.configure
       instance
@@ -21,27 +30,57 @@ module Consumer
     end
 
     handle Subscription::GetBatch::Reply do |get_batch_reply|
-      messages = get_batch_reply.batch
+      received_batch = get_batch_reply.batch
 
-      logger.trace { "Received batch (Messages: #{messages.count})" }
+      logger.trace(tag: :actor) { "Received batch (Received Batch Size: #{received_batch.size}, Prefetch Queue Depth: #{prefetch_queue.size}, Delay Threshold: #{delay_threshold})" }
 
-      request_batch
+      prefetch_queue_empty = prefetch_queue.empty?
+
+      self.prefetch_queue += received_batch
+
+      unless prefetch_queue.size > delay_threshold
+        request_batch
+      end
+
+      if prefetch_queue_empty
+        next_message = :dispatch
+      end
 
-      messages.each do |message_data|
-        consumer.dispatch(message_data)
+      logger.debug(tag: :actor) { "Batch received (Received Batch Size: #{received_batch.size}, Prefetch Queue Depth: #{prefetch_queue.size}, Delay Threshold: #{delay_threshold}, Next Actor Message: #{next_message || '(none)'})" }
+
+      next_message
+    end
+
+    handle :dispatch do
+      logger.trace(tag: :actor) { "Dispatching Message (Prefetch Queue Depth: #{prefetch_queue.size}, Delay Threshold: #{delay_threshold})" }
+
+      dispatch_message = prefetch_queue.shift
+
+      if prefetch_queue.size == delay_threshold
+        request_batch
       end
 
-      logger.debug { "Batch received (Events: #{messages.count})" }
+      consumer.dispatch(dispatch_message)
+
+      unless prefetch_queue.empty?
+        next_message = :dispatch
+      end
+
+      logger.debug(tag: :actor) { "Dispatched Message (Prefetch Queue Depth: #{prefetch_queue.size}, Delay Threshold: #{delay_threshold}, Global Position: #{dispatch_message.global_position}, Next Actor Message: #{next_message || '(none)'})" }
+
+      next_message
     end
 
     def request_batch
-      logger.trace { "Requesting batch" }
+      logger.trace(tag: :actor) { "Requesting batch (Prefetch Queue Depth: #{prefetch_queue.size}, Delay Threshold: #{delay_threshold})" }
 
       get_batch = Subscription::GetBatch.new(address)
 
       send.(get_batch, subscription_address)
 
-      logger.debug { "Send batch request" }
+      logger.debug(tag: :actor) { "Sent batch request (Prefetch Queue Depth: #{prefetch_queue.size}, Delay Threshold: #{delay_threshold})" }
+
+      nil
     end
   end
 end

data/lib/consumer/controls.rb

@@ -20,6 +20,8 @@ require 'consumer/controls/subscription'
 require 'consumer/controls/handle'
 require 'consumer/controls/handle/raise_error'
 
+require 'consumer/controls/actor'
+
 require 'consumer/controls/consumer'
 require 'consumer/controls/consumer/incrementing'
 require 'consumer/controls/consumer/error_handler'

data/lib/consumer/controls/actor.rb

@@ -0,0 +1,24 @@
+module Consumer
+  module Controls
+    module Actor
+      def self.example(subscription_address: nil, delay_threshold: nil)
+        delay_threshold ||= DelayThreshold.example
+        subscription_address ||= Address.example
+
+        ::Consumer::Actor.new(subscription_address, delay_threshold)
+      end
+
+      module DelayThreshold
+        def self.example
+          Get.default_batch_size
+        end
+      end
+
+      module Address
+        def self.example
+          ::Actor::Messaging::Address.build
+        end
+      end
+    end
+  end
+end

data/lib/consumer/controls/get.rb

@@ -1,17 +1,27 @@
 module Consumer
   module Controls
     module Get
-      def self.example
-        Example.new
+      def self.example(batch_size: nil)
+        Example.build(batch_size: batch_size)
+      end
+
+      def self.default_batch_size
+        MessageData::Batch.size
       end
 
       class Example
-        extend ::Configure::Macro
+        include ::Configure
+
+        include MessageStore::Get
+
+        initializer :batch_size
 
         configure :get
 
-        def self.build
-          new
+        def self.build(batch_size: nil)
+          batch_size ||= Get.default_batch_size
+
+          new(batch_size)
         end
 
         def call(stream_name, position: nil)

data/lib/consumer/controls/session.rb

@@ -6,8 +6,8 @@ module Consumer
       end
 
       class Example
-        extend ::Configure::Macro
-        extend ::Settings::Setting::Macro
+        include ::Configure
+        include Settings::Setting
 
         configure :session
 

data/lib/consumer/controls/subscription.rb

@@ -1,10 +1,10 @@
 module Consumer
   module Controls
     module Subscription
-      def self.example(next_batch: nil, batch: nil, position: nil)
+      def self.example(next_batch: nil, batch: nil, position: nil, batch_size: nil)
         stream_name = StreamName.example
 
-        get = Get.example
+        get = Get.example(batch_size: batch_size)
 
         unless batch.nil?
           get.set_batch(stream_name, batch, position)

data/lib/consumer/subscription.rb

@@ -17,6 +17,10 @@ module Consumer
       @position ||= 0
     end
 
+    def batch_size
+      get.batch_size
+    end
+
     dependency :poll, Poll
 
     def self.build(stream_name, get, position: nil, poll_interval_milliseconds: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 0.11.0.3
+  version: 0.11.1.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -104,6 +104,7 @@ files:
 - lib/consumer/actor.rb
 - lib/consumer/consumer.rb
 - lib/consumer/controls.rb
+- lib/consumer/controls/actor.rb
 - lib/consumer/controls/category.rb
 - lib/consumer/controls/consumer.rb
 - lib/consumer/controls/consumer/error_handler.rb