moneta 1.1.0 → 1.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +2 -0
- data/.rubocop.yml +194 -0
- data/.travis.yml +65 -25
- data/CHANGES +36 -0
- data/CONTRIBUTORS +4 -2
- data/Gemfile +94 -65
- data/README.md +50 -25
- data/feature_matrix.yaml +3 -11
- data/lib/action_dispatch/middleware/session/moneta_store.rb +1 -0
- data/lib/active_support/cache/moneta_store.rb +5 -5
- data/lib/moneta.rb +20 -10
- data/lib/moneta/adapters/activerecord.rb +35 -19
- data/lib/moneta/adapters/activesupportcache.rb +3 -7
- data/lib/moneta/adapters/cassandra.rb +24 -16
- data/lib/moneta/adapters/client.rb +62 -21
- data/lib/moneta/adapters/couch.rb +225 -80
- data/lib/moneta/adapters/datamapper.rb +1 -0
- data/lib/moneta/adapters/file.rb +9 -6
- data/lib/moneta/adapters/hbase.rb +1 -1
- data/lib/moneta/adapters/kyotocabinet.rb +8 -7
- data/lib/moneta/adapters/leveldb.rb +1 -1
- data/lib/moneta/adapters/lmdb.rb +3 -4
- data/lib/moneta/adapters/lruhash.rb +29 -62
- data/lib/moneta/adapters/memcached.rb +1 -0
- data/lib/moneta/adapters/memcached/dalli.rb +1 -1
- data/lib/moneta/adapters/memcached/native.rb +10 -8
- data/lib/moneta/adapters/mongo.rb +256 -6
- data/lib/moneta/adapters/null.rb +1 -2
- data/lib/moneta/adapters/pstore.rb +3 -2
- data/lib/moneta/adapters/redis.rb +8 -4
- data/lib/moneta/adapters/restclient.rb +12 -3
- data/lib/moneta/adapters/riak.rb +2 -2
- data/lib/moneta/adapters/sequel.rb +137 -328
- data/lib/moneta/adapters/sequel/mysql.rb +66 -0
- data/lib/moneta/adapters/sequel/postgres.rb +80 -0
- data/lib/moneta/adapters/sequel/postgres_hstore.rb +240 -0
- data/lib/moneta/adapters/sequel/sqlite.rb +57 -0
- data/lib/moneta/adapters/sqlite.rb +25 -11
- data/lib/moneta/adapters/tokyotyrant.rb +1 -1
- data/lib/moneta/builder.rb +2 -3
- data/lib/moneta/create_support.rb +21 -0
- data/lib/moneta/dbm_adapter.rb +31 -0
- data/lib/moneta/{mixins.rb → defaults.rb} +3 -302
- data/lib/moneta/each_key_support.rb +27 -0
- data/lib/moneta/enumerable.rb +38 -0
- data/lib/moneta/expires.rb +12 -12
- data/lib/moneta/expires_support.rb +60 -0
- data/lib/moneta/fallback.rb +84 -0
- data/lib/moneta/hash_adapter.rb +68 -0
- data/lib/moneta/increment_support.rb +16 -0
- data/lib/moneta/lock.rb +7 -2
- data/lib/moneta/logger.rb +2 -2
- data/lib/moneta/nil_values.rb +35 -0
- data/lib/moneta/option_support.rb +51 -0
- data/lib/moneta/optionmerger.rb +0 -1
- data/lib/moneta/pool.rb +312 -30
- data/lib/moneta/proxy.rb +3 -3
- data/lib/moneta/server.rb +216 -65
- data/lib/moneta/shared.rb +13 -7
- data/lib/moneta/stack.rb +6 -6
- data/lib/moneta/synchronize.rb +3 -3
- data/lib/moneta/transformer.rb +68 -24
- data/lib/moneta/transformer/config.rb +63 -43
- data/lib/moneta/transformer/helper.rb +3 -3
- data/lib/moneta/transformer/helper/bson.rb +7 -14
- data/lib/moneta/utils.rb +3 -9
- data/lib/moneta/version.rb +1 -1
- data/lib/moneta/weak_each_key.rb +2 -4
- data/lib/rack/cache/moneta.rb +13 -11
- data/lib/rack/moneta_rest.rb +2 -2
- data/lib/rack/session/moneta.rb +3 -4
- data/moneta.gemspec +18 -4
- data/script/benchmarks +145 -46
- data/script/contributors +11 -6
- data/script/start-couchdb +27 -0
- data/script/start-hbase +3 -2
- data/script/start-services +3 -11
- data/spec/active_support/cache_moneta_store_spec.rb +30 -30
- data/spec/features/concurrent_create.rb +31 -10
- data/spec/features/concurrent_increment.rb +26 -19
- data/spec/features/create_expires.rb +15 -15
- data/spec/features/default_expires.rb +11 -12
- data/spec/features/expires.rb +215 -210
- data/spec/features/increment.rb +41 -41
- data/spec/features/store.rb +3 -3
- data/spec/helper.rb +23 -82
- data/spec/moneta/adapters/activerecord/standard_activerecord_spec.rb +1 -1
- data/spec/moneta/adapters/activerecord/standard_activerecord_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_spec.rb +4 -1
- data/spec/moneta/adapters/activesupportcache/adapter_activesupportcache_with_default_expires_spec.rb +4 -1
- data/spec/moneta/adapters/activesupportcache/standard_activesupportcache_spec.rb +14 -0
- data/spec/moneta/adapters/cassandra/standard_cassandra_spec.rb +1 -1
- data/spec/moneta/adapters/client/adapter_client_spec.rb +6 -6
- data/spec/moneta/adapters/client/client_helper.rb +24 -0
- data/spec/moneta/adapters/client/standard_client_tcp_spec.rb +8 -8
- data/spec/moneta/adapters/client/standard_client_unix_spec.rb +23 -7
- data/spec/moneta/adapters/couch/adapter_couch_spec.rb +199 -2
- data/spec/moneta/adapters/couch/standard_couch_spec.rb +9 -3
- data/spec/moneta/adapters/couch/standard_couch_with_expires_spec.rb +8 -2
- data/spec/moneta/adapters/daybreak/standard_daybreak_spec.rb +1 -1
- data/spec/moneta/adapters/daybreak/standard_daybreak_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/dbm/standard_dbm_spec.rb +1 -1
- data/spec/moneta/adapters/dbm/standard_dbm_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/faraday_helper.rb +9 -0
- data/spec/moneta/adapters/file/standard_file_spec.rb +2 -2
- data/spec/moneta/adapters/file/standard_file_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/gdbm/standard_gdbm_spec.rb +1 -1
- data/spec/moneta/adapters/gdbm/standard_gdbm_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/kyotocabinet/adapter_kyotocabinet_spec.rb +1 -1
- data/spec/moneta/adapters/kyotocabinet/standard_kyotocabinet_spec.rb +2 -2
- data/spec/moneta/adapters/kyotocabinet/standard_kyotocabinet_with_expires_spec.rb +2 -2
- data/spec/moneta/adapters/leveldb/standard_leveldb_spec.rb +1 -1
- data/spec/moneta/adapters/leveldb/standard_leveldb_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/lmdb/standard_lmdb_spec.rb +1 -1
- data/spec/moneta/adapters/lmdb/standard_lmdb_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/lruhash/adapter_lruhash_spec.rb +2 -2
- data/spec/moneta/adapters/lruhash/standard_lruhash_spec.rb +1 -1
- data/spec/moneta/adapters/lruhash/standard_lruhash_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/memcached/adapter_memcached_spec.rb +1 -1
- data/spec/moneta/adapters/memcached/dalli/adapter_memcached_dalli_spec.rb +1 -1
- data/spec/moneta/adapters/memcached/dalli/adapter_memcached_dalli_with_default_expires_spec.rb +1 -1
- data/spec/moneta/adapters/memcached/dalli/standard_memcached_dalli_spec.rb +1 -1
- data/spec/moneta/adapters/memcached/native/adapter_memcached_native_spec.rb +1 -1
- data/spec/moneta/adapters/memcached/native/adapter_memcached_native_with_default_expires_spec.rb +1 -1
- data/spec/moneta/adapters/memcached/native/standard_memcached_native_spec.rb +1 -1
- data/spec/moneta/adapters/memcached/standard_memcached_spec.rb +1 -1
- data/spec/moneta/adapters/{memcached/helper.rb → memcached_helper.rb} +0 -0
- data/spec/moneta/adapters/memory/standard_memory_spec.rb +1 -1
- data/spec/moneta/adapters/memory/standard_memory_with_compress_spec.rb +1 -1
- data/spec/moneta/adapters/memory/standard_memory_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/memory/standard_memory_with_json_key_serializer_spec.rb +1 -1
- data/spec/moneta/adapters/memory/standard_memory_with_json_serializer_spec.rb +1 -1
- data/spec/moneta/adapters/memory/standard_memory_with_json_value_serializer_spec.rb +2 -2
- data/spec/moneta/adapters/memory/standard_memory_with_prefix_spec.rb +39 -2
- data/spec/moneta/adapters/memory/standard_memory_with_snappy_compress_spec.rb +2 -2
- data/spec/moneta/adapters/mongo/adapter_mongo_spec.rb +18 -2
- data/spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb +5 -3
- data/spec/moneta/adapters/mongo/standard_mongo_spec.rb +2 -2
- data/spec/moneta/adapters/null/null_adapter_spec.rb +1 -1
- data/spec/moneta/adapters/pstore/standard_pstore_spec.rb +1 -1
- data/spec/moneta/adapters/pstore/standard_pstore_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/redis/standard_redis_spec.rb +1 -1
- data/spec/moneta/adapters/restclient/adapter_restclient_spec.rb +7 -5
- data/spec/moneta/adapters/restclient/helper.rb +12 -0
- data/spec/moneta/adapters/restclient/standard_restclient_spec.rb +9 -6
- data/spec/moneta/adapters/riak/standard_riak_with_expires_spec.rb +4 -0
- data/spec/moneta/adapters/sdbm/standard_sdbm_spec.rb +1 -1
- data/spec/moneta/adapters/sdbm/standard_sdbm_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/sequel/adapter_sequel_spec.rb +31 -79
- data/spec/moneta/adapters/sequel/helper.rb +75 -0
- data/spec/moneta/adapters/sequel/standard_sequel_spec.rb +5 -11
- data/spec/moneta/adapters/sequel/standard_sequel_with_expires_spec.rb +8 -9
- data/spec/moneta/adapters/sqlite/standard_sqlite_spec.rb +1 -1
- data/spec/moneta/adapters/sqlite/standard_sqlite_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/tdb/standard_tdb_spec.rb +1 -1
- data/spec/moneta/adapters/tdb/standard_tdb_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/tokyocabinet/standard_tokyocabinet_spec.rb +1 -1
- data/spec/moneta/adapters/tokyocabinet/standard_tokyocabinet_with_expires_spec.rb +1 -1
- data/spec/moneta/adapters/tokyotyrant/adapter_tokyotyrant_spec.rb +6 -2
- data/spec/moneta/adapters/tokyotyrant/helper.rb +12 -0
- data/spec/moneta/adapters/tokyotyrant/standard_tokyotyrant_spec.rb +5 -2
- data/spec/moneta/adapters/tokyotyrant/standard_tokyotyrant_with_expires_spec.rb +5 -1
- data/spec/moneta/adapters/yaml/standard_yaml_spec.rb +1 -1
- data/spec/moneta/adapters/yaml/standard_yaml_with_expires_spec.rb +1 -1
- data/spec/moneta/builder_spec.rb +22 -0
- data/spec/moneta/proxies/enumerable/enumerable_spec.rb +26 -0
- data/spec/moneta/proxies/expires/expires_file_spec.rb +1 -1
- data/spec/moneta/proxies/fallback/fallback_spec.rb +42 -0
- data/spec/moneta/proxies/pool/pool_spec.rb +319 -6
- data/spec/moneta/proxies/shared/shared_tcp_spec.rb +14 -4
- data/spec/moneta/proxies/shared/shared_unix_spec.rb +14 -4
- data/spec/moneta/proxies/transformer/transformer_bencode_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_bert_spec.rb +3 -3
- data/spec/moneta/proxies/transformer/transformer_bson_spec.rb +2 -2
- data/spec/moneta/proxies/transformer/transformer_json_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_key_marshal_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_key_yaml_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_marshal_base64_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_marshal_escape_spec.rb +8 -4
- data/spec/moneta/proxies/transformer/transformer_marshal_hex_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_marshal_hmac_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_marshal_prefix_base64_spec.rb +33 -0
- data/spec/moneta/proxies/transformer/transformer_marshal_prefix_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_marshal_qp_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_marshal_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_marshal_urlsafe_base64_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_marshal_uuencode_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_msgpack_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_ox_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_php_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_tnet_spec.rb +1 -1
- data/spec/moneta/proxies/transformer/transformer_yaml_spec.rb +2 -2
- data/spec/moneta/proxies/weak_each_key/weak_each_key_spec.rb +0 -2
- data/spec/restserver.rb +55 -0
- data/spec/support/mongo_helper.rb +12 -0
- metadata +140 -32
- data/lib/moneta/adapters/mongo/base.rb +0 -103
- data/lib/moneta/adapters/mongo/moped.rb +0 -164
- data/lib/moneta/adapters/mongo/official.rb +0 -157
- data/script/install-kyotocabinet +0 -17
- data/spec/moneta/adapters/mongo/adapter_mongo_moped_spec.rb +0 -25
- data/spec/moneta/adapters/mongo/adapter_mongo_moped_with_default_expires_spec.rb +0 -12
- data/spec/moneta/adapters/mongo/adapter_mongo_official_spec.rb +0 -25
- data/spec/moneta/adapters/mongo/adapter_mongo_official_with_default_expires_spec.rb +0 -12
- data/spec/moneta/adapters/mongo/standard_mongo_moped_spec.rb +0 -7
- data/spec/moneta/adapters/mongo/standard_mongo_official_spec.rb +0 -7
- data/spec/quality_spec.rb +0 -51
data/lib/rack/moneta_rest.rb
CHANGED
@@ -69,11 +69,11 @@ module Rack
|
|
69
69
|
private
|
70
70
|
|
71
71
|
def empty(status)
|
72
|
-
[status, {'Content-Type'=>'application/octet-stream', 'Content-Length' => '0'}, []]
|
72
|
+
[status, { 'Content-Type' => 'application/octet-stream', 'Content-Length' => '0' }, []]
|
73
73
|
end
|
74
74
|
|
75
75
|
def respond(status, value)
|
76
|
-
[status, {'Content-Type'=>'application/octet-stream', 'Content-Length' => value.bytesize.to_s}, [value]]
|
76
|
+
[status, { 'Content-Type' => 'application/octet-stream', 'Content-Length' => value.bytesize.to_s }, [value]]
|
77
77
|
end
|
78
78
|
end
|
79
79
|
end
|
data/lib/rack/session/moneta.rb
CHANGED
@@ -1,6 +1,5 @@
|
|
1
1
|
require 'moneta'
|
2
2
|
require 'rack/session/abstract/id'
|
3
|
-
require 'thread'
|
4
3
|
|
5
4
|
module Rack
|
6
5
|
module Session
|
@@ -44,9 +43,10 @@ module Rack
|
|
44
43
|
with_lock(env) do
|
45
44
|
unless sid && session = @pool[sid]
|
46
45
|
session = {}
|
47
|
-
|
46
|
+
loop do
|
48
47
|
sid = generate_sid
|
49
|
-
|
48
|
+
break if @pool.create(sid, session)
|
49
|
+
end
|
50
50
|
end
|
51
51
|
[sid, session]
|
52
52
|
end
|
@@ -76,4 +76,3 @@ module Rack
|
|
76
76
|
end
|
77
77
|
end
|
78
78
|
end
|
79
|
-
|
data/moneta.gemspec
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
require File.dirname(__FILE__) + '/lib/moneta/version'
|
3
2
|
require 'date'
|
4
3
|
|
@@ -7,15 +6,30 @@ Gem::Specification.new do |s|
|
|
7
6
|
s.version = Moneta::VERSION
|
8
7
|
s.date = Date.today.to_s
|
9
8
|
s.authors = ['Daniel Mendler', 'Yehuda Katz', 'Hannes Georg', 'Alastair Pharo']
|
10
|
-
s.email = %w{mail@daniel-mendler.de wycats@gmail.com hannes.georg@googlemail.com
|
9
|
+
s.email = %w{mail@daniel-mendler.de wycats@gmail.com hannes.georg@googlemail.com me@asph.dev}
|
11
10
|
s.description = 'A unified interface to key/value stores'
|
12
11
|
s.extra_rdoc_files = %w{README.md SPEC.md LICENSE}
|
13
12
|
s.files = `git ls-files`.split("\n")
|
14
13
|
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
15
14
|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
16
|
-
s.homepage = '
|
15
|
+
s.homepage = 'https://github.com/moneta-rb/moneta'
|
17
16
|
s.licenses = %w(MIT)
|
18
17
|
s.require_paths = %w(lib)
|
19
18
|
s.summary = %{A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet, ActiveRecord and many more}
|
20
|
-
|
19
|
+
|
20
|
+
s.metadata = {
|
21
|
+
'bug_tracker_uri' => 'https://github.com/moneta-rb/moneta/issues',
|
22
|
+
'changelog_uri' => "https://github.com/moneta-rb/moneta/blob/v#{s.version}/CHANGES",
|
23
|
+
'documentation_uri' => "https://www.rubydoc.info/gems/moneta/#{s.version}",
|
24
|
+
'source_code_uri' => "https://github.com/moneta-rb/moneta/tree/v#{s.version}",
|
25
|
+
}
|
26
|
+
|
27
|
+
s.required_ruby_version = '>= 2.3.0'
|
28
|
+
|
29
|
+
s.add_development_dependency 'parallel_tests', '~> 2.29.2'
|
30
|
+
s.add_development_dependency 'rantly', '~> 1.2.0'
|
31
|
+
s.add_development_dependency 'rspec', '~> 3.0'
|
32
|
+
s.add_development_dependency 'rspec-retry', '~> 0.6.1'
|
33
|
+
s.add_development_dependency 'rubocop', '~> 0.81.0'
|
34
|
+
s.add_development_dependency 'timecop', '~> 0.9.1'
|
21
35
|
end
|
data/script/benchmarks
CHANGED
@@ -5,6 +5,9 @@ require 'benchmark'
|
|
5
5
|
require 'moneta'
|
6
6
|
require 'fileutils'
|
7
7
|
require 'active_support'
|
8
|
+
require 'active_support/cache/moneta_store'
|
9
|
+
|
10
|
+
require_relative '../spec/restserver.rb'
|
8
11
|
|
9
12
|
class String
|
10
13
|
def random(n)
|
@@ -33,6 +36,9 @@ class MonetaBenchmarks
|
|
33
36
|
postgres_database1 = ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta1'
|
34
37
|
postgres_database2 = ENV['MONETA_POSTGRES_DATABSASE1'] || 'moneta2'
|
35
38
|
|
39
|
+
couch_login = ENV['COUCH_LOGIN'] || 'admin'
|
40
|
+
couch_password = ENV['COUCH_PASSWORD'] || 'password'
|
41
|
+
|
36
42
|
STORES = [
|
37
43
|
# SDBM accepts only very short key/value pairs (1k for both)
|
38
44
|
{name: "SDBM", sizes: [:small], options: {file: "#{DIR}/sdbm"}},
|
@@ -62,6 +68,17 @@ class MonetaBenchmarks
|
|
62
68
|
}
|
63
69
|
}
|
64
70
|
},
|
71
|
+
{
|
72
|
+
name: "ActiveRecord (Sqlite)",
|
73
|
+
adapter: :ActiveRecord,
|
74
|
+
options: {
|
75
|
+
table: 'activerecord',
|
76
|
+
connection: {
|
77
|
+
adapter: (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'),
|
78
|
+
database: "#{DIR}/activerecord_sqlite.db"
|
79
|
+
}
|
80
|
+
}
|
81
|
+
},
|
65
82
|
{
|
66
83
|
name: "ActiveSupportCache (Memory)",
|
67
84
|
adapter: :ActiveSupportCache,
|
@@ -76,9 +93,34 @@ class MonetaBenchmarks
|
|
76
93
|
backend: ::ActiveSupport::Cache::RedisCacheStore.new
|
77
94
|
}
|
78
95
|
},
|
96
|
+
{
|
97
|
+
name: "ActiveSupportCache (Moneta Memory)",
|
98
|
+
adapter: :ActiveSupportCache,
|
99
|
+
options: {
|
100
|
+
backend: ::ActiveSupport::Cache::MonetaStore.new(store: Moneta.new(:Memory))
|
101
|
+
}
|
102
|
+
},
|
103
|
+
{
|
104
|
+
name: "ActiveSupportCache (Moneta Redis)",
|
105
|
+
adapter: :ActiveSupportCache,
|
106
|
+
options: {
|
107
|
+
backend: ::ActiveSupport::Cache::MonetaStore.new(store: Moneta.new(:Redis))
|
108
|
+
}
|
109
|
+
},
|
79
110
|
{name: "Cassandra"},
|
80
111
|
{name: "Client (Memory)", adapter: :Client},
|
81
|
-
{
|
112
|
+
{
|
113
|
+
name: "Couch",
|
114
|
+
options: {
|
115
|
+
backend: if defined?(JRUBY_VERSION)
|
116
|
+
require 'faraday/adapter/manticore'
|
117
|
+
::Faraday.new("http://127.0.0.1:5984/moneta") { |f| f.adapter :manticore }
|
118
|
+
end,
|
119
|
+
login: couch_login,
|
120
|
+
password: couch_password
|
121
|
+
},
|
122
|
+
clear_options: { compact: true, await_compact: true },
|
123
|
+
},
|
82
124
|
{
|
83
125
|
name: "DBM",
|
84
126
|
options: {file: "#{DIR}/dbm"}
|
@@ -122,11 +164,20 @@ class MonetaBenchmarks
|
|
122
164
|
{name: "MemcachedNative"}
|
123
165
|
end,
|
124
166
|
{name: "Memory"},
|
125
|
-
{name: "
|
126
|
-
{name: "MongoOfficial"},
|
167
|
+
{name: "Mongo"},
|
127
168
|
{name: "PStore", options: { file: "#{DIR}/pstore" }},
|
128
169
|
{name: "Redis"},
|
129
|
-
{
|
170
|
+
{
|
171
|
+
name: "RestClient (Memory)",
|
172
|
+
adapter: :RestClient,
|
173
|
+
options: {
|
174
|
+
url: 'http://127.0.0.1:8808/moneta',
|
175
|
+
backend: if defined?(JRUBY_VERSION)
|
176
|
+
require 'faraday/adapter/manticore'
|
177
|
+
::Faraday.new("http://127.0.0.1:8808/moneta") { |f| f.adapter :manticore }
|
178
|
+
end
|
179
|
+
}
|
180
|
+
},
|
130
181
|
{name: "Riak"},
|
131
182
|
{
|
132
183
|
name: "Sequel (MySQL)",
|
@@ -151,6 +202,27 @@ class MonetaBenchmarks
|
|
151
202
|
}
|
152
203
|
end.merge(table: 'sequel')
|
153
204
|
},
|
205
|
+
{
|
206
|
+
name: "Sequel (HStore)",
|
207
|
+
adapter: :Sequel,
|
208
|
+
options:
|
209
|
+
if defined?(JRUBY_VERSION)
|
210
|
+
{db: "jdbc:postgresql://localhost/#{postgres_database1}?user=#{postgres_username}"}
|
211
|
+
else
|
212
|
+
{
|
213
|
+
db: "postgres://localhost/#{postgres_database1}",
|
214
|
+
user: postgres_username
|
215
|
+
}
|
216
|
+
end.merge(table: 'sequel_hstore', hstore: 'row')
|
217
|
+
},
|
218
|
+
{
|
219
|
+
name: "Sequel (Sqlite)",
|
220
|
+
adapter: :Sequel,
|
221
|
+
options: {
|
222
|
+
table: 'sequel',
|
223
|
+
db: "#{defined?(JRUBY_VERSION) && 'jdbc:'}sqlite://#{DIR}/sequel"
|
224
|
+
}
|
225
|
+
},
|
154
226
|
{
|
155
227
|
name: "Sqlite (Memory)",
|
156
228
|
adapter: :Sqlite,
|
@@ -158,12 +230,29 @@ class MonetaBenchmarks
|
|
158
230
|
file: ':memory:'
|
159
231
|
}
|
160
232
|
},
|
233
|
+
{
|
234
|
+
name: "Sqlite (File)",
|
235
|
+
adapter: :Sqlite,
|
236
|
+
options: {
|
237
|
+
file: "#{DIR}/sqlite"
|
238
|
+
}
|
239
|
+
},
|
161
240
|
{name: "TDB", options: { file: "#{DIR}/tdb" }},
|
162
241
|
{name: "TokyoCabinet", options: { file: "#{DIR}/tokyocabinet" }},
|
163
|
-
{name: "TokyoTyrant"},
|
242
|
+
{name: "TokyoTyrant", options: {port: 10431}},
|
164
243
|
].compact
|
165
244
|
|
166
245
|
CONFIGS = {
|
246
|
+
test: {
|
247
|
+
runs: 2,
|
248
|
+
keys: 10,
|
249
|
+
min_key_len: 1,
|
250
|
+
max_key_len: 32,
|
251
|
+
key_dist: :uniform,
|
252
|
+
min_val_len: 0,
|
253
|
+
max_val_len: 256,
|
254
|
+
val_dist: :uniform
|
255
|
+
},
|
167
256
|
uniform_small: {
|
168
257
|
runs: 3,
|
169
258
|
keys: 1000,
|
@@ -227,8 +316,6 @@ class MonetaBenchmarks
|
|
227
316
|
}
|
228
317
|
|
229
318
|
DICT = 'ABCDEFGHIJKLNOPQRSTUVWXYZabcdefghijklnopqrstuvwxyz123456789'.freeze
|
230
|
-
HEADER = "\n Minimum Maximum Total Mean Stddev Ops/s"
|
231
|
-
SEPARATOR = '=' * 77
|
232
319
|
|
233
320
|
module Rand
|
234
321
|
extend self
|
@@ -256,6 +343,14 @@ class MonetaBenchmarks
|
|
256
343
|
end
|
257
344
|
end
|
258
345
|
|
346
|
+
def header
|
347
|
+
(" " * @name_len) + " Minimum Maximum Total Mean Stddev Ops/s"
|
348
|
+
end
|
349
|
+
|
350
|
+
def separator
|
351
|
+
"=" * header.length
|
352
|
+
end
|
353
|
+
|
259
354
|
def parallel(&block)
|
260
355
|
if defined?(JRUBY_VERSION)
|
261
356
|
Thread.new(&block)
|
@@ -279,43 +374,44 @@ class MonetaBenchmarks
|
|
279
374
|
end
|
280
375
|
|
281
376
|
def start_servers
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
377
|
+
@moneta_server_handle =
|
378
|
+
parallel do
|
379
|
+
begin
|
380
|
+
Moneta::Server.new(Moneta.new(:Memory)).run
|
381
|
+
rescue => ex
|
382
|
+
puts "\e[31mFailed to start Moneta server - #{ex.message}\e[0m"
|
383
|
+
end
|
287
384
|
end
|
288
|
-
end
|
289
385
|
|
290
|
-
|
291
|
-
begin
|
292
|
-
require 'rack'
|
293
|
-
require 'webrick'
|
294
|
-
require 'rack/moneta_rest'
|
386
|
+
@restserver_handle = start_restserver(8808)
|
295
387
|
|
296
|
-
|
297
|
-
::WEBrick::HTTPServer.class_eval do
|
298
|
-
def access_log(config, req, res); end
|
299
|
-
end
|
300
|
-
::WEBrick::BasicLog.class_eval do
|
301
|
-
def log(level, data); end
|
302
|
-
end
|
388
|
+
@tokyotyrant_handle = spawn("ttserver -port 10431 -le -log #{DIR}/tokyotyrant.log #{DIR}/tokyotyrant.tch")
|
303
389
|
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
end,
|
308
|
-
environment: :none,
|
309
|
-
server: :webrick,
|
310
|
-
Port: 8808)
|
311
|
-
rescue Exception => ex
|
312
|
-
puts "\e[31mFailed to start Rack server - #{ex.message}\e[0m"
|
313
|
-
end
|
390
|
+
Signal.trap "INT" do
|
391
|
+
stop_servers
|
392
|
+
exit
|
314
393
|
end
|
315
394
|
|
316
395
|
sleep 1 # Wait for servers
|
317
396
|
end
|
318
397
|
|
398
|
+
def stop_servers
|
399
|
+
if @restserver_handle
|
400
|
+
stop_restserver(@restserver_handle)
|
401
|
+
@restserver_handle = nil
|
402
|
+
end
|
403
|
+
|
404
|
+
case @moneta_server_handle
|
405
|
+
when Thread
|
406
|
+
Thread.kill @moneta_server_handle
|
407
|
+
when Integer
|
408
|
+
Process.kill "TERM", @moneta_server_handle
|
409
|
+
Process.wait @moneta_server_handle
|
410
|
+
end
|
411
|
+
|
412
|
+
Process.kill "TERM", @tokyotyrant_handle
|
413
|
+
end
|
414
|
+
|
319
415
|
def test_stores
|
320
416
|
@stores.select! do |spec|
|
321
417
|
adapter = spec[:adapter] || spec[:name].to_sym
|
@@ -357,26 +453,26 @@ class MonetaBenchmarks
|
|
357
453
|
write_histogram("#{DIR}/key.histogram", key_lens)
|
358
454
|
write_histogram("#{DIR}/value.histogram", val_lens)
|
359
455
|
|
360
|
-
puts "\n\e[1m\e[34m#{
|
361
|
-
puts %{
|
362
|
-
puts 'Key Length
|
363
|
-
puts 'Value Length
|
456
|
+
puts "\n\e[1m\e[34m#{separator}\n\e[34mComputing keys and values...\n\e[34m#{separator}\e[0m"
|
457
|
+
puts " " * @name_len + %{ Minimum Maximum Total Mean Stddev}
|
458
|
+
puts 'Key Length'.ljust(@name_len) + ' % 8d % 8d % 8d % 8d % 8d' % [key_lens.min, key_lens.max, key_lens.sum, mean(key_lens), stddev(key_lens)]
|
459
|
+
puts 'Value Length'.ljust(@name_len) + ' % 8d % 8d % 8d % 8d % 8d' % [val_lens.min, val_lens.max, val_lens.sum, mean(val_lens), stddev(val_lens)]
|
364
460
|
end
|
365
461
|
|
366
462
|
def print_config
|
367
|
-
puts "\e[1m\e[36m#{
|
463
|
+
puts "\e[1m\e[36m#{separator}\n\e[36mConfig #{@config_name}\n\e[36m#{separator}\e[0m"
|
368
464
|
@config.each do |k,v|
|
369
465
|
puts '%-16s = %-10s' % [k,v]
|
370
466
|
end
|
371
467
|
end
|
372
468
|
|
373
469
|
def print_store_stats(name)
|
374
|
-
puts
|
470
|
+
puts "\n" + header
|
375
471
|
[:write, :read, :sum].each do |i|
|
376
472
|
ops = (1000 * @config[:runs] * @data.size) / @stats[name][i].sum
|
377
|
-
line =
|
473
|
+
line = "%-#{@name_len-1}.#{@name_len-1}s %-5s % 8d % 8d % 8d % 8d % 8d % 8d" %
|
378
474
|
[name, i, @stats[name][i].min, @stats[name][i].max, @stats[name][i].sum,
|
379
|
-
mean(@stats[name][i]),
|
475
|
+
mean(@stats[name][i]), stddev(@stats[name][i]), ops]
|
380
476
|
@summary << [-ops, line << "\n"] if i == :sum
|
381
477
|
puts line
|
382
478
|
end
|
@@ -394,7 +490,7 @@ class MonetaBenchmarks
|
|
394
490
|
name = spec[:name]
|
395
491
|
adapter = spec[:adapter] || spec[:name].to_sym
|
396
492
|
options = spec[:options] || {}
|
397
|
-
puts "\n\e[1m\e[34m#{
|
493
|
+
puts "\n\e[1m\e[34m#{separator}\n\e[34m#{name}\n\e[34m#{separator}\e[0m"
|
398
494
|
|
399
495
|
store = Moneta.new(adapter, options.dup)
|
400
496
|
|
@@ -410,7 +506,7 @@ class MonetaBenchmarks
|
|
410
506
|
print "%s [%#{2 * @config[:runs]}s] " % [type, state]
|
411
507
|
|
412
508
|
@config[:runs].times do |run|
|
413
|
-
store.clear
|
509
|
+
store.clear(spec[:clear_options] || {})
|
414
510
|
|
415
511
|
@data.shuffle!
|
416
512
|
m1 = Benchmark.measure do
|
@@ -453,7 +549,7 @@ class MonetaBenchmarks
|
|
453
549
|
end
|
454
550
|
|
455
551
|
def print_summary
|
456
|
-
puts "\n\e[1m\e[36m#{
|
552
|
+
puts "\n\e[1m\e[36m#{separator}\n\e[36mSummary #{@config_name}: #{@config[:runs]} runs, #{@data.size} keys\n\e[36m#{separator}\e[0m\n#{header}\n"
|
457
553
|
@summary.sort_by(&:first).each do |entry|
|
458
554
|
puts entry.last
|
459
555
|
end
|
@@ -478,6 +574,8 @@ class MonetaBenchmarks
|
|
478
574
|
STORES
|
479
575
|
end.select { |spec| !spec.key?(:sizes) || spec[:sizes].include?(@size) }
|
480
576
|
|
577
|
+
@name_len = (@stores.map { |spec| spec[:name] }.map(&:length) + ["Value Length".length]).max + 2
|
578
|
+
|
481
579
|
# Disable jruby stdout pollution by memcached
|
482
580
|
if defined?(JRUBY_VERSION)
|
483
581
|
require 'java'
|
@@ -499,6 +597,7 @@ class MonetaBenchmarks
|
|
499
597
|
generate_data
|
500
598
|
run_benchmarks
|
501
599
|
print_summary
|
600
|
+
stop_servers
|
502
601
|
FileUtils.rm_rf(DIR)
|
503
602
|
end
|
504
603
|
end
|
data/script/contributors
CHANGED
@@ -1,7 +1,12 @@
|
|
1
|
-
#!/bin/
|
2
|
-
git log --format='%aN <%aE>' |\
|
3
|
-
sed -e 's/hiddenbek/Scott Wadden/g' |\
|
4
|
-
sed -e 's/Asmod4n/Hendrik Beskow/' |\
|
5
|
-
grep -v 'hannes.georg@xing.com\|spotapov\|yehuda-katzs-mac\|wycats ' |\
|
6
|
-
sort -u | sort > CONTRIBUTORS
|
1
|
+
#!/usr/bin/env ruby
|
7
2
|
|
3
|
+
contributors = `git log --format='%aN <%aE>'`
|
4
|
+
.gsub(/hiddenbek/, 'Scott Wadden')
|
5
|
+
.gsub(/Asmod4n/, 'Hendrik Beskow')
|
6
|
+
.lines
|
7
|
+
.uniq
|
8
|
+
.reject { |line| line.match? /asppsa@gmail.com|hannes.georg@xing.com|spotapov|yehuda-katzs-mac|wycats / }
|
9
|
+
.sort { |str1, str2| str1.casecmp(str2) }
|
10
|
+
|
11
|
+
file = File.open('CONTRIBUTORS', 'w')
|
12
|
+
file << contributors.join
|
@@ -0,0 +1,27 @@
|
|
1
|
+
#!/bin/bash
|
2
|
+
set -e
|
3
|
+
|
4
|
+
# Copied from https://github.com/apache/couchdb-pkg/blob/master/debian/README.Debian
|
5
|
+
COUCHDB_PASSWORD=password
|
6
|
+
echo "couchdb couchdb/mode select standalone
|
7
|
+
couchdb couchdb/mode seen true
|
8
|
+
couchdb couchdb/bindaddress string 127.0.0.1
|
9
|
+
couchdb couchdb/bindaddress seen true
|
10
|
+
couchdb couchdb/adminpass password ${COUCHDB_PASSWORD}
|
11
|
+
couchdb couchdb/adminpass seen true
|
12
|
+
couchdb couchdb/adminpass_again password ${COUCHDB_PASSWORD}
|
13
|
+
couchdb couchdb/adminpass_again seen true" | sudo debconf-set-selections
|
14
|
+
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --force-yes couchdb
|
15
|
+
|
16
|
+
# Reconfigure CouchDB to use delayed commits for speed: http://guide.couchdb.org/draft/performance.html
|
17
|
+
sudo sed -i '/\[couchdb\]/a delayed_commits = true' /etc/couchdb/local.ini
|
18
|
+
|
19
|
+
# (Re)start couchdb
|
20
|
+
sudo systemctl restart couchdb
|
21
|
+
|
22
|
+
# Display some info about CouchDB
|
23
|
+
sudo systemctl status couchdb
|
24
|
+
until curl http://localhost:5984/; do
|
25
|
+
sleep 1
|
26
|
+
done
|
27
|
+
|