@@ -12,3 +12,18 @@ IRB.conf[:SAVE_HISTORY] = 100 IRB.conf[:HISTORY_FILE] = ".irb_history" IRB.conf[:PROMPT_MODE] = :SIMPLE + +def use_spec_db + RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => "spec_doc", :logger => Logger.new(STDOUT) + RelaxDB.use_db "relaxdb_spec" + RelaxDB.enable_view_creation +end + +def new_spec_db + RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => "spec_doc", :logger => Logger.new(STDOUT) + RelaxDB.delete_db "relaxdb_spec" rescue "ok" + RelaxDB.use_db "relaxdb_spec" + RelaxDB.replicate_db "relaxdb_spec_base", "relaxdb_spec" + RelaxDB.enable_view_creation +end + .irbrc @@ -61,6 +61,7 @@ module RelaxDB property :_id property :_rev + property :_conflicts def self.create_validator(att, v) method_name = "validate_#{att}" @@ -198,17 +199,25 @@ module RelaxDB resp = RelaxDB.db.put(_id, to_json) self._rev = JSON.parse(resp.body)["rev"] rescue HTTP_409 - on_update_conflict - @update_conflict = true + conflicted return false end end + def conflicted + @update_conflict = true + on_update_conflict + end + def on_update_conflict # override with any behaviour you want to happen when # CouchDB returns DocumentConflict on an attempt to save end + def update_conflict? + @update_conflict + end + def pre_save set_timestamps return false unless validates? @@ -238,11 +247,7 @@ module RelaxDB raise ValidationFailure, self.errors.to_json end end - - def update_conflict? - @update_conflict - end - + def validates? props = properties - validation_skip_list prop_vals = props.map { |prop| instance_variable_get("@#{prop}") } lib/relaxdb/document.rb @@ -67,25 +67,35 @@ module RelaxDB end def bulk_save!(*objs) + if objs[0].equal? :all_or_nothing + objs.shift + all_or_nothing = true + end + pre_save_success = objs.inject(true) { |s, o| s &= o.pre_save } raise ValidationFailure, objs unless pre_save_success docs = {} objs.each { |o| docs[o._id] = o } - begin - resp = db.post("_bulk_docs", { "docs" => objs }.to_json ) - data = JSON.parse(resp.body) - - data.each do |new_rev| - obj = docs[ new_rev["id"] ] + data = { "docs" => objs } + data[:all_or_nothing] = true if all_or_nothing + resp = db.post("_bulk_docs", data.to_json ) + data = JSON.parse(resp.body) + + conflicted = false + data.each do |new_rev| + obj = docs[ new_rev["id"] ] + if new_rev["rev"] obj._rev = new_rev["rev"] obj.post_save + else + conflicted = true + obj.conflicted end - rescue HTTP_409 - raise UpdateConflict, objs end - + + raise UpdateConflict if conflicted objs end @@ -101,7 +111,12 @@ module RelaxDB load(obj._id) end - def load(ids) + # + # Examples: + # RelaxDB.load "foo", :conflicts => true + # RelaxDB.load ["foo", "bar"] + # + def load(ids, atts={}) # RelaxDB.logger.debug(caller.inject("#{db.name}/#{ids}\n") { |a, i| a += "#{i}\n" }) if ids.is_a? Array @@ -110,9 +125,11 @@ module RelaxDB data["rows"].map { |row| row["doc"] ? create_object(row["doc"]) : nil } else begin - resp = db.get(ids) - data = JSON.parse(resp.body) - create_object(data) + qs = atts.map{ |k, v| "#{k}=#{v}" }.join("&") + qs = atts.empty? ? ids : "#{ids}?#{qs}" + resp = db.get qs + data = JSON.parse resp.body + create_object data rescue HTTP_404 nil end lib/relaxdb/relaxdb.rb @@ -15,7 +15,7 @@ module RelaxDB def initialize(config) @get_count, @post_count, @put_count = 0, 0, 0 @server = RelaxDB::Server.new(config[:host], config[:port]) - @logger = config[:logger] ? config[:logger] : Logger.new(Tempfile.new('couchdb.log')) + @logger = config[:logger] ? config[:logger] : Logger.new(Tempfile.new('relaxdb.log')) end def use_db(name) lib/relaxdb/server.rb @@ -73,7 +73,7 @@ describe "Inheritance" do describe "derived properties" do it "should be stored" do - u = User.new(:name => "u").save! + u = User.new(:_id => "foo", :name => "u").save! s = SubDescendant.new(:user => u).save! r = RichDescendant.new(:user => u, :ukulele => u).save! spec/doc_inheritable_spec.rb @@ -70,6 +70,45 @@ describe RelaxDB do RelaxDB.bulk_save(x).first.foo.should == :bar end + it "should save non conflicting docs and mark conflicting docs" do + p1, p2 = Atom.new.save!, Atom.new.save! + p1.dup.save! + RelaxDB.bulk_save p1, p2 + p1._rev.should =~ /1-/ + p1.should be_update_conflict + p2._rev.should =~ /2-/ + end + + # The spec is as much a verification of my understanding of + # bulk_save semantics as it is a test of RelaxDB + describe "all-or-nothing" do + it "should save non conflicting and conflicting docs" do + p1, p2 = Primitives.new(:num => 1).save!, Primitives.new(:num => 2).save! + p1d = p1.dup + p1d.num = 11 + p1d.save! + p1.num = 6 + RelaxDB.bulk_save :all_or_nothing, p1, p2 + p1._rev.should =~ /2-/ + p2._rev.should =~ /2-/ + + p1 = RelaxDB.load p1._id, :conflicts => true + p1.num.should == 11 + p1 = RelaxDB.load p1._id, :rev => p1._conflicts[0] + p1.num.should == 6 + end + + it "non-deterministic winner" do + p = Primitives.new(:num => 1).save! + pd = p.dup + p.num = 2 + p.save! + pd.num = 3 + RelaxDB.bulk_save :all_or_nothing, pd + RelaxDB.reload(p).num.should == 2 + end + end + end describe ".bulk_save!" do @@ -81,9 +120,11 @@ describe RelaxDB do lambda { RelaxDB.bulk_save!(c.new) }.should raise_error(RelaxDB::ValidationFailure) end - it "will not raise an exception if a document update conflict occurs on save" do - Atom.new(:_id => "a1").save! - RelaxDB.bulk_save! Atom.new(:_id => "a1") + it "should raise an exception on document conflict after all docs have been processed" do + p1, p2 = Atom.new.save!, Atom.new.save! + p1.dup.save! + lambda { RelaxDB.bulk_save!(p1, p2) }.should raise_error(RelaxDB::UpdateConflict) + p2._rev.should =~ /2-/ end end spec/relaxdb_spec.rb @@ -180,7 +180,7 @@ class RichDescendant < Descendant references :ukulele property :ukulele_name, - :derived => [:ukulele, lambda { |p, o| o.user.name } ] + :derived => [:ukulele, lambda { |p, o| o.ukulele.name } ] end module Inh spec/spec_models.rb f45f7ca012501f2ecab1dc5715afedc0c9e873b6 Paul Carey paul.p.carey@gmail.com http://github.com/paulcarey/relaxdb/commit/665d4e932cc991e21a778a4f051ddeb0b8b617ba 665d4e932cc991e21a778a4f051ddeb0b8b617ba 2009-05-22T05:05:40-07:00 2009-05-22T05:05:40-07:00 Added support for all_or_nothing bulk_docs save. b6234b33890af175615b27f22df4c79f1ec384d3 Paul Carey paul.p.carey@gmail.com