evt-message_store-postgres 0.4.1.0 → 0.4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804ec8bcdbcdabf8515f82dd7b428a4930476990
-  data.tar.gz: 0e68766b913388a04f9f6853304b8348997cb3be
+  metadata.gz: e829f486640cb338fad6c776a2228d4d2d262424
+  data.tar.gz: 4cfe187dd12a3edf49ed372d2ade361cb53f2685
 SHA512:
-  metadata.gz: 9072be070eca9efc9d8a9e29611e98fd3b86354f960fa408162837ca05ad7087815453c861f893ae74d951d5d9f328862ab7a6de1cf7d5f5c946540ff89fda1c
-  data.tar.gz: 43928b49001998379c939684c836034e453b5c516c6e698ce37492699d5781cec2d01052a855a2911fc6f7ae1eaefc7289822027d2897167042cb93d521e50b0
+  metadata.gz: 6ae5549046f2eae1f2054c08d0acc8e6e68dbc1b02f209c09164a29c0f8335e03c767461250f3eedd799a07df70c0a5030db72afd24bd47ad2bf2199b26f4674
+  data.tar.gz: a0d19f8e82707204f388898977ec07dd220e3efb9f8770db4ba3d5c1144da3de75c3be6880e78dd3244eb4e5372bdfde0c4871d9fc77117612dcea031b6a1f80

data/lib/message_store/postgres/get.rb

@@ -3,19 +3,19 @@ module MessageStore
     class Get
       include MessageStore::Get
 
-      initializer :batch_size
+      initializer :batch_size, :condition
 
       dependency :session, Session
 
-      def self.build(batch_size: nil, session: nil)
-        new(batch_size).tap do |instance|
+      def self.build(batch_size: nil, session: nil, condition: nil)
+        new(batch_size, condition).tap do |instance|
           instance.configure(session: session)
         end
       end
 
-      def self.configure(receiver, attr_name: nil, position: nil, batch_size: nil, session: nil)
+      def self.configure(receiver, attr_name: nil, position: nil, batch_size: nil, condition: nil, session: nil)
         attr_name ||= :get
-        instance = build(batch_size: batch_size, session: session)
+        instance = build(batch_size: batch_size, condition: condition, session: session)
         receiver.public_send "#{attr_name}=", instance
       end
 
@@ -23,8 +23,8 @@ module MessageStore
         Session.configure self, session: session
       end
 
-      def self.call(stream_name, position: nil, batch_size: nil, session: nil)
-        instance = build(batch_size: batch_size, session: session)
+      def self.call(stream_name, position: nil, batch_size: nil, condition: nil,  session: nil)
+        instance = build(batch_size: batch_size, condition: condition, session: session)
         instance.(stream_name, position: position)
       end
 
@@ -42,13 +42,15 @@ module MessageStore
       end
 
       def get_records(stream_name, position)
-        logger.trace { "Getting records (Stream: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect})" }
+        logger.trace { "Getting records (Stream: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect}, Condition: #{condition || '(none)'})" }
 
-        select_statement = SelectStatement.build(stream_name, position: position, batch_size: batch_size)
+        where_fragment = self.condition
+
+        select_statement = SelectStatement.build(stream_name, position: position, batch_size: batch_size, condition: condition)
 
         records = session.execute(select_statement.sql)
 
-        logger.debug { "Finished getting records (Count: #{records.ntuples}, Stream: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect})" }
+        logger.debug { "Finished getting records (Count: #{records.ntuples}, Stream: #{stream_name}, Position: #{position.inspect}, Batch Size: #{batch_size.inspect}, Condition: #{condition || '(none)'})" }
 
         records
       end

data/lib/message_store/postgres/get/select_statement.rb

@@ -4,7 +4,7 @@ module MessageStore
       class SelectStatement
         include Log::Dependency
 
-        initializer :stream_name, w(:position), w(:batch_size)
+        initializer :stream_name, w(:position), w(:batch_size), :condition
 
         def position
           @position ||= Defaults.position
@@ -22,14 +22,16 @@ module MessageStore
           is_category_stream ||= StreamName.category?(stream_name)
         end
 
-        def self.build(stream_name, position: nil, batch_size: nil)
-          new(stream_name, position, batch_size)
+        def self.build(stream_name, position: nil, batch_size: nil, condition: nil)
+          new(stream_name, position, batch_size, condition)
         end
 
         def sql
-          logger.trace(tag: :sql) { "Composing select statement (Stream: #{stream_name}, Category: #{category_stream?}, Types: #{stream_type_list.inspect}, Position: #{position}, Batch Size: #{batch_size})" }
+          logger.trace(tag: :sql) { "Composing select statement (Stream: #{stream_name}, Category: #{category_stream?}, Types: #{stream_type_list.inspect}, Position: #{position}, Batch Size: #{batch_size}, Condition: #{condition || '(none)'})" }
 
-          statement = <<-SQL
+          formatted_where_clause = where_clause.each_line.to_a.join("  ")
+
+          statement = <<~SQL
             SELECT
               id::varchar,
               stream_name::varchar,
@@ -42,8 +44,7 @@ module MessageStore
             FROM
               messages
             WHERE
-              #{where_clause_field} = '#{stream_name}' AND
-              #{position_field} >= #{position}
+              #{formatted_where_clause}
             ORDER BY
               #{position_field} ASC
             LIMIT
@@ -51,13 +52,26 @@ module MessageStore
             ;
           SQL
 
-          logger.debug(tag: :sql) { "Composed select statement (Stream: #{stream_name}, Category: #{category_stream?}, Types: #{stream_type_list.inspect}, Position: #{position}, Batch Size: #{batch_size})" }
+          logger.debug(tag: :sql) { "Composed select statement (Stream: #{stream_name}, Category: #{category_stream?}, Types: #{stream_type_list.inspect}, Position: #{position}, Batch Size: #{batch_size}, Condition: #{condition || '(none)'})" }
           logger.debug(tags: [:data, :sql]) { "Statement: #{statement}" }
 
           statement
         end
 
-        def where_clause_field
+        def where_clause
+          clause = <<~SQL.chomp
+            #{discriminator_field} = '#{stream_name}' AND
+            #{position_field} >= #{position}
+          SQL
+
+          unless condition.nil?
+            clause << " AND\n(#{condition})"
+          end
+
+          clause
+        end
+
+        def discriminator_field
           unless category_stream?
             'stream_name'
           else

data/lib/message_store/postgres/read.rb

@@ -3,9 +3,9 @@ module MessageStore
     class Read
       include MessageStore::Read
 
-      def configure(session: nil)
+      def configure(session: nil, condition: nil)
         Iterator.configure(self, stream_name, position: position)
-        Get.configure(self.iterator, batch_size: batch_size, session: session)
+        Get.configure(self.iterator, batch_size: batch_size, condition: condition, session: session)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store-postgres
 version: !ruby/object:Gem::Version
-  version: 0.4.1.0
+  version: 0.4.2.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: scripts
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Message store implementation for PostgreSQL