Use Redis#pipelined with block

The version without the block causes exccessive logging since redis/redis-rb#1059

lib/fresh_redis/hash.rb

@@ -12,11 +12,11 @@ def fhset(key, hash_key, value, options={})
  def fhget(key, hash_key, options={})
  key = build_key(key, options)
 
- bucket_values = @redis.pipelined {
+ bucket_values = @redis.pipelined do |pipeline|
  key.timestamp_buckets.reverse.each do |bucket_key|
- @redis.hget(bucket_key, hash_key)
+ pipeline.hget(bucket_key, hash_key)
  end
- }
+ end
 
  # find the first non-nil value
  bucket_values.find{|e| e } 
@@ -25,11 +25,11 @@ def fhget(key, hash_key, options={})
  def fhgetall(key, options={})
  key = build_key(key, options)
 
- bucket_values = @redis.pipelined {
+ bucket_values = @redis.pipelined do |pipeline|
  key.timestamp_buckets.each do |bucket_key|
- @redis.hgetall(bucket_key)
+ pipeline.hgetall(bucket_key)
  end
- }
+ end
 
  merged_values = bucket_values.inject({}){ |acc, bucket_hash|
  acc.merge(bucket_hash)
@@ -41,11 +41,11 @@ def fhgetall(key, options={})
  def fhdel(key, hash_key, options={})
  key = build_key(key, options)
 
- bucket_values = @redis.pipelined {
+ bucket_values = @redis.pipelined do |pipeline|
  key.timestamp_buckets.each do |bucket_key|
- @redis.hdel(bucket_key, hash_key)
+ pipeline.hdel(bucket_key, hash_key)
  end
- }
+ end
  end
  end
 end

lib/fresh_redis/set.rb

@@ -12,11 +12,11 @@ def fsadd(key, value, options={})
  def fsmembers(key, options={})
  key = build_key(key, options)
 
- bucket_values = @redis.pipelined {
+ bucket_values = @redis.pipelined do |pipeline|
  key.timestamp_buckets.reverse.each do |bucket_key|
- @redis.smembers(bucket_key)
+ pipeline.smembers(bucket_key)
  end
- }
+ end
 
  # find the first non-nil value
  bucket_values.flatten.uniq
@@ -25,11 +25,11 @@ def fsmembers(key, options={})
  def fsismembers(key, value, options={})
  key = build_key(key, options)
 
- bucket_values = @redis.pipelined {
+ bucket_values = @redis.pipelined do |pipeline|
  key.timestamp_buckets.reverse.each do |bucket_key|
- return true if @redis.sismembers(bucket_key, value)
+ return true if pipeline.sismembers(bucket_key, value)
  end
- }
+ end
 
  # find the first non-nil value
  return false
@@ -38,11 +38,11 @@ def fsismembers(key, value, options={})
  def fsrem(key, value, options={})
  key = build_key(key, options)
 
- bucket_values = @redis.pipelined {
+ bucket_values = @redis.pipelined do |pipeline|
  key.timestamp_buckets.reverse.each do |bucket_key|
- @redis.srem(bucket_key, value)
+ pipeline.srem(bucket_key, value)
  end
- }
+ end
  end
  end
 end

lib/fresh_redis/string.rb

@@ -30,9 +30,9 @@ def fdecrby(key, decrement, options={})
 
  def fsum(key, options={})
  key = build_key(key, options)
- @redis.pipelined {
+ @redis.pipelined { |pipeline|
  key.timestamp_buckets.each do |bucket_key|
- @redis.get(bucket_key)
+ pipeline.get(bucket_key)
  end
  }.reduce(0){|acc, value|
  value ? acc + value.to_f : acc