You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2018/07/14 13:13:41 UTC
[couchdb] 01/01: Merge branch 'master' into
1278-add-clustered-db-info
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch 1278-add-clustered-db-info
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit cb87b479443123e94a571e98b68a70176a33b935
Merge: 6bdfeca dacb658
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Sat Jul 14 15:13:38 2018 +0200
Merge branch 'master' into 1278-add-clustered-db-info
.gitignore | 1 +
.travis.yml | 9 +-
INSTALL.Unix.md | 6 +-
Jenkinsfile | 153 ++++++++++----
LICENSE | 24 +++
Makefile | 23 ++-
NOTICE | 4 +
rebar.config.script | 18 +-
rel/overlay/etc/default.ini | 35 ++--
rel/overlay/etc/local.ini | 14 --
rel/overlay/etc/vm.args | 6 +
rel/reltool.config | 2 +
src/chttpd/src/chttpd.erl | 68 ++++++-
src/chttpd/src/chttpd_auth.erl | 4 +
src/chttpd/src/chttpd_db.erl | 1 -
src/chttpd/src/chttpd_misc.erl | 10 +-
src/couch/src/couch.app.src | 3 +-
src/couch/src/couch_bt_engine.erl | 4 +-
src/couch/src/couch_db.erl | 10 +-
src/couch/src/couch_db_updater.erl | 55 +++--
src/couch/src/couch_httpd_misc_handlers.erl | 2 +-
src/couch/src/couch_httpd_multipart.erl | 3 +-
src/couch/src/couch_key_tree.erl | 83 +++++++-
src/couch/src/couch_native_process.erl | 12 ++
src/couch/src/couch_query_servers.erl | 34 +++-
src/couch/src/couch_server.erl | 4 +-
src/couch/src/couch_util.erl | 50 ++++-
src/couch/src/test_engine_util.erl | 3 +-
src/couch/src/test_util.erl | 26 ++-
src/couch/test/couch_changes_tests.erl | 38 +++-
src/couch/test/couch_key_tree_tests.erl | 197 +++++++++---------
src/couch/test/couchdb_attachments_tests.erl | 6 +-
src/couch_log/src/couch_log_server.erl | 1 +
src/couch_mrview/src/couch_mrview.erl | 30 ++-
src/couch_mrview/src/couch_mrview_compactor.erl | 2 +
src/couch_mrview/src/couch_mrview_index.erl | 3 +-
src/couch_mrview/src/couch_mrview_util.erl | 17 ++
.../test/couch_mrview_index_info_tests.erl | 96 ++++++---
.../src/couch_replicator_scheduler.erl | 82 +++++++-
src/ddoc_cache/src/ddoc_cache_lru.erl | 1 +
src/fabric/src/fabric_db_delete.erl | 6 +-
src/fabric/src/fabric_doc_atts.erl | 168 ++++++++++++++++
src/fabric/src/fabric_rpc.erl | 7 +-
src/fabric/src/fabric_view.erl | 3 +-
src/mango/src/mango_cursor.erl | 18 +-
src/mango/src/mango_cursor_view.erl | 8 +-
src/mango/src/mango_error.erl | 4 +-
src/mango/src/mango_idx.erl | 36 +---
src/mango/src/mango_idx_special.erl | 13 +-
src/mango/src/mango_idx_view.erl | 38 +++-
src/mango/src/mango_selector.erl | 113 ++++++++++-
src/mango/test/02-basic-find-test.py | 7 +
src/mango/test/12-use-correct-index-test.py | 13 ++
src/mango/test/18-json-sort.py | 222 +++++++++++++++++++++
src/mango/test/19-find-conflicts.py | 41 ++++
src/mango/test/mango.py | 5 +
src/mem3/src/mem3_shards.erl | 42 ++--
src/mem3/test/01-config-default.ini | 14 --
src/mem3/test/mem3_sync_security_test.erl | 19 +-
src/mem3/test/mem3_util_test.erl | 55 ++---
src/rexi/src/rexi_server.erl | 1 +
test/javascript/run | 8 +-
.../with-quorum/{db-creation.js => attachments.js} | 29 ++-
.../{db-creation.js => attachments_delete.js} | 25 ++-
.../attachments_delete_overridden_quorum.js | 36 ++++
.../with-quorum/attachments_overridden_quorum.js | 40 ++++
.../with-quorum/{db-creation.js => db_creation.js} | 0
...reation.js => db_creation_overridden_quorum.js} | 11 +-
.../db-creation.js => with-quorum/db_deletion.js} | 16 +-
...reation.js => db_deletion_overridden_quorum.js} | 14 +-
.../with-quorum/{db-creation.js => doc_bulk.js} | 20 +-
...b-creation.js => doc_bulk_overridden_quorum.js} | 20 +-
.../with-quorum/{db-creation.js => doc_copy.js} | 20 +-
...b-creation.js => doc_copy_overridden_quorum.js} | 23 ++-
.../with-quorum/{db-creation.js => doc_crud.js} | 24 ++-
...b-creation.js => doc_crud_overridden_quorum.js} | 24 ++-
.../tests-cluster/without-quorum/attachments.js | 39 ++++
.../without-quorum/attachments_delete.js | 37 ++++
.../attachments_delete_overridden_quorum.js | 36 ++++
.../attachments_overridden_quorum.js | 42 ++++
.../{db-creation.js => db_creation.js} | 3 +-
...reation.js => db_creation_overridden_quorum.js} | 12 +-
.../{db-creation.js => db_deletion.js} | 18 +-
...reation.js => db_deletion_overridden_quorum.js} | 15 +-
.../without-quorum/{db-creation.js => doc_bulk.js} | 20 +-
...b-creation.js => doc_bulk_overridden_quorum.js} | 20 +-
.../without-quorum/{db-creation.js => doc_copy.js} | 20 +-
...b-creation.js => doc_copy_overridden_quorum.js} | 23 ++-
.../without-quorum/{db-creation.js => doc_crud.js} | 25 ++-
...b-creation.js => doc_crud_overridden_quorum.js} | 24 ++-
test/javascript/tests/reduce_builtin.js | 20 ++
test/javascript/tests/users_db.js | 7 +
92 files changed, 1991 insertions(+), 653 deletions(-)