You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2018/03/26 23:20:46 UTC

[couchdb] 01/01: Merge branch 'master' into fix-custom-compaction-daemon-config

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

wohali pushed a commit to branch fix-custom-compaction-daemon-config
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 26ddad7a72e0b188048c4eef60eca58699953b00
Merge: 56c8f71 e7c48b3
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Mon Mar 26 19:20:42 2018 -0400

    Merge branch 'master' into fix-custom-compaction-daemon-config

 .gitignore                                         |    5 +-
 Jenkinsfile                                        |  117 --
 LICENSE                                            |  117 ++
 Makefile                                           |   84 +-
 Makefile.win                                       |   18 -
 NOTICE                                             |    7 +
 README-DEV.rst                                     |   24 -
 configure                                          |    9 +
 dev/run                                            |   24 +-
 rebar.config.script                                |   12 +-
 rel/haproxy.cfg                                    |    4 +-
 rel/overlay/bin/couchdb                            |    8 +-
 rel/overlay/etc/default.ini                        |   44 +-
 rel/plugins/eunit_plugin.erl                       |   20 +
 rel/reltool.config                                 |    2 +
 src/chttpd/src/chttpd_auth_request.erl             |    4 +
 src/chttpd/src/chttpd_db.erl                       |   63 +-
 src/chttpd/src/chttpd_httpd_handlers.erl           |    1 +
 src/chttpd/src/chttpd_misc.erl                     |   35 +
 src/chttpd/src/chttpd_view.erl                     |   16 +
 .../test/chttpd_csp_tests.erl}                     |   11 +-
 src/chttpd/test/chttpd_db_test.erl                 |  218 +++-
 src/chttpd/test/chttpd_dbs_info_test.erl           |  169 +++
 src/chttpd/test/chttpd_security_tests.erl          |   22 +
 src/chttpd/test/chttpd_view_test.erl               |  123 ++
 src/couch/.gitignore                               |    5 +
 src/couch/include/couch_db.hrl                     |    5 +-
 src/couch/include/couch_eunit.hrl                  |   11 +-
 src/couch/include/couch_js_functions.hrl           |    9 +
 src/couch/src/couch.app.src                        |    1 +
 src/couch/src/couch.erl                            |    1 +
 src/couch/src/couch_att.erl                        |  146 ++-
 src/couch/src/couch_auth_cache.erl                 |   16 +-
 src/couch/src/couch_bt_engine.erl                  |  962 ++++++++++++++
 .../src/couch_bt_engine.hrl}                       |   20 +-
 src/couch/src/couch_bt_engine_compactor.erl        |  496 ++++++++
 src/couch/src/couch_bt_engine_header.erl           |  434 +++++++
 src/couch/src/couch_bt_engine_stream.erl           |   70 ++
 src/couch/src/couch_changes.erl                    |   21 +-
 src/couch/src/couch_compaction_daemon.erl          |   87 +-
 src/couch/src/couch_db.erl                         |  720 +++++------
 src/couch/src/couch_db_engine.erl                  |  893 +++++++++++++
 src/couch/src/couch_db_int.hrl                     |   69 +-
 src/couch/src/couch_db_updater.erl                 | 1310 +++++---------------
 src/couch/src/couch_file.erl                       |   40 +-
 src/couch/src/couch_httpd.erl                      |   13 +
 src/couch/src/couch_httpd_auth.erl                 |   12 +-
 src/couch/src/couch_httpd_db.erl                   |   11 +-
 src/couch/src/couch_httpd_misc_handlers.erl        |   38 +-
 src/couch/src/couch_httpd_multipart.erl            |   77 +-
 src/couch/src/couch_key_tree.erl                   |    6 +-
 src/couch/src/couch_passwords.erl                  |   39 +-
 src/couch/src/couch_query_servers.erl              |    2 +-
 src/couch/src/couch_server.erl                     |  236 +++-
 src/couch/src/couch_stream.erl                     |  255 ++--
 src/couch/src/couch_users_db.erl                   |   10 +-
 src/couch/src/couch_util.erl                       |   47 +-
 src/couch/src/test_engine_attachments.erl          |   93 ++
 src/couch/src/test_engine_compaction.erl           |  185 +++
 src/couch/src/test_engine_fold_changes.erl         |  190 +++
 src/couch/src/test_engine_fold_docs.erl            |  390 ++++++
 src/couch/src/test_engine_get_set_props.erl        |   70 ++
 src/couch/src/test_engine_open_close_delete.erl    |   81 ++
 src/couch/src/test_engine_purge_docs.erl           |  158 +++
 src/couch/src/test_engine_read_write_docs.erl      |  317 +++++
 src/couch/src/test_engine_ref_counting.erl         |  103 ++
 src/couch/src/test_engine_util.erl                 |  607 +++++++++
 src/couch/src/test_request.erl                     |   10 +
 src/couch/test/chttpd_endpoints_tests.erl          |    1 +
 .../test/couch_bt_engine_tests.erl}                |   16 +-
 src/couch/test/couch_db_plugin_tests.erl           |    2 +-
 src/couch/test/couch_db_tests.erl                  |   10 +-
 src/couch/test/couch_key_tree_tests.erl            |   18 +-
 src/couch/test/couch_passwords_tests.erl           |   42 +-
 src/couch/test/couch_server_tests.erl              |   16 +
 src/couch/test/couch_stream_tests.erl              |   32 +-
 src/couch/test/couchdb_compaction_daemon_tests.erl |    3 +-
 src/couch/test/couchdb_vhosts_tests.erl            |   25 -
 src/couch/test/couchdb_views_tests.erl             |   42 +-
 src/couch_epi/rebar.config                         |    4 +
 src/couch_epi/src/couch_epi_codegen.erl            |   19 +-
 src/couch_event/src/couch_event_listener.erl       |   28 +-
 src/couch_index/src/couch_index.erl                |    6 +-
 src/couch_index/src/couch_index_updater.erl        |    6 +-
 src/couch_log/src/couch_log.erl                    |    1 +
 src/couch_log/test/couch_log_test_util.erl         |    7 +-
 src/couch_mrview/src/couch_mrview.erl              |   32 +-
 src/couch_mrview/src/couch_mrview_util.erl         |   19 +-
 .../test/couch_mrview_local_docs_tests.erl         |    6 +-
 src/couch_peruser/src/couch_peruser.erl            |   52 +-
 src/couch_peruser/test/couch_peruser_test.erl      |  140 ++-
 .../{src => include}/couch_replicator_api_wrap.hrl |   13 +-
 src/couch_replicator/src/couch_replicator.app.src  |    1 +
 src/couch_replicator/src/couch_replicator.erl      |    2 +-
 .../src/couch_replicator_api_wrap.erl              |    7 +-
 src/couch_replicator/src/couch_replicator_auth.erl |  100 ++
 .../src/couch_replicator_auth_noop.erl             |   52 +
 .../src/couch_replicator_auth_session.erl          |  693 +++++++++++
 .../src/couch_replicator_changes_reader.erl        |    2 +-
 src/couch_replicator/src/couch_replicator_docs.erl |   49 +-
 .../src/couch_replicator_httpc.erl                 |   86 +-
 src/couch_replicator/src/couch_replicator_ids.erl  |   51 +-
 .../src/couch_replicator_scheduler.erl             |    2 +-
 .../src/couch_replicator_scheduler_job.erl         |    2 +-
 .../src/couch_replicator_utils.erl                 |   90 +-
 .../src/couch_replicator_worker.erl                |   49 +-
 .../test/couch_replicator_compact_tests.erl        |    4 +-
 .../test/couch_replicator_filtered_tests.erl       |    4 +-
 .../test/couch_replicator_missing_stubs_tests.erl  |    4 +-
 .../test/couch_replicator_proxy_tests.erl          |    2 +-
 .../test/couch_replicator_selector_tests.erl       |    4 +-
 ...ch_replicator_small_max_request_size_target.erl |   28 +-
 .../test/couch_replicator_test_helper.erl          |    4 +-
 .../couch_replicator_use_checkpoints_tests.erl     |    4 +-
 src/couch_stats/src/couch_stats.app.src            |    2 +-
 src/couch_stats/src/couch_stats.erl                |    2 +-
 .../src/couch_stats_process_tracker.erl            |   12 +-
 src/fabric/src/fabric_db_create.erl                |   33 +-
 src/fabric/src/fabric_rpc.erl                      |    9 +-
 src/fabric/src/fabric_view_all_docs.erl            |   10 +-
 src/mango/src/mango_cursor_special.erl             |    7 +-
 src/mango/src/mango_httpd.erl                      |    2 +-
 src/mango/src/mango_idx_text.erl                   |    2 +-
 src/mango/src/mango_native_proc.erl                |   51 +-
 src/mango/test/03-operator-test.py                 |    9 +-
 src/mango/test/16-index-selectors-test.py          |   10 +
 src/mango/test/mango.py                            |   18 +-
 src/mem3/include/mem3.hrl                          |    6 +-
 src/mem3/src/mem3.erl                              |   19 +-
 src/mem3/src/mem3_nodes.erl                        |    3 +-
 src/mem3/src/mem3_rep.erl                          |   13 +-
 src/mem3/src/mem3_shards.erl                       |   61 +-
 src/mem3/src/mem3_util.erl                         |   17 +-
 src/mem3/test/mem3_util_test.erl                   |   16 +-
 test/javascript/run                                |   16 +-
 .../tests-cluster/with-quorum/db-creation.js       |   27 +
 .../tests-cluster/without-quorum/db-creation.js    |   28 +
 test/javascript/tests/design_docs_query.js         |  154 +++
 test/javascript/tests/users_db_security.js         |  144 ++-
 test/javascript/tests/view_errors.js               |    2 +-
 140 files changed, 9385 insertions(+), 2491 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
wohali@apache.org.