lib/pipeline.rb @@ -4,12 +4,41 @@ require 'redis' times = 20000 -@r = Redis.new +@r = Redis.new#(:debug => true) @r['foo'] = "The first line we sent to the server is some text" + Benchmark.bmbm do |x| - x.report("set") { 20000.times {|i| @r["foo#{i}"] = "The first line we sent to the server is some text"; @r["foo#{i}"]} } + x.report("set") do + 20000.times do |i| + @r["set#{i}"] = "The first line we sent to the server is some text"; @r["foo#{i}"] + end + end + + x.report("set (pipelined)") do + @r.pipelined do |pipeline| + 20000.times do |i| + pipeline["set_pipelined#{i}"] = "The first line we sent to the server is some text"; @r["foo#{i}"] + end + end + end + + x.report("push+trim") do + 20000.times do |i| + @r.push_head "push_trim#{i}", i + @r.list_trim "push_trim#{i}", 0, 30 + end + end + + x.report("push+trim (pipelined)") do + @r.pipelined do |pipeline| + 20000.times do |i| + pipeline.push_head "push_trim_pipelined#{i}", i + pipeline.list_trim "push_trim_pipelined#{i}", 0, 30 + end + end + end end @r.keys('*').each do |k| @r.delete k -end \ No newline at end of file +end \ No newline at end of file bench.rb @@ -1,6 +1,7 @@ require 'socket' require 'set' require File.join(File.dirname(__FILE__),'server') +require File.join(File.dirname(__FILE__),'pipeline') class RedisError < StandardError @@ -25,6 +26,12 @@ class Redis @server = Server.new(@opts[:host], @opts[:port]) end + def pipelined + pipeline = Pipeline.new(self) + yield pipeline + pipeline.finish + end + def to_s "#{host}:#{port}" end @@ -476,6 +483,14 @@ class Redis buff[0..-3] end + def read_socket + with_socket_management(@server) do |socket| + while res = socket.read(8096) + break if res.size != 8096 + end + end + end + def read_proto with_socket_management(@server) do |socket| if res = socket.gets lib/redis.rb @@ -374,4 +374,15 @@ describe "redis" do end end -end + it "should be able to pipeline writes" do + @r.pipelined do |pipeline| + pipeline.push_head "list", "hello" + pipeline.push_head "list", 42 + end + + @r.type?('list').should == "list" + @r.list_length('list').should == 2 + @r.pop_head('list').should == '42' + @r.delete('list') + end +end \ No newline at end of file spec/redis_spec.rb 8e9dcfc3ae3f3b32d66798e81f79c960c9ba8ca6 Bryan Helmkamp bryan@brynary.com http://github.com/brynary/redis-rb/commit/5f07d2570666abe6315ef4e350428eabac0e09a5 5f07d2570666abe6315ef4e350428eabac0e09a5 2009-04-28T16:13:08-07:00 2009-04-17T14:37:14-07:00 Add simple pipelining for writes (doesn't check responses) Signed-off-by: ezmobius <ez@engineyard.com> 9b1d709e51866ff8f418cc4a71c5d833cc4ecd84 ezmobius ez@engineyard.com