Compare commits

...

10 Commits

Author SHA1 Message Date
Ash Moran 50e2fbe843 Bump version to 0.0.12.2 2011-08-27 05:55:24 +08:00
Ash Moran 4745db500c Remove the (erroneously re-added) weakref.rb file and the require line that was still including it (project now uses the ref gem) 2011-08-27 05:55:24 +08:00
Ash Moran 93cd84cd59 Bump version to 0.0.12.1 to bump bdb dependency to 0.2.6.5 2011-08-27 05:55:23 +08:00
Ash Moran 31021f703f Specify minimum bdb gem dependency version 2011-08-27 05:55:23 +08:00
Ash Moran 50f610da4a Version bump to 0.0.12 2011-08-27 05:55:23 +08:00
Andy Shipman 037544bdb5 Add weakhash back in 2011-08-27 05:55:23 +08:00
Denis Knauf 4700562b3e gemspec removed 2011-08-27 05:55:23 +08:00
Ash Moran 676718c40f Regenerate gemspec for version 0.0.10.1 2011-08-27 05:55:22 +08:00
Denis Knauf 6c686eb2d3 rubinius-compatible; ref.gem. README: INIT_TRANSACTION 2011-08-25 13:48:26 +02:00
Denis Knauf bfe13fcce8 weakhash entfernt. ref-gem 2011-08-25 13:23:38 +02:00
8 changed files with 26 additions and 76 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ pkg
*.gem
*.gemspec
rdoc
*.rbc

View File

@ -23,21 +23,22 @@ First, open environment and database
require 'sbdb'
Dir.mkdir 'newenv' rescue Errno::EEXIST
env = SBDB::Env.new 'newenv', SBDB::CREATE
db = env.open SBDB::Btree, 'newdb.db', :flags => SBDB::CREATE
env = SBDB::Env.new 'newenv', SBDB::CREATE | SBDB::Env::INIT_TRANSACTION
db = env.btree 'newdb.db', :flags => SBDB::CREATE
It works nearly like a Ruby-Hash:
db['key'] = 'value'
db['key'] # => 'value'
db.to_hash # => {'key'=>'value'}
db.map {|k, v| [k, v].join ' => '} # => ["key => value"]
db.count # => 1
db['key'] # => 'value'
db.to_hash # => {'key'=>'value'}
db.map {|k, v| "k => v" } # => ["key => value"]
db.count # => 1
db.each {|k,v| puts "#{k}: #{v}" }
SBDB::DB#each uses a SBDB::Cursor:
`SBDB::DB#each` uses a `SBDB::Cursor`:
cursor = db.cursor
cursor.each {|k,v| puts "#{k}: ${v}" }
cursor.each {|k,v| puts "#{k}: #{v}" }
**Don't forget to close everything, you've opened!**
@ -47,10 +48,14 @@ SBDB::DB#each uses a SBDB::Cursor:
But you can use a *lambda* to ensure to close everything:
SBDB::Env.new( 'newenv', SBDB::CREATE) do |env|
SBDB::Env.new( 'newenv', SBDB::CREATE | SBDB::Env::INIT_TRANSACTION) do |env|
env.open SBDB::Btree, 'newdb.db', :flags => SBDB::CREATE do |db|
db.to_hash
end
end
SBDB::DB#to_hash creates a cursor and close it later.
`SBDB::DB#to_hash` creates a cursor and close it later.
Tip:
Signal.trap 'EXIT', env.method( :close)

View File

@ -14,7 +14,8 @@ begin
gem.authors = ["Denis Knauf"]
gem.files = %w[AUTHORS README.md VERSION lib/**/*.rb test/**/*.rb]
gem.require_paths = %w[lib]
gem.add_dependency 'bdb'
gem.add_dependency 'bdb', '>= 0.2.6.5'
gem.add_dependency 'ref'
end
Jeweler::GemcutterTasks.new
rescue LoadError

View File

@ -1 +1 @@
0.0.10.1
0.0.12.2

View File

@ -1,4 +1,5 @@
require 'bdb'
require 'ref'
require 'sbdb/environment'
require 'sbdb/db'
require 'sbdb/cursor'

View File

@ -60,7 +60,11 @@ module SBDB
def _txn txn
txn ||= @txn
txn && t.bdb_object
txn && txn.bdb_object
end
def transaction flg = nil, &exe
block_given? ? home.transaction( flg, &exe) : home.transaction( flg)
end
# Arguments:

View File

@ -1,5 +1,4 @@
require 'bdb'
require 'sbdb/weakhash'
require 'sbdb/db'
require 'sbdb/transaction'
@ -61,7 +60,7 @@ module SBDB
def initialize *args
opts = ::Hash === args.last ? args.pop : {}
opts = {:dir => args[0], :flags => args[1], :mode => args[2]}.update opts
@dbs, @env = WeakHash.new, Bdb::Env.new( 0)
@dbs, @env = Ref::WeakValueMap.new, Bdb::Env.new( 0)
@env.log_config opts[:log_config], 1 if opts[:log_config]
@env.lg_bsize = opts[:lg_bsize] if opts[:lg_bsize]
@env.lg_max = opts[:lg_max] if opts[:lg_max]

View File

@ -1,61 +0,0 @@
module SBDB
# See http://eigenclass.org/hiki/deferred-finalizers-in-Ruby
# Not threadsafe.
class WeakHash
attr_reader :cache
def initialize cache = ::Hash.new
@cache = cache
@key_map = {}
@rev_cache = ::Hash.new{|h,k| h[k] = {}}
@reclaim_value = lambda do |value_id|
if @rev_cache.has_key? value_id
@rev_cache[value_id].each_key{|key| @cache.delete key}
@rev_cache.delete value_id
end
end
@reclaim_key = lambda do |key_id|
@cache.delete @key_map.delete(key_id) if @key_map.has_key? key_id
end
end
def []= key, value
case key
when Fixnum, Symbol, true, false
key2 = key
else
key2 = key.dup
end
@rev_cache[value.object_id][key2] = true
@cache[key2] = value.object_id
@key_map[key.object_id] = key2
ObjectSpace.define_finalizer(value, @reclaim_value)
ObjectSpace.define_finalizer(key, @reclaim_key)
value
end
def [] key
value_id = @cache[key]
return ObjectSpace._id2ref( value_id) unless value_id.nil?
nil
rescue RangeError
nil
end
def each &e
@cache.each do |k, vid|
unless vid.nil?
obj = begin
ObjectSpace._id2ref vid
rescue RangeError
next
end
yield k, obj
end
end
end
end
end