1999-01-20 07:59:39 +03:00
|
|
|
#
|
1998-01-16 15:19:09 +03:00
|
|
|
# How to use:
|
|
|
|
#
|
|
|
|
# db = PStore.new("/tmp/foo")
|
|
|
|
# db.transaction do
|
|
|
|
# p db.roots
|
|
|
|
# ary = db["root"] = [1,2,3,4]
|
|
|
|
# ary[0] = [1,1.5]
|
|
|
|
# end
|
|
|
|
|
|
|
|
# db.transaction do
|
|
|
|
# p db["root"]
|
|
|
|
# end
|
|
|
|
|
2004-03-07 16:37:52 +03:00
|
|
|
require "fileutils"
|
2001-12-01 17:07:01 +03:00
|
|
|
require "digest/md5"
|
1998-01-16 15:19:09 +03:00
|
|
|
|
|
|
|
class PStore
|
1999-01-20 07:59:39 +03:00
|
|
|
class Error < StandardError
|
|
|
|
end
|
1998-01-16 15:19:09 +03:00
|
|
|
|
|
|
|
def initialize(file)
|
|
|
|
dir = File::dirname(file)
|
|
|
|
unless File::directory? dir
|
|
|
|
raise PStore::Error, format("directory %s does not exist", dir)
|
|
|
|
end
|
|
|
|
if File::exist? file and not File::readable? file
|
|
|
|
raise PStore::Error, format("file %s not readable", file)
|
|
|
|
end
|
|
|
|
@transaction = false
|
|
|
|
@filename = file
|
|
|
|
@abort = false
|
|
|
|
end
|
|
|
|
|
|
|
|
def in_transaction
|
|
|
|
raise PStore::Error, "not in transaction" unless @transaction
|
|
|
|
end
|
2004-02-17 18:26:03 +03:00
|
|
|
def in_transaction_wr()
|
|
|
|
in_transaction()
|
|
|
|
raise PStore::Error, "in read-only transaction" if @rdonly
|
|
|
|
end
|
|
|
|
private :in_transaction, :in_transaction_wr
|
1998-01-16 15:19:09 +03:00
|
|
|
|
|
|
|
def [](name)
|
|
|
|
in_transaction
|
2002-07-11 12:22:18 +04:00
|
|
|
@table[name]
|
|
|
|
end
|
|
|
|
def fetch(name, default=PStore::Error)
|
2001-05-06 19:06:00 +04:00
|
|
|
unless @table.key? name
|
2002-07-11 12:22:18 +04:00
|
|
|
if default==PStore::Error
|
|
|
|
raise PStore::Error, format("undefined root name `%s'", name)
|
|
|
|
else
|
|
|
|
default
|
|
|
|
end
|
1998-01-16 15:19:09 +03:00
|
|
|
end
|
2002-07-11 12:22:18 +04:00
|
|
|
self[name]
|
1998-01-16 15:19:09 +03:00
|
|
|
end
|
|
|
|
def []=(name, value)
|
2004-02-17 18:26:03 +03:00
|
|
|
in_transaction_wr()
|
1998-01-16 15:19:09 +03:00
|
|
|
@table[name] = value
|
|
|
|
end
|
2000-03-06 07:15:42 +03:00
|
|
|
def delete(name)
|
2004-02-17 18:26:03 +03:00
|
|
|
in_transaction_wr()
|
2000-03-06 07:15:42 +03:00
|
|
|
@table.delete name
|
|
|
|
end
|
1998-01-16 15:19:09 +03:00
|
|
|
|
|
|
|
def roots
|
|
|
|
in_transaction
|
|
|
|
@table.keys
|
|
|
|
end
|
|
|
|
def root?(name)
|
|
|
|
in_transaction
|
|
|
|
@table.key? name
|
|
|
|
end
|
|
|
|
def path
|
|
|
|
@filename
|
|
|
|
end
|
|
|
|
|
|
|
|
def commit
|
2001-05-06 19:06:00 +04:00
|
|
|
in_transaction
|
1998-01-16 15:19:09 +03:00
|
|
|
@abort = false
|
|
|
|
throw :pstore_abort_transaction
|
|
|
|
end
|
|
|
|
def abort
|
2001-05-06 19:06:00 +04:00
|
|
|
in_transaction
|
1998-01-16 15:19:09 +03:00
|
|
|
@abort = true
|
|
|
|
throw :pstore_abort_transaction
|
|
|
|
end
|
|
|
|
|
2001-07-31 10:24:45 +04:00
|
|
|
def transaction(read_only=false)
|
1998-01-16 15:19:09 +03:00
|
|
|
raise PStore::Error, "nested transaction" if @transaction
|
|
|
|
begin
|
2004-02-17 18:26:03 +03:00
|
|
|
@rdonly = read_only
|
|
|
|
@abort = false
|
1998-01-16 15:19:09 +03:00
|
|
|
@transaction = true
|
1999-11-25 12:03:08 +03:00
|
|
|
value = nil
|
2004-02-17 18:26:03 +03:00
|
|
|
new_file = @filename + ".new"
|
|
|
|
|
|
|
|
content = nil
|
2004-05-27 11:43:38 +04:00
|
|
|
unless read_only
|
2004-07-01 13:31:37 +04:00
|
|
|
file = File.open(@filename, File::RDWR | File::CREAT)
|
2004-10-05 05:37:46 +04:00
|
|
|
file.binmode
|
2004-02-17 18:26:03 +03:00
|
|
|
file.flock(File::LOCK_EX)
|
2004-03-07 16:37:52 +03:00
|
|
|
commit_new(file) if FileTest.exist?(new_file)
|
2004-02-17 18:26:03 +03:00
|
|
|
content = file.read()
|
|
|
|
else
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
begin
|
|
|
|
file = File.open(@filename, File::RDONLY)
|
|
|
|
file.binmode
|
|
|
|
file.flock(File::LOCK_SH)
|
|
|
|
content = (File.read(new_file) rescue file.read())
|
|
|
|
rescue Errno::ENOENT
|
|
|
|
content = ""
|
|
|
|
end
|
1999-11-17 10:30:37 +03:00
|
|
|
end
|
2004-02-17 18:26:03 +03:00
|
|
|
|
|
|
|
if content != ""
|
2004-05-27 11:43:38 +04:00
|
|
|
@table = load(content)
|
2004-02-17 18:26:03 +03:00
|
|
|
if !read_only
|
|
|
|
size = content.size
|
|
|
|
md5 = Digest::MD5.digest(content)
|
|
|
|
end
|
2001-05-06 19:06:00 +04:00
|
|
|
else
|
|
|
|
@table = {}
|
1998-01-16 15:19:09 +03:00
|
|
|
end
|
2004-02-17 18:26:03 +03:00
|
|
|
content = nil # unreference huge data
|
|
|
|
|
1998-01-16 15:19:09 +03:00
|
|
|
begin
|
|
|
|
catch(:pstore_abort_transaction) do
|
|
|
|
value = yield(self)
|
|
|
|
end
|
1999-01-20 07:59:39 +03:00
|
|
|
rescue Exception
|
|
|
|
@abort = true
|
|
|
|
raise
|
1998-01-16 15:19:09 +03:00
|
|
|
ensure
|
2002-11-14 09:18:59 +03:00
|
|
|
if !read_only and !@abort
|
2004-02-17 18:26:03 +03:00
|
|
|
tmp_file = @filename + ".tmp"
|
2004-05-27 11:43:38 +04:00
|
|
|
content = dump(@table)
|
2001-12-01 17:07:01 +03:00
|
|
|
if !md5 || size != content.size || md5 != Digest::MD5.digest(content)
|
2004-02-17 18:26:03 +03:00
|
|
|
File.open(tmp_file, "w") {|t|
|
2004-10-06 11:40:06 +04:00
|
|
|
t.binmode
|
2004-02-17 18:26:03 +03:00
|
|
|
t.write(content)
|
|
|
|
}
|
|
|
|
File.rename(tmp_file, new_file)
|
2004-03-07 16:37:52 +03:00
|
|
|
commit_new(file)
|
2004-02-17 18:26:03 +03:00
|
|
|
end
|
|
|
|
content = nil # unreference huge data
|
2002-11-14 09:18:59 +03:00
|
|
|
end
|
1998-01-16 15:19:09 +03:00
|
|
|
end
|
|
|
|
ensure
|
1999-01-20 07:59:39 +03:00
|
|
|
@table = nil
|
1998-01-16 15:19:09 +03:00
|
|
|
@transaction = false
|
2001-11-19 08:03:03 +03:00
|
|
|
file.close if file
|
1998-01-16 15:19:09 +03:00
|
|
|
end
|
|
|
|
value
|
|
|
|
end
|
2004-02-17 18:26:03 +03:00
|
|
|
|
2004-05-27 11:43:38 +04:00
|
|
|
def dump(table)
|
|
|
|
Marshal::dump(table)
|
|
|
|
end
|
|
|
|
|
|
|
|
def load(content)
|
|
|
|
Marshal::load(content)
|
|
|
|
end
|
|
|
|
|
|
|
|
def load_file(file)
|
|
|
|
Marshal::load(file)
|
|
|
|
end
|
|
|
|
|
2004-02-17 18:26:03 +03:00
|
|
|
private
|
2004-03-07 16:37:52 +03:00
|
|
|
def commit_new(f)
|
|
|
|
f.truncate(0)
|
|
|
|
f.rewind
|
2004-02-17 18:26:03 +03:00
|
|
|
new_file = @filename + ".new"
|
2004-03-07 16:37:52 +03:00
|
|
|
File.open(new_file) do |nf|
|
2004-10-06 11:40:06 +04:00
|
|
|
nf.binmode
|
2004-03-07 16:37:52 +03:00
|
|
|
FileUtils.copy_stream(nf, f)
|
2004-02-17 18:26:03 +03:00
|
|
|
end
|
|
|
|
File.unlink(new_file)
|
|
|
|
end
|
1998-01-16 15:19:09 +03:00
|
|
|
end
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
if __FILE__ == $0
|
|
|
|
db = PStore.new("/tmp/foo")
|
|
|
|
db.transaction do
|
|
|
|
p db.roots
|
|
|
|
ary = db["root"] = [1,2,3,4]
|
|
|
|
ary[1] = [1,1.5]
|
|
|
|
end
|
1998-01-16 15:19:09 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
1000.times do
|
|
|
|
db.transaction do
|
|
|
|
db["root"][0] += 1
|
|
|
|
p db["root"][0]
|
|
|
|
end
|
|
|
|
end
|
2001-05-06 19:06:00 +04:00
|
|
|
|
2001-07-31 10:24:45 +04:00
|
|
|
db.transaction(true) do
|
2001-05-06 19:06:00 +04:00
|
|
|
p db["root"]
|
|
|
|
end
|
1998-01-16 15:19:09 +03:00
|
|
|
end
|