diff options
| -rw-r--r-- | apps/couch/INSTALL.Windows | 6 | ||||
| -rw-r--r-- | apps/couch/src/couch_doc.erl | 8 | ||||
| -rw-r--r-- | couchjs/js/util.js | 7 | ||||
| -rw-r--r-- | rel/overlay/share/www/script/test/recreate_doc.js | 88 |
4 files changed, 69 insertions, 40 deletions
diff --git a/apps/couch/INSTALL.Windows b/apps/couch/INSTALL.Windows index d2082734..d661f1da 100644 --- a/apps/couch/INSTALL.Windows +++ b/apps/couch/INSTALL.Windows @@ -8,8 +8,8 @@ Dependencies You will need the following installed: - * Erlang OTP (=14B01) (http://erlang.org/) - * ICU (http://icu.sourceforge.net/) + * Erlang OTP (>=14B03) (http://erlang.org/) + * ICU (=4.4.*) (http://icu.sourceforge.net/) * OpenSSL (http://www.openssl.org/) * Mozilla SpiderMonkey (1.8) (http://www.mozilla.org/js/spidermonkey/) * libcurl (http://curl.haxx.se/libcurl/) @@ -21,7 +21,7 @@ General Notes * When installing Erlang, you must build it from source. - The CouchDB build makes use of a number of the Erlang build scripts. +The CouchDB build requires a number of the Erlang build scripts. * When installing ICU, select the binaries built with Visual Studio 2008. diff --git a/apps/couch/src/couch_doc.erl b/apps/couch/src/couch_doc.erl index 827015db..63ac0892 100644 --- a/apps/couch/src/couch_doc.erl +++ b/apps/couch/src/couch_doc.erl @@ -302,7 +302,7 @@ to_doc_info(FullDocInfo) -> {DocInfo, _Path} = to_doc_info_path(FullDocInfo), DocInfo. -max_seq(Tree) -> +max_seq(Tree, UpdateSeq) -> FoldFun = fun({_Pos, _Key}, Value, _Type, MaxOldSeq) -> case Value of {_Deleted, _DiskPos, OldTreeSeq} -> @@ -313,9 +313,9 @@ max_seq(Tree) -> MaxOldSeq end end, - couch_key_tree:fold(FoldFun, 0, Tree). + couch_key_tree:fold(FoldFun, UpdateSeq, Tree). -to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree}) -> +to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree,update_seq=FDISeq}) -> RevInfosAndPath = [{#rev_info{deleted=Del,body_sp=Bp,seq=Seq,rev={Pos,RevId}}, Path} || {#leaf{deleted=Del, ptr=Bp, seq=Seq},{Pos, [RevId|_]}=Path} <- @@ -328,7 +328,7 @@ to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree}) -> end, RevInfosAndPath), [{_RevInfo, WinPath}|_] = SortedRevInfosAndPath, RevInfos = [RevInfo || {RevInfo, _Path} <- SortedRevInfosAndPath], - {#doc_info{id=Id, high_seq=max_seq(Tree), revs=RevInfos}, WinPath}. + {#doc_info{id=Id, high_seq=max_seq(Tree, FDISeq), revs=RevInfos}, WinPath}. diff --git a/couchjs/js/util.js b/couchjs/js/util.js index 65e3bb06..d498ee64 100644 --- a/couchjs/js/util.js +++ b/couchjs/js/util.js @@ -46,7 +46,7 @@ var resolveModule = function(names, mod, root) { } else if (root) { mod = {current : root}; } - if (!mod.current[n]) { + if (mod.current[n] === undefined) { throw ["error", "invalid_require_path", 'Object has no property "'+n+'". '+JSON.stringify(mod.current)]; } return resolveModule(names, { @@ -63,6 +63,11 @@ var Couch = { }, compileFunction : function(source, ddoc) { if (!source) throw(["error","not_found","missing function"]); + // Some newer SpiderMonkey's appear to not like evaluating + // an anonymous function at global scope. Simple fix just + // wraps the source with parens so the function object is + // returned correctly. + source = "(" + source + ")"; try { if (sandbox) { if (ddoc) { diff --git a/rel/overlay/share/www/script/test/recreate_doc.js b/rel/overlay/share/www/script/test/recreate_doc.js index a1cfb8f8..f9723793 100644 --- a/rel/overlay/share/www/script/test/recreate_doc.js +++ b/rel/overlay/share/www/script/test/recreate_doc.js @@ -81,41 +81,65 @@ couchTests.recreate_doc = function(debug) { db.deleteDb(); db.createDb(); - // COUCHDB-1265 - // Resuscitate an unavailable old revision and make sure that it - // doesn't introduce duplicates into the _changes feed. - - var doc = {_id: "bar", count: 0}; - T(db.save(doc).ok); - var ghost = {_id: "bar", _rev: doc._rev, count: doc.count}; - for(var i = 0; i < 2; i++) { - doc.count += 1; - T(db.save(doc).ok); + // Helper function to create a doc with multiple revisions + // that are compacted away to ?REV_MISSING. + + var createDoc = function(docid) { + var ret = [{_id: docid, count: 0}]; + T(db.save(ret[0]).ok); + for(var i = 0; i < 2; i++) { + ret[ret.length] = { + _id: docid, + _rev: ret[ret.length-1]._rev, + count: ret[ret.length-1].count+1 + }; + T(db.save(ret[ret.length-1]).ok); + } + db.compact(); + while(db.info().compact_running) {} + return ret; } - // Compact so that the old revision to be resuscitated will be - // in the rev_tree as ?REV_MISSING + // Helper function to check that there are no duplicates + // in the changes feed and that it has proper update + // sequence ordering. + + var checkChanges = function() { + // Assert that there are no duplicates in _changes. + var req = CouchDB.request("GET", "/test_suite_db/_changes"); + var resp = JSON.parse(req.responseText); + var docids = {}; + var prev_seq = -1; + for(var i = 0; i < resp.results.length; i++) { + row = resp.results[i]; + T(row.seq > prev_seq, "Unordered _changes feed."); + T(docids[row.id] === undefined, "Duplicates in _changes feed."); + prev_seq = row.seq; + docids[row.id] = true; + } + }; + + // COUCHDB-1265 - Check that the changes feed remains proper + // after we try and break the update_seq tree. + + // This first case is the one originally reported and "fixed" + // in COUCHDB-1265. Reinserting an old revision into the + // revision tree causes duplicates in the update_seq tree. + + var revs = createDoc("a"); + T(db.save(revs[1], {new_edits: false}).ok); + T(db.save(revs[revs.length-1]).ok); + checkChanges(); + + // The original fix for COUCHDB-1265 is not entirely correct + // as it didn't consider the possibility that a compaction + // might run after the original tree screw up. + + revs = createDoc("b"); + T(db.save(revs[1], {new_edits: false}).ok); db.compact(); while(db.info().compact_running) {} + T(db.save(revs[revs.length-1]).ok); + checkChanges(); - // Saving the ghost here puts it back in the rev_tree in such - // a way as to create a new update_seq but without changing a - // leaf revision. This would cause the #full_doc_info{} and - // #doc_info{} records to diverge in their idea of what the - // doc's update_seq is and end up introducing a duplicate in - // the _changes feed the next time this doc is updated. - T(db.save(ghost, {new_edits: false}).ok); - - // The duplicate would have been introduce here becuase the #doc_info{} - // would not have been removed correctly. - T(db.save(doc).ok); - - // And finally assert that there are no duplicates in _changes. - var req = CouchDB.request("GET", "/test_suite_db/_changes"); - var resp = JSON.parse(req.responseText); - var docids = {}; - for(var i = 0; i < resp.results.length; i++) { - T(docids[resp.results[i].id] === undefined, "Duplicates in _changes feed."); - docids[resp.results[i].id] = true; - } }; |