You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2020/08/10 20:50:57 UTC

[couchdb] branch prototype/fdb-replicator updated (7986587 -> 07db80f)

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a change to branch prototype/fdb-replicator
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 7986587  [wip] extra logging and fixes in _parse and _job
 discard 8d04989  [wip] add extra logging to _job_server
 discard ceee5e4  [wip] fix typos in _utils
 discard 105ba3b  [wip] fix typos in _jobs
 discard fe21003  [wip] handle options map in _ids
 discard 436ee1c  [wip] handle options as a map in _filters
 discard c81ad89  [wip] fix typo in _docs
 discard 575748f  [wip] handle options as a map in _changes_reader
 discard 31c31e7  [wip] fix typo in _api_wrap
 discard 841c6a3  [wip] refactor couch_replicator order
 discard 0067898  [wip] couch_jobs fix in fold jobs
 discard 36a8452  [wip] add callbacks for fabric2_db_plugin
 discard aff4dd8  [wip] clean up and update default.ini replicator section
 discard 6e121fe  [wip] set replication job type timeout in API nodes as well
 discard 1c937d0  [wip] allow jobs to do some more graceful termination
 discard e305ab8  [wip] remove unused include in _parse
 discard 48a8fe6  [wip] implement node types for replicator
 discard b25f2ee  [wip] update metrics and fix job exists in _job_server
 discard b4011f9  [wip] update _job and _job_server
 discard 2a44970  [wip] Fix typon in supervisor
 discard f0de0cb  [wip] add couch_jobs app dependency
 discard 07e5228  [wip] everything compiles now, yay!
 discard 865c3bd  [wip] cleanup and refactor _jobs, make it compile
 discard b4fd48f  [wip] cleanup parse separate into doc and request parsing
 discard de72e68  [wip] remove imports from _utils
 discard d60e410  [wip] _ids:replication_id is actually just base_id
 discard 4401b66  [wip] cleanup _docs, make it compile
 discard 252310f  [wip] cleanup used var in _jobs
 discard a02f1e7  [wip] remove unused function in _stats
 discard ae5f9ae  [wip] _scheduler endpoints implemented
 discard 154f351  [wip] _api_wrap module cleanup, remove imports
 discard 24c44e9  [wip] couch_jobs pending and fold fixes
 discard acb20dc  [wip] fix typo in fabric2 callback
 discard ebed000  [wip] remove validate module, use parse_rep
 discard 8d9f5b1  [wip] fix compilation errors
 discard 2b636e0  [wip] move parsing bits to a separate module
 discard 725b39e  [wip] fix iso8601 formatter
 discard 28fb9fd  [wip] remove more code from _docs
 discard 5df5d01  [wip] more cleanups, remove all of teh scheduler bits
 discard c25652e  [wip] clean httpd handlers
 discard 7244d06  [wip] moved sum_stats to stats module
 discard 5d8f45f  [wip] remove more modules that are not needed
 discard 9c1c764  [wip] add plumbing for _scheduler/{jobs,docs}
 discard ede9c86  [wip] update fold_jobs callback in replicator_jobs
 discard 3b4a407  [wip] re-use IS_REP_DB test guard, move to .hrl
 discard 14b69c3  [wip] couch_jobs:fold_jobs UserFun update
 discard abef763  [wip] remove unused .hrl file
 discard 2a6ea86  [wip] publish active_tasks and cleanup initialization
 discard 649d218  [wip] remove cruft from supervisor
 discard 2ce0570  [wip] normal replications need checkpoint history
 discard b8ea252  [wip] job server uses the renamed couch_replicator_job module
 discard 72731d6  [wip] use db uuids when updating _replicator db
 discard a644870  [wip] remove initializating, triggered and error states
 discard eaeede8  [wip] move epi callbacks to couch_replicator
 discard 13d2ec7  [wip] removed vdu, doc processor, old acceptor
 discard 127a206  [wip] improved job termination
 discard 2528c20  [wip] the new replication job is feature complete
 discard 9e59f18  [wip] correctly keep track of the doc_state
 discard ecefd11  [wip] couch_jobs API additions and cleanup
 discard 51ddb9a  [wip] doc_state is in the job data not rep
 discard 0d203a9  [wip] update .hrl file with history tags
 discard 1ebbf41  [wip] make config units more consistent
 discard 721c8c0  [wip] set up filter source fetching
 discard 4fba9dc  [wip] implement scheduling algorithm
 discard 8ca0dc7  [wip] start on the main scheduler loop
 discard 173a70f  [wip] include file cleanups
 discard 6780718  [wip] use replication_id(Rep) instead of update_rep_id
 discard 40effd5  [wip] replication_ids module also calculate job ids
 discard 404b808  [wip] move doc_id, db_name, db_uuid out of the REP map
 discard e5f906c  [wip] fabric2 add REPLICATION_IDS keyspace prefix
 discard b2f30df  [wip] transient replications switched to use couch_replicator_jobs
 discard b5a8639  [wip] remove un-used count_pending/4 from couch_jobs api
 discard 8ea6398  [wip] move all couch_jobs functiont to couch_replicator_jobs
 discard 82f5632  [wip] mentioned that "triggered" is a legacy state
 discard 370f71a  [wip] let the BDU do the full parsing of the rep doc
 discard a5ba161  [wip] minor ws change
 discard eb3ddd5  [wip] replication jobs start as couch_jobs acceptors
 discard ee7ba31  [wip] add a simple job supervisor
 discard 476b499  [wip] delete job supervisors
 discard cc9d161  [wip] add is_replicator guards to db/doc update notifier callbacks
 discard e64263c  [wip] convert a few more fields to defines
 discard a1862ae  [wip] use defined fields for replication docs as well
 discard 6d32ed6  [wip] doc processor cleanups
 discard 5a71d66  [wip] implement _replicate endpoing
 discard 107688c  [wip] make sure we always have a db_uuid field in a rep object
 discard 4ed7f28  [wip] impove rep object normalization
 discard 88884af  [wip] Make sure we add jobs when dbs get undeleted
 discard 8ac523b  [wip] minor fix to couch_jobs pending_count
 discard be0d0b1  [wip] expose pending_count at the top level in couch_jobs
 discard 8fa7bab  [wip] add couch_jobs get_pending_count
 discard 056cf64  [wip] forgot to register replicator epi plugin in supervisor
 discard b75ad64  [wip] move stats updates individual jobs and use couch_jobs for it
 discard 0fd0d29  [wip] add more defined map fields for rep and httpd objects
 discard e3096ac  [wip] improve job creation logic when docs/dbs change
 discard 5b71022  [wip] add a db uuid field to rep object
 discard f481258  [wip] add couch_jobs:fold/4
 discard 88334ab  [wip] replace state maps fields with defines
 discard 5636460  [wip] remove get_view_info unused function
 discard eb23621  [wip] add doc update and db create/delete callbacks
 discard 7aca652  [wip] stats may be a map
 discard f18ca6c  WIP 2 - Rebased on latest master
     add d7b0051  Do not fail when emilio detects errors
     add 6654b7f  Merge pull request #2993 from cloudant/emilio-warnings
     add ddbaf4f  Simplify using `req_body` for JSON requests
     add eda40cc  Merge pull request #2991 from cloudant/req_body-json
     add f1f8f60  Fix auth injection in test helper
     add 733c357  Merge pull request #2985 from cloudant/fix-session-test-helper
     add 8d20399  Initial commit
     add 6044f0a  readme
     add cbacdec  Update README.md
     add 51fd72a  Update README.md
     add 5b77d53  oops forgot the .app
     add b66184a  get vsn from git
     add d36e801  fix compilation warnings
     add 2528903  Update README.md
     add 2e6cfa2  Add incremental reduce on non-leaf nodes.
     add 69a4ec0  Merge pull request #1 from cloudant/reduce
     add b6446c3  Update README.md
     add cbf60dc  fix bug in reduce handling during delete
     add 4b726dd  add gitignore
     add 75bab7c  Pluggable collation
     add cb27931  Merge pull request #4 from cloudant/collation
     add 33b610e  nah
     add 692d747  remove ?MODULE: nonsense
     add 10d0e31  Merge pull request #5 from cloudant/remove-module
     add 16e7a44  improve range tests
     add 88371b5  fix range when using non-standard collation
     add b95cbb8  fix reverse_range when using non-standard collation
     add 07d22e6  Merge pull request #6 from cloudant/range-collation
     add 4e176c3  Accidentally introduced duplicates with custom collation
     add be7b10a  Merge pull request #8 from cloudant/fix-dupes
     add fb378e5  fix delete with custom collation
     add 45c62a0  Merge pull request #9 from cloudant/delete-collation-bug
     add 9d691c2  remember firstkey of subtree
     add bd9ed98  Merge pull request #10 from cloudant/firstkey
     add 9054e74  document existence of reduce functionality
     add e6b7a57  rename reduce to full_reduce to better represent its function
     add 46d9c82  arbitrary reductions
     add 7f82e50  add fold/4
     add 3828d8b  implement full_reduce using fold
     add 03e1c6d  handy comparison funs
     add 38269f5  reimplement lookup as a fold
     add 5b35378  unused variables
     add a1714f1  reimplement reduce as fold
     add 56686a8  enable coverage
     add fd7b579  collation fun tests
     add d6edc5e  remove unused functions
     add 8e44430  Merge pull request #11 from cloudant/reduce3
     add 2ca9f7f  Add upper bound to intermediate reduce list size
     add c19e0a1  Merge pull request #12 from cloudant/upper-bound
     add c4cb82d  make upper bound of interactive reduce match tree maximum
     add 0ea8ddd  move full_reduce
     add c6689c2  more tests
     add 8cac976  fix bug in full_reduce when root is a leaf
     add cb20ab4  more tests
     add 60a35a9  reduce every 50. flip flop.
     add 976fa8f  follow reduce's style in full_reduce
     add 87bb813  remove premature optimization even thought it was neat
     add d598fc6  minor optimize when visting leaf
     add 465e7b2  extract final reduce function
     add 6ae6cc2  Arbitrary group reduce
     add 60cea2d  Merge pull request #13 from cloudant/group_level
     add 46cc29e  ensure erlfdb is started before ebtree
     add c48f4fe  sequential ids
     add 38d5622  Merge pull request #14 from cloudant/sequential
     add ac3f25f  Eliminate unnecessary node lookup
     add a00717a  Merge pull request #15 from cloudant/optimize-split-child
     add 2da3eee  swap get_node and get_node_wait
     add 9b016c8  Merge pull request #16 from cloudant/get_node_wait_swap
     add 952cab3  Remove separate init function
     add ee39d56  Merge pull request #17 from cloudant/implicit-create
     add 382096d  Introduce min and max keys for open ranges
     add 44e9904  Merge pull request #18 from cloudant/min-max
     add a3aa8cb  Update README.md
     add b2d7aa3  reuse do_reduce in full_reduce
     add b602a96  clarify the meaning of Fun in range/reverse_range
     add 06c1f2f  switch group_reduce to a user-defined acc function
     add 5bfcc40  Merge pull request #19 from cloudant/accfuns
     add e2175aa  Ensure all keys are in range during group_reduce
     add 2818bce  Merge pull request #20 from cloudant/group-reduce-bug
     add 387b7c1  assert that non-leafs have no prev/next pointers
     add 7485892  and then fix the bug where they got one
     add 6e507b7  Merge pull request #21 from cloudant/remove_pointers_from_non_leaf
     add 9e8629a  adjust rebar.config to work with rebar2 and rebar3
     add 11e5b55  Merge pull request #23 from cloudant/rebar-config-fix
     add ec5a380  fix how lookup rate is calculated in tests
     add 0b24409  honor ?MIN and ?MAX in find_child_int
     add a24e76f  update README.md to reflect progress
     add ffc07e9  don't export reduce funs, they're just for tests now
     add 0a2eca5  add spec/edoc to all public functions
     add 3f1e6a5  Allow fold in fwd and rev direction
     add 842c116  Add support for group_reduce in reverse order
     add 9e1483a  Merge pull request #25 from cloudant/group-reduce-rev
     add e347ad2  two blank lines between different functions
     add 11f46e5  refine typespec for callback functions
     add b23df65  Add ASLv2 license
     add 598733d  Merge ebtree into src/ebtree
     add 6233d43  add ebtree to rebar / reltool.config
     add fb6c83a  Allow encode/decode customisation
     add 6fa3b19  Merge pull request #3017 from apache/prototype/fdb-layer-ebtree
     add a081412  Add support for previous bookmark
     add 46ee05e  Merge pull request #2904 from cloudant/support-previous-bookmark
     add 983ff1c  Use stored order without complaint
     add 0a31cd8  Merge pull request #3023 from apache/prototype/fdb-layer-ebtree-order
     add 9b2bf52  Pass fdb key to the encode_fun
     add 869a8f7  Merge pull request #3024 from apache/prototype/fdb-layer-ebtree-encoding
     add 822f278  Fix 'first page should not return previous bookmark' test
     add 6875e7b  Merge pull request #3027 from cloudant/fix-previous-bookmark
     add ebe62b2  Only call erlfdb:set if the node changes
     add f811f3f  Merge pull request #3033 from apache/prototype/fdb-layer-ebtree-spurious-conflicts
     add 90158ea  separate out collation wrapper to avoid spurious comparisons
     add 81a8db7  Merge pull request #3034 from apache/prototype/fdb-layer-collation-bugs
     add 0a44446  add get_active_job_ids and get_types
     add fd9557a  add support for active_tasks via fabric2
     add a447f07  add active_tasks for view builds using version stamps
     add 0c7c77e  Merge pull request #3003 from apache/add_active_tasks_fdb
     add 77e1c8c  Use _scheduler/jobs instead of _active_tasks in replication Elixir tests
     add 5a4da50  Replace the 'true' clauses in visit with more explicit ones
     add 79cb06c  Allow inclusive_start/end
     add 46cff24  Merge pull request #3045 from apache/prototype/fdb-layer-ebtree-enhancements
     add e1b4259  Strip last_msg from logs
     add 97e7a95  Add format_status/2 callback in gen_server implementations
     add 52d5327  Do not log sensitive data during _cluster_setup
     add 8360026  Do not log admin credentials
     add e4555a4  Update config app
     add 6ff2f41  Merge pull request #3031 from cloudant/clean-up-logs
     add f8fdf97  Call collate for group equality
     add 41d946b  Merge pull request #3046 from apache/prototype/fdb-layer-ebtree-group-reduce-fix
     add 8b49b0d  Allow interactive requests to reopen a re-created db instance
     add bd53678  Optionally add a key manager application as a dependency
     add 22d857d  Merge pull request #3053 from apache/aegis_key_manager_app
     add 683335c  Validate the result from collate_fun
     add e0bcb2a  Merge pull request #3055 from apache/prototype/fdb-layer-ebtree-collate-validate
     add 282e858  add local_seq option to views (#3043)
     add f925919  Export reduce/5
     add a32bc83  Handle empty reduce batches
     add 29d6498  Fix range scans over an empty tree
     add 31b467c  Speed up ebtree test suite without losing coverage
     add bf4265e  Merge pull request #3060 from apache/prototype/fdb-layer-ebtree-speedy-tests
     add 042347e  fixup: Build couch_js for redhat linux
     add dff8bc9  Merge pull request #3057 from apache/build-fdb-couchjs-for-redhat-linux
     add 51a131d  Tighten expectation of members format by level
     add 887e835  extra tests
     add 8ddcc22  Merge pull request #3062 from apache/prototype/fdb-layer-ebtree-enhance
     add a74675f  Pluggable persist_fun
     add 4d7149c  Merge pull request #3065 from apache/prototype/fdb-layer-ebtree-persist-fun
     add 78801ac  WIP 2 - Rebased on latest master
     add e4bf4b4  [wip] stats may be a map
     add ea9dd24  [wip] add doc update and db create/delete callbacks
     add 3f51124  [wip] remove get_view_info unused function
     add a6daaaf  [wip] replace state maps fields with defines
     add 65b7217  [wip] add couch_jobs:fold/4
     add 21adc53  [wip] add a db uuid field to rep object
     add 826107d  [wip] improve job creation logic when docs/dbs change
     add 73ee2e1  [wip] add more defined map fields for rep and httpd objects
     add f612942  [wip] move stats updates individual jobs and use couch_jobs for it
     add 6f70db9  [wip] forgot to register replicator epi plugin in supervisor
     add 526b75e  [wip] add couch_jobs get_pending_count
     add 9404f97  [wip] expose pending_count at the top level in couch_jobs
     add c80edf0  [wip] minor fix to couch_jobs pending_count
     add c68d796  [wip] Make sure we add jobs when dbs get undeleted
     add 8f1bbeb  [wip] impove rep object normalization
     add b2b75f7  [wip] make sure we always have a db_uuid field in a rep object
     add 8cc1197  [wip] implement _replicate endpoing
     add 82eb295  [wip] doc processor cleanups
     add 00e876f  [wip] use defined fields for replication docs as well
     add f89305d  [wip] convert a few more fields to defines
     add 7b44984  [wip] add is_replicator guards to db/doc update notifier callbacks
     add d16d86e  [wip] delete job supervisors
     add 908eb53  [wip] add a simple job supervisor
     add 601fff5  [wip] replication jobs start as couch_jobs acceptors
     add a26fe3b  [wip] minor ws change
     add b2568a6  [wip] let the BDU do the full parsing of the rep doc
     add ad57618  [wip] mentioned that "triggered" is a legacy state
     add 33ad152  [wip] move all couch_jobs functiont to couch_replicator_jobs
     add 2a49e0b  [wip] remove un-used count_pending/4 from couch_jobs api
     add 76cf52e  [wip] transient replications switched to use couch_replicator_jobs
     add 35140b1  [wip] fabric2 add REPLICATION_IDS keyspace prefix
     add 70fad37  [wip] move doc_id, db_name, db_uuid out of the REP map
     add b2f5ee3  [wip] replication_ids module also calculate job ids
     add fdae6e0  rebasing
     add 11d899f  [wip] include file cleanups
     add 0a68bab  [wip] start on the main scheduler loop
     add 275a65e  [wip] implement scheduling algorithm
     add a64794c  [wip] set up filter source fetching
     add 96aa965  [wip] make config units more consistent
     add e9b7f6e  [wip] update .hrl file with history tags
     add af563f4  [wip] doc_state is in the job data not rep
     add b13a443  [wip] couch_jobs API additions and cleanup
     add 9b5de86  [wip] correctly keep track of the doc_state
     add b6244e8  [wip] the new replication job is feature complete
     add ddc83db  [wip] improved job termination
     add fb3ca57  [wip] removed vdu, doc processor, old acceptor
     add 5e72fff  [wip] move epi callbacks to couch_replicator
     add 58d4274  [wip] remove initializating, triggered and error states
     add 650fee6  [wip] use db uuids when updating _replicator db
     add f3fc317  [wip] job server uses the renamed couch_replicator_job module
     add 1e088de  [wip] normal replications need checkpoint history
     add 6d45b96  [wip] remove cruft from supervisor
     add 00b7f33  [wip] publish active_tasks and cleanup initialization
     add 420765c  [wip] remove unused .hrl file
     add 140a78f  [wip] couch_jobs:fold_jobs UserFun update
     add 5e4009d  [wip] re-use IS_REP_DB test guard, move to .hrl
     add b50c760  [wip] update fold_jobs callback in replicator_jobs
     add 8f76794  [wip] add plumbing for _scheduler/{jobs,docs}
     add 10a46c4  [wip] remove more modules that are not needed
     add db60551  [wip] moved sum_stats to stats module
     add d3cf4ca  [wip] clean httpd handlers
     add 61307ca  [wip] more cleanups, remove all of teh scheduler bits
     add 2ecb5bf  [wip] remove more code from _docs
     add bf608c1  [wip] fix iso8601 formatter
     add f48a125  [wip] move parsing bits to a separate module
     add 8def3c6  [wip] fix compilation errors
     add bb6a465  [wip] remove validate module, use parse_rep
     add f28d5c9  [wip] fix typo in fabric2 callback
     add 037c2e8  [wip] couch_jobs pending and fold fixes
     add 8b97294  [wip] _api_wrap module cleanup, remove imports
     add e78a4b8  [wip] _scheduler endpoints implemented
     add 82636b0  [wip] remove unused function in _stats
     add 6c6900a  [wip] cleanup used var in _jobs
     add 412201c  [wip] cleanup _docs, make it compile
     add 1b84d72  [wip] _ids:replication_id is actually just base_id
     add 6566b16  [wip] remove imports from _utils
     add 94d47a6  [wip] cleanup parse separate into doc and request parsing
     add c10e3fb  [wip] cleanup and refactor _jobs, make it compile
     add 895a111  [wip] everything compiles now, yay!
     add f982562  [wip] add couch_jobs app dependency
     add 2be53aa  [wip] Fix typon in supervisor
     add 2be0008  [wip] update _job and _job_server
     add 3ee6784  [wip] update metrics and fix job exists in _job_server
     add 71c560b  [wip] implement node types for replicator
     add c75112d  [wip] remove unused include in _parse
     add d9bfb12  [wip] allow jobs to do some more graceful termination
     add 9a2dff3  [wip] set replication job type timeout in API nodes as well
     add 117da29  [wip] clean up and update default.ini replicator section
     add 524652e  [wip] add callbacks for fabric2_db_plugin
     add 6c29de0  [wip] couch_jobs fix in fold jobs
     add 4031923  [wip] refactor couch_replicator order
     add bf9b3bf  [wip] fix typo in _api_wrap
     add fb8e2e5  [wip] handle options as a map in _changes_reader
     add 467f047  [wip] fix typo in _docs
     add 80e87c8  [wip] handle options as a map in _filters
     add 5574dec  [wip] handle options map in _ids
     add f892fa0  [wip] fix typos in _jobs
     add 420f6a3  [wip] fix typos in _utils
     add 3e318a3  [wip] add extra logging to _job_server
     add ba22156  [wip] extra logging and fixes in _parse and _job
     add edf8ed6  [wip] match json decode/encode behavior with couch_util
     add 23d2909  [wip] ignore unknown fields in map stats in _stats
     add 57b602c  [wip] fix typo in _replicator_jobs
     add f42b392  [wip] fix couch_jobs bug: remove activity when removing job
     add c0f9544  [wip] move time formatting to _utils
     add 74583b9  [wip] more fixes
     add 07db80f  [wip] trim logs and improve stats emitter

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7986587)
            \
             N -- N -- N   refs/heads/prototype/fdb-replicator (07db80f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 Makefile                                           |    2 +-
 Makefile.win                                       |    2 +-
 rebar.config.script                                |    5 +-
 rel/reltool.config                                 |    2 +
 .../src/{aegis.app.src => aegis.app.src.script}    |   33 +-
 src/chttpd/src/chttpd.erl                          |   10 +-
 src/chttpd/src/chttpd_db.erl                       |    3 +-
 src/chttpd/src/chttpd_misc.erl                     |   10 +-
 src/chttpd/src/chttpd_node.erl                     |    4 +-
 src/chttpd/test/eunit/chttpd_handlers_tests.erl    |    2 +-
 src/chttpd/test/exunit/pagination_test.exs         |   47 +
 src/couch/include/couch_db.hrl                     |    3 +
 src/couch/rebar.config.script                      |    2 +-
 src/couch/src/couch_lru.erl                        |    5 +-
 src/couch/src/couch_multidb_changes.erl            |   14 +-
 src/couch/src/couch_native_process.erl             |   17 +-
 src/couch/src/couch_proc_manager.erl               |   16 +-
 src/couch/src/couch_server.erl                     |    6 +-
 src/couch/src/couch_stream.erl                     |   16 +-
 src/couch/src/couch_work_queue.erl                 |   25 +-
 src/couch_index/src/couch_index.erl                |   19 +-
 src/couch_jobs/src/couch_jobs.erl                  |   21 +
 src/couch_jobs/src/couch_jobs_fdb.erl              |    9 +-
 src/couch_jobs/src/couch_jobs_notifier.erl         |   22 +-
 src/couch_js/src/couch_js_native_process.erl       |   18 +-
 src/couch_js/src/couch_js_proc_manager.erl         |   16 +-
 src/couch_log/src/couch_log_config.erl             |   11 +-
 src/couch_log/src/couch_log_config_dyn.erl         |    3 +-
 src/couch_log/src/couch_log_formatter.erl          |   24 +-
 src/couch_log/src/couch_log_sup.erl                |    2 +
 src/couch_log/test/eunit/couch_log_config_test.erl |   37 +-
 .../test/eunit/couch_log_formatter_test.erl        |  114 +-
 src/couch_mrview/src/couch_mrview_index.erl        |   12 +
 src/couch_peruser/src/couch_peruser.erl            |   13 +-
 src/couch_replicator/src/couch_replicator.erl      |   28 +-
 src/couch_replicator/src/couch_replicator.hrl      |    2 +
 .../src/couch_replicator_auth_session.erl          |    2 +-
 .../src/couch_replicator_changes_reader.erl        |    5 +-
 .../src/couch_replicator_httpc_pool.erl            |   14 +-
 src/couch_replicator/src/couch_replicator_job.erl  |  115 +-
 .../src/couch_replicator_job_server.erl            |    6 +-
 src/couch_replicator/src/couch_replicator_jobs.erl |    7 +-
 .../src/couch_replicator_stats.erl                 |    9 +-
 .../src/couch_replicator_utils.erl                 |   31 +-
 src/couch_stats/src/couch_stats_aggregator.erl     |   17 +-
 src/couch_views/src/couch_views_http.erl           |   47 +-
 src/couch_views/src/couch_views_indexer.erl        |   60 +-
 src/couch_views/src/couch_views_server.erl         |   17 +-
 src/couch_views/src/couch_views_util.erl           |   27 +-
 .../test/couch_views_active_tasks_test.erl         |  155 +++
 src/couch_views/test/couch_views_map_test.erl      |   51 +-
 src/ddoc_cache/src/ddoc_cache_entry.erl            |   21 +-
 src/dreyfus/src/dreyfus_index.erl                  |   26 +-
 src/ebtree/.gitignore                              |    3 +
 src/ebtree/README.md                               |   19 +
 src/{couch_tests => ebtree}/rebar.config           |   11 +-
 .../dreyfus_app.erl => ebtree/src/ebtree.app.src}  |   25 +-
 src/ebtree/src/ebtree.erl                          | 1457 ++++++++++++++++++++
 src/fabric/src/fabric2_active_tasks.erl            |   51 +
 src/fabric/src/fabric2_db.erl                      |    8 +-
 src/fabric/src/fabric2_fdb.erl                     |   24 +-
 src/fabric/src/fabric2_server.erl                  |    3 +-
 src/fabric/src/fabric2_txids.erl                   |   15 +-
 src/fabric/test/fabric2_db_crud_tests.erl          |   28 +
 src/fabric/test/fabric2_db_security_tests.erl      |   55 +-
 src/global_changes/src/global_changes_server.erl   |   11 +-
 src/ken/src/ken_server.erl                         |   16 +-
 src/setup/src/setup.erl                            |    2 +-
 src/setup/src/setup_httpd.erl                      |   17 +-
 test/elixir/lib/couch.ex                           |   12 +-
 test/elixir/test/map_test.exs                      |   27 +
 test/elixir/test/replication_test.exs              |   24 +-
 72 files changed, 2763 insertions(+), 230 deletions(-)
 rename src/aegis/src/{aegis.app.src => aegis.app.src.script} (62%)
 create mode 100644 src/couch_views/test/couch_views_active_tasks_test.erl
 create mode 100644 src/ebtree/.gitignore
 create mode 100644 src/ebtree/README.md
 copy src/{couch_tests => ebtree}/rebar.config (81%)
 copy src/{dreyfus/src/dreyfus_app.erl => ebtree/src/ebtree.app.src} (70%)
 create mode 100644 src/ebtree/src/ebtree.erl
 create mode 100644 src/fabric/src/fabric2_active_tasks.erl