oxblood 0.1.0.dev12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30b1991382a2df8f7fdfb18563b7da0d10b105e8
-  data.tar.gz: af6cfe127dd7f4d0469b6a98464b30096b9ef726
+  metadata.gz: 27d328641bcf1ed89164aeb5288e6f9280ca6127
+  data.tar.gz: fbf311595af5e1bb6fc0a582f7d1a799168399f0
 SHA512:
-  metadata.gz: 7b839abf82ef981cd459a2b2e4dad29e690788fcd33ba5b242670b19bc2ed96cce01580427a1da685a1ae89db9f53f003e9a1371ce8d853bbde5f9652df479c4
-  data.tar.gz: c28a49faf89c1b92090c371b1d943259e80df75571522cfe8998c45f4a7fe0cfab44fa7ec8f5c346fddacc8176c6d17515b3c516ac2a2b7e5cc27e79f39db358
+  metadata.gz: 9876df90dcd7a807fe2bbcf9b7ef9a8068a08dd80943d7c0fd8808883ab99986d954d078215c7794a52dfeeb707b97f56e4b1f8976ee3ede87e5d5bf7b064e84
+  data.tar.gz: 82efd7dd0895e1275afdecdb6c47a46d95bf8b3550bbcb45e2f18a313c575a04097ad0f17f4ed284f88002ab1c2124310ce227290f22095d076d8e594218c657

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+## 0.1.0 (2017-01-18)
+  * Initial public release - [@etehtsea](https://github.com/etehtsea)

data/benchmarks/pipeline.rb

@@ -11,12 +11,12 @@ def benchmark(label, &blk)
 end
 
 def redis_without
-  r = Redis.new
+  r = Redis.new(driver: :ruby)
   N.times { r.ping }
 end
 
 def redis_with
-  r = Redis.new
+  r = Redis.new(driver: :ruby)
   r.pipelined { N.times { r.ping } }
 end
 

data/benchmarks/pool.rb

@@ -3,15 +3,17 @@ require 'redis'
 require 'oxblood'
 require 'benchmark'
 
-N = 10_000
+N = 5_000
 TASKS = 1_000
-POOL_SIZE = 32
+POOL_SIZE = Concurrent.processor_count + 1
+
+Concurrent.use_stdlib_logger(Logger::DEBUG)
 
 def worker_pool
-  Concurrent::FixedThreadPool.new(POOL_SIZE * 2)
+  Concurrent::FixedThreadPool.new(POOL_SIZE)
 end
 
-RedisPool = ConnectionPool.new(size: POOL_SIZE) { Redis.new }
+RedisPool = ConnectionPool.new(size: POOL_SIZE) { Redis.new(driver: :ruby) }
 OxbloodPool = Oxblood::Pool.new(size: POOL_SIZE)
 
 def benchmark(label, &blk)
@@ -19,20 +21,37 @@ def benchmark(label, &blk)
   puts [label, sec.round(3)].join(': ')
 end
 
-def run(&blk)
+def run(name, &blk)
+  puts "Running #{name}"
+
   pool = worker_pool
   TASKS.times { pool.post(&blk) }
-  sleep 0.1 while pool.completed_task_count != TASKS
+  sleep 0.1 while pool.scheduled_task_count != TASKS
+  pool.shutdown
+  pool.wait_for_termination
+  puts "#{pool.completed_task_count} tasks finished successfully"
 end
 
 def redis
-  RedisPool.with { |r| r.pipelined { N.times { r.ping } } }
+  RedisPool.with do |r|
+    r.pipelined do
+      N.times { r.ping }
+    end
+  end
 end
 
 def oxblood
-  OxbloodPool.pipelined { |p| N.times { p.ping } }
+  OxbloodPool.with do |s|
+    s.pipelined do |p|
+      N.times { p.ping }
+    end
+  end
 end
 
+# Check that everything is working
+redis
+oxblood
+
 # Warmup JVM
 if RUBY_ENGINE == 'jruby'
   10.times do
@@ -41,5 +60,5 @@ if RUBY_ENGINE == 'jruby'
   end
 end
 
-benchmark('redis-rb') { run { redis } }
-benchmark('oxblood') { run { oxblood } }
+benchmark('redis-rb') { run('redis-rb') { redis } }
+benchmark('oxblood') { run('oxblood') { oxblood } }

data/lib/oxblood/connection.rb

@@ -38,8 +38,11 @@ module Oxblood
     end
 
     # Send comand to Redis server
-    # @example send_command('CONFIG', 'GET', '*') => 32
+    # @example
+    #   send_command('CONFIG', 'GET', '*') => 32
+    #
     # @param [Array] command Array of command name with it's args
+    #
     # @return [Integer] Number of bytes written to socket
     def send_command(*command)
       @socket.write(Protocol.build_command(*command))

data/lib/oxblood/pool.rb

@@ -42,8 +42,10 @@ module Oxblood
       session = Session.new(conn)
       yield(session)
     ensure
-      session.discard if conn.in_transaction?
-      @pool.checkin if conn
+      if conn
+        session.discard if conn.in_transaction?
+        @pool.checkin
+      end
     end
   end
 end

data/lib/oxblood/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxblood
 version: !ruby/object:Gem::Version
-  version: 0.1.0.dev12
+  version: 0.1.0
 platform: ruby
 authors:
 - Konstantin Shabanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -106,6 +106,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -151,9 +152,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8