dalli 2.7.2 → 3.0.0

data/test/benchmark_test.rb

@@ -1,242 +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)
-
-    @servers = ['127.0.0.1:19122', 'localhost:19122']
-    @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 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

data/test/helper.rb

@@ -1,55 +0,0 @@
-$TESTING = true
-require 'rubygems'
-# require 'simplecov'
-# SimpleCov.start
-require 'minitest/pride'
-require 'minitest/autorun'
-require 'mocha/setup'
-require 'memcached_mock'
-
-ENV['MEMCACHED_SASL_PWDB'] = "#{File.dirname(__FILE__)}/sasldb"
-
-WANT_RAILS_VERSION = ENV['RAILS_VERSION'] || '>= 3.0.0'
-gem 'rails', WANT_RAILS_VERSION
-require 'rails'
-puts "Testing with Rails #{Rails.version}"
-
-require 'dalli'
-require 'logger'
-
-Dalli.logger = Logger.new(STDOUT)
-Dalli.logger.level = Logger::ERROR
-
-class MiniTest::Spec
-  include MemcachedMock::Helper
-
-  def assert_error(error, regexp=nil, &block)
-    ex = assert_raises(error, &block)
-    assert_match(regexp, ex.message, "#{ex.class.name}: #{ex.message}\n#{ex.backtrace.join("\n\t")}")
-  end
-
-  def op_cas_succeeds(rsp)
-    rsp.is_a?(Integer) && rsp > 0
-  end
-
-  def op_replace_succeeds(rsp)
-    rsp.is_a?(Integer) && rsp > 0
-  end
-
-  # add and set must have the same return value because of DalliStore#write_entry
-  def op_addset_succeeds(rsp)
-    rsp.is_a?(Integer) && rsp > 0
-  end
-
-  def with_activesupport
-    require 'active_support/all'
-    require 'active_support/cache/dalli_store'
-    yield
-  end
-
-  def with_actionpack
-    require 'action_dispatch'
-    require 'action_controller'
-    yield
-  end
-end

data/test/memcached_mock.rb

@@ -1,121 +0,0 @@
-require "socket"
-
-$started = {}
-
-module MemcachedMock
-  def self.start(port=19123, &block)
-    server = TCPServer.new("localhost", port)
-    session = server.accept
-    block.call session
-  end
-
-  def self.delayed_start(port=19123, wait=1, &block)
-    server = TCPServer.new("localhost", port)
-    sleep wait
-    block.call server
-  end
-
-  module Helper
-    # Forks the current process and starts a new mock Memcached server on
-    # port 22122.
-    #
-    #     memcached_mock(lambda {|sock| socket.write('123') }) do
-    #       assert_equal "PONG", Dalli::Client.new('localhost:22122').get('abc')
-    #     end
-    #
-    def memcached_mock(proc, meth = :start)
-      return unless supports_fork?
-      begin
-        pid = fork do
-          trap("TERM") { exit }
-
-          MemcachedMock.send(meth) do |*args|
-            proc.call(*args)
-          end
-        end
-
-        sleep 0.3 # Give time for the socket to start listening.
-        yield
-      ensure
-        if pid
-          Process.kill("TERM", pid)
-          Process.wait(pid)
-        end
-      end
-    end
-
-    PATHS = %w(
-      /usr/local/bin/
-      /opt/local/bin/
-      /usr/bin/
-    )
-
-    def find_memcached
-      output = `memcached -h | head -1`.strip
-      if output && output =~ /^memcached (\d.\d.\d+)/ && $1 > '1.4'
-        return (puts "Found #{output} in PATH"; '')
-      end
-      PATHS.each do |path|
-        output = `memcached -h | head -1`.strip
-        if output && output =~ /^memcached (\d\.\d\.\d+)/ && $1 > '1.4'
-          return (puts "Found #{output} in #{path}"; path)
-        end
-      end
-
-      raise Errno::ENOENT, "Unable to find memcached 1.4+ locally"
-    end
-
-    def memcached(port=19122, args='', options={})
-      memcached_server(port, args)
-      yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"], options)
-    end
-
-    def memcached_cas(port=19122, args='', options={})
-      memcached_server(port, args)
-      require 'dalli/cas/client'
-      yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"], options)
-    end
-
-    def memcached_server(port=19122, args='')
-      Memcached.path ||= find_memcached
-
-      cmd = "#{Memcached.path}memcached #{args} -p #{port}"
-
-      $started[port] ||= begin
-        #puts "Starting: #{cmd}..."
-        pid = IO.popen(cmd).pid
-        at_exit do
-          begin
-            Process.kill("TERM", pid)
-            Process.wait(pid)
-          rescue Errno::ECHILD, Errno::ESRCH
-          end
-        end
-        sleep 0.1
-        pid
-      end
-    end
-
-    def supports_fork?
-      !defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby'
-    end
-
-    def memcached_kill(port)
-      pid = $started.delete(port)
-      if pid
-        begin
-          Process.kill("TERM", pid)
-          Process.wait(pid)
-        rescue Errno::ECHILD, Errno::ESRCH
-        end
-      end
-    end
-
-  end
-end
-
-module Memcached
-  class << self
-    attr_accessor :path
-  end
-end

data/test/sasldb

@@ -1 +0,0 @@
-testuser:testtest:::::::