couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject svn commit: r807687 - in /couchdb/branches/0.10.x: ./ src/ src/couchdb/ test/ test/etap/ test/etap/112-replication-missing-revs.t
Date Tue, 25 Aug 2009 16:19:18 GMT
Author: kocolosk
Date: Tue Aug 25 16:19:17 2009
New Revision: 807687

URL: http://svn.apache.org/viewvc?rev=807687&view=rev
Log:
merged performance and stability fixes for replication from trunk

r807308, r807354: more precise and accurate calculation of replication progress
r807342, r807345: follow 302 redirects during replication
r807208, r807320, r807360, r807459, r807461: minimize the # of full commits
r807473: disable internal gen_server timeouts
r807477: fix a process leak in local changes feed consumer

Thanks Robert Newson and Bob Dionne for stress testing

Modified:
    couchdb/branches/0.10.x/   (props changed)
    couchdb/branches/0.10.x/src/   (props changed)
    couchdb/branches/0.10.x/src/couchdb/   (props changed)
    couchdb/branches/0.10.x/test/   (props changed)
    couchdb/branches/0.10.x/test/etap/   (props changed)
    couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t   (contents, props changed)

Propchange: couchdb/branches/0.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 25 16:19:17 2009
@@ -3,3 +3,4 @@
 /couchdb/branches/form:729440-730015
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
+/couchdb/trunk:807208*,807308*,807320*,807342*,807345*,807354*,807360*,807459*,807461*,807468*,807473*,807477*

Propchange: couchdb/branches/0.10.x/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 25 16:19:17 2009
@@ -0,0 +1,6 @@
+/couchdb/branches/0.9.x/src:775634
+/couchdb/branches/design_resources/src:751716-751803
+/couchdb/branches/form/src:729440-730015
+/couchdb/branches/list-iterator/src:782292-784593
+/couchdb/branches/tail_header/src:775760-778477
+/couchdb/trunk/src:807208*,807308*,807320*,807342*,807345*,807354*,807360*,807459*,807461*,807468*,807473*,807477*

Propchange: couchdb/branches/0.10.x/src/couchdb/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 25 16:19:17 2009
@@ -0,0 +1,6 @@
+/couchdb/branches/0.9.x/src/couchdb:775634
+/couchdb/branches/design_resources/src/couchdb:751716-751803
+/couchdb/branches/form/src/couchdb:729440-730015
+/couchdb/branches/list-iterator/src/couchdb:782292-784593
+/couchdb/branches/tail_header/src/couchdb:775760-778477
+/couchdb/trunk/src/couchdb:807208*,807308*,807320*,807342*,807345*,807354*,807360*,807459*,807461*,807468*,807473*,807477*

Propchange: couchdb/branches/0.10.x/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 25 16:19:17 2009
@@ -0,0 +1,6 @@
+/couchdb/branches/0.9.x/test:775634
+/couchdb/branches/design_resources/test:751716-751803
+/couchdb/branches/form/test:729440-730015
+/couchdb/branches/list-iterator/test:782292-784593
+/couchdb/branches/tail_header/test:775760-778477
+/couchdb/trunk/test:807208*,807308*,807320*,807342*,807345*,807354*,807360*,807459*,807461*,807468*,807473*,807477*

Propchange: couchdb/branches/0.10.x/test/etap/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 25 16:19:17 2009
@@ -0,0 +1,6 @@
+/couchdb/branches/0.9.x/test/etap:775634
+/couchdb/branches/design_resources/test/etap:751716-751803
+/couchdb/branches/form/test/etap:729440-730015
+/couchdb/branches/list-iterator/test/etap:782292-784593
+/couchdb/branches/tail_header/test/etap:775760-778477
+/couchdb/trunk/test/etap:807208*,807308*,807320*,807342*,807345*,807354*,807360*,807459*,807461*,807468*,807473*,807477*

Modified: couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t?rev=807687&r1=807686&r2=807687&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t (original)
+++ couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t Tue Aug 25 16:19:17 2009
@@ -113,8 +113,8 @@
 test_changes_not_missing(SrcType, TgtType) ->
     %% put identical changes on source and target
     Id = couch_util:new_uuid(),
-    {Id, [Rev]} = Expect = generate_change(Id, {[]}, get_db(source)),
-    {Id, [Rev]} = generate_change(Id, {[]}, get_db(target)),
+    {Id, _Seq, [Rev]} = Expect = generate_change(Id, {[]}, get_db(source)),
+    {Id, _, [Rev]} = generate_change(Id, {[]}, get_db(target)),
 
     %% confirm that this change is not in missing revs feed
     {ok, Pid1} = start_changes_feed(SrcType, 0, false),
@@ -141,9 +141,10 @@
 
 generate_change(Id, EJson, Db) ->
     Doc = couch_doc:from_json_obj(EJson),
+    Seq = get_update_seq(),
     {ok, Rev} = couch_db:update_doc(Db, Doc#doc{id = Id}, [full_commit]),
     couch_db:close(Db),
-    {Id, [Rev]}.
+    {Id, Seq+1, [Rev]}.
 
 get_all_missing_revs(Pid, {HighSeq, Revs}) ->
     case couch_rep_missing_revs:next(Pid) of
@@ -160,6 +161,12 @@
     {ok, Db} = couch_db:open(<<"etap-test-target">>, []),
     Db.
 
+get_update_seq() ->
+    Db = get_db(source),
+    Seq = couch_db:get_update_seq(Db),
+    couch_db:close(Db),
+    Seq.
+
 setup() ->
     {ok, DbA} = couch_db:create(<<"etap-test-source">>, []),
     {ok, DbB} = couch_db:create(<<"etap-test-target">>, []),

Propchange: couchdb/branches/0.10.x/test/etap/112-replication-missing-revs.t
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 25 16:19:17 2009
@@ -0,0 +1,6 @@
+/couchdb/branches/0.9.x/test/etap/112-replication-missing-revs.t:775634
+/couchdb/branches/design_resources/test/etap/112-replication-missing-revs.t:751716-751803
+/couchdb/branches/form/test/etap/112-replication-missing-revs.t:729440-730015
+/couchdb/branches/list-iterator/test/etap/112-replication-missing-revs.t:782292-784593
+/couchdb/branches/tail_header/test/etap/112-replication-missing-revs.t:775760-778477
+/couchdb/trunk/test/etap/112-replication-missing-revs.t:807208,807308,807320,807342,807345,807354,807360,807459,807461,807468,807473,807477



Mime
View raw message