2005-10-27 04:18:38 -04:00
|
|
|
# = PStore -- Transactional File Storage for Ruby Objects
|
1999-01-19 23:59:39 -05:00
|
|
|
#
|
2005-10-27 04:18:38 -04:00
|
|
|
# pstore.rb -
|
2005-11-01 08:04:35 -05:00
|
|
|
# originally by matz
|
2005-10-27 04:18:38 -04:00
|
|
|
# documentation by Kev Jackson and James Edward Gray II
|
1998-01-16 07:19:09 -05:00
|
|
|
#
|
2005-10-27 04:18:38 -04:00
|
|
|
# See PStore for documentation.
|
1998-01-16 07:19:09 -05:00
|
|
|
|
|
|
|
|
2004-03-07 08:37:52 -05:00
|
|
|
require "fileutils"
|
2001-12-01 09:07:01 -05:00
|
|
|
require "digest/md5"
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# PStore implements a file based persistance mechanism based on a Hash. User
|
|
|
|
# code can store hierarchies of Ruby objects (values) into the data store file
|
|
|
|
# by name (keys). An object hierarchy may be just a single object. User code
|
|
|
|
# may later read values back from the data store or even update data, as needed.
|
|
|
|
#
|
|
|
|
# The transactional behavior ensures that any changes succeed or fail together.
|
|
|
|
# This can be used to ensure that the data store is not left in a transitory
|
|
|
|
# state, where some values were upated but others were not.
|
|
|
|
#
|
|
|
|
# Behind the scenes, Ruby objects are stored to the data store file with
|
|
|
|
# Marshal. That carries the usual limitations. Proc objects cannot be
|
|
|
|
# marshalled, for example.
|
|
|
|
#
|
|
|
|
# == Usage example:
|
|
|
|
#
|
|
|
|
# require "pstore"
|
|
|
|
#
|
|
|
|
# # a mock wiki object...
|
|
|
|
# class WikiPage
|
|
|
|
# def initialize( page_name, author, contents )
|
|
|
|
# @page_name = page_name
|
|
|
|
# @revisions = Array.new
|
|
|
|
#
|
|
|
|
# add_revision(author, contents)
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# attr_reader :page_name
|
|
|
|
#
|
|
|
|
# def add_revision( author, contents )
|
|
|
|
# @revisions << { :created => Time.now,
|
|
|
|
# :author => author,
|
|
|
|
# :contents => contents }
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# def wiki_page_references
|
|
|
|
# [@page_name] + @revisions.last[:contents].scan(/\b(?:[A-Z]+[a-z]+){2,}/)
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# # ...
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# # create a new page...
|
|
|
|
# home_page = WikiPage.new( "HomePage", "James Edward Gray II",
|
|
|
|
# "A page about the JoysOfDocumentation..." )
|
|
|
|
#
|
|
|
|
# # then we want to update page data and the index together, or not at all...
|
|
|
|
# wiki = PStore.new("wiki_pages.pstore")
|
|
|
|
# wiki.transaction do # begin transaction; do all of this or none of it
|
|
|
|
# # store page...
|
|
|
|
# wiki[home_page.page_name] = home_page
|
|
|
|
# # ensure that an index has been created...
|
|
|
|
# wiki[:wiki_index] ||= Array.new
|
|
|
|
# # update wiki index...
|
|
|
|
# wiki[:wiki_index].push(*home_page.wiki_page_references)
|
|
|
|
# end # commit changes to wiki data store file
|
|
|
|
#
|
|
|
|
# ### Some time later... ###
|
|
|
|
#
|
|
|
|
# # read wiki data...
|
|
|
|
# wiki.transaction(true) do # begin read-only transaction, no changes allowed
|
|
|
|
# wiki.roots.each do |data_root_name|
|
|
|
|
# p data_root_name
|
|
|
|
# p wiki[data_root_name]
|
|
|
|
# end
|
|
|
|
# end
|
|
|
|
#
|
1998-01-16 07:19:09 -05:00
|
|
|
class PStore
|
2006-09-08 15:56:37 -04:00
|
|
|
binmode = defined?(File::BINARY) ? File::BINARY : 0
|
|
|
|
RDWR_ACCESS = File::RDWR | File::CREAT | binmode
|
|
|
|
RD_ACCESS = File::RDONLY | binmode
|
|
|
|
WR_ACCESS = File::WRONLY | File::CREAT | File::TRUNC | binmode
|
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
# The error type thrown by all PStore methods.
|
1999-01-19 23:59:39 -05:00
|
|
|
class Error < StandardError
|
|
|
|
end
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# To construct a PStore object, pass in the _file_ path where you would like
|
|
|
|
# the data to be stored.
|
|
|
|
#
|
1998-01-16 07:19:09 -05: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
|
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
# Raises PStore::Error if the calling code is not in a PStore#transaction.
|
1998-01-16 07:19:09 -05:00
|
|
|
def in_transaction
|
|
|
|
raise PStore::Error, "not in transaction" unless @transaction
|
|
|
|
end
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Raises PStore::Error if the calling code is not in a PStore#transaction or
|
|
|
|
# if the code is in a read-only PStore#transaction.
|
|
|
|
#
|
2004-02-17 10:26:03 -05: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 07:19:09 -05:00
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Retrieves a value from the PStore file data, by _name_. The hierarchy of
|
|
|
|
# Ruby objects stored under that root _name_ will be returned.
|
|
|
|
#
|
|
|
|
# *WARNING*: This method is only valid in a PStore#transaction. It will
|
|
|
|
# raise PStore::Error if called at any other time.
|
|
|
|
#
|
1998-01-16 07:19:09 -05:00
|
|
|
def [](name)
|
|
|
|
in_transaction
|
2002-07-11 04:22:18 -04:00
|
|
|
@table[name]
|
|
|
|
end
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# This method is just like PStore#[], save that you may also provide a
|
|
|
|
# _default_ value for the object. In the event the specified _name_ is not
|
|
|
|
# found in the data store, your _default_ will be returned instead. If you do
|
|
|
|
# not specify a default, PStore::Error will be raised if the object is not
|
|
|
|
# found.
|
|
|
|
#
|
|
|
|
# *WARNING*: This method is only valid in a PStore#transaction. It will
|
|
|
|
# raise PStore::Error if called at any other time.
|
|
|
|
#
|
2002-07-11 04:22:18 -04:00
|
|
|
def fetch(name, default=PStore::Error)
|
2006-02-05 00:28:11 -05:00
|
|
|
in_transaction
|
2001-05-06 11:06:00 -04:00
|
|
|
unless @table.key? name
|
2002-07-11 04:22:18 -04:00
|
|
|
if default==PStore::Error
|
|
|
|
raise PStore::Error, format("undefined root name `%s'", name)
|
|
|
|
else
|
2006-02-05 00:28:11 -05:00
|
|
|
return default
|
2002-07-11 04:22:18 -04:00
|
|
|
end
|
1998-01-16 07:19:09 -05:00
|
|
|
end
|
2006-02-05 00:28:11 -05:00
|
|
|
@table[name]
|
1998-01-16 07:19:09 -05:00
|
|
|
end
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Stores an individual Ruby object or a hierarchy of Ruby objects in the data
|
|
|
|
# store file under the root _name_. Assigning to a _name_ already in the data
|
|
|
|
# store clobbers the old data.
|
|
|
|
#
|
|
|
|
# == Example:
|
|
|
|
#
|
|
|
|
# require "pstore"
|
|
|
|
#
|
|
|
|
# store = PStore.new("data_file.pstore")
|
|
|
|
# store.transaction do # begin transaction
|
|
|
|
# # load some data into the store...
|
|
|
|
# store[:single_object] = "My data..."
|
|
|
|
# store[:obj_heirarchy] = { "Kev Jackson" => ["rational.rb", "pstore.rb"],
|
|
|
|
# "James Gray" => ["erb.rb", "pstore.rb"] }
|
|
|
|
# end # commit changes to data store file
|
|
|
|
#
|
|
|
|
# *WARNING*: This method is only valid in a PStore#transaction and it cannot
|
|
|
|
# be read-only. It will raise PStore::Error if called at any other time.
|
|
|
|
#
|
1998-01-16 07:19:09 -05:00
|
|
|
def []=(name, value)
|
2004-02-17 10:26:03 -05:00
|
|
|
in_transaction_wr()
|
1998-01-16 07:19:09 -05:00
|
|
|
@table[name] = value
|
|
|
|
end
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Removes an object hierarchy from the data store, by _name_.
|
|
|
|
#
|
|
|
|
# *WARNING*: This method is only valid in a PStore#transaction and it cannot
|
|
|
|
# be read-only. It will raise PStore::Error if called at any other time.
|
|
|
|
#
|
2000-03-05 23:15:42 -05:00
|
|
|
def delete(name)
|
2004-02-17 10:26:03 -05:00
|
|
|
in_transaction_wr()
|
2000-03-05 23:15:42 -05:00
|
|
|
@table.delete name
|
|
|
|
end
|
1998-01-16 07:19:09 -05:00
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Returns the names of all object hierarchies currently in the store.
|
|
|
|
#
|
|
|
|
# *WARNING*: This method is only valid in a PStore#transaction. It will
|
|
|
|
# raise PStore::Error if called at any other time.
|
|
|
|
#
|
1998-01-16 07:19:09 -05:00
|
|
|
def roots
|
|
|
|
in_transaction
|
|
|
|
@table.keys
|
|
|
|
end
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Returns true if the supplied _name_ is currently in the data store.
|
|
|
|
#
|
|
|
|
# *WARNING*: This method is only valid in a PStore#transaction. It will
|
|
|
|
# raise PStore::Error if called at any other time.
|
|
|
|
#
|
1998-01-16 07:19:09 -05:00
|
|
|
def root?(name)
|
|
|
|
in_transaction
|
|
|
|
@table.key? name
|
|
|
|
end
|
2005-10-27 04:18:38 -04:00
|
|
|
# Returns the path to the data store file.
|
1998-01-16 07:19:09 -05:00
|
|
|
def path
|
|
|
|
@filename
|
|
|
|
end
|
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Ends the current PStore#transaction, committing any changes to the data
|
|
|
|
# store immediately.
|
|
|
|
#
|
|
|
|
# == Example:
|
|
|
|
#
|
|
|
|
# require "pstore"
|
|
|
|
#
|
|
|
|
# store = PStore.new("data_file.pstore")
|
|
|
|
# store.transaction do # begin transaction
|
|
|
|
# # load some data into the store...
|
|
|
|
# store[:one] = 1
|
|
|
|
# store[:two] = 2
|
|
|
|
#
|
|
|
|
# store.commit # end transaction here, committing changes
|
|
|
|
#
|
|
|
|
# store[:three] = 3 # this change is never reached
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# *WARNING*: This method is only valid in a PStore#transaction. It will
|
|
|
|
# raise PStore::Error if called at any other time.
|
|
|
|
#
|
1998-01-16 07:19:09 -05:00
|
|
|
def commit
|
2001-05-06 11:06:00 -04:00
|
|
|
in_transaction
|
1998-01-16 07:19:09 -05:00
|
|
|
@abort = false
|
|
|
|
throw :pstore_abort_transaction
|
|
|
|
end
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Ends the current PStore#transaction, discarding any changes to the data
|
|
|
|
# store.
|
|
|
|
#
|
|
|
|
# == Example:
|
|
|
|
#
|
|
|
|
# require "pstore"
|
|
|
|
#
|
|
|
|
# store = PStore.new("data_file.pstore")
|
|
|
|
# store.transaction do # begin transaction
|
|
|
|
# store[:one] = 1 # this change is not applied, see below...
|
|
|
|
# store[:two] = 2 # this change is not applied, see below...
|
|
|
|
#
|
|
|
|
# store.abort # end transaction here, discard all changes
|
|
|
|
#
|
|
|
|
# store[:three] = 3 # this change is never reached
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# *WARNING*: This method is only valid in a PStore#transaction. It will
|
|
|
|
# raise PStore::Error if called at any other time.
|
|
|
|
#
|
1998-01-16 07:19:09 -05:00
|
|
|
def abort
|
2001-05-06 11:06:00 -04:00
|
|
|
in_transaction
|
1998-01-16 07:19:09 -05:00
|
|
|
@abort = true
|
|
|
|
throw :pstore_abort_transaction
|
|
|
|
end
|
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
#
|
|
|
|
# Opens a new transaction for the data store. Code executed inside a block
|
|
|
|
# passed to this method may read and write data to and from the data store
|
|
|
|
# file.
|
|
|
|
#
|
|
|
|
# At the end of the block, changes are committed to the data store
|
|
|
|
# automatically. You may exit the transaction early with a call to either
|
|
|
|
# PStore#commit or PStore#abort. See those methods for details about how
|
|
|
|
# changes are handled. Raising an uncaught Exception in the block is
|
|
|
|
# equivalent to calling PStore#abort.
|
|
|
|
#
|
|
|
|
# If _read_only_ is set to +true+, you will only be allowed to read from the
|
|
|
|
# data store during the transaction and any attempts to change the data will
|
|
|
|
# raise a PStore::Error.
|
|
|
|
#
|
|
|
|
# Note that PStore does not support nested transactions.
|
|
|
|
#
|
|
|
|
def transaction(read_only=false) # :yields: pstore
|
1998-01-16 07:19:09 -05:00
|
|
|
raise PStore::Error, "nested transaction" if @transaction
|
|
|
|
begin
|
2004-02-17 10:26:03 -05:00
|
|
|
@rdonly = read_only
|
|
|
|
@abort = false
|
1998-01-16 07:19:09 -05:00
|
|
|
@transaction = true
|
1999-11-25 04:03:08 -05:00
|
|
|
value = nil
|
2004-02-17 10:26:03 -05:00
|
|
|
new_file = @filename + ".new"
|
|
|
|
|
|
|
|
content = nil
|
2004-05-27 03:43:38 -04:00
|
|
|
unless read_only
|
2006-09-08 15:56:37 -04:00
|
|
|
file = File.open(@filename, RDWR_ACCESS)
|
2004-02-17 10:26:03 -05:00
|
|
|
file.flock(File::LOCK_EX)
|
2004-03-07 08:37:52 -05:00
|
|
|
commit_new(file) if FileTest.exist?(new_file)
|
2004-02-17 10:26:03 -05: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 01:47:45 -05:00
|
|
|
begin
|
2006-09-08 15:56:37 -04:00
|
|
|
file = File.open(@filename, RD_ACCESS)
|
* 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 01:47:45 -05:00
|
|
|
file.flock(File::LOCK_SH)
|
2006-09-08 15:56:37 -04:00
|
|
|
content = (File.open(new_file, RD_ACCESS) {|n| n.read} rescue file.read())
|
* 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 01:47:45 -05:00
|
|
|
rescue Errno::ENOENT
|
|
|
|
content = ""
|
|
|
|
end
|
1999-11-17 02:30:37 -05:00
|
|
|
end
|
2004-02-17 10:26:03 -05:00
|
|
|
|
|
|
|
if content != ""
|
2004-05-27 03:43:38 -04:00
|
|
|
@table = load(content)
|
2004-02-17 10:26:03 -05:00
|
|
|
if !read_only
|
|
|
|
size = content.size
|
|
|
|
md5 = Digest::MD5.digest(content)
|
|
|
|
end
|
2001-05-06 11:06:00 -04:00
|
|
|
else
|
|
|
|
@table = {}
|
1998-01-16 07:19:09 -05:00
|
|
|
end
|
2004-02-17 10:26:03 -05:00
|
|
|
content = nil # unreference huge data
|
|
|
|
|
1998-01-16 07:19:09 -05:00
|
|
|
begin
|
|
|
|
catch(:pstore_abort_transaction) do
|
|
|
|
value = yield(self)
|
|
|
|
end
|
1999-01-19 23:59:39 -05:00
|
|
|
rescue Exception
|
|
|
|
@abort = true
|
|
|
|
raise
|
1998-01-16 07:19:09 -05:00
|
|
|
ensure
|
2002-11-14 01:18:59 -05:00
|
|
|
if !read_only and !@abort
|
2004-02-17 10:26:03 -05:00
|
|
|
tmp_file = @filename + ".tmp"
|
2004-05-27 03:43:38 -04:00
|
|
|
content = dump(@table)
|
2001-12-01 09:07:01 -05:00
|
|
|
if !md5 || size != content.size || md5 != Digest::MD5.digest(content)
|
2006-09-08 15:56:37 -04:00
|
|
|
File.open(tmp_file, WR_ACCESS) {|t| t.write(content)}
|
2004-02-17 10:26:03 -05:00
|
|
|
File.rename(tmp_file, new_file)
|
2004-03-07 08:37:52 -05:00
|
|
|
commit_new(file)
|
2004-02-17 10:26:03 -05:00
|
|
|
end
|
|
|
|
content = nil # unreference huge data
|
2002-11-14 01:18:59 -05:00
|
|
|
end
|
1998-01-16 07:19:09 -05:00
|
|
|
end
|
|
|
|
ensure
|
1999-01-19 23:59:39 -05:00
|
|
|
@table = nil
|
1998-01-16 07:19:09 -05:00
|
|
|
@transaction = false
|
2001-11-19 00:03:03 -05:00
|
|
|
file.close if file
|
1998-01-16 07:19:09 -05:00
|
|
|
end
|
|
|
|
value
|
|
|
|
end
|
2004-02-17 10:26:03 -05:00
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
# This method is just a wrapped around Marshal.dump.
|
|
|
|
def dump(table) # :nodoc:
|
2004-05-27 03:43:38 -04:00
|
|
|
Marshal::dump(table)
|
|
|
|
end
|
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
# This method is just a wrapped around Marshal.load.
|
|
|
|
def load(content) # :nodoc:
|
2004-05-27 03:43:38 -04:00
|
|
|
Marshal::load(content)
|
|
|
|
end
|
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
# This method is just a wrapped around Marshal.load.
|
|
|
|
def load_file(file) # :nodoc:
|
2004-05-27 03:43:38 -04:00
|
|
|
Marshal::load(file)
|
|
|
|
end
|
|
|
|
|
2004-02-17 10:26:03 -05:00
|
|
|
private
|
2005-10-27 04:18:38 -04:00
|
|
|
# Commits changes to the data store file.
|
2004-03-07 08:37:52 -05:00
|
|
|
def commit_new(f)
|
|
|
|
f.truncate(0)
|
|
|
|
f.rewind
|
2004-02-17 10:26:03 -05:00
|
|
|
new_file = @filename + ".new"
|
2006-09-08 15:56:37 -04:00
|
|
|
File.open(new_file, RD_ACCESS) do |nf|
|
2004-03-07 08:37:52 -05:00
|
|
|
FileUtils.copy_stream(nf, f)
|
2004-02-17 10:26:03 -05:00
|
|
|
end
|
|
|
|
File.unlink(new_file)
|
|
|
|
end
|
1998-01-16 07:19:09 -05:00
|
|
|
end
|
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
# :enddoc:
|
|
|
|
|
1999-01-19 23:59:39 -05: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 07:19:09 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
1000.times do
|
|
|
|
db.transaction do
|
|
|
|
db["root"][0] += 1
|
|
|
|
p db["root"][0]
|
|
|
|
end
|
|
|
|
end
|
2001-05-06 11:06:00 -04:00
|
|
|
|
2001-07-31 02:24:45 -04:00
|
|
|
db.transaction(true) do
|
2001-05-06 11:06:00 -04:00
|
|
|
p db["root"]
|
|
|
|
end
|
1998-01-16 07:19:09 -05:00
|
|
|
end
|