oxblood 0.1.0.dev9 → 0.1.0.dev10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef39e93b7bf0f2dc011433a59874028fcc1e49e6
-  data.tar.gz: f9c730aac3b62cc6e4cfb3d76bd0fb29d87bcc76
+  metadata.gz: aa40f0d5b2f3279151d1689abb30900a658e4b42
+  data.tar.gz: 1dab3c062674dc0cacae8ed38bd54b01965fc962
 SHA512:
-  metadata.gz: e22b6aea29ce947a9f735ab788a29e14d1ada26cdb411cd3970e1b703fa62b3b14d59b83829edecc46f1eec3539b8538313fb3182758096adf7d0d07adbcd7a9
-  data.tar.gz: b32802b13c4569f8b7cc164b2a2ee5d0a0932b9320788626e95bc025e557b828b3046798d49a55b302fc1e271c4796dd900358c6cf9213349bb73f2f0f6912c1
+  metadata.gz: cca554b76261801ee8805aef706002efcfbed3412cf93105f74885b329e80b3d2632b1e53b586199bf610c0f584f856d744fd8eede3b6ccc58ac83b25c355b8d
+  data.tar.gz: 26168ad1e57c524f137374865648680f4d684f0ea4ade6a71664cf9d7ee70507cfcfc5c9ab946e42bb91fd189ce7fd89218fbb2141453404d211a98a0785924b

data/README.md

@@ -22,7 +22,7 @@ An experimental Redis Ruby client.
   - Hashes (14/15) (See [#3](https://github.com/etehtsea/oxblood/issues/3))
   - HyperLogLog (0/3)
   - Keys (18/22) (See [#4], [#6], [#7], [#8])
-  - Lists (14/17) (See [#11](https://github.com/etehtsea/oxblood/issues/11))
+  - Lists
   - Pub/Sub (0/6)
   - Scripting (0/7)
   - Server (2/31)

data/benchmarks/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'hiredis', platforms: :mri
 gem 'oxblood', path: '..'
 gem 'benchmark-ips'
 gem 'redis'
+gem 'concurrent-ruby'

data/benchmarks/pipeline.rb

@@ -1,3 +1,4 @@
+require 'hiredis' unless RUBY_ENGINE == 'jruby'
 require 'redis'
 require 'oxblood'
 require 'benchmark'
@@ -19,6 +20,16 @@ def redis_with
   r.pipelined { N.times { r.ping } }
 end
 
+def hiredis_without
+  r = Redis.new(driver: :hiredis)
+  N.times { r.ping }
+end
+
+def hiredis_with
+  r = Redis.new(driver: :hiredis)
+  r.pipelined { N.times { r.ping } }
+end
+
 def oxblood_without
   r = Oxblood::Session.new(Oxblood::Connection.new)
   N.times { r.ping }
@@ -30,7 +41,19 @@ def oxblood_with
   pipe.sync
 end
 
+# Warmup JVM
+if RUBY_ENGINE == 'jruby'
+  redis_without
+  redis_with
+  oxblood_without
+  oxblood_with
+end
+
 benchmark('redis without') { redis_without }
 benchmark('redis with') { redis_with }
 benchmark('oxblood without') { oxblood_without }
 benchmark('oxblood with') { oxblood_with }
+unless RUBY_ENGINE == 'jruby'
+  benchmark('hiredis without') { hiredis_without }
+  benchmark('hiredis with') { hiredis_with }
+end

data/benchmarks/pool.rb

@@ -0,0 +1,45 @@
+require 'concurrent'
+require 'redis'
+require 'oxblood'
+require 'benchmark'
+
+N = 10_000
+TASKS = 1_000
+POOL_SIZE = 32
+
+def worker_pool
+  Concurrent::FixedThreadPool.new(POOL_SIZE * 2)
+end
+
+RedisPool = ConnectionPool.new(size: POOL_SIZE) { Redis.new }
+OxbloodPool = Oxblood::Pool.new(size: POOL_SIZE)
+
+def benchmark(label, &blk)
+  sec = Benchmark.realtime(&blk)
+  puts [label, sec.round(3)].join(': ')
+end
+
+def run(&blk)
+  pool = worker_pool
+  TASKS.times { pool.post(&blk) }
+  sleep 0.1 while pool.completed_task_count != TASKS
+end
+
+def redis
+  RedisPool.with { |r| r.pipelined { N.times { r.ping } } }
+end
+
+def oxblood
+  OxbloodPool.pipelined { |p| N.times { p.ping } }
+end
+
+# Warmup JVM
+if RUBY_ENGINE == 'jruby'
+  10.times do
+    redis
+    oxblood
+  end
+end
+
+benchmark('redis-rb') { run { redis } }
+benchmark('oxblood') { run { oxblood } }

data/lib/oxblood/commands/lists.rb

@@ -1,6 +1,49 @@
 module Oxblood
   module Commands
     module Lists
+      # Remove and get the first element in a list, or block until one
+      # is available
+      # @see http://redis.io/commands/blpop
+      #
+      # @param [String, Array<String>] keys
+      # @param [Integer] timeout in seconds
+      #
+      # @return [nil] when no element could be popped and the timeout expired
+      # @return [[String, String]] a two-element multi-bulk with the first
+      #   element being the name of the key where an element was popped and
+      #  the second element being the value of the popped element
+      def blpop(*keys, timeout)
+        blocking_pop(:BLPOP, keys, timeout)
+      end
+
+      # Remove and get the last element in a list, or block until one
+      # is available
+      # @see http://redis.io/commands/brpop
+      #
+      # @param [String, Array<String>] keys
+      # @param [Integer] timeout in seconds
+      #
+      # @return [nil] when no element could be popped and the timeout expired
+      # @return [[String, String]] a two-element multi-bulk with the first
+      #   element being the name of the key where an element was popped and
+      #  the second element being the value of the popped element
+      def brpop(*keys, timeout)
+        blocking_pop(:BRPOP, keys, timeout)
+      end
+
+      # Pop a value from a list, push it to another list and return it;
+      # or block until one is available
+      # @see http://redis.io/commands/brpoplpush
+      #
+      # @param [String] source
+      # @param [String] destination
+      #
+      # @return [nil] when no element could be popped and the timeout expired
+      # @return [String] the element being popped and pushed
+      def brpoplpush(source, destination, timeout)
+        blocking_pop(:BRPOPLPUSH, [source, destination], timeout)
+      end
+
       # Get an element from a list by its index
       # @see http://www.redis.io/commands/lindex
       #
@@ -164,6 +207,32 @@ module Oxblood
       def rpushx(key, value)
         run(:RPUSHX, key, value)
       end
+
+      private
+
+      # @note Mutates keys argument!
+      def blocking_pop(command, keys, timeout)
+        with_custom_timeout(timeout) do
+          run(*keys.unshift(command).push(timeout))
+        end
+      end
+
+      # Temporary increase socket timeout for blocking operations
+      # @note non-threadsafe!
+      def with_custom_timeout(timeout)
+        old_timeout = connection.socket.timeout
+
+        if timeout.zero?
+          # Indefinite blocking means 0 on redis server and nil on ruby
+          connection.socket.timeout = nil
+        else
+          connection.socket.timeout += timeout
+        end
+
+        yield
+      ensure
+        connection.socket.timeout = old_timeout
+      end
     end
   end
 end

data/lib/oxblood/pipeline.rb

@@ -16,6 +16,8 @@ module Oxblood
   class Pipeline
     include Oxblood::Commands
 
+    attr_reader :connection
+
     def initialize(connection)
       @connection = connection
       @commands = Array.new

data/lib/oxblood/rsocket.rb

@@ -8,9 +8,10 @@ module Oxblood
   class RSocket
     TimeoutError = Class.new(RuntimeError)
 
-    # JRuby don't properly support SO_LINGER setting
+    # JRuby before 9.1.6.0 don't properly support SO_LINGER setting
     # @see https://github.com/jruby/jruby/issues/4040
-    LINGER_OPTION = if RUBY_ENGINE == 'jruby'
+    LINGER_OPTION = if RUBY_ENGINE == 'jruby' &&
+                       Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('9.1.6.0')
                       [Socket::SOL_SOCKET, :LINGER, 0].freeze
                     else
                       Socket::Option.linger(true, 0)
@@ -42,11 +43,11 @@ module Oxblood
     # Read number of bytes
     # @param [Integer] nbytes number of bytes to read
     # @return [String] read result
-    def read(nbytes)
+    def read(nbytes, timeout = @timeout)
       result = @buffer.slice!(0, nbytes)
 
       while result.bytesize < nbytes
-        result << readpartial(nbytes - result.bytesize)
+        result << readpartial(nbytes - result.bytesize, timeout)
       end
 
       result
@@ -55,9 +56,9 @@ module Oxblood
     # Read until separator
     # @param [String] separator separator
     # @return [String] read result
-    def gets(separator)
+    def gets(separator, timeout = @timeout)
       while (crlf = @buffer.index(separator)).nil?
-        @buffer << readpartial(1024)
+        @buffer << readpartial(1024, timeout)
       end
 
       @buffer.slice!(0, crlf + separator.bytesize)
@@ -66,14 +67,14 @@ module Oxblood
     # Write data to socket
     # @param [String] data given
     # @return [Integer] the number of bytes written
-    def write(data)
+    def write(data, timeout = @timeout)
       full_size = data.bytesize
 
       while data.bytesize > 0
         written = socket.write_nonblock(data, exception: false)
 
         if written == :wait_writable
-          socket.wait_writable(@timeout) or fail_with_timeout!
+          socket.wait_writable(timeout) or fail_with_timeout!
         else
           data = data.byteslice(written..-1)
         end
@@ -119,12 +120,12 @@ module Oxblood
       end
     end
 
-    def readpartial(nbytes)
+    def readpartial(nbytes, timeout)
       case data = socket.read_nonblock(nbytes, exception: false)
       when String
         return data
       when :wait_readable
-        socket.wait_readable(@timeout) or fail_with_timeout!
+        socket.wait_readable(timeout) or fail_with_timeout!
       when nil
         close
         raise Errno::ECONNRESET

data/lib/oxblood/session.rb

@@ -15,6 +15,8 @@ module Oxblood
   class Session
     include Oxblood::Commands
 
+    attr_reader :connection
+
     def initialize(connection)
       @connection = connection
     end

data/lib/oxblood/version.rb

@@ -1,3 +1,3 @@
 module Oxblood
-  VERSION = '0.1.0.dev9'
+  VERSION = '0.1.0.dev10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxblood
 version: !ruby/object:Gem::Version
-  version: 0.1.0.dev9
+  version: 0.1.0.dev10
 platform: ruby
 authors:
 - Konstantin Shabanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -112,6 +112,7 @@ files:
 - Rakefile
 - benchmarks/Gemfile
 - benchmarks/pipeline.rb
+- benchmarks/pool.rb
 - benchmarks/serializer.rb
 - lib/oxblood.rb
 - lib/oxblood/commands.rb
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: A Ruby Redis client