dalli 2.7.4 → 2.7.5

data/lib/dalli/socket.rb

@@ -1,5 +1,14 @@
 require 'rbconfig'
 
+module Dalli::Server::TCPSocketOptions
+  def setsockopts(sock, options)
+    sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
+    sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) if options[:keepalive]
+    sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF, options[:rcvbuf]) if options[:rcvbuf]
+    sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, options[:sndbuf]) if options[:sndbuf]
+  end
+end
+
 begin
   require 'kgio'
   puts "Using kgio socket IO" if defined?($TESTING) && $TESTING
@@ -44,11 +53,12 @@ begin
   end
 
   class Dalli::Server::KSocket::TCP < Dalli::Server::KSocket
+    extend Dalli::Server::TCPSocketOptions
+
     def self.open(host, port, server, options = {})
       addr = Socket.pack_sockaddr_in(port, host)
       sock = start(addr)
-      sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
-      sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) if options[:keepalive]
+      setsockopts(sock, options)
       sock.options = options
       sock.server = server
       sock.kgio_wait_writable
@@ -114,13 +124,13 @@ rescue LoadError
   end
 
   class Dalli::Server::KSocket::TCP < TCPSocket
+    extend Dalli::Server::TCPSocketOptions
     include Dalli::Server::KSocket
 
     def self.open(host, port, server, options = {})
       Timeout.timeout(options[:socket_timeout]) do
         sock = new(host, port)
-        sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
-        sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) if options[:keepalive]
+        setsockopts(sock, options)
         sock.options = {:host => host, :port => port}.merge(options)
         sock.server = server
         sock

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '2.7.4'
+  VERSION = '2.7.5'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
+- Peter M. Goldstein
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,8 +53,80 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: High performance memcached client for Ruby
-email: mperham@gmail.com
+email:
+- peter.m.goldstein@gmail.com
+- mperham@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -61,10 +134,7 @@ files:
 - Gemfile
 - History.md
 - LICENSE
-- Performance.md
 - README.md
-- Rakefile
-- dalli.gemspec
 - lib/action_dispatch/middleware/session/dalli_store.rb
 - lib/active_support/cache/dalli_store.rb
 - lib/dalli.rb
@@ -78,24 +148,7 @@ files:
 - lib/dalli/socket.rb
 - lib/dalli/version.rb
 - lib/rack/session/dalli.rb
-- test/benchmark_test.rb
-- test/helper.rb
-- test/memcached_mock.rb
-- test/sasl/memcached.conf
-- test/sasl/sasldb
-- test/test_active_support.rb
-- test/test_cas_client.rb
-- test/test_compressor.rb
-- test/test_dalli.rb
-- test/test_encoding.rb
-- test/test_failover.rb
-- test/test_network.rb
-- test/test_rack_session.rb
-- test/test_ring.rb
-- test/test_sasl.rb
-- test/test_serializer.rb
-- test/test_server.rb
-homepage: http://github.com/mperham/dalli
+homepage: https://github.com/petergoldstein/dalli
 licenses:
 - MIT
 metadata: {}
@@ -116,25 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: High performance memcached client for Ruby
-test_files:
-- test/benchmark_test.rb
-- test/helper.rb
-- test/memcached_mock.rb
-- test/sasl/memcached.conf
-- test/sasl/sasldb
-- test/test_active_support.rb
-- test/test_cas_client.rb
-- test/test_compressor.rb
-- test/test_dalli.rb
-- test/test_encoding.rb
-- test/test_failover.rb
-- test/test_network.rb
-- test/test_rack_session.rb
-- test/test_ring.rb
-- test/test_sasl.rb
-- test/test_serializer.rb
-- test/test_server.rb
+test_files: []

data/Performance.md

@@ -1,42 +0,0 @@
-Performance
-====================
-
-Caching is all about performance, so I carefully track Dalli performance to ensure no regressions.
-You can optionally use kgio to give Dalli a 10-20% performance boost: `gem install kgio`.
-
-Note I've added some benchmarks over time to Dalli that the other libraries don't necessarily have.
-
-memcache-client
----------------
-
-Testing 1.8.5 with ruby 1.9.3p0 (2011-10-30 revision 33570) [x86_64-darwin11.2.0]
-
-                                          user     system      total        real
-    set:plain:memcache-client         1.860000   0.310000   2.170000 (  2.188030)
-    set:ruby:memcache-client          1.830000   0.290000   2.120000 (  2.130212)
-    get:plain:memcache-client         1.830000   0.340000   2.170000 (  2.176156)
-    get:ruby:memcache-client          1.900000   0.330000   2.230000 (  2.235045)
-    multiget:ruby:memcache-client     0.860000   0.120000   0.980000 (  0.987348)
-    missing:ruby:memcache-client      1.630000   0.320000   1.950000 (  1.954867)
-    mixed:ruby:memcache-client        3.690000   0.670000   4.360000 (  4.364469)
-
-
-dalli
------
-
-Testing with Rails 3.2.1
-Using kgio socket IO
-Testing 2.0.0 with ruby 1.9.3p125 (2012-02-16 revision 34643) [x86_64-darwin11.3.0]
-
-                                          user     system      total        real
-    mixed:rails:dalli                 1.580000   0.570000   2.150000 (  3.008839)
-    set:plain:dalli                   0.730000   0.300000   1.030000 (  1.567098)
-    setq:plain:dalli                  0.520000   0.120000   0.640000 (  0.634402)
-    set:ruby:dalli                    0.800000   0.300000   1.100000 (  1.640348)
-    get:plain:dalli                   0.840000   0.330000   1.170000 (  1.668425)
-    get:ruby:dalli                    0.850000   0.330000   1.180000 (  1.665716)
-    multiget:ruby:dalli               0.700000   0.260000   0.960000 (  0.965423)
-    missing:ruby:dalli                0.720000   0.320000   1.040000 (  1.511720)
-    mixed:ruby:dalli                  1.660000   0.640000   2.300000 (  3.320743)
-    mixedq:ruby:dalli                 1.630000   0.510000   2.140000 (  2.629734)
-    incr:ruby:dalli                   0.270000   0.100000   0.370000 (  0.547618)

data/Rakefile

@@ -1,43 +0,0 @@
-require 'bundler/gem_tasks'
-require 'appraisal'
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.warning = true
-  test.verbose = true
-end
-
-Rake::TestTask.new(:bench) do |test|
-  test.libs << 'test'
-  test.pattern = 'test/benchmark_test.rb'
-end
-
-begin
-  require 'metric_fu'
-  MetricFu::Configuration.run do |config|
-    config.rcov[:rcov_opts] << "-Itest:lib"
-  end
-rescue LoadError
-end
-
-task :default => :test
-
-task :test_all do
-  system('rake test RAILS_VERSION="~> 3.0.0"')
-  system('rake test RAILS_VERSION=">= 3.0.0"')
-end
-
-# 'gem install rdoc' to upgrade RDoc if this is giving you errors
-begin
-  require 'rdoc/task'
-  RDoc::Task.new do |rd|
-    rd.rdoc_files.include("lib/**/*.rb")
-  end
-rescue LoadError
-  puts "Unable to load rdoc, run 'gem install rdoc' to fix this."
-end
-
-require 'rake/clean'
-CLEAN.include "**/*.rbc"
-CLEAN.include "**/.DS_Store"

data/dalli.gemspec

@@ -1,29 +0,0 @@
-require './lib/dalli/version'
-
-Gem::Specification.new do |s|
-  s.name = %q{dalli}
-  s.version = Dalli::VERSION
-  s.license = "MIT"
-
-  s.authors = ["Mike Perham"]
-  s.description = %q{High performance memcached client for Ruby}
-  s.email = %q{mperham@gmail.com}
-  s.files = Dir.glob("lib/**/*") + [
-     "LICENSE",
-     "README.md",
-     "History.md",
-     "Rakefile",
-     "Gemfile",
-     "dalli.gemspec",
-     "Performance.md",
-  ]
-  s.homepage = %q{http://github.com/mperham/dalli}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.summary = %q{High performance memcached client for Ruby}
-  s.test_files = Dir.glob("test/**/*")
-  s.add_development_dependency(%q<minitest>, [">= 4.2.0"])
-  s.add_development_dependency(%q<mocha>, [">= 0"])
-  s.add_development_dependency(%q<rails>, ["~> 4"])
-end
-

data/test/benchmark_test.rb

@@ -1,243 +0,0 @@
-require 'helper'
-require 'benchmark'
-require 'active_support/cache/dalli_store'
-
-describe 'performance' do
-  before do
-    puts "Testing #{Dalli::VERSION} with #{RUBY_DESCRIPTION}"
-    # We'll use a simple @value to try to avoid spending time in Marshal,
-    # which is a constant penalty that both clients have to pay
-    @value = []
-    @marshalled = Marshal.dump(@value)
-
-    @port = 23417
-    @servers = ["127.0.0.1:#{@port}", "localhost:#{@port}"]
-    @key1 = "Short"
-    @key2 = "Sym1-2-3::45"*8
-    @key3 = "Long"*40
-    @key4 = "Medium"*8
-    # 5 and 6 are only used for multiget miss test
-    @key5 = "Medium2"*8
-    @key6 = "Long3"*40
-    @counter = 'counter'
-  end
-
-  it 'runs benchmarks' do
-    memcached(@port) do
-
-      Benchmark.bm(37) do |x|
-
-        n = 2500
-
-        @ds = ActiveSupport::Cache::DalliStore.new(@servers)
-        x.report("mixed:rails:dalli") do
-          n.times do
-            @ds.read @key1
-            @ds.write @key2, @value
-            @ds.fetch(@key3) { @value }
-            @ds.fetch(@key2) { @value }
-            @ds.fetch(@key1) { @value }
-            @ds.write @key2, @value, :unless_exists => true
-            @ds.delete @key2
-            @ds.increment @counter, 1, :initial => 100
-            @ds.increment @counter, 1, :expires_in => 12
-            @ds.decrement @counter, 1
-          end
-        end
-
-        x.report("mixed:rails-localcache:dalli") do
-          n.times do
-            @ds.with_local_cache do
-              @ds.read @key1
-              @ds.write @key2, @value
-              @ds.fetch(@key3) { @value }
-              @ds.fetch(@key2) { @value }
-              @ds.fetch(@key1) { @value }
-              @ds.write @key2, @value, :unless_exists => true
-              @ds.delete @key2
-              @ds.increment @counter, 1, :initial => 100
-              @ds.increment @counter, 1, :expires_in => 12
-              @ds.decrement @counter, 1
-            end
-          end
-        end
-
-        @ds.clear
-        sizeable_data = "<marquee>some view partial data</marquee>" * 50
-        [@key1, @key2, @key3, @key4, @key5, @key6].each do |key|
-          @ds.write(key, sizeable_data)
-        end
-
-        x.report("read_multi_big:rails:dalli") do
-          n.times do
-            @ds.read_multi @key1, @key2, @key3, @key4
-            @ds.read @key1
-            @ds.read @key2
-            @ds.read @key3
-            @ds.read @key4
-            @ds.read @key1
-            @ds.read @key2
-            @ds.read @key3
-            @ds.read_multi @key1, @key2, @key3
-          end
-        end
-
-        x.report("read_multi_big:rails-localcache:dalli") do
-          n.times do
-            @ds.with_local_cache do
-              @ds.read_multi @key1, @key2, @key3, @key4
-              @ds.read @key1
-              @ds.read @key2
-              @ds.read @key3
-              @ds.read @key4
-            end
-            @ds.with_local_cache do
-              @ds.read @key1
-              @ds.read @key2
-              @ds.read @key3
-              @ds.read_multi @key1, @key2, @key3
-            end
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("set:plain:dalli") do
-          n.times do
-            @m.set @key1, @marshalled, 0, :raw => true
-            @m.set @key2, @marshalled, 0, :raw => true
-            @m.set @key3, @marshalled, 0, :raw => true
-            @m.set @key1, @marshalled, 0, :raw => true
-            @m.set @key2, @marshalled, 0, :raw => true
-            @m.set @key3, @marshalled, 0, :raw => true
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("setq:plain:dalli") do
-          @m.multi do
-            n.times do
-              @m.set @key1, @marshalled, 0, :raw => true
-              @m.set @key2, @marshalled, 0, :raw => true
-              @m.set @key3, @marshalled, 0, :raw => true
-              @m.set @key1, @marshalled, 0, :raw => true
-              @m.set @key2, @marshalled, 0, :raw => true
-              @m.set @key3, @marshalled, 0, :raw => true
-            end
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("set:ruby:dalli") do
-          n.times do
-            @m.set @key1, @value
-            @m.set @key2, @value
-            @m.set @key3, @value
-            @m.set @key1, @value
-            @m.set @key2, @value
-            @m.set @key3, @value
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("get:plain:dalli") do
-          n.times do
-            @m.get @key1, :raw => true
-            @m.get @key2, :raw => true
-            @m.get @key3, :raw => true
-            @m.get @key1, :raw => true
-            @m.get @key2, :raw => true
-            @m.get @key3, :raw => true
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("get:ruby:dalli") do
-          n.times do
-            @m.get @key1
-            @m.get @key2
-            @m.get @key3
-            @m.get @key1
-            @m.get @key2
-            @m.get @key3
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("multiget:ruby:dalli") do
-          n.times do
-            # We don't use the keys array because splat is slow
-            @m.get_multi @key1, @key2, @key3, @key4, @key5, @key6
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("missing:ruby:dalli") do
-          n.times do
-            begin @m.delete @key1; rescue; end
-            begin @m.get @key1; rescue; end
-            begin @m.delete @key2; rescue; end
-            begin @m.get @key2; rescue; end
-            begin @m.delete @key3; rescue; end
-            begin @m.get @key3; rescue; end
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("mixed:ruby:dalli") do
-          n.times do
-            @m.set @key1, @value
-            @m.set @key2, @value
-            @m.set @key3, @value
-            @m.get @key1
-            @m.get @key2
-            @m.get @key3
-            @m.set @key1, @value
-            @m.get @key1
-            @m.set @key2, @value
-            @m.get @key2
-            @m.set @key3, @value
-            @m.get @key3
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("mixedq:ruby:dalli") do
-          @m.multi do
-            n.times do
-              @m.set @key1, @value
-              @m.set @key2, @value
-              @m.set @key3, @value
-              @m.get @key1
-              @m.get @key2
-              @m.get @key3
-              @m.set @key1, @value
-              @m.get @key1
-              @m.set @key2, @value
-              @m.replace @key2, @value
-              @m.delete @key3
-              @m.add @key3, @value
-              @m.get @key2
-              @m.set @key3, @value
-              @m.get @key3
-            end
-          end
-        end
-
-        @m = Dalli::Client.new(@servers)
-        x.report("incr:ruby:dalli") do
-          counter = 'foocount'
-          n.times do
-            @m.incr counter, 1, 0, 1
-          end
-          n.times do
-            @m.decr counter, 1
-          end
-
-          assert_equal 0, @m.incr(counter, 0)
-        end
-
-      end
-    end
-
-  end
-end