moneta 1.1.1 → 1.4.1

data/lib/rack/moneta_rest.rb

@@ -69,11 +69,11 @@ module Rack
     private
 
     def empty(status)
-      [status, {'Content-Type'=>'application/octet-stream', 'Content-Length' => '0'}, []]
+      [status, { 'Content-Type' => 'application/octet-stream', 'Content-Length' => '0' }, []]
     end
 
     def respond(status, value)
-      [status, {'Content-Type'=>'application/octet-stream', 'Content-Length' => value.bytesize.to_s}, [value]]
+      [status, { 'Content-Type' => 'application/octet-stream', 'Content-Length' => value.bytesize.to_s }, [value]]
     end
   end
 end

data/lib/rack/session/moneta.rb

@@ -1,6 +1,5 @@
 require 'moneta'
 require 'rack/session/abstract/id'
-require 'thread'
 
 module Rack
   module Session
@@ -44,9 +43,10 @@ module Rack
         with_lock(env) do
           unless sid && session = @pool[sid]
             session = {}
-            begin
+            loop do
               sid = generate_sid
-            end until @pool.create(sid, session)
+              break if @pool.create(sid, session)
+            end
           end
           [sid, session]
         end
@@ -76,4 +76,3 @@ module Rack
     end
   end
 end
-

data/moneta.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require File.dirname(__FILE__) + '/lib/moneta/version'
 require 'date'
 
@@ -7,15 +6,30 @@ Gem::Specification.new do |s|
   s.version          = Moneta::VERSION
   s.date             = Date.today.to_s
   s.authors          = ['Daniel Mendler', 'Yehuda Katz', 'Hannes Georg', 'Alastair Pharo']
-  s.email            = %w{mail@daniel-mendler.de wycats@gmail.com hannes.georg@googlemail.com asppsa@gmail.com}
+  s.email            = %w{mail@daniel-mendler.de wycats@gmail.com hannes.georg@googlemail.com me@asph.dev}
   s.description      = 'A unified interface to key/value stores'
   s.extra_rdoc_files = %w{README.md SPEC.md LICENSE}
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.homepage         = 'http://github.com/moneta-rb/moneta'
+  s.homepage         = 'https://github.com/moneta-rb/moneta'
   s.licenses         = %w(MIT)
   s.require_paths    = %w(lib)
   s.summary          = %{A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet, ActiveRecord and many more}
-  s.required_ruby_version = '>= 2.2.2'
+
+  s.metadata = {
+    'bug_tracker_uri' => 'https://github.com/moneta-rb/moneta/issues',
+    'changelog_uri' => "https://github.com/moneta-rb/moneta/blob/v#{s.version}/CHANGES",
+    'documentation_uri' => "https://www.rubydoc.info/gems/moneta/#{s.version}",
+    'source_code_uri' => "https://github.com/moneta-rb/moneta/tree/v#{s.version}",
+  }
+
+  s.required_ruby_version = '>= 2.3.0'
+
+  s.add_development_dependency 'parallel_tests', '~> 2.29.2'
+  s.add_development_dependency 'rantly', '~> 1.2.0'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec-retry', '~> 0.6.1'
+  s.add_development_dependency 'rubocop', '~> 0.81.0'
+  s.add_development_dependency 'timecop', '~> 0.9.1'
 end

data/script/benchmarks

@@ -7,6 +7,8 @@ require 'fileutils'
 require 'active_support'
 require 'active_support/cache/moneta_store'
 
+require_relative '../spec/restserver.rb'
+
 class String
   def random(n)
     (1..n).map { self[rand(size),1] }.join
@@ -34,6 +36,9 @@ class MonetaBenchmarks
   postgres_database1 = ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta1'
   postgres_database2 = ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta2'
 
+  couch_login = ENV['COUCH_LOGIN'] || 'admin'
+  couch_password = ENV['COUCH_PASSWORD'] || 'password'
+
   STORES = [
     # SDBM accepts only very short key/value pairs (1k for both)
     {name: "SDBM", sizes: [:small], options: {file: "#{DIR}/sdbm"}},
@@ -104,7 +109,18 @@ class MonetaBenchmarks
     },
     {name: "Cassandra"},
     {name: "Client (Memory)", adapter: :Client},
-    {name: "Couch"},
+    {
+      name: "Couch",
+      options: {
+        backend: if defined?(JRUBY_VERSION)
+                   require 'faraday/adapter/manticore'
+                   ::Faraday.new("http://127.0.0.1:5984/moneta") { |f| f.adapter :manticore }
+                 end,
+        login: couch_login,
+        password: couch_password
+      },
+      clear_options: { compact: true, await_compact: true },
+    },
     {
       name: "DBM",
       options: {file: "#{DIR}/dbm"}
@@ -148,11 +164,20 @@ class MonetaBenchmarks
       {name: "MemcachedNative"}
     end,
     {name: "Memory"},
-    {name: "MongoMoped"},
-    {name: "MongoOfficial"},
+    {name: "Mongo"},
     {name: "PStore", options: { file: "#{DIR}/pstore" }},
     {name: "Redis"},
-    {name: "RestClient", options: { url: 'http://localhost:8808/' }},
+    {
+      name: "RestClient (Memory)",
+      adapter: :RestClient,
+      options: {
+        url: 'http://127.0.0.1:8808/moneta',
+        backend: if defined?(JRUBY_VERSION)
+                   require 'faraday/adapter/manticore'
+                   ::Faraday.new("http://127.0.0.1:8808/moneta") { |f| f.adapter :manticore }
+                 end
+      }
+    },
     {name: "Riak"},
     {
       name: "Sequel (MySQL)",
@@ -214,7 +239,7 @@ class MonetaBenchmarks
     },
     {name: "TDB", options: { file: "#{DIR}/tdb" }},
     {name: "TokyoCabinet", options: { file: "#{DIR}/tokyocabinet" }},
-    {name: "TokyoTyrant"},
+    {name: "TokyoTyrant", options: {port: 10431}},
   ].compact
 
   CONFIGS = {
@@ -349,43 +374,44 @@ class MonetaBenchmarks
   end
 
   def start_servers
-    parallel do
-      begin
-        Moneta::Server.new(Moneta.new(:Memory)).run
-      rescue Exception => ex
-        puts "\e[31mFailed to start Moneta server - #{ex.message}\e[0m"
+    @moneta_server_handle =
+      parallel do
+        begin
+          Moneta::Server.new(Moneta.new(:Memory)).run
+        rescue => ex
+          puts "\e[31mFailed to start Moneta server - #{ex.message}\e[0m"
+        end
       end
-    end
 
-    parallel do
-      begin
-        require 'rack'
-        require 'webrick'
-        require 'rack/moneta_rest'
+    @restserver_handle = start_restserver(8808)
 
-        # Keep webrick quiet
-        ::WEBrick::HTTPServer.class_eval do
-          def access_log(config, req, res); end
-        end
-        ::WEBrick::BasicLog.class_eval do
-          def log(level, data); end
-        end
+    @tokyotyrant_handle = spawn("ttserver -port 10431 -le -log #{DIR}/tokyotyrant.log #{DIR}/tokyotyrant.tch")
 
-        Rack::Server.start(app: Rack::Builder.app do
-                             use Rack::Lint
-                             run Rack::MonetaRest.new(store: :Memory)
-                           end,
-                           environment: :none,
-                           server: :webrick,
-                           Port: 8808)
-      rescue Exception => ex
-        puts "\e[31mFailed to start Rack server - #{ex.message}\e[0m"
-      end
+    Signal.trap "INT" do
+      stop_servers
+      exit
     end
 
     sleep 1 # Wait for servers
   end
 
+  def stop_servers
+    if @restserver_handle
+      stop_restserver(@restserver_handle)
+      @restserver_handle = nil
+    end
+
+    case @moneta_server_handle
+    when Thread
+      Thread.kill @moneta_server_handle
+    when Integer
+      Process.kill "TERM", @moneta_server_handle
+      Process.wait @moneta_server_handle
+    end
+
+    Process.kill "TERM", @tokyotyrant_handle
+  end
+
   def test_stores
     @stores.select! do |spec|
       adapter = spec[:adapter] || spec[:name].to_sym
@@ -480,7 +506,7 @@ class MonetaBenchmarks
       print "%s [%#{2 * @config[:runs]}s] " % [type, state]
 
       @config[:runs].times do |run|
-        store.clear
+        store.clear(spec[:clear_options] || {})
 
         @data.shuffle!
         m1 = Benchmark.measure do
@@ -571,6 +597,7 @@ class MonetaBenchmarks
     generate_data
     run_benchmarks
     print_summary
+    stop_servers
     FileUtils.rm_rf(DIR)
   end
 end

data/script/contributors

@@ -1,7 +1,12 @@
-#!/bin/sh
-git log --format='%aN <%aE>' |\
-sed -e 's/hiddenbek/Scott Wadden/g' |\
-sed -e 's/Asmod4n/Hendrik Beskow/' |\
-grep -v 'hannes.georg@xing.com\|spotapov\|yehuda-katzs-mac\|wycats ' |\
-sort -u | sort > CONTRIBUTORS
+#!/usr/bin/env ruby
 
+contributors = `git log --format='%aN <%aE>'`
+  .gsub(/hiddenbek/, 'Scott Wadden')
+  .gsub(/Asmod4n/, 'Hendrik Beskow')
+  .lines
+  .uniq
+  .reject { |line| line.match? /asppsa@gmail.com|hannes.georg@xing.com|spotapov|yehuda-katzs-mac|wycats / }
+  .sort { |str1, str2| str1.casecmp(str2) }
+
+file = File.open('CONTRIBUTORS', 'w')
+file << contributors.join

data/script/start-couchdb

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+
+# Copied from https://github.com/apache/couchdb-pkg/blob/master/debian/README.Debian
+COUCHDB_PASSWORD=password
+echo "couchdb couchdb/mode select standalone
+couchdb couchdb/mode seen true
+couchdb couchdb/bindaddress string 127.0.0.1
+couchdb couchdb/bindaddress seen true
+couchdb couchdb/adminpass password ${COUCHDB_PASSWORD}
+couchdb couchdb/adminpass seen true
+couchdb couchdb/adminpass_again password ${COUCHDB_PASSWORD}
+couchdb couchdb/adminpass_again seen true" | sudo debconf-set-selections
+DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --force-yes couchdb
+
+# Reconfigure CouchDB to use delayed commits for speed: http://guide.couchdb.org/draft/performance.html
+sudo sed -i '/\[couchdb\]/a delayed_commits = true' /etc/couchdb/local.ini
+
+# (Re)start couchdb
+sudo systemctl restart couchdb
+
+# Display some info about CouchDB
+sudo systemctl status couchdb
+until curl http://localhost:5984/; do
+  sleep 1
+done
+

data/script/start-hbase

@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 cd $(dirname $(dirname $0))
 
@@ -7,13 +8,13 @@ mkdir -p zookeeper
 mkdir -p downloads
 root=$(pwd)
 
-version=$(curl -sS https://www-us.apache.org/dist/hbase/stable/ | grep -oP '(?<=hbase-)(\d+\.?)+' | head -n1)
+version=$(curl -sS https://downloads.apache.org/hbase/stable/RELEASENOTES.md | grep -oP '(?<=# HBASE\s\s)(\d+\.?)+' | head -n1)
 
 echo HBase stable version is $version
 
 if [ ! -f downloads/hbase-$version-bin.tar.gz ]; then
   echo Downloading HBase ...
-  wget -P downloads http://www-us.apache.org/dist/hbase/stable/hbase-$version-bin.tar.gz
+  wget -P downloads https://downloads.apache.org/hbase/stable/hbase-$version-bin.tar.gz
 fi
 
 echo Extracting HBase ...

data/script/start-services

@@ -1,18 +1,10 @@
 #!/bin/bash
 
-echo Starting TokyoTyrant ...
-/usr/sbin/ttserver -dmn -pid /tmp/ttserver.pid -log /tmp/ttserver.log -port 1978
+# Install and start CouchDB
+$(dirname $0)/start-couchdb
 
-# Reconfigure CouchDB to use delayed commits for speed: http://guide.couchdb.org/draft/performance.html
-sudo sed -i '/\[couchdb\]/a delayed_commits = true' /etc/couchdb/local.ini
-sudo service couchdb restart
-
-# Start HBase
+# Install and start HBase
 $(dirname $0)/start-hbase
 
 # Waiting for servers to start
 sleep 3
-
-echo TokyoTyrant status:
-ps aux | grep ttserver
-cat /tmp/ttserver.log

data/spec/active_support/cache_moneta_store_spec.rb

@@ -2,6 +2,7 @@ require 'moneta'
 require 'active_support'
 require 'active_support/cache/moneta_store'
 require 'ostruct'
+require_relative '../moneta/adapters/memcached_helper.rb'
 
 describe "cache_moneta_store" do
   before(:all) do
@@ -78,40 +79,38 @@ describe "cache_moneta_store" do
   end
 
   shared_examples :expiry do
-    at_each_usec do
-      it 'writes the data with expiration time' do
-        store.write 'rabbit', white_rabbit, expires_in: 0.2.second
-        expect(store.read('rabbit')).to eq white_rabbit
-        sleep 0.3
-        expect(store.read('rabbit')).to be_nil
-      end
+    it 'writes the data with expiration time' do
+      store.write 'rabbit', white_rabbit, expires_in: 0.2.second
+      expect(store.read('rabbit')).to eq white_rabbit
+      sleep 0.3
+      expect(store.read('rabbit')).to be_nil
+    end
 
-      it 'writes multiple values with expiration time' do
-        store.write_multi({
-          'rabbit' => white_rabbit,
-          'irish whisky' => 'Jameson'
-        }, expires_in: 0.2.second)
+    it 'writes multiple values with expiration time' do
+      store.write_multi({
+        'rabbit' => white_rabbit,
+        'irish whisky' => 'Jameson'
+      }, expires_in: 0.2.second)
 
-        expect(store.read_multi('rabbit', 'irish whisky')).to eq \
-          'rabbit' => white_rabbit,
-          'irish whisky' => 'Jameson'
+      expect(store.read_multi('rabbit', 'irish whisky')).to eq \
+        'rabbit' => white_rabbit,
+        'irish whisky' => 'Jameson'
 
-        sleep 0.3
-        expect(store.read_multi('rabbit', 'irish whisky')).to be_empty
-      end
+      sleep 0.3
+      expect(store.read_multi('rabbit', 'irish whisky')).to be_empty
+    end
 
-      it "sets expiry on cache miss" do
-        store.fetch('rabbit', force: true, expires_in: 0.2.second) { white_rabbit }
-        expect(store.fetch('rabbit')).to eq white_rabbit
-        sleep 0.3
-        expect(store.fetch('rabbit')).to be_nil
-      end
+    it "sets expiry on cache miss" do
+      store.fetch('rabbit', force: true, expires_in: 0.2.second) { white_rabbit }
+      expect(store.fetch('rabbit')).to eq white_rabbit
+      sleep 0.3
+      expect(store.fetch('rabbit')).to be_nil
+    end
 
-      it 'does not set expiry on cache hit' do
-        expect(store.fetch('rabbit', expires_in: 0.2.second) { white_rabbit }).to eq rabbit
-        sleep 0.3
-        expect(store.fetch('rabbit')).to eq rabbit
-      end
+    it 'does not set expiry on cache hit' do
+      expect(store.fetch('rabbit', expires_in: 0.2.second) { white_rabbit }).to eq rabbit
+      sleep 0.3
+      expect(store.fetch('rabbit')).to eq rabbit
     end
   end
 
@@ -261,7 +260,8 @@ describe "cache_moneta_store" do
 
   describe ActiveSupport::Cache::MemCacheStore do
     let(:store){ described_class.new('127.0.0.1:11213') }
-    start_memcached 11213
+
+    include_context :start_memcached, 11213
 
     include_examples :basic_store
     include_examples :expiry

data/spec/features/concurrent_create.rb

@@ -1,21 +1,42 @@
 shared_examples :concurrent_create do
+  # Each thread attempts to create
   def create_thread(name)
     Thread.new do
       s = new_store
-      1000.times do |i|
-        s[i.to_s].should == name if s.create(i.to_s, name, expires: false)
-        Thread.pass if rand(100) >= 99
+      begin
+        (0...1000).map do |i|
+          s.create(i.to_s, name, expires: false).tap do
+            Thread.pass if rand(100) >= 99
+          end
+        end
+      ensure
+        s.close
       end
-      s.close
     end
   end
 
   it 'have atomic create across multiple threads', isolate: true do
-    a = create_thread('a')
-    b = create_thread('b')
-    c = create_thread('c')
-    a.join
-    b.join
-    c.join
+    names = %w{a b c}
+
+    # Spawn threads and then group results (lists of true/false values) by
+    # store index (0...1000)
+    results = names
+      .map { |name| create_thread(name) }
+      .map(&:value)
+      .transpose.each_with_index
+      .map { |created_values, i| [i.to_s, created_values] }
+      .to_h
+
+    # Just a quick sanity check
+    expect(results.length).to eq 1000
+
+    # Ensure that for each index, one and only one created value is true
+    expect(results.map { |_, created_values| created_values.inject(:^) }).to all(be true)
+
+    # Check that the when a call to create returned true, that the store
+    # contains the correct value as a result
+    expect(store.slice(*results.keys).to_h).to eq(results.map do |i, values|
+      [i, names[values.index(true)]]
+    end.to_h)
   end
 end