You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2011/05/26 21:00:20 UTC
svn commit: r1128039 - in /couchdb/branches/1.1.x:
share/www/script/couch_tests.js share/www/script/test/regression.js
src/couchdb/couch_db.erl
Author: rnewson
Date: Thu May 26 19:00:19 2011
New Revision: 1128039
URL: http://svn.apache.org/viewvc?rev=1128039&view=rev
Log:
COUCHDB-1178 - fix make_first_doc_on_disk function_clause error
Added:
couchdb/branches/1.1.x/share/www/script/test/regression.js
Modified:
couchdb/branches/1.1.x/share/www/script/couch_tests.js
couchdb/branches/1.1.x/src/couchdb/couch_db.erl
Modified: couchdb/branches/1.1.x/share/www/script/couch_tests.js
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/share/www/script/couch_tests.js?rev=1128039&r1=1128038&r2=1128039&view=diff
==============================================================================
--- couchdb/branches/1.1.x/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/branches/1.1.x/share/www/script/couch_tests.js [utf-8] Thu May 26 19:00:19 2011
@@ -76,6 +76,7 @@ loadTest("reduce.js");
loadTest("reduce_builtin.js");
loadTest("reduce_false.js");
loadTest("reduce_false_temp.js");
+loadTest("regression.js");
loadTest("replication.js");
loadTest("replicator_db.js");
loadTest("rev_stemming.js");
Added: couchdb/branches/1.1.x/share/www/script/test/regression.js
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/share/www/script/test/regression.js?rev=1128039&view=auto
==============================================================================
--- couchdb/branches/1.1.x/share/www/script/test/regression.js (added)
+++ couchdb/branches/1.1.x/share/www/script/test/regression.js Thu May 26 19:00:19 2011
@@ -0,0 +1,48 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations under
+// the License.
+
+couchTests.regression = function(debug) {
+ var db = new CouchDB("test_suite_db", {"X-Couch-Full-Commit":"false"});
+ db.deleteDb();
+ db.createDb();
+ if (debug) debugger;
+
+ // COUCHDB-1178
+ {
+ var r1 = {"_id":"doc","foo":"bar"};
+ var r2 = {"_id":"doc","foo":"baz","_rev":"1-4c6114c65e295552ab1019e2b046b10e"};
+ var r3 = {"_id":"doc","foo":"bam","_rev":"2-cfcd6781f13994bde69a1c3320bfdadb"};
+ var r4 = {"_id":"doc","foo":"bat","_rev":"3-cc2f3210d779aef595cd4738be0ef8ff"};
+
+ T(db.save({"_id":"_design/couchdb-1178","validate_doc_update":"function(){}"}).ok);
+ T(db.save(r1).ok);
+ T(db.save(r2).ok);
+ T(db.save(r3).ok);
+
+ T(db.compact().ok);
+ while (db.info().compact_running) {};
+
+ TEquals({"_id":"doc",
+ "_rev":"3-cc2f3210d779aef595cd4738be0ef8ff",
+ "foo":"bam",
+ "_revisions":{"start":3,
+ "ids":["cc2f3210d779aef595cd4738be0ef8ff",
+ "cfcd6781f13994bde69a1c3320bfdadb",
+ "4c6114c65e295552ab1019e2b046b10e"]}},
+ db.open("doc", {"revs": true}));
+
+ TEquals([], db.bulkSave([r4, r3, r2], {"new_edits":false}), "no failures");
+ }
+
+ // cleanup
+ db.deleteDb();
+};
\ No newline at end of file
Modified: couchdb/branches/1.1.x/src/couchdb/couch_db.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/src/couchdb/couch_db.erl?rev=1128039&r1=1128038&r2=1128039&view=diff
==============================================================================
--- couchdb/branches/1.1.x/src/couchdb/couch_db.erl (original)
+++ couchdb/branches/1.1.x/src/couchdb/couch_db.erl Thu May 26 19:00:19 2011
@@ -733,6 +733,8 @@ update_docs(Db, Docs, Options, interacti
% for the doc.
make_first_doc_on_disk(_Db, _Id, _Pos, []) ->
nil;
+make_first_doc_on_disk(Db, Id, Pos, [{_Rev, #doc{}} | RestPath]) ->
+ make_first_doc_on_disk(Db, Id, Pos-1, RestPath);
make_first_doc_on_disk(Db, Id, Pos, [{_Rev, ?REV_MISSING}|RestPath]) ->
make_first_doc_on_disk(Db, Id, Pos - 1, RestPath);
make_first_doc_on_disk(Db, Id, Pos, [{_Rev, {IsDel, Sp, _Seq}} |_]=DocPath) ->