summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-29Stem revision trees after merging a path, COUCHDB-968Adam Kocoloski
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1053513 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29Skip recursive path merging, COUCHDB-968Adam Kocoloski
This patch ensures that we only ever merge a linear path into the tree. It relies on the stemming code to collapse paths that could have been merged together by a recursive use of merge_one. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1053512 13f79535-47bb-0310-9956-ffa450edef68
2010-12-23Merged revision 1052227 from trunk:Filipe David Borba Manana
Fix: replicator didn't use the HTTP settings defined in the .ini config Issue found by Randall Leeds. Thanks. Closes COUCHDB-992 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1052229 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22Merged revision 1052047 from trunk:Filipe David Borba Manana
Allow a multipart/mixed document GET to send the attachments in encoded (compressed) form Currently this API is not used internally but it's a very important one for the new replicator. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1052048 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22Merged revision 1052031 from trunk:Filipe David Borba Manana
Make sure attachments get compressed when their MIME type lists parameters Closes COUCHDB-996. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1052032 13f79535-47bb-0310-9956-ffa450edef68
2010-12-20Merged revision 1051082 from trunkFilipe David Borba Manana
Upgraded ibrowse to version 2.1.2 (released today) This version fixes a blocking issue (which rarely happens) when using the same connection (with ot without pipelining) for multiple requests using the option {stream_to, {pid(), once}}. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1051083 13f79535-47bb-0310-9956-ffa450edef68
2010-12-18Merged revision 1050633 from trunkFilipe David Borba Manana
Upgrade ibrowse to version 2.1.1 This ibrowse release includes a few important fixes. See https://github.com/cmullaparthi/ibrowse for the list of fixes. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1050634 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14Fix OOME when compacting doc w/ lots of conflicts, COUCHDB-888Adam Kocoloski
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1049250 13f79535-47bb-0310-9956-ffa450edef68
2010-12-13COUCHDB-984 - Backported fix for spinner.gifPaul Joseph Davis
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1045207 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10Merged revision 1043524 from trunkFilipe David Borba Manana
Calculate and verify MD5 digests outside of a couch_file server This has a significant positive impact on the performance, both for readers and writers, when there are several requests in parallel acessing the same database or view index file. $ node tests/compare_write_and_read.js --wclients 100 --rclients 200 \ -name1 md5_out -name2 trunk \ -url1 http://localhost:5984/ -url2 http://localhost:5985/ \ --duration 120 run 1) http://graphs.mikeal.couchone.com/#/graph/5c859b3e7d1b9bd0488cfe271105130c run 2) http://graphs.mikeal.couchone.com/#/graph/5c859b3e7d1b9bd0488cfe2711051bba Closes COUCHDB-980 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1044283 13f79535-47bb-0310-9956-ffa450edef68
2010-12-08Fix compactor crash when .compact file is missing headerAdam Kocoloski
Users affected by COUCHDB-968 can take advantage of this patch to force a compaction in retry mode and thus remove the duplicates. Simply create an empty dbname.couch.compact file in the database_dir before triggering the compaction for dbname. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1043542 13f79535-47bb-0310-9956-ffa450edef68
2010-12-08Change key_tree merge to take path as 2nd arg, add type specsAdam Kocoloski
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1043462 13f79535-47bb-0310-9956-ffa450edef68
2010-12-08Usort the infos during compaction to remove dupes, COUCHDB-968Adam Kocoloski
This is not a bulletproof solution; it only removes dupes when the they appear in the same batch of 1000 updates. However, for dupes that show up in _all_docs the probability of that happening is quite high. If the dupes are only in _changes a user may need to compact twice, once to get the dupes ordered together and a second time to remove them. A more complete solution would be to trigger the compaction in "retry" mode, but this is siginificantly slower. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1043461 13f79535-47bb-0310-9956-ffa450edef68
2010-12-08Prefer values from old tree when merging, COUCHDB-968Adam Kocoloski
This commit represents a substantial refactor of the key tree merging logic, some of which is not strictly necessary for the resolution of COUCHDB-968. Two etap test cases checking the ability to merge in a non-linear tree are removed because the functionality is no longer supported. CouchDB only ever merged a linear revision history into an existing revision tree. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1043460 13f79535-47bb-0310-9956-ffa450edef68
2010-12-08Stem new rev tree before comparing with old one, COUCHDB-968Adam Kocoloski
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1043459 13f79535-47bb-0310-9956-ffa450edef68
2010-12-07Merged revision 1043186 from trunk:Filipe David Borba Manana
Replicator improvement: send "unauthorized" error message instead of "db_not_found" when a remote endpoint can not be accessed due to authorization. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1043188 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01Merged revision 1041103 from trunk:Filipe David Borba Manana
Proper verification of the accepted content types plus some code cleaning. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1041113 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30Merged revision 1040603 from trunk:Filipe David Borba Manana
Missing cases for COUCHDB-949 (adding aliases start_key and end_key). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1040605 13f79535-47bb-0310-9956-ffa450edef68
2010-11-28Merged revision 1039872 from trunk:Filipe David Borba Manana
Replicator DB listener: removed function clause not needed anymore. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1039873 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25Merged revision 1039118 from trunk:Filipe David Borba Manana
Even if sealing of an array is not allowed in the installed SpiderMonkey version, seal its members. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1039123 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25Merged revision 1039069 from trunk:Filipe David Borba Manana
Replicator DB: proper handling of the changes loop process. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1039070 13f79535-47bb-0310-9956-ffa450edef68
2010-11-24Merged revision 1038665 from trunk:Filipe David Borba Manana
Replicator DB: added _replication_state_time (a unix timestamp value) to replication documents. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1038666 13f79535-47bb-0310-9956-ffa450edef68
2010-11-24Merged revision 1038660 from trunk:Filipe David Borba Manana
Replicator DB: fix a rare gen_server death case. Happened when the rep_db_created message is received before the changes loop dies. Also simplified a bit the handling of subprocesses exits. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1038662 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23Merged revision 1038193 from trunk:Filipe David Borba Manana
Seal documents before passing them to map functions (JavaScript view server only). This prevents one map function from modifying a document before it's passed to another map function. Has no effect on array fields for some Spidermonkey versions (see https://bugzilla.mozilla.org/show_bug.cgi?id=449657). Closes COUCHDB-925. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1038195 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23Merged revision 1038181 from trunk:Filipe David Borba Manana
Corrected error message grammar. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1038182 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23Merged revision 1038176 from trunk:Filipe David Borba Manana
Replicator DB: stop all ongoing replications when the replicator DB is deleted or renamed (in the .ini config). Also updated the gen_server to stop when it receives unexpected calls. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1038177 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23Merged revision 1038172 from trunk:Filipe David Borba Manana
Replicator DB: added underscore prefix to the replication document fields that are meant to to be set/updated only by the replicator. This makes it more clear to end users that those fields are meant to be used internally by CouchDB. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1038173 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23Merged revision 1038067 from trunk:Filipe David Borba Manana
Replicator DB changes: - Added back the restriction that only the replicator can edit replication documents - this avoids lots of potential race conditions and confusion; - Added more tests; - More accurate log messages; - Don't ignore always replication documents already tagged with a replication_id property - this is necessary when replicating a replicator DB from one server to another server. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1038068 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21Merged revision 1037455 from trunk:Filipe David Borba Manana
Add proper validation of user_ctx.roles for replication documents. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1037457 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21Merged revision 1037448 from trunk:Filipe David Borba Manana
Proper verification of the roles property of a user document. Closes COUCHDB-790. Thanks Gabriel Farrell. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1037450 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20Merged revision 1037245 from trunk:Filipe David Borba Manana
Fix recursive call: recursivelySeal is not defined within the body of the anonymous function declaration. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1037248 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20Merged revision 1037213 from trunk:Filipe David Borba Manana
Bug fix: using undeclared identifier (doc). The function argument is named obj, not doc. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1037216 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20Updated CHANGES for release 1.1.0.Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1037198 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19Updated CHANGES for release 1.1.0.Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1036865 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19branching 1.1.xJan Lehnardt
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1036841 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19Undo overzealous escaping.Jan Lehnardt
Patch by Gabriel Farrell. Closes COUCHDB-948. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036832 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19For absolute consistency, renamed aliases start_key_docid and end_key_docid ↵Filipe David Borba Manana
to start_key_doc_id and end_key_doc_id. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036818 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19Updated CHANGES for 1.1.0.Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036816 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19Add aliases start_key, end_key, start_key_docid and end_key_docid.Filipe David Borba Manana
Closes COUCHDB-949. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036813 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19Make sure that after a local database compaction the old database reference ↵Filipe David Borba Manana
counters don't get unreleased forever because of a continuous (or long) replication is going on. Same type of issue as in COUCHDB-926. Thanks Adam Kocoloski for some suggestions. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036705 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18Preserve user context when reopening a database.Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036627 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18update NEWS and CHANGES for 1.1.0Jan Lehnardt
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036541 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18COUCHDB-957 - Show an error message if trying 'Compact View' without ↵Robert Newson
selecting a view, rather than compacting the associated database by mistake. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036486 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18JavaScript tests: avoid global variable declarations.Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036447 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18Replicator DB: added one more useful log message.Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036425 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18Make sure that after compaction of the authentication database the old ↵Filipe David Borba Manana
reference counter is released. Same type of issue as in COUCHDB-926. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036407 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18Make sure that after a database compaction the old database reference ↵Filipe David Borba Manana
counters don't get unreleased forever. Closes COUCHDB-926. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036294 13f79535-47bb-0310-9956-ffa450edef68
2010-11-17add comment about SSL portJan Lehnardt
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036051 13f79535-47bb-0310-9956-ffa450edef68
2010-11-17Added missing semicolons to the view_pagination.js test.Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1035999 13f79535-47bb-0310-9956-ffa450edef68
2010-11-17Replicator DB: added 2 useful log messages.Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1035987 13f79535-47bb-0310-9956-ffa450edef68