New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
(#2685) - fix bogus conflicts, remove 20x speedup #2685
Conversation
Well crap. Removing the 20x |
This is one of the saddest commits I've had to write. Also, it's broken in LevelDB, and I don't have time to fix it right now. |
Nevermind, it's passing. |
Sigh. There's an intermittent: { failures:
[ { message: 'res.rows[0] is undefined',
title: 'Replicates modified docs (issue #2636)',
stack: '@http://127.0.0.1:8000/tests/test.replication.js:1058\nunwrap/<@http://127.0.0.1:8000/dist/pouchdb.js:8070\ndrainQueue@http://127.0.0.1:8000/dist/pouchdb.js:8101\n' } ],
passed: 485,
failed: 1,
lastPassed: 'Replicates deleted docs w/ compaction' } |
OK, figured it out. Apparently On the bright side, we have more stable and informative tests now. On the downside, we are back to slowsville for replication. |
delete diffs[doc.ok._id]; | ||
} | ||
function getDocs() { | ||
return getRevisionOneDocs().then(getAllDocs); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
^ This used to have an if (src.type() === 'http')
around it, so we only used this optimization for http adapters. But now that allDocs
is fixed in all three adapters, we can use this optimization everywhere.
@@ -85,7 +85,6 @@ adapters.forEach(function (adapters) { | |||
}); | |||
|
|||
it('Test pull replication with many changes', function (done) { | |||
this.timeout(20000); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the default is 30000 anyway. this is a mistake
Travis would be green, but this is blocked by an unrelated issue: #2690. Because when it rains, it pours. |
Green. Looking for a +1, then a 3.0.3 release. @calvinmetcalf I know you have some other commits waiting, but I can look at them after the 3.0.3 release. This is important enough that I think it should get out soon, if you agree. |
+1 |
Though the changes canceling one that should also be in
|
I'll look at it, but I don't think it should block 3.0.3. We can always do a 3.0.4. |
@daleharvey Correct me if I'm wrong, but shouldn't the
_conflicts
array be empty in these cases? For the remote db it's returning['1-cf398aa8cceefcf9b8484d02bdaee3fe']
and for the local one,['2-cf398aa8cceefcf9b8484d02bdaee3fe']
. Very bizarre.