active_publisher 1.2.0.pre5-java → 1.2.0.pre6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40de0cc1b0adca96b23de5ddb5fb5fc79738644e74a8dc5a40990ec3b67a56ed
-  data.tar.gz: 61ae6ef5ae471f9a9c6dce0156e45e7bf51f09b64b7e5ae1cd8a1762b08eb829
+  metadata.gz: 11d1b9773427c5ae05fa5d590f83f270141ca1b8ccc4811fb163be87c98a80af
+  data.tar.gz: c1f2f8231212d9d3ccb7a6a8d2cc4e5b2786637915d7e0b2447598f114085af0
 SHA512:
-  metadata.gz: 3aabc8bb12969dce2a4e176a6420acfc1cdcd70c47e361f7dd665879e5445e93ba6777cdc6a6f523baea4c116c70040a3cde6fd21b565424f68426fb2c4a04f1
-  data.tar.gz: ed43c8134e853a0a2b8b0d904361c51f6d73120f991b26e5adedc46df454407da5f0ac8317596dc0dfea380f6fc3c5ef1a9c88cb70e011855a61f45ee99b0637
+  metadata.gz: 54d67ce2651ec0e6d3db5c84e11af82a71f4a2a5c0410b9991c846d4263527ec5479be7044573c2f605cca31edf8b512ec557e7cd5a5865fca8aafb884b1f5b3
+  data.tar.gz: d598c499b8e78152c9f5b50ffe97cbda35b201c7523635f441480ea88e175d503804d522e87c5750024ccbbdec6fbf8413640607c7da74d38f28178b0cbbd02c

data/lib/active_publisher/async/redis_adapter.rb

@@ -65,7 +65,7 @@ module ActivePublisher
           return unless encoded_messages.size > 0
 
           redis_pool.with do |redis|
-            redis.lpush(::ActivePublisher::Async::RedisAdapter::REDIS_LIST_KEY, encoded_messages)
+            redis.rpush(::ActivePublisher::Async::RedisAdapter::REDIS_LIST_KEY, encoded_messages)
           end
         end
       end

data/lib/active_publisher/async/redis_adapter/redis_multi_pop_queue.rb

@@ -13,7 +13,7 @@ module ActivePublisher
           encoded_message = ::Marshal.dump(message)
 
           redis_pool.with do |redis|
-            redis.lpush(list_key, encoded_message)
+            redis.rpush(list_key, encoded_message)
           end
         end
 
@@ -28,7 +28,7 @@ module ActivePublisher
           end
 
           redis_pool.with do |redis|
-            redis.lpush(list_key, encoded_messages)
+            redis.rpush(list_key, encoded_messages)
           end
         end
 
@@ -71,25 +71,30 @@ module ActivePublisher
         end
 
         def shift(number)
-          messages = []
           number = [number, size].min
+          return [] if number <= 0
+
+          messages = []
+          multi_response = []
           redis_pool.with do |redis|
-            redis.pipelined do
-              number.times do
-                messages << redis.rpop(list_key)
-              end
+            multi_response = redis.multi do
+              redis.lrange(list_key, 0, number - 1)
+              redis.ltrim(list_key, number, -1)
             end
           end
 
+          messages = multi_response.first
+          success = multi_response.last
+          return [] unless success =~ /ok/i
+
           messages = [] if messages.nil?
           messages = [messages] unless messages.respond_to?(:each)
 
           shifted_messages = []
           messages.each do |message|
-            next unless message.is_a?(::Redis::Future)
-            next if message.value.nil?
+            next if message.nil?
 
-            shifted_messages << ::Marshal.load(message.value)
+            shifted_messages << ::Marshal.load(message)
           end
 
           shifted_messages

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "1.2.0.pre5"
+  VERSION = "1.2.0.pre6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre5
+  version: 1.2.0.pre6
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement